1 files changed, 298 insertions, 270 deletions

diff --git a/po/ja.po b/po/ja.po
index 5c4349293..a0403da97 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-02-22 09:17+0100\n"
+"POT-Creation-Date: 2000-03-16 17:17+0100\n"
 "PO-Revision-Date: 2000-02-16 20:10+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -19,11 +19,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "�ٹ�: �����Ǥʤ����꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:281
+#: util/secmem.c:287
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "��������줿�����ʥ��꡼��̵�����ˤϼ¹ԤǤ��ޤ���\n"
 
-#: util/secmem.c:282
+#: util/secmem.c:288
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤ���Ŭ�ڤʥץ��������Ѥ����ΤǤ��礦)\n"
 
@@ -43,7 +43,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:579 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:308
 msgid "quit"
 msgstr "quit"
 
@@ -257,63 +257,63 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:301 g10/import.c:127
+#: cipher/random.c:304 g10/import.c:127 g10/keygen.c:1136
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
 
-#: cipher/random.c:305
+#: cipher/random.c:308
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
 
-#: cipher/random.c:310
+#: cipher/random.c:313
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:315
+#: cipher/random.c:318
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:321
+#: cipher/random.c:324
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:329
+#: cipher/random.c:332
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
 
-#: cipher/random.c:367
+#: cipher/random.c:370
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:382
+#: cipher/random.c:385
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "%s �������Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:389
+#: cipher/random.c:392
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' �������ޤ���: %s\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:406
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:625
+#: cipher/random.c:635
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: �����Ǥʤ�����������֤��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:626
+#: cipher/random.c:636
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -581,30 +581,10 @@ msgstr "|NAME|ü����ʸ�������ɤ� NAME �����ꤹ��"
 msgid "read options from file"
 msgstr "�ե����뤫�饪�ץ������ɤ߹���"
 
-#: g10/g10.c:279
-msgid "set debugging flags"
-msgstr "�ǥХå��ե饰�򥻥åȤ���"
-
-#: g10/g10.c:280
-msgid "enable full debugging"
-msgstr "���ƤΥǥХå���ͭ���ˤ���"
-
 #: g10/g10.c:281
 msgid "|FD|write status info to this FD"
 msgstr "|FD|���� FD �˾��֤�񤭽Ф�"
 
-#: g10/g10.c:282
-msgid "do not write comment packets"
-msgstr "�����ȥѥ��åȤ�񤭽Ф��ʤ�"
-
-#: g10/g10.c:283
-msgid "(default is 1)"
-msgstr "(�ǥե���Ȥ� 1)"
-
-#: g10/g10.c:284
-msgid "(default is 3)"
-msgstr "(�ǥե���Ȥ� 3)"
-
 #: g10/g10.c:286
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|��ĥ�⥸�塼�� FILE ���ɤߤ���"
@@ -649,7 +629,13 @@ msgstr "�Ź�ѥ��åȤθ� ID �ե�����ɤ����Ф���"
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|��������ǡ������Ѥ���"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
+msgid ""
+"@\n"
+"(See the man page for a complete listing of all commands and options)\n"
+msgstr ""
+
+#: g10/g10.c:304
 msgid ""
 "@\n"
 "Examples:\n"
@@ -669,15 +655,15 @@ msgstr ""
 " --list-keys [names]        ����ɽ��\n"
 " --fingerprint [names]      �����ɽ��\n"
 
-#: g10/g10.c:391
+#: g10/g10.c:395
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǥ�ݡ��Ȥ����äƲ�������\n"
 
-#: g10/g10.c:395
+#: g10/g10.c:399
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:398
+#: g10/g10.c:402
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -687,7 +673,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽���ޤ��� ����\n"
 "�ǥե���Ȥ�ư������ϥǡ����˰�¸\n"
 
-#: g10/g10.c:405
+#: g10/g10.c:409
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -695,182 +681,182 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:484
+#: g10/g10.c:488
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [options] "
 
-#: g10/g10.c:537
+#: g10/g10.c:541
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:678
+#: g10/g10.c:682
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: �ǥե���ȥ��ץ����ե����� `%s' ������ޤ���\n"
 
-#: g10/g10.c:682
+#: g10/g10.c:686
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ����ե����� `%s': %s\n"
 
-#: g10/g10.c:689
+#: g10/g10.c:693
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s' ���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:875
+#: g10/g10.c:879
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ��������ʸ�������ɤǤϤ���ޤ���\n"
 
-#: g10/g10.c:934 g10/g10.c:943
+#: g10/g10.c:938 g10/g10.c:947
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: %s ���̾���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:936
+#: g10/g10.c:940
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �� %s �ȶ����Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:939
+#: g10/g10.c:943
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s �ȶ����Ѥ��Ƥ��̣������ޤ���!\n"
 
-#: g10/g10.c:958 g10/g10.c:970
+#: g10/g10.c:962 g10/g10.c:974
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:964 g10/g10.c:976
+#: g10/g10.c:968 g10/g10.c:980
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:980
+#: g10/g10.c:984
 msgid "the given policy URL is invalid\n"
 msgstr "Ϳ����줿�ݥꥷ�� URL ��̵���Ǥ�\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:987
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ��� %d..%d ���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:985
+#: g10/g10.c:989
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �� 0 ����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:987
+#: g10/g10.c:991
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �� 1 ����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:993
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth �� 1 ���� 255 ���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:996
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ��� S2K �⡼�� (0) �λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:996
+#: g10/g10.c:1000
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵���� S2K �⡼�ɡ�0, 1 �ޤ��� 3 �Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1085
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1087
+#: g10/g10.c:1091
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1094
+#: g10/g10.c:1098
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1102
+#: g10/g10.c:1106
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1115
+#: g10/g10.c:1119
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1132
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1142
+#: g10/g10.c:1146
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1163
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1171
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1175
+#: g10/g10.c:1179
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1183
+#: g10/g10.c:1187
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [���ޥ��]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1203
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1202
+#: g10/g10.c:1206
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1239 g10/sign.c:373
+#: g10/encode.c:260 g10/g10.c:1243 g10/sign.c:373
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s �������ޤ���: %s\n"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1258
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [�����]"
 
-#: g10/g10.c:1313
+#: g10/g10.c:1324
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "���ý���˼���: %s\n"
 
-#: g10/g10.c:1321
+#: g10/g10.c:1332
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "���ò��˼���: %s\n"
 
-#: g10/g10.c:1389
+#: g10/g10.c:1400
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�ϥå��奢�르�ꥺ�� `%s' ��̵���Ǥ�\n"
 
-#: g10/g10.c:1470
+#: g10/g10.c:1481
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1474
+#: g10/g10.c:1485
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ʋ����� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1477 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1488 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' �������ޤ���\n"
 
-#: g10/g10.c:1647
+#: g10/g10.c:1658
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1653
+#: g10/g10.c:1664
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -878,11 +864,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ��������������(_)�Τߤ��Ѥ���'=' "
 "��ȼ��ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1659
+#: g10/g10.c:1670
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤ�ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1667
+#: g10/g10.c:1678
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -1217,56 +1203,61 @@ msgstr "%s: �����å�: ��������̵�뤷�ޤ���\n"
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
-#: g10/keygen.c:123
+#: g10/keygen.c:175
 msgid "writing self signature\n"
 msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:161
+#: g10/keygen.c:213
 msgid "writing key binding signature\n"
 msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:261 g10/keygen.c:345
+#, fuzzy, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
+
+#: g10/keygen.c:266 g10/keygen.c:350
+#, fuzzy, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
+
+#: g10/keygen.c:456
 msgid "Please select what kind of key you want:\n"
 msgstr "���μ�������򤷤Ʋ�����:\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:458
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA �� ElGamal (�ǥե����)\n"
 
-#: g10/keygen.c:390
+#: g10/keygen.c:459
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:461
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:393
+#: g10/keygen.c:462
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (��̾�ȰŹ沽)\n"
 
-#: g10/keygen.c:395
-#, c-format
-msgid "   (%d) ElGamal in a v3 packet\n"
-msgstr "   (%d) ElGamal in a v3 packet\n"
-
-#: g10/keygen.c:400
+#: g10/keygen.c:465
 msgid "Your selection? "
 msgstr "�ɤ�����Ӥޤ���? "
 
-#: g10/keygen.c:410
+#: g10/keygen.c:475
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�����˽�̾�ȰŹ��Ѥθ�����ޤ���? "
 
-#: g10/keygen.c:431
+#: g10/keygen.c:489
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/keygen.c:443
+#: g10/keygen.c:501
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1279,15 +1270,15 @@ msgstr ""
 "          �ǥե���Ȥθ��������� 1024 �ӥå�\n"
 "                ����θ��������� 2048 �ӥå�\n"
 
-#: g10/keygen.c:450
+#: g10/keygen.c:508
 msgid "What keysize do you want? (1024) "
 msgstr "�ɤθ������������򤷤ޤ���? (1024) "
 
-#: g10/keygen.c:455
+#: g10/keygen.c:513
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA �θ��������� 512 ���� 1024 �ޤǤǤ�\n"
 
-#: g10/keygen.c:457
+#: g10/keygen.c:515
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
 
@@ -1299,12 +1290,12 @@ msgstr "�������������������ޤ�; 768 ���Ǿ��Ǥ���\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:467
+#: g10/keygen.c:525
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "�����������礭�����ޤ�; %d ������Ǥ���\n"
 
-#: g10/keygen.c:472
+#: g10/keygen.c:530
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1312,11 +1303,11 @@ msgstr ""
 "2048 �ʾ�θ��������ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
 "�侩���ޤ���!\n"
 
-#: g10/keygen.c:475
+#: g10/keygen.c:533
 msgid "Are you sure that you want this keysize? "
 msgstr "���θ����������������ɤ��Ǥ���? "
 
-#: g10/keygen.c:476
+#: g10/keygen.c:534
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1324,21 +1315,21 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�������Ф��� "
 "�������餱�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ʋ�����!\n"
 
-#: g10/keygen.c:484
+#: g10/keygen.c:542
 msgid "Do you really need such a large keysize? "
 msgstr "���ʤ��������ˤ��Τ褦��Ĺ������ɬ�פǤ���? "
 
-#: g10/keygen.c:490
+#: g10/keygen.c:548
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿���������� %u �ӥå�\n"
 
-#: g10/keygen.c:493 g10/keygen.c:497
+#: g10/keygen.c:551 g10/keygen.c:555
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u �ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:510
+#: g10/keygen.c:603
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1354,25 +1345,25 @@ msgstr ""
 "      <n>m = ͭ������ n ��\n"
 "      <n>y = ͭ������ n ǯ\n"
 
-#: g10/keygen.c:527
+#: g10/keygen.c:618
 msgid "Key is valid for? (0) "
 msgstr "����ͭ������? (0)"
 
-#: g10/keygen.c:548
+#: g10/keygen.c:623
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:553
+#: g10/keygen.c:628
 msgid "Key does not expire at all\n"
 msgstr "����̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:559
+#: g10/keygen.c:634
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:562
+#: g10/keygen.c:637
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1380,11 +1371,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:567
+#: g10/keygen.c:642
 msgid "Is this correct (y/n)? "
 msgstr "������ɤ��Ǥ��� (y/n)? "
 
-#: g10/keygen.c:610
+#: g10/keygen.c:685
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1400,44 +1391,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:621
+#: g10/keygen.c:696
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:625
+#: g10/keygen.c:700
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:627
+#: g10/keygen.c:702
 msgid "Name may not start with a digit\n"
 msgstr "̾���Ͽ����ǻϤޤäƤϤ����ޤ���\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:704
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾���� 5 ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:637
+#: g10/keygen.c:712
 msgid "Email address: "
 msgstr "�Żҥ᡼�륢�ɥ쥹: "
 
-#: g10/keygen.c:648
+#: g10/keygen.c:723
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�륢�ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:656
+#: g10/keygen.c:731
 msgid "Comment: "
 msgstr "����: "
 
-#: g10/keygen.c:662
+#: g10/keygen.c:737
 msgid "Invalid character in comment\n"
 msgstr "�����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:684
+#: g10/keygen.c:759
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������� `%s' ��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:690
+#: g10/keygen.c:765
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1448,15 +1439,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:693
+#: g10/keygen.c:768
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:703
+#: g10/keygen.c:778
 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:755
+#: g10/keygen.c:830
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1464,11 +1455,11 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼����ɬ�פǤ���\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:763
+#: g10/keyedit.c:468 g10/keygen.c:838
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ʋ�������\n"
 
-#: g10/keygen.c:769
+#: g10/keygen.c:844
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1480,7 +1471,7 @@ msgstr ""
 "���ץ����ˤ�äơ����ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:790
+#: g10/keygen.c:865
 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"
@@ -1491,33 +1482,29 @@ msgstr ""
 "�ǥ������˥�����������ʤɤ�¾�ι�ư��Ʊ���˹Ԥ��ȡ�����������֤ˤ�\n"
 "�𻨤����礭���ɤ�������������䤹���ʤ�ޤ��Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:860
-msgid "Key generation can only be used in interactive mode\n"
-msgstr "���κ��������å⡼�ɤǤ����¹ԤǤ��ޤ���\n"
-
-#: g10/keygen.c:868
+#: g10/keygen.c:1311
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ���ڥ��� 1024 �ӥåȤˤʤ�ޤ�\n"
 
-#: g10/keygen.c:874
+#: g10/keygen.c:1354
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:884
-#, c-format
-msgid "writing public certificate to `%s'\n"
+#: g10/keygen.c:1455
+#, fuzzy, c-format
+msgid "writing public key to `%s'\n"
 msgstr "`%s' �ؤθ����������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:885
-#, c-format
-msgid "writing secret certificate to `%s'\n"
+#: g10/keygen.c:1456
+#, fuzzy, c-format
+msgid "writing secret key to `%s'\n"
 msgstr "`%s' �ؤ���̩�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:962
+#: g10/keygen.c:1552
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����������졢��̾����ޤ�����\n"
 
-#: g10/keygen.c:964
+#: g10/keygen.c:1557
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1525,24 +1512,24 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "\"--edit-key\" ���ޥ�ɤ��Ѥ���������������Ƥ���������\n"
 
-#: g10/keygen.c:978 g10/keygen.c:1079
+#: g10/keygen.c:1574 g10/keygen.c:1675
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���κ����˼���: %s\n"
 
-#: g10/keygen.c:1022 g10/sig-check.c:318 g10/sign.c:111
+#: g10/keygen.c:1618 g10/sig-check.c:318 g10/sign.c:111
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1024 g10/sig-check.c:320 g10/sign.c:113
+#: g10/keygen.c:1620 g10/sig-check.c:320 g10/sign.c:113
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "���� %lu ��̤��˺�������ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1057
+#: g10/keygen.c:1653
 msgid "Really create? "
 msgstr "�����˺������ޤ���? "
 
@@ -1596,27 +1583,27 @@ msgstr "�� %08lX: rfc2440 �θ��ǤϤ���ޤ��� - �����åפ��ޤ�\n"
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:206
+#: g10/getkey.c:207
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk ����å���Υ���ȥ꡼��¿�����ޤ� - ̵��\n"
 
-#: g10/getkey.c:345
+#: g10/getkey.c:346
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk ����å���Υ���ȥ꡼��¿�����ޤ� - ̵��\n"
 
-#: g10/getkey.c:1294 g10/getkey.c:1333
+#: g10/getkey.c:1302 g10/getkey.c:1341
 msgid "RSA key cannot be used in this version\n"
 msgstr "���ΥС������Ǥ� RSA �����ϻȤ��ޤ���\n"
 
-#: g10/getkey.c:1296 g10/getkey.c:1335
+#: g10/getkey.c:1304 g10/getkey.c:1343
 msgid "No key for user ID\n"
 msgstr "�桼�� ID �θ�������ޤ���\n"
 
-#: g10/getkey.c:1374 g10/getkey.c:1414
+#: g10/getkey.c:1382 g10/getkey.c:1422
 msgid "No user ID for key\n"
 msgstr "���Υ桼�� ID ������ޤ���\n"
 
-#: g10/getkey.c:1570 g10/getkey.c:1626
+#: g10/getkey.c:1636 g10/getkey.c:1692
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "���� %08lX ����Ѥ��ޤ� - �縰 %08lX ������\n"
@@ -1968,7 +1955,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1859 g10/keyedit.c:1921 g10/sign.c:135
+#: g10/keyedit.c:373 g10/keyedit.c:1864 g10/keyedit.c:1926 g10/sign.c:135
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -2015,384 +2002,388 @@ msgstr "�����˼¹Ԥ��ޤ���? "
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:579
+#: g10/keyedit.c:580
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "list key and user IDs"
 msgstr "���ȥ桼�� ID �ΰ���"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "select user ID N"
 msgstr "�桼�� ID N ������"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select secondary key N"
 msgstr "���� N ������"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "sign the key locally"
 msgstr "���˽񤭽Ф��ԲĤʽ�̾"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "add a user ID"
 msgstr "�桼�� ID ���ɲ�"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "delete user ID"
 msgstr "�桼�� ID �ξõ�"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������������ڤ��ؤ�"
 
-#: g10/keyedit.c:603
+#: g10/keyedit.c:604
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "list preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the ownertrust"
 msgstr "���ʽ�̾���ѹ�"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "disable a key"
 msgstr "��������ԲĤˤ���"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "enable a key"
 msgstr "������ѲĤˤ���"
 
-#: g10/delkey.c:107 g10/keyedit.c:629
+#: g10/delkey.c:107 g10/keyedit.c:630
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϼ¹ԤǤ��ޤ���\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:667
+#: g10/keyedit.c:668
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ�\n"
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:697
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:727
 msgid "Need the secret key to do this.\n"
 msgstr "�����¹Ԥ���ˤ���̩����ɬ�פǤ���\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:731
+msgid "Please use the command \"toggle\" first.\n"
+msgstr ""
+
+#: g10/keyedit.c:778
 msgid "Really sign all user IDs? "
 msgstr "���ƤΥ桼�� ID �� ������ ��̾���ޤ���? "
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:779
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "�ҥ��: ��̾����桼�� ID  ������\n"
 
-#: g10/keyedit.c:801 g10/keyedit.c:983
+#: g10/keyedit.c:806 g10/keyedit.c:988
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:833
+#: g10/keyedit.c:817 g10/keyedit.c:838
 msgid "You must select at least one user ID.\n"
 msgstr "���ʤ��Ȥ� 1 �ĤΥ桼�� ID �����򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:814
+#: g10/keyedit.c:819
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�桼�� ID �ν�̾�Ϻ���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:817
+#: g10/keyedit.c:822
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤��桼�� ID �� ������ ������ޤ���? "
 
-#: g10/keyedit.c:818
+#: g10/keyedit.c:823
 msgid "Really remove this user ID? "
 msgstr "���Υ桼�� ID �� ������ ������ޤ���? "
 
-#: g10/keyedit.c:854 g10/keyedit.c:876
+#: g10/keyedit.c:859 g10/keyedit.c:881
 msgid "You must select at least one key.\n"
 msgstr "���ʤ��Ȥ� 1 �Ĥθ������򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:858
+#: g10/keyedit.c:863
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����� ������ ������ޤ���? "
 
-#: g10/keyedit.c:859
+#: g10/keyedit.c:864
 msgid "Do you really want to delete this key? "
 msgstr "���θ��� ������ ������ޤ���? "
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:885
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤����� ������ �˴����ޤ���? "
 
-#: g10/keyedit.c:881
+#: g10/keyedit.c:886
 msgid "Do you really want to revoke this key? "
 msgstr "���θ��� ������ �˴����ޤ���? "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:952
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:950
+#: g10/keyedit.c:955
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:966
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼���: %s\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:973
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼���: %s\n"
 
-#: g10/keyedit.c:975
+#: g10/keyedit.c:980
 msgid "Key not changed so no update needed.\n"
 msgstr "�����ѹ�����Ƥ��ޤ���Τǹ�������ɬ�פϤ���ޤ���\n"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:995
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (\"help\" �򸫤�)\n"
 
-#: g10/keyedit.c:1083
+#: g10/keyedit.c:1088
 msgid "This key has been disabled"
 msgstr "���θ��ϻ����ԲĤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1359
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1363
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1367
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "���������ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1373
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�� ������ ������ޤ���? (y/N)"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1387
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d �Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1388
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d �Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1391
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1460
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩��������������Ʋ�������\n"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1466
 msgid "Please select at most one secondary key.\n"
 msgstr "¿���Ƥ� 1 �Ĥ����������򤷤Ʋ�������\n"
 
-#: g10/keyedit.c:1465
+#: g10/keyedit.c:1470
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1472
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1509
+#: g10/keyedit.c:1514
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 ����ͭ�����¤��ѹ����뤳�Ȥ��Ǥ��ޤ�\n"
 
-#: g10/keyedit.c:1525
+#: g10/keyedit.c:1530
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩����󥰤��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:1586
+#: g10/keyedit.c:1591
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d �֤Υ桼�� ID �Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1632
+#: g10/keyedit.c:1637
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d �֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1735
 msgid "user ID: \""
 msgstr "�桼�� ID: \""
 
-#: g10/keyedit.c:1733
+#: g10/keyedit.c:1738
 #, c-format
 msgid ""
 "\"\n"
@@ -2401,37 +2392,43 @@ msgstr ""
 "\"\n"
 "���ʤ��θ� %08lX �� %s �˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1737
+#: g10/keyedit.c:1742
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "���ν�̾���Ф����˴��������������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1766
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼�� ID �˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:1775 g10/keyedit.c:1810
+#: g10/keyedit.c:1780 g10/keyedit.c:1815
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX �ˤ�ä� %s �˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1780
+#: g10/keyedit.c:1785
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX �ˤ�ä� %s ���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1800
+#: g10/keyedit.c:1805
 msgid "You are about to revoke these signatures:\n"
 msgstr "���ʤ��Ϥ����ν�̾���˴����뤫�¤äƤ��ޤ�:\n"
 
-#: g10/keyedit.c:1818
+#: g10/keyedit.c:1823
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�˴�������� ������ �������ޤ���? (y/N)"
 
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1852
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
+#. of subkey
+#: g10/keylist.c:318 g10/mainproc.c:736
+#, fuzzy, c-format
+msgid " [expires: %s]"
+msgstr "���� %s �ˤƴ����ڤ�ˤʤ�ޤ�\n"
+
 #: g10/mainproc.c:213
 #, c-format
 msgid "public key is %08lX\n"
@@ -2498,43 +2495,43 @@ msgstr "����: "
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1048
+#: g10/mainproc.c:1053
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��Ǥ��ޤ���\n"
 
-#: g10/mainproc.c:1054
+#: g10/mainproc.c:1059
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s �� %s �� ID %08lX �ˤ���̾\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1080 g10/mainproc.c:1091
+#: g10/mainproc.c:1085 g10/mainproc.c:1096
 msgid "BAD signature from \""
 msgstr "�����ʽ�̾: \""
 
-#: g10/mainproc.c:1081 g10/mainproc.c:1092
+#: g10/mainproc.c:1086 g10/mainproc.c:1097
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1083
+#: g10/mainproc.c:1088
 msgid "                aka \""
 msgstr "                ��̾ \""
 
-#: g10/mainproc.c:1139
+#: g10/mainproc.c:1144
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�θ��ڤ��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1200
+#: g10/mainproc.c:1205
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1241
+#: g10/mainproc.c:1246
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ˤ���̾\n"
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1251
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ����Ф���ޤ���\n"
 
@@ -2642,11 +2639,21 @@ msgstr "��λ��������μ������ѤǤ���\n"
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK �ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:191
+#: g10/pubkey-enc.c:156
+#, fuzzy, c-format
+msgid "cipher algorithm %d is unknown or disabled\n"
+msgstr "�ݸ�르�ꥺ�� %d �ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: g10/pubkey-enc.c:195
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "����: �Ź楢�르�ꥺ�� %d ��ͥ�������äƤ��ޤ���\n"
 
+#: g10/pubkey-enc.c:201
+#, fuzzy, c-format
+msgid "NOTE: secret key %08lX expired at %s\n"
+msgstr "����: ��̾�θ��ϴ����ڤ�Ǥ� %s\n"
+
 #: g10/hkp.c:62
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
@@ -3565,3 +3572,24 @@ msgstr "�إ�פϤ���ޤ���"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s' �ؤΥإ�פϤ���ޤ���"
+
+#~ msgid "set debugging flags"
+#~ msgstr "�ǥХå��ե饰�򥻥åȤ���"
+
+#~ msgid "enable full debugging"
+#~ msgstr "���ƤΥǥХå���ͭ���ˤ���"
+
+#~ msgid "do not write comment packets"
+#~ msgstr "�����ȥѥ��åȤ�񤭽Ф��ʤ�"
+
+#~ msgid "(default is 1)"
+#~ msgstr "(�ǥե���Ȥ� 1)"
+
+#~ msgid "(default is 3)"
+#~ msgstr "(�ǥե���Ȥ� 3)"
+
+#~ msgid "   (%d) ElGamal in a v3 packet\n"
+#~ msgstr "   (%d) ElGamal in a v3 packet\n"
+
+#~ msgid "Key generation can only be used in interactive mode\n"
+#~ msgstr "���κ��������å⡼�ɤǤ����¹ԤǤ��ޤ���\n"