1 files changed, 307 insertions, 316 deletions

diff --git a/po/ja.po b/po/ja.po
index 7e8b9b29f..a52a7b41e 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-11 12:05+0100\n"
+"POT-Creation-Date: 2008-11-13 12:28+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:1064 g10/keygen.c:3226
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1094 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:1065 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1095 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:2076
-#: sm/gpgsm.c:2113 sm/gpgsm.c:2151 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -305,14 +305,14 @@ msgstr ""
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
+#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
 #: tools/gpgconf.c:77 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:122 g10/gpgv.c:71 kbx/kbxutil.c:89 scd/scdaemon.c:108
-#: sm/gpgsm.c:345
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
@@ -324,7 +324,7 @@ msgstr ""
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 tools/symcryptrun.c:167
+#: agent/gpg-agent.c:125 sm/gpgsm.c:311 tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -394,7 +394,7 @@ 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:571 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:213 sm/gpgsm.c:494 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 <"
@@ -411,30 +411,30 @@ msgid ""
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:334 g10/gpg.c:971 scd/scdaemon.c:253 sm/gpgsm.c:735
+#: agent/gpg-agent.c:334 g10/gpg.c:1001 scd/scdaemon.c:253 sm/gpgsm.c:658
 #, 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:973 sm/gpgsm.c:976 tools/symcryptrun.c:997
+#: scd/scdaemon.c:347 sm/gpgsm.c:896 sm/gpgsm.c:899 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:2071 scd/scdaemon.c:428 sm/gpgsm.c:1064
+#: agent/gpg-agent.c:631 g10/gpg.c:2101 scd/scdaemon.c:428 sm/gpgsm.c:987
 #, 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:2075
-#: scd/scdaemon.c:433 sm/gpgsm.c:1068 tools/symcryptrun.c:930
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:644 g10/gpg.c:2082 scd/scdaemon.c:441 sm/gpgsm.c:1075
+#: agent/gpg-agent.c:644 g10/gpg.c:2112 scd/scdaemon.c:441 sm/gpgsm.c:998
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -1427,7 +1427,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3952 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3984 g10/keyring.c:380 g10/keyring.c:667
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1729,7 +1729,7 @@ msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
 msgid ""
 "@Commands:\n"
 " "
@@ -1737,35 +1737,37 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:372
-msgid "|[file]|make a signature"
-msgstr "|[�ե�����]|��̾�����"
+#: g10/gpg.c:372 sm/gpgsm.c:187
+#, fuzzy
+msgid "make a signature"
+msgstr "���ѽ�̾�����"
 
-#: g10/gpg.c:373
-msgid "|[file]|make a clear text signature"
+#: g10/gpg.c:373 sm/gpgsm.c:188
+#, fuzzy
+msgid "make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:189
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:375 sm/gpgsm.c:251
+#: g10/gpg.c:375 sm/gpgsm.c:190
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:377 sm/gpgsm.c:252
+#: g10/gpg.c:377 sm/gpgsm.c:191
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:379 sm/gpgsm.c:253
+#: g10/gpg.c:379 sm/gpgsm.c:192
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:193
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:383 sm/gpgsm.c:256
+#: g10/gpg.c:383 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "�����"
 
@@ -1777,11 +1779,11 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:387 sm/gpgsm.c:260
+#: g10/gpg.c:387 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:388 sm/gpgsm.c:258
+#: g10/gpg.c:388 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
@@ -1789,79 +1791,80 @@ msgstr "��̩���ΰ���"
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:390 sm/gpgsm.c:262
+#: g10/gpg.c:391 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:394
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:399 sm/gpgsm.c:263
+#: g10/gpg.c:400 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:400 sm/gpgsm.c:264
+#: g10/gpg.c:401 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:412
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:430
-msgid "|algo [files]|print message digests"
+#: g10/gpg.c:431
+#, fuzzy
+msgid "print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:433 sm/gpgsm.c:268
+#: g10/gpg.c:434 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
+#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
 #: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -1872,52 +1875,51 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:437 sm/gpgsm.c:285
+#: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:439 sm/gpgsm.c:297
-msgid "|NAME|encrypt for NAME"
+#: g10/gpg.c:441 sm/gpgsm.c:241
+#, fuzzy
+msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:450 sm/gpgsm.c:335
-msgid "use this user-id to sign or decrypt"
+#: g10/gpg.c:454 sm/gpgsm.c:278
+#, fuzzy
+msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:451 sm/gpgsm.c:338
-msgid "|N|set compress level N (0 disables)"
+#: g10/gpg.c:457
+#, fuzzy
+msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:456 sm/gpgsm.c:340
+#: g10/gpg.c:463
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:470 sm/gpgsm.c:343
+#: g10/gpg.c:480 sm/gpgsm.c:280
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:484
+#: g10/gpg.c:497
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:549
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:528
-msgid "generate PGP 2.x compatible messages"
-msgstr "PGP 2.x�ߴ��Υ�å�����������"
-
-#: g10/gpg.c:557 sm/gpgsm.c:403
+#: g10/gpg.c:580 sm/gpgsm.c:335
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1926,7 +1928,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:560 sm/gpgsm.c:406
+#: g10/gpg.c:583 sm/gpgsm.c:338
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1946,15 +1948,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:760 g10/gpgv.c:95
+#: g10/gpg.c:790 g10/gpgv.c:100
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:807
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:810
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1964,7 +1966,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:791 sm/gpgsm.c:584
+#: g10/gpg.c:821 sm/gpgsm.c:507
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1972,573 +1974,574 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:794
+#: g10/gpg.c:824
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:801 g10/keyedit.c:2343
+#: g10/gpg.c:831 g10/keyedit.c:2343
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:808
+#: g10/gpg.c:838
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:815 g10/keyedit.c:2388
+#: g10/gpg.c:845 g10/keyedit.c:2388
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:822 sm/gpgsm.c:604
+#: g10/gpg.c:852 sm/gpgsm.c:527
 msgid "Used libraries:"
 msgstr ""
 
-#: g10/gpg.c:930
+#: g10/gpg.c:960
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1100 sm/gpgsm.c:771
+#: g10/gpg.c:1130 sm/gpgsm.c:694
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1118
+#: g10/gpg.c:1148
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1315
+#: g10/gpg.c:1345
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1318
+#: g10/gpg.c:1348
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1321
+#: g10/gpg.c:1351
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1327
+#: g10/gpg.c:1357
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1330
+#: g10/gpg.c:1360
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1333
+#: g10/gpg.c:1363
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1339
+#: g10/gpg.c:1369
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1342
+#: g10/gpg.c:1372
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1345
+#: g10/gpg.c:1375
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1351
+#: g10/gpg.c:1381
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1354
+#: g10/gpg.c:1384
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1357
+#: g10/gpg.c:1387
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1536
+#: g10/gpg.c:1566
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1636
+#: g10/gpg.c:1666
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1638
+#: g10/gpg.c:1668
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1640
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1642
+#: g10/gpg.c:1672
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1646
+#: g10/gpg.c:1676
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1648
+#: g10/gpg.c:1678
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1650
+#: g10/gpg.c:1680
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1652
+#: g10/gpg.c:1682
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1654
+#: g10/gpg.c:1684
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1656
+#: g10/gpg.c:1686
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1658
+#: g10/gpg.c:1688
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1819
+#: g10/gpg.c:1849
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1910
+#: g10/gpg.c:1940
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2294 g10/gpg.c:2978 g10/gpg.c:2990
+#: g10/gpg.c:2324 g10/gpg.c:3010 g10/gpg.c:3022
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2475 g10/gpg.c:2487
+#: g10/gpg.c:2505 g10/gpg.c:2517
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2569
+#: g10/gpg.c:2599
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2592 g10/gpg.c:2787 g10/keyedit.c:4107
+#: g10/gpg.c:2622 g10/gpg.c:2817 g10/keyedit.c:4107
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2604
+#: g10/gpg.c:2634
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2607
+#: g10/gpg.c:2637
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2614
+#: g10/gpg.c:2644
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2617
+#: g10/gpg.c:2647
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2624
+#: g10/gpg.c:2654
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2627
+#: g10/gpg.c:2657
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2634
+#: g10/gpg.c:2664
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2637
+#: g10/gpg.c:2667
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2645
+#: g10/gpg.c:2675
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2647
+#: g10/gpg.c:2677
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2679
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2651
+#: g10/gpg.c:2681
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2655
+#: g10/gpg.c:2685
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2657
+#: g10/gpg.c:2687
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2659
+#: g10/gpg.c:2689
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2661
+#: g10/gpg.c:2691
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2693
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2665
+#: g10/gpg.c:2695
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2697
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2704
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2707
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2684
+#: g10/gpg.c:2714
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2859
+#: g10/gpg.c:2889
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2892
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2967 sm/gpgsm.c:1484
+#: g10/gpg.c:2999 sm/gpgsm.c:1405
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2971
+#: g10/gpg.c:3003
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2980
+#: g10/gpg.c:3012
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2983
+#: g10/gpg.c:3015
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2998
+#: g10/gpg.c:3030
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3012
+#: g10/gpg.c:3044
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3018
+#: g10/gpg.c:3050
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3024
+#: g10/gpg.c:3056
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3037
+#: g10/gpg.c:3069
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3103 g10/gpg.c:3127 sm/gpgsm.c:1556
+#: g10/gpg.c:3135 g10/gpg.c:3159 sm/gpgsm.c:1477
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3109 g10/gpg.c:3133 sm/gpgsm.c:1564 sm/gpgsm.c:1570
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1485 sm/gpgsm.c:1491
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3147
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3121
+#: g10/gpg.c:3153
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3168
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3170
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3140
+#: g10/gpg.c:3172
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3142
+#: g10/gpg.c:3174
 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:3144
+#: g10/gpg.c:3176
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3147
+#: g10/gpg.c:3179
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3151
+#: g10/gpg.c:3183
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3158
+#: g10/gpg.c:3190
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3167
+#: g10/gpg.c:3199
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3171
+#: g10/gpg.c:3203
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3207
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3240
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3255
+#: g10/gpg.c:3287
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3260
+#: g10/gpg.c:3292
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3265
+#: g10/gpg.c:3297
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3348
+#: g10/gpg.c:3380
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3359
+#: g10/gpg.c:3391
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3412
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3387
+#: g10/gpg.c:3419
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3389
+#: g10/gpg.c:3421
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3399
+#: g10/gpg.c:3431
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3444
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3446
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3449
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3467
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3448
+#: g10/gpg.c:3480
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3463
+#: g10/gpg.c:3495
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3497
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3468
+#: g10/gpg.c:3500
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3520
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3529
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3554
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3562
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3534
+#: g10/gpg.c:3566
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3555
+#: g10/gpg.c:3587
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3679
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3681
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3683
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3662
+#: g10/gpg.c:3694
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3672
+#: g10/gpg.c:3704
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3723
+#: g10/gpg.c:3755
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3731
+#: g10/gpg.c:3763
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3821
+#: g10/gpg.c:3853
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3938
+#: g10/gpg.c:3970
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3942
+#: g10/gpg.c:3974
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4254
+#: g10/gpg.c:4286
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4256
+#: g10/gpg.c:4288
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4289
+#: g10/gpg.c:4321
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpgv.c:72
-msgid "take the keys from this keyring"
+#: g10/gpgv.c:74
+#, fuzzy
+msgid "|FILE|take the keys from the keyring FILE"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: g10/gpgv.c:74
+#: g10/gpgv.c:76
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:75 sm/gpgsm.c:377
+#: g10/gpgv.c:78 sm/gpgsm.c:325
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭹���"
 
-#: g10/gpgv.c:99
+#: g10/gpgv.c:103
 msgid "Usage: gpgv [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpgv.c:102
+#: g10/gpgv.c:105
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
@@ -6303,77 +6306,77 @@ msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
 msgid "can't open fd %d: %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: jnlib/argparse.c:177
+#: jnlib/argparse.c:180
 #, fuzzy
 msgid "argument not expected"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: jnlib/argparse.c:179
+#: jnlib/argparse.c:182
 #, fuzzy
 msgid "read error"
 msgstr "�ե�������ɽФ����顼"
 
-#: jnlib/argparse.c:181
+#: jnlib/argparse.c:184
 #, fuzzy
 msgid "keyword too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: jnlib/argparse.c:183
+#: jnlib/argparse.c:186
 #, fuzzy
 msgid "missing argument"
 msgstr "̵���ʻ���Ǥ�"
 
-#: jnlib/argparse.c:185
+#: jnlib/argparse.c:188
 #, fuzzy
 msgid "invalid command"
 msgstr "�������ѥ��ޥ��\n"
 
-#: jnlib/argparse.c:187
+#: jnlib/argparse.c:190
 #, fuzzy
 msgid "invalid alias definition"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: jnlib/argparse.c:189
+#: jnlib/argparse.c:192
 #, fuzzy
 msgid "out of core"
 msgstr "̤����"
 
-#: jnlib/argparse.c:191
+#: jnlib/argparse.c:194
 #, fuzzy
 msgid "invalid option"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: jnlib/argparse.c:199
+#: jnlib/argparse.c:202
 #, c-format
 msgid "missing argument for option \"%.50s\"\n"
 msgstr ""
 
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
 #, c-format
 msgid "option \"%.50s\" does not expect an argument\n"
 msgstr ""
 
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:207
 #, fuzzy, c-format
 msgid "invalid command \"%.50s\"\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: jnlib/argparse.c:206
+#: jnlib/argparse.c:209
 #, c-format
 msgid "option \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:208
+#: jnlib/argparse.c:211
 #, c-format
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-#: jnlib/argparse.c:210
+#: jnlib/argparse.c:213
 #, fuzzy
 msgid "out of core\n"
 msgstr "̤����"
 
-#: jnlib/argparse.c:212
+#: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
@@ -6708,7 +6711,7 @@ msgstr "������PIN"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:111 sm/gpgsm.c:366
+#: scd/scdaemon.c:111
 #, fuzzy
 msgid "read options from file"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
@@ -7328,194 +7331,147 @@ msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:248
-#, fuzzy
-msgid "|[FILE]|make a signature"
-msgstr "|[�ե�����]|��̾�����"
-
-#: sm/gpgsm.c:249
-#, fuzzy
-msgid "|[FILE]|make a clear text signature"
-msgstr "|[�ե�����]|���ꥢ��̾�����"
-
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:259
+#: sm/gpgsm.c:199
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:206
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:209
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:269
+#: sm/gpgsm.c:212
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:271
+#: sm/gpgsm.c:214
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:215
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:230
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:235
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:237
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:239
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:244
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:247
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:257
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:313
+#: sm/gpgsm.c:262
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:316
+#: sm/gpgsm.c:265
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:268
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:272
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:327
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-
-#: sm/gpgsm.c:329
-#, fuzzy
-msgid "use the default key as default recipient"
-msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
-
-#: sm/gpgsm.c:346
+#: sm/gpgsm.c:283
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:285
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:290
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: sm/gpgsm.c:351
-#, fuzzy
-msgid "force v3 signatures"
-msgstr "��̾�μ���"
-
-#: sm/gpgsm.c:352
-msgid "always use a MDC for encryption"
-msgstr ""
-
-#: sm/gpgsm.c:357
+#: sm/gpgsm.c:292
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:358
+#: sm/gpgsm.c:293
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:294
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:361
+#: sm/gpgsm.c:297
 #, fuzzy
-msgid "add this keyring to the list of keyrings"
+msgid "|FILE|add keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:362
-#, fuzzy
-msgid "add this secret keyring to the list"
-msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
-msgid "|NAME|use NAME as default secret key"
+#: sm/gpgsm.c:300
+msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:365
-#, fuzzy
-msgid "|NAME|set terminal charset to NAME"
-msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-
-#: sm/gpgsm.c:369
+#: sm/gpgsm.c:315
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: sm/gpgsm.c:384
-msgid "|FILE|load extension module FILE"
-msgstr ""
-
-#: sm/gpgsm.c:390
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:392
+#: sm/gpgsm.c:330
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:395
-#, fuzzy
-msgid "|N|use compress algorithm N"
-msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
-
-#: sm/gpgsm.c:574
+#: sm/gpgsm.c:497
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:500
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7526,60 +7482,60 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:706
+#: sm/gpgsm.c:629
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:804
+#: sm/gpgsm.c:727
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:815
+#: sm/gpgsm.c:738
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:866
+#: sm/gpgsm.c:789
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:885
+#: sm/gpgsm.c:808
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:906
+#: sm/gpgsm.c:829
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1418
+#: sm/gpgsm.c:1341
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1501
+#: sm/gpgsm.c:1422
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1603
+#: sm/gpgsm.c:1524
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1641
+#: sm/gpgsm.c:1562
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1812
+#: sm/gpgsm.c:1733
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1967
+#: sm/gpgsm.c:1888
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7908,6 +7864,10 @@ msgstr "�������"
 msgid "do not allow the reuse of old passphrases"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
+#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+msgid "|NAME|use NAME as default secret key"
+msgstr ""
+
 #: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
@@ -8240,6 +8200,40 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "|[file]|make a signature"
+#~ msgstr "|[�ե�����]|��̾�����"
+
+#~ msgid "generate PGP 2.x compatible messages"
+#~ msgstr "PGP 2.x�ߴ��Υ�å�����������"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a signature"
+#~ msgstr "|[�ե�����]|��̾�����"
+
+#, fuzzy
+#~ msgid "|[FILE]|make a clear text signature"
+#~ msgstr "|[�ե�����]|���ꥢ��̾�����"
+
+#, fuzzy
+#~ msgid "use the default key as default recipient"
+#~ msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
+
+#, fuzzy
+#~ msgid "force v3 signatures"
+#~ msgstr "��̾�μ���"
+
+#, fuzzy
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
+
+#, fuzzy
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr "|̾��|��̾�����Ѥ˰Ź沽"
+
+#, fuzzy
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
+
 #, fuzzy
 #~ msgid "remove key from the public keyring"
 #~ msgstr "�������ؤ��鸰������"
@@ -8921,9 +8915,6 @@ msgstr ""
 #~ msgid "--nrlsign-key user-id"
 #~ msgstr "--nrlsign-key �桼����id"
 
-#~ msgid "make a trust signature"
-#~ msgstr "���ѽ�̾�����"
-
 #~ msgid "sign the key non-revocably"
 #~ msgstr "�����Ǥ��ʤ��褦���ؽ�̾"