1 files changed, 243 insertions, 238 deletions

diff --git a/po/ja.po b/po/ja.po
index a52a7b41e..65f9c7676 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-11-13 12:28+0100\n"
+"POT-Creation-Date: 2008-12-03 09:59+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -96,7 +96,7 @@ msgstr "�ѥ��ե졼���������Ǥ�"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
 #: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:311
@@ -106,12 +106,12 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1095 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
 #: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
 #: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1997
-#: sm/gpgsm.c:2034 sm/gpgsm.c:2072 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1978
+#: sm/gpgsm.c:2015 sm/gpgsm.c:2053 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -324,12 +324,13 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:119
+#: agent/gpg-agent.c:130 scd/scdaemon.c:120
 msgid "do not detach from the console"
 msgstr ""
 
@@ -337,7 +338,7 @@ msgstr ""
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:132 scd/scdaemon.c:120 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:132 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
@@ -393,165 +394,165 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:294 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:213 sm/gpgsm.c:494 tools/gpg-connect-agent.c:173
+#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
 #: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:297
+#: agent/gpg-agent.c:322
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:299
+#: agent/gpg-agent.c:324
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
+#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:639
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:532 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 tools/symcryptrun.c:997
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
+#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
+#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:636 agent/gpg-agent.c:1215 g10/gpg.c:2105
-#: scd/scdaemon.c:433 sm/gpgsm.c:991 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
+#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:973 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1328 agent/gpg-agent.c:1448 agent/gpg-agent.c:1452
-#: agent/gpg-agent.c:1493 agent/gpg-agent.c:1497 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:928
+#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
+#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:971
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1342 scd/scdaemon.c:942
+#: agent/gpg-agent.c:1367 scd/scdaemon.c:985
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1365 scd/scdaemon.c:965
+#: agent/gpg-agent.c:1390 scd/scdaemon.c:1008
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1374
+#: agent/gpg-agent.c:1399
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1394
+#: agent/gpg-agent.c:1419
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1405 scd/scdaemon.c:985
+#: agent/gpg-agent.c:1430 scd/scdaemon.c:1028
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1410 scd/scdaemon.c:988
+#: agent/gpg-agent.c:1435 scd/scdaemon.c:1031
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1422 scd/scdaemon.c:997
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1040
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1453 scd/scdaemon.c:1047
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1456 agent/gpg-agent.c:1503 g10/openfile.c:432
+#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1509
+#: agent/gpg-agent.c:1534
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1513
+#: agent/gpg-agent.c:1538
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1643 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1668 scd/scdaemon.c:1063
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1665
+#: agent/gpg-agent.c:1690
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1670
+#: agent/gpg-agent.c:1695
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1715
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1720
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1808 scd/scdaemon.c:1143
+#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1921 scd/scdaemon.c:1210
+#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2049
+#: agent/gpg-agent.c:2074
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2060 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2094
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:2073 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2105
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -694,12 +695,12 @@ msgid ""
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:463
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:587
+#: agent/trustlist.c:587 common/audit.c:465
 msgid "No"
 msgstr ""
 
@@ -881,128 +882,128 @@ msgstr ""
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
-#: common/audit.c:684
+#: common/audit.c:692
 #, fuzzy
 msgid "Certificate chain available"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:691
+#: common/audit.c:699
 #, fuzzy
 msgid "root certificate missing"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:717
+#: common/audit.c:725
 msgid "Data encryption succeeded"
 msgstr ""
 
-#: common/audit.c:722 common/audit.c:783 common/audit.c:803 common/audit.c:827
+#: common/audit.c:730 common/audit.c:791 common/audit.c:811 common/audit.c:835
 #, fuzzy
 msgid "Data available"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: common/audit.c:725
+#: common/audit.c:733
 #, fuzzy
 msgid "Session key created"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: common/audit.c:730
+#: common/audit.c:738
 #, fuzzy, c-format
 msgid "algorithm: %s"
 msgstr "ͭ����: %s"
 
-#: common/audit.c:732 common/audit.c:734
+#: common/audit.c:740 common/audit.c:742
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: common/audit.c:736
+#: common/audit.c:744
 #, fuzzy
 msgid "seems to be not encrypted"
 msgstr "�Ź沽����Ƥ��ޤ���"
 
-#: common/audit.c:742
+#: common/audit.c:750
 #, fuzzy
 msgid "Number of recipients"
 msgstr "������:\n"
 
-#: common/audit.c:750
+#: common/audit.c:758
 #, c-format
 msgid "Recipient %d"
 msgstr ""
 
-#: common/audit.c:778
+#: common/audit.c:786
 msgid "Data signing succeeded"
 msgstr ""
 
-#: common/audit.c:798
+#: common/audit.c:806
 msgid "Data decryption succeeded"
 msgstr ""
 
-#: common/audit.c:823
+#: common/audit.c:831
 #, fuzzy
 msgid "Data verification succeeded"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: common/audit.c:832
+#: common/audit.c:840
 #, fuzzy
 msgid "Signature available"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: common/audit.c:837
+#: common/audit.c:845
 #, fuzzy
 msgid "Parsing signature succeeded"
 msgstr "��%s�ɤ������������̾"
 
-#: common/audit.c:842
+#: common/audit.c:850
 #, fuzzy, c-format
 msgid "Bad hash algorithm: %s"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: common/audit.c:857
+#: common/audit.c:865
 #, fuzzy, c-format
 msgid "Signature %d"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: common/audit.c:873
+#: common/audit.c:881
 #, fuzzy
 msgid "Certificate chain valid"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: common/audit.c:884
+#: common/audit.c:892
 #, fuzzy
 msgid "Root certificate trustworthy"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:894
+#: common/audit.c:902
 #, fuzzy
 msgid "CRL/OCSP check of certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:911
+#: common/audit.c:919
 #, fuzzy
 msgid "Included certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: common/audit.c:970
+#: common/audit.c:978
 msgid "No audit log entries."
 msgstr ""
 
-#: common/audit.c:1019
+#: common/audit.c:1027
 #, fuzzy
 msgid "Unknown operation"
 msgstr "̤�ΤΥС������Ǥ�"
 
-#: common/audit.c:1037
+#: common/audit.c:1045
 msgid "Gpg-Agent usable"
 msgstr ""
 
-#: common/audit.c:1047
+#: common/audit.c:1055
 msgid "Dirmngr usable"
 msgstr ""
 
-#: common/audit.c:1083
+#: common/audit.c:1091
 #, fuzzy, c-format
 msgid "No help available for `%s'."
 msgstr "��%s�פΥإ�פϤ���ޤ���"
@@ -1427,7 +1428,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1948,15 +1949,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:790 g10/gpgv.c:100
+#: g10/gpg.c:808 g10/gpgv.c:114
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:807
+#: g10/gpg.c:831
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:810
+#: g10/gpg.c:834
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1966,7 +1967,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:821 sm/gpgsm.c:507
+#: g10/gpg.c:845 sm/gpgsm.c:536
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1974,551 +1975,547 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:824
+#: g10/gpg.c:848
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:831 g10/keyedit.c:2343
+#: g10/gpg.c:855 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:838
+#: g10/gpg.c:862
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:845 g10/keyedit.c:2388
+#: g10/gpg.c:869 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:852 sm/gpgsm.c:527
-msgid "Used libraries:"
-msgstr ""
-
-#: g10/gpg.c:960
+#: g10/gpg.c:939
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1130 sm/gpgsm.c:694
+#: g10/gpg.c:1109 sm/gpgsm.c:675
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1148
+#: g10/gpg.c:1127
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1324
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1348
+#: g10/gpg.c:1327
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1330
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1336
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1360
+#: g10/gpg.c:1339
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1363
+#: g10/gpg.c:1342
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1369
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1372
+#: g10/gpg.c:1351
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1375
+#: g10/gpg.c:1354
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1381
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1384
+#: g10/gpg.c:1363
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1387
+#: g10/gpg.c:1366
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1566
+#: g10/gpg.c:1545
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1666
+#: g10/gpg.c:1645
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1668
+#: g10/gpg.c:1647
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1670
+#: g10/gpg.c:1649
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1672
+#: g10/gpg.c:1651
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1676
+#: g10/gpg.c:1655
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1678
+#: g10/gpg.c:1657
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1680
+#: g10/gpg.c:1659
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1682
+#: g10/gpg.c:1661
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1684
+#: g10/gpg.c:1663
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1686
+#: g10/gpg.c:1665
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1688
+#: g10/gpg.c:1667
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1849
+#: g10/gpg.c:1828
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1940
+#: g10/gpg.c:1919
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
+#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2505 g10/gpg.c:2517
+#: g10/gpg.c:2484 g10/gpg.c:2496
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2599
+#: g10/gpg.c:2578
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
+#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2613
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2616
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2644
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2626
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2636
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2646
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2675
+#: g10/gpg.c:2654
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2656
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2679
+#: g10/gpg.c:2658
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2681
+#: g10/gpg.c:2660
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2685
+#: g10/gpg.c:2664
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2687
+#: g10/gpg.c:2666
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2691
+#: g10/gpg.c:2670
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2695
+#: g10/gpg.c:2674
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2697
+#: g10/gpg.c:2676
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2683
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2707
+#: g10/gpg.c:2686
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2693
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2889
+#: g10/gpg.c:2868
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2892
+#: g10/gpg.c:2871
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2999 sm/gpgsm.c:1405
+#: g10/gpg.c:2978 sm/gpgsm.c:1386
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:3003
+#: g10/gpg.c:2982
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:2991
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:2994
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:3030
+#: g10/gpg.c:3009
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3044
+#: g10/gpg.c:3023
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3050
+#: g10/gpg.c:3029
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3035
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3069
+#: g10/gpg.c:3048
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
+#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3126
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3132
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3147
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3170
+#: g10/gpg.c:3149
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3172
+#: g10/gpg.c:3151
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3174
+#: g10/gpg.c:3153
 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:3176
+#: g10/gpg.c:3155
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3158
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3183
+#: g10/gpg.c:3162
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3190
+#: g10/gpg.c:3169
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3199
+#: g10/gpg.c:3178
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3203
+#: g10/gpg.c:3182
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3207
+#: g10/gpg.c:3186
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3240
+#: g10/gpg.c:3219
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3287
+#: g10/gpg.c:3266
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3292
+#: g10/gpg.c:3271
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3297
+#: g10/gpg.c:3276
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3359
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3391
+#: g10/gpg.c:3370
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3391
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3398
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3400
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3410
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3444
+#: g10/gpg.c:3423
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3446
+#: g10/gpg.c:3425
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3428
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3467
+#: g10/gpg.c:3446
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3459
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3495
+#: g10/gpg.c:3474
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3476
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3500
+#: g10/gpg.c:3479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3520
+#: g10/gpg.c:3499
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3529
+#: g10/gpg.c:3508
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3554
+#: g10/gpg.c:3533
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3562
+#: g10/gpg.c:3541
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3566
+#: g10/gpg.c:3545
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3587
+#: g10/gpg.c:3566
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3658
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3681
+#: g10/gpg.c:3660
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3683
+#: g10/gpg.c:3662
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3694
+#: g10/gpg.c:3673
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3704
+#: g10/gpg.c:3683
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3755
+#: g10/gpg.c:3734
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3763
+#: g10/gpg.c:3742
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3853
+#: g10/gpg.c:3832
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3949
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3974
+#: g10/gpg.c:3953
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4286
+#: g10/gpg.c:4265
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4288
+#: g10/gpg.c:4267
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4321
+#: g10/gpg.c:4300
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2537,11 +2534,11 @@ msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:103
+#: g10/gpgv.c:117
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:105
+#: g10/gpgv.c:119
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6711,57 +6708,65 @@ msgstr "������PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111
+#: scd/scdaemon.c:115 sm/gpgsm.c:315
+msgid "|LEVEL|set the debugging level to LEVEL"
+msgstr ""
+
+#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
 #, fuzzy
-msgid "read options from file"
+msgid "|FILE|write a log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:121
+#: scd/scdaemon.c:123
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:122
+#: scd/scdaemon.c:125
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:130
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:131
+#: scd/scdaemon.c:136
+msgid "|N|disconnect the card after N seconds of inactivity"
+msgstr ""
+
+#: scd/scdaemon.c:138
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:140
 #, fuzzy
 msgid "allow the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:216
+#: scd/scdaemon.c:254
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:218
+#: scd/scdaemon.c:256
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:675
+#: scd/scdaemon.c:718
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1029
+#: scd/scdaemon.c:1072
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1041
+#: scd/scdaemon.c:1084
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7452,10 +7457,6 @@ msgstr ""
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:315
-msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr ""
-
 #: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
@@ -7466,12 +7467,12 @@ msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:497
+#: sm/gpgsm.c:515
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:500
+#: sm/gpgsm.c:518
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7482,60 +7483,60 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:629
+#: sm/gpgsm.c:610
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:727
+#: sm/gpgsm.c:708
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:738
+#: sm/gpgsm.c:719
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:789
+#: sm/gpgsm.c:770
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:808
+#: sm/gpgsm.c:789
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:829
+#: sm/gpgsm.c:810
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1341
+#: sm/gpgsm.c:1322
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1422
+#: sm/gpgsm.c:1403
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1524
+#: sm/gpgsm.c:1505
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1562
+#: sm/gpgsm.c:1543
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1733
+#: sm/gpgsm.c:1714
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1888
+#: sm/gpgsm.c:1869
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7813,8 +7814,8 @@ msgstr ""
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
-#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
+#: tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
@@ -8200,6 +8201,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "read options from file"
+#~ msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
+
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[�ե�����]|��̾�����"