aboutsummaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po1664
1 files changed, 895 insertions, 769 deletions
diff --git a/po/ja.po b/po/ja.po
index 8da5aaeb4..9a6842839 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: 2004-12-16 10:56+0100\n"
+"POT-Creation-Date: 2005-02-03 10:35+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"
@@ -31,9 +31,9 @@ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
msgid "no entropy gathering module detected\n"
msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
-#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709
#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
-#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248
+#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254
#: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
#: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021
#: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
@@ -69,8 +69,8 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
msgid "note: random_seed file not updated\n"
msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
-#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716
-#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
+#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722
+#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257
#: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
#, c-format
msgid "can't create `%s': %s\n"
@@ -124,143 +124,146 @@ msgstr ""
"��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
"�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
-#: g10/app-openpgp.c:539
+#: g10/app-openpgp.c:547
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
-#: g10/app-openpgp.c:552
+#: g10/app-openpgp.c:560
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
-#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
+#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
-#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
+#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
-#: g10/app-openpgp.c:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884
-#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408
+#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888
+#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
-#: g10/app-openpgp.c:828
+#: g10/app-openpgp.c:836
msgid "access to admin commands is not configured\n"
msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
-#: g10/app-openpgp.c:845
+#: g10/app-openpgp.c:851
msgid "error retrieving CHV status from card\n"
msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
-#: g10/app-openpgp.c:851
+#: g10/app-openpgp.c:857
msgid "card is permanently locked!\n"
msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
-#: g10/app-openpgp.c:858
+#: g10/app-openpgp.c:862
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
-#: g10/app-openpgp.c:865
+#. TRANSLATORS: Do not translate the "|A|" prefix but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: g10/app-openpgp.c:869
msgid "|A|Admin PIN"
msgstr "|A|Admin PIN"
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
#, fuzzy
msgid "|AN|New Admin PIN"
msgstr "|A|������Admin PIN"
-#: g10/app-openpgp.c:1021
+#: g10/app-openpgp.c:1018
#, fuzzy
msgid "|N|New PIN"
msgstr "������PIN"
-#: g10/app-openpgp.c:1025
+#: g10/app-openpgp.c:1022
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "������PIN�μ������顼: %s\n"
-#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230
msgid "error reading application data\n"
msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
-#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237
msgid "error reading fingerprint DO\n"
msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
-#: g10/app-openpgp.c:1107
+#: g10/app-openpgp.c:1104
msgid "key already exists\n"
msgstr "���Ϥ⤦����ޤ�\n"
-#: g10/app-openpgp.c:1111
+#: g10/app-openpgp.c:1108
msgid "existing key will be replaced\n"
msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
-#: g10/app-openpgp.c:1113
+#: g10/app-openpgp.c:1110
msgid "generating new key\n"
msgstr "��������������\n"
-#: g10/app-openpgp.c:1123
+#: g10/app-openpgp.c:1120
msgid "please wait while key is being generated ...\n"
msgstr "�������δ֡����Ԥ��������� ...\n"
-#: g10/app-openpgp.c:1138
+#: g10/app-openpgp.c:1135
msgid "generating key failed\n"
msgstr "���������˼��Ԥ��ޤ���\n"
-#: g10/app-openpgp.c:1141
+#: g10/app-openpgp.c:1138
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "������������λ���ޤ��� (%d��)\n"
-#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875
msgid "response does not contain the public key data\n"
msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
-#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883
msgid "response does not contain the RSA modulus\n"
msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
-#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894
msgid "response does not contain the RSA public exponent\n"
msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
-#: g10/app-openpgp.c:1198
+#: g10/app-openpgp.c:1195
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
-#: g10/app-openpgp.c:1359
+#: g10/app-openpgp.c:1356
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "����ޤǤ˺������줿��̾: %lu\n"
-#: g10/app-openpgp.c:1367
+#: g10/app-openpgp.c:1364
#, c-format
msgid "PIN [sigs done: %lu]"
msgstr "PIN [��̾��: %lu]"
-#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
-#: g10/app-openpgp.c:1734
+#: g10/app-openpgp.c:1731
#, c-format
msgid "error getting serial number: %s\n"
msgstr "���֤μ������顼: %s\n"
-#: g10/app-openpgp.c:1829
+#: g10/app-openpgp.c:1826
#, c-format
msgid "failed to store the key: %s\n"
msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
-#: g10/app-openpgp.c:1871
+#: g10/app-openpgp.c:1868
msgid "reading the key failed\n"
msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
@@ -293,7 +296,7 @@ msgstr "ͽ����������: "
msgid "invalid dash escaped line: "
msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
-#: g10/armor.c:715 g10/armor.c:1300
+#: g10/armor.c:715 g10/armor.c:1322
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
@@ -310,7 +313,7 @@ msgstr "�ե������������᤹���ޤ� (CRC������)\n"
msgid "malformed CRC\n"
msgstr "CRC�ν񼰤�����������ޤ���\n"
-#: g10/armor.c:804 g10/armor.c:1337
+#: g10/armor.c:804 g10/armor.c:1359
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC���顼��%06lX - %06lX\n"
@@ -323,23 +326,23 @@ msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
msgid "error in trailer line\n"
msgstr "�����ιԤ˥��顼������ޤ�\n"
-#: g10/armor.c:1115
+#: g10/armor.c:1137
msgid "no valid OpenPGP data found.\n"
msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
-#: g10/armor.c:1120
+#: g10/armor.c:1142
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
-#: g10/armor.c:1124
+#: g10/armor.c:1146
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
"MTA��Ȥä��ΤǤ��礦\n"
-#: g10/card-util.c:58 g10/card-util.c:282
+#: g10/card-util.c:58 g10/card-util.c:283
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
@@ -349,14 +352,14 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP������no. %s�򸡽�\n"
-#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353
-#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398
+#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417
msgid "can't do this in batch mode\n"
msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147
-#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
-#: g10/keygen.c:1363
+#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174
+#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300
+#: g10/keygen.c:1365
msgid "Your selection? "
msgstr "�����? "
@@ -364,138 +367,138 @@ msgstr "�����? "
msgid "[not set]"
msgstr "[̤����]"
-#: g10/card-util.c:378
+#: g10/card-util.c:379
msgid "male"
msgstr "��"
-#: g10/card-util.c:379
+#: g10/card-util.c:380
msgid "female"
msgstr "��"
-#: g10/card-util.c:379
+#: g10/card-util.c:380
msgid "unspecified"
msgstr "̵����"
-#: g10/card-util.c:406
+#: g10/card-util.c:407
msgid "not forced"
msgstr "̤����"
-#: g10/card-util.c:406
+#: g10/card-util.c:407
msgid "forced"
msgstr "����"
-#: g10/card-util.c:458
+#: g10/card-util.c:485
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
-#: g10/card-util.c:460
+#: g10/card-util.c:487
msgid "Error: The \"<\" character may not be used.\n"
msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
-#: g10/card-util.c:462
+#: g10/card-util.c:489
msgid "Error: Double spaces are not allowed.\n"
msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
-#: g10/card-util.c:479
+#: g10/card-util.c:506
msgid "Cardholder's surname: "
msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
-#: g10/card-util.c:481
+#: g10/card-util.c:508
msgid "Cardholder's given name: "
msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
-#: g10/card-util.c:499
+#: g10/card-util.c:526
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
-#: g10/card-util.c:521
+#: g10/card-util.c:548
msgid "URL to retrieve public key: "
msgstr "��������õ������URL: "
-#: g10/card-util.c:529
+#: g10/card-util.c:556
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
-#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
+#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264
#, c-format
msgid "error reading `%s': %s\n"
msgstr "��%s�פ��ɽФ����顼: %s\n"
-#: g10/card-util.c:630
+#: g10/card-util.c:657
msgid "Login data (account name): "
msgstr "�������󡦥ǡ��� (���������̾): "
-#: g10/card-util.c:640
+#: g10/card-util.c:667
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
-#: g10/card-util.c:699
+#: g10/card-util.c:726
msgid "Private DO data: "
msgstr ""
-#: g10/card-util.c:709
+#: g10/card-util.c:736
#, fuzzy, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
-#: g10/card-util.c:729
+#: g10/card-util.c:756
msgid "Language preferences: "
msgstr "���������: "
-#: g10/card-util.c:737
+#: g10/card-util.c:764
msgid "Error: invalid length of preference string.\n"
msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
-#: g10/card-util.c:746
+#: g10/card-util.c:773
msgid "Error: invalid characters in preference string.\n"
msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
-#: g10/card-util.c:767
+#: g10/card-util.c:794
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "���� ((M)�ˡ�(F)��������): "
-#: g10/card-util.c:781
+#: g10/card-util.c:808
msgid "Error: invalid response.\n"
msgstr "���顼: ̵���ʱ�����\n"
-#: g10/card-util.c:802
+#: g10/card-util.c:829
msgid "CA fingerprint: "
msgstr "CA���: "
-#: g10/card-util.c:825
+#: g10/card-util.c:852
msgid "Error: invalid formatted fingerprint.\n"
msgstr "���顼: ̵���ʷ����λ��档\n"
-#: g10/card-util.c:873
+#: g10/card-util.c:900
#, c-format
msgid "key operation not possible: %s\n"
msgstr "�������Ǥ��ޤ���: %s\n"
-#: g10/card-util.c:874
+#: g10/card-util.c:901
msgid "not an OpenPGP card"
msgstr "OpenPGP�����ɤǤ���ޤ���"
-#: g10/card-util.c:883
+#: g10/card-util.c:910
#, c-format
msgid "error getting current key info: %s\n"
msgstr "���Ը�����μ������顼: %s\n"
-#: g10/card-util.c:966
+#: g10/card-util.c:993
msgid "Replace existing key? (y/N) "
msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
-#: g10/card-util.c:987 g10/card-util.c:996
+#: g10/card-util.c:1014 g10/card-util.c:1023
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
-#: g10/card-util.c:1008
+#: g10/card-util.c:1035
msgid "Replace existing keys? (y/N) "
msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
-#: g10/card-util.c:1017
+#: g10/card-util.c:1044
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@ -506,116 +509,116 @@ msgstr ""
" PIN = `%s' Admin PIN = `%s'\n"
"���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
-#: g10/card-util.c:1056
+#: g10/card-util.c:1083
msgid "Please select the type of key to generate:\n"
msgstr "�������븰�η������򤷤Ƥ�������:\n"
-#: g10/card-util.c:1058 g10/card-util.c:1138
+#: g10/card-util.c:1085 g10/card-util.c:1165
msgid " (1) Signature key\n"
msgstr " (1) ��̾��\n"
-#: g10/card-util.c:1059 g10/card-util.c:1140
+#: g10/card-util.c:1086 g10/card-util.c:1167
msgid " (2) Encryption key\n"
msgstr " (2) �Ź沽��\n"
-#: g10/card-util.c:1060 g10/card-util.c:1142
+#: g10/card-util.c:1087 g10/card-util.c:1169
msgid " (3) Authentication key\n"
msgstr " (3) ǧ�ڸ�\n"
-#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
-#: g10/keygen.c:1402 g10/revoke.c:642
+#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908
+#: g10/keygen.c:1404 g10/revoke.c:642
msgid "Invalid selection.\n"
msgstr "̵��������Ǥ���\n"
-#: g10/card-util.c:1135
+#: g10/card-util.c:1162
msgid "Please select where to store the key:\n"
msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
-#: g10/card-util.c:1170
+#: g10/card-util.c:1197
msgid "unknown key protection algorithm\n"
msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
-#: g10/card-util.c:1175
+#: g10/card-util.c:1202
msgid "secret parts of key are not available\n"
msgstr "������̩��ʬ��̵���Ǥ�\n"
-#: g10/card-util.c:1180
+#: g10/card-util.c:1207
msgid "secret key already stored on a card\n"
msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
-#: g10/card-util.c:1250 g10/keyedit.c:1285
+#: g10/card-util.c:1277 g10/keyedit.c:1317
msgid "quit this menu"
msgstr "���Υ�˥塼��λ"
-#: g10/card-util.c:1252
+#: g10/card-util.c:1279
msgid "show admin commands"
msgstr "�������ޥ�ɤ�ɽ��"
-#: g10/card-util.c:1253 g10/keyedit.c:1288
+#: g10/card-util.c:1280 g10/keyedit.c:1320
msgid "show this help"
msgstr "���Υإ�פ�ɽ��"
-#: g10/card-util.c:1255
+#: g10/card-util.c:1282
msgid "list all available data"
msgstr "��ͭ���ǡ�����ɽ��"
-#: g10/card-util.c:1258
+#: g10/card-util.c:1285
msgid "change card holder's name"
msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
-#: g10/card-util.c:1259
+#: g10/card-util.c:1286
msgid "change URL to retrieve key"
msgstr "����õ������URL���ѹ�"
-#: g10/card-util.c:1260
+#: g10/card-util.c:1287
msgid "fetch the key specified in the card URL"
msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
-#: g10/card-util.c:1261
+#: g10/card-util.c:1288
msgid "change the login name"
msgstr "��������̾���ѹ�"
-#: g10/card-util.c:1262
+#: g10/card-util.c:1289
msgid "change the language preferences"
msgstr "�����������ѹ�"
-#: g10/card-util.c:1263
+#: g10/card-util.c:1290
msgid "change card holder's sex"
msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
-#: g10/card-util.c:1264
+#: g10/card-util.c:1291
msgid "change a CA fingerprint"
msgstr "CA������ѹ�"
-#: g10/card-util.c:1265
+#: g10/card-util.c:1292
msgid "toggle the signature force PIN flag"
msgstr "��̾����PIN�ե饰��ȿž"
-#: g10/card-util.c:1266
+#: g10/card-util.c:1293
msgid "generate new keys"
msgstr "����������������"
-#: g10/card-util.c:1267
+#: g10/card-util.c:1294
msgid "menu to change or unblock the PIN"
msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
-#: g10/card-util.c:1333 g10/keyedit.c:1436
+#: g10/card-util.c:1360 g10/keyedit.c:1481
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/card-util.c:1368
+#: g10/card-util.c:1395
msgid "Admin-only command\n"
msgstr "�������ѥ��ޥ��\n"
-#: g10/card-util.c:1384
+#: g10/card-util.c:1411
msgid "Admin commands are allowed\n"
msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
-#: g10/card-util.c:1386
+#: g10/card-util.c:1413
msgid "Admin commands are not allowed\n"
msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
-#: g10/card-util.c:1455 g10/keyedit.c:1928
+#: g10/card-util.c:1482 g10/keyedit.c:1994
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
@@ -623,7 +626,7 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
msgid "Please insert the card and hit return or enter 'c' to cancel: "
msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
-#: g10/cardglue.c:371
+#: g10/cardglue.c:372
#, c-format
msgid ""
"Please remove the current card and insert the one with serial number:\n"
@@ -632,37 +635,37 @@ msgstr ""
"���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
" %.*s\n"
-#: g10/cardglue.c:379
+#: g10/cardglue.c:380
msgid "Hit return when ready or enter 'c' to cancel: "
msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
-#: g10/cardglue.c:687
+#: g10/cardglue.c:688
#, fuzzy
msgid "Enter New Admin PIN: "
msgstr "Admin PIN������: "
-#: g10/cardglue.c:688
+#: g10/cardglue.c:689
#, fuzzy
msgid "Enter New PIN: "
msgstr "PIN������: "
-#: g10/cardglue.c:689
+#: g10/cardglue.c:690
msgid "Enter Admin PIN: "
msgstr "Admin PIN������: "
-#: g10/cardglue.c:690
+#: g10/cardglue.c:691
msgid "Enter PIN: "
msgstr "PIN������: "
-#: g10/cardglue.c:704
+#: g10/cardglue.c:705
msgid "Repeat this PIN: "
msgstr "PIN�������: "
-#: g10/cardglue.c:718
+#: g10/cardglue.c:719
msgid "PIN not correctly repeated; try again"
msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376
#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
#, c-format
msgid "can't open `%s'\n"
@@ -672,14 +675,14 @@ msgstr "��%s�פ������ޤ���\n"
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421
+#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502
#: g10/revoke.c:226
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
-#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232
-#: g10/revoke.c:439
+#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516
+#: g10/revoke.c:232 g10/revoke.c:439
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "���֥��å����ɽФ����顼: %s\n"
@@ -862,30 +865,30 @@ msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
-#: g10/export.c:182
+#: g10/export.c:183
msgid "exporting secret keys not allowed\n"
msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
-#: g10/export.c:211
+#: g10/export.c:212
#, c-format
msgid "key %s: not protected - skipped\n"
msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
-#: g10/export.c:219
+#: g10/export.c:220
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
-#: g10/export.c:384
+#: g10/export.c:395
#, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
-#: g10/export.c:416
+#: g10/export.c:427
msgid "WARNING: nothing exported\n"
msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
-#: g10/g10.c:358
+#: g10/g10.c:360
msgid ""
"@Commands:\n"
" "
@@ -893,127 +896,127 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:360
+#: g10/g10.c:362
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/g10.c:361
+#: g10/g10.c:363
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/g10.c:362
+#: g10/g10.c:364
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:363
+#: g10/g10.c:365
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:365
+#: g10/g10.c:367
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:367
+#: g10/g10.c:369
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/g10.c:369
+#: g10/g10.c:371
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:371
+#: g10/g10.c:373
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:373
+#: g10/g10.c:375
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:374
+#: g10/g10.c:376
msgid "list and check key signatures"
msgstr "����̾�θ����Ȱ���"
-#: g10/g10.c:375
+#: g10/g10.c:377
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:376
+#: g10/g10.c:378
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:377
+#: g10/g10.c:379
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/g10.c:378
+#: g10/g10.c:380
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/g10.c:380
+#: g10/g10.c:382
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/g10.c:381
+#: g10/g10.c:383
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:382
+#: g10/g10.c:384
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/g10.c:383
+#: g10/g10.c:385
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/g10.c:384
+#: g10/g10.c:386
msgid "generate a revocation certificate"
msgstr "���������������"
-#: g10/g10.c:386
+#: g10/g10.c:388
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:387
+#: g10/g10.c:389
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/g10.c:388
+#: g10/g10.c:390
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:390
+#: g10/g10.c:392
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/g10.c:392
+#: g10/g10.c:394
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/g10.c:395
+#: g10/g10.c:397
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/g10.c:398
+#: g10/g10.c:400
msgid "print the card status"
msgstr "�����ɾ��֤�ɽ��"
-#: g10/g10.c:399
+#: g10/g10.c:401
msgid "change data on a card"
msgstr "�����ɤΥǡ������ѹ�"
-#: g10/g10.c:400
+#: g10/g10.c:402
msgid "change a card's PIN"
msgstr "�����ɤ�PIN���ѹ�"
-#: g10/g10.c:408
+#: g10/g10.c:410
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:415
+#: g10/g10.c:417
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
-#: g10/g10.c:419 g10/gpgv.c:65
+#: g10/g10.c:421 g10/gpgv.c:66
msgid ""
"@\n"
"Options:\n"
@@ -1023,55 +1026,55 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:421
+#: g10/g10.c:423
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/g10.c:423
+#: g10/g10.c:425
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/g10.c:434
+#: g10/g10.c:436
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/g10.c:435
+#: g10/g10.c:437
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/g10.c:440
+#: g10/g10.c:442
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/g10.c:450
+#: g10/g10.c:452
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/g10.c:452 g10/gpgv.c:67
+#: g10/g10.c:454 g10/gpgv.c:68
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:463
+#: g10/g10.c:465
msgid "do not make any changes"
msgstr "̵�ѹ�"
-#: g10/g10.c:464
+#: g10/g10.c:466
msgid "prompt before overwriting"
msgstr "������˳�ǧ"
-#: g10/g10.c:505
+#: g10/g10.c:507
msgid "use strict OpenPGP behavior"
msgstr "��̩��OpenPGP�ο�������"
-#: g10/g10.c:506
+#: g10/g10.c:508
msgid "generate PGP 2.x compatible messages"
msgstr "PGP 2.x�ߴ��Υ�å�����������"
-#: g10/g10.c:532
+#: g10/g10.c:536
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1080,7 +1083,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/g10.c:535
+#: g10/g10.c:539
msgid ""
"@\n"
"Examples:\n"
@@ -1100,15 +1103,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/g10.c:716 g10/gpgv.c:92
+#: g10/g10.c:720 g10/gpgv.c:93
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/g10.c:733
+#: g10/g10.c:737
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:736
+#: g10/g10.c:740
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1118,7 +1121,7 @@ msgstr ""
"��̾���������Ź沽������\n"
"��������ϡ����ϥǡ����˰�¸\n"
-#: g10/g10.c:747
+#: g10/g10.c:751
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1126,471 +1129,471 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:750
+#: g10/g10.c:754
msgid "Pubkey: "
msgstr "������: "
-#: g10/g10.c:756 g10/keyedit.c:1965
+#: g10/g10.c:760 g10/keyedit.c:2031
msgid "Cipher: "
msgstr "�Ź�ˡ: "
-#: g10/g10.c:762
+#: g10/g10.c:766
msgid "Hash: "
msgstr "�ϥå���: "
-#: g10/g10.c:768 g10/keyedit.c:2011
+#: g10/g10.c:772 g10/keyedit.c:2077
msgid "Compression: "
msgstr "����: "
-#: g10/g10.c:851
+#: g10/g10.c:855
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/g10.c:999
+#: g10/g10.c:1003
msgid "conflicting commands\n"
msgstr "��Ω���륳�ޥ��\n"
-#: g10/g10.c:1017
+#: g10/g10.c:1021
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
-#: g10/g10.c:1214
+#: g10/g10.c:1218
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1217
+#: g10/g10.c:1221
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1220
+#: g10/g10.c:1224
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:1226
+#: g10/g10.c:1230
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1229
+#: g10/g10.c:1233
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1232
+#: g10/g10.c:1236
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1238
+#: g10/g10.c:1242
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1241
+#: g10/g10.c:1245
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1244
+#: g10/g10.c:1248
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
-#: g10/g10.c:1250
+#: g10/g10.c:1254
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1253
+#: g10/g10.c:1257
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1256
+#: g10/g10.c:1260
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
-#: g10/g10.c:1397
+#: g10/g10.c:1401
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "̤�Τι������ܡ�%s��\n"
-#: g10/g10.c:1798
+#: g10/g10.c:1796
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
-#: g10/g10.c:1840
+#: g10/g10.c:1838
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-#: g10/g10.c:1844
+#: g10/g10.c:1842
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե������%s��: %s\n"
-#: g10/g10.c:1851
+#: g10/g10.c:1849
#, c-format
msgid "reading options from `%s'\n"
msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
-#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594
+#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s�ϻȤ��ޤ���!\n"
-#: g10/g10.c:2078
+#: g10/g10.c:2076
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
-#: g10/g10.c:2292
+#: g10/g10.c:2293
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/g10.c:2311 g10/keyedit.c:3498
+#: g10/g10.c:2312 g10/keyedit.c:3573
msgid "could not parse keyserver URL\n"
msgstr "�������С���URL�������ǽ\n"
-#: g10/g10.c:2317
+#: g10/g10.c:2318
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/g10.c:2320
+#: g10/g10.c:2321
msgid "invalid keyserver options\n"
msgstr "̵���ʸ������С������ץ����Ǥ�\n"
-#: g10/g10.c:2327
+#: g10/g10.c:2328
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/g10.c:2330
+#: g10/g10.c:2331
msgid "invalid import options\n"
msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/g10.c:2337
+#: g10/g10.c:2338
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/g10.c:2340
+#: g10/g10.c:2341
msgid "invalid export options\n"
msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
-#: g10/g10.c:2347
+#: g10/g10.c:2348
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
-#: g10/g10.c:2350
+#: g10/g10.c:2351
msgid "invalid list options\n"
msgstr "̵���ʰ������ץ����Ǥ�\n"
-#: g10/g10.c:2372
+#: g10/g10.c:2373
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/g10.c:2375
+#: g10/g10.c:2376
msgid "invalid verify options\n"
msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
-#: g10/g10.c:2382
+#: g10/g10.c:2383
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path��%s��������ǽ\n"
-#: g10/g10.c:2572
+#: g10/g10.c:2573
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/g10.c:2576
+#: g10/g10.c:2577
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/g10.c:2585
+#: g10/g10.c:2586
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:2588
+#: g10/g10.c:2589
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
-#: g10/g10.c:2602
-#, c-format
-msgid "will not run with insecure memory due to %s"
-msgstr ""
+#: g10/g10.c:2603
+#, fuzzy, c-format
+msgid "will not run with insecure memory due to %s\n"
+msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
-#: g10/g10.c:2616
+#: g10/g10.c:2617
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/g10.c:2622
+#: g10/g10.c:2623
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
-#: g10/g10.c:2628
+#: g10/g10.c:2629
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/g10.c:2641
+#: g10/g10.c:2642
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
-#: g10/g10.c:2711 g10/g10.c:2735
+#: g10/g10.c:2712 g10/g10.c:2736
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2717 g10/g10.c:2741
+#: g10/g10.c:2718 g10/g10.c:2742
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2723
+#: g10/g10.c:2724
msgid "selected compression algorithm is invalid\n"
msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2729
+#: g10/g10.c:2730
msgid "selected certification digest algorithm is invalid\n"
msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:2744
+#: g10/g10.c:2745
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:2746
+#: g10/g10.c:2747
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:2748
+#: g10/g10.c:2749
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2750
+#: g10/g10.c:2751
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2752
+#: g10/g10.c:2753
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2755
+#: g10/g10.c:2756
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:2759
+#: g10/g10.c:2760
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2766
+#: g10/g10.c:2767
msgid "invalid default preferences\n"
msgstr "̵���ʴ��������\n"
-#: g10/g10.c:2775
+#: g10/g10.c:2776
msgid "invalid personal cipher preferences\n"
msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2780
msgid "invalid personal digest preferences\n"
msgstr "̵���ʸĿ������������\n"
-#: g10/g10.c:2783
+#: g10/g10.c:2784
msgid "invalid personal compress preferences\n"
msgstr "̵���ʸĿ��Ѱ��̤�����\n"
-#: g10/g10.c:2816
+#: g10/g10.c:2817
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
-#: g10/g10.c:2863
+#: g10/g10.c:2864
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2868
+#: g10/g10.c:2869
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2873
+#: g10/g10.c:2874
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:2969
+#: g10/g10.c:2970
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:2980
+#: g10/g10.c:2981
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
-#: g10/g10.c:2991
+#: g10/g10.c:2992
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:2998
+#: g10/g10.c:2999
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:3000
+#: g10/g10.c:3001
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3010
+#: g10/g10.c:3011
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:3023
+#: g10/g10.c:3024
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [�ե�����̾]"
-#: g10/g10.c:3025
+#: g10/g10.c:3026
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:3028
+#: g10/g10.c:3029
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:3046
+#: g10/g10.c:3047
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:3059
+#: g10/g10.c:3060
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:3074
+#: g10/g10.c:3075
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [�ե�����̾]"
-#: g10/g10.c:3076
+#: g10/g10.c:3077
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:3079
+#: g10/g10.c:3080
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
-#: g10/g10.c:3099
+#: g10/g10.c:3100
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/g10.c:3108
+#: g10/g10.c:3109
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:3133
+#: g10/g10.c:3134
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:3141
+#: g10/g10.c:3142
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/g10.c:3145
+#: g10/g10.c:3146
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/g10.c:3166
+#: g10/g10.c:3167
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/g10.c:3237
+#: g10/g10.c:3238
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/g10.c:3274
+#: g10/g10.c:3275
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3276
+#: g10/g10.c:3277
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3278
+#: g10/g10.c:3279
#, c-format
msgid "key export failed: %s\n"
msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3289
+#: g10/g10.c:3290
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3299
+#: g10/g10.c:3300
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3340
+#: g10/g10.c:3341
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3348
+#: g10/g10.c:3349
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:3435
+#: g10/g10.c:3436
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
-#: g10/g10.c:3558
+#: g10/g10.c:3559
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:3562
+#: g10/g10.c:3563
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
-#: g10/g10.c:3852
+#: g10/g10.c:3853
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
"����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:3860
+#: g10/g10.c:3861
msgid "a user notation name must contain the '@' character\n"
msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:3870
+#: g10/g10.c:3871
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
-#: g10/g10.c:3904
+#: g10/g10.c:3905
msgid "the given certification policy URL is invalid\n"
msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:3906
+#: g10/g10.c:3907
msgid "the given signature policy URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:3939
+#: g10/g10.c:3940
msgid "the given preferred keyserver URL is invalid\n"
msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
@@ -1598,53 +1601,53 @@ msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
-#: g10/getkey.c:186 g10/getkey.c:2711
+#: g10/getkey.c:186 g10/getkey.c:2749
msgid "[User ID not found]"
msgstr "[�桼����ID�����Ĥ���ޤ���]"
-#: g10/getkey.c:1639
+#: g10/getkey.c:1677
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
-#: g10/getkey.c:2189
+#: g10/getkey.c:2227
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
-#: g10/getkey.c:2420
-#, c-format
-msgid "using secondary key %s instead of primary key %s\n"
+#: g10/getkey.c:2458
+#, fuzzy, c-format
+msgid "using subkey %s instead of primary key %s\n"
msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
-#: g10/getkey.c:2467
+#: g10/getkey.c:2505
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
-#: g10/gpgv.c:68
+#: g10/gpgv.c:69
msgid "be somewhat more quiet"
msgstr "����Ť�"
-#: g10/gpgv.c:69
+#: g10/gpgv.c:70
msgid "take the keys from this keyring"
msgstr "���θ����ؤ��������ޤ�"
-#: g10/gpgv.c:71
+#: g10/gpgv.c:72
msgid "make timestamp conflicts only a warning"
msgstr "������̷���ٹ�����ˤ��ޤ�"
-#: g10/gpgv.c:72
+#: g10/gpgv.c:73
msgid "|FD|write status info to this FD"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭹���"
-#: g10/gpgv.c:96
+#: g10/gpgv.c:97
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/gpgv.c:99
+#: g10/gpgv.c:100
msgid ""
"Syntax: gpg [options] [files]\n"
"Check signatures against known trusted keys\n"
@@ -1976,377 +1979,398 @@ msgstr "�إ�פϤ���ޤ���"
msgid "No help available for `%s'"
msgstr "��%s�פΥإ�פϤ���ޤ���"
-#: g10/import.c:249
+#: g10/import.c:250
#, c-format
msgid "skipping block of type %d\n"
msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
-#: g10/import.c:258
+#: g10/import.c:259
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu���ޤǽ���\n"
-#: g10/import.c:275
+#: g10/import.c:276
#, c-format
msgid "Total number processed: %lu\n"
msgstr " ��������: %lu\n"
-#: g10/import.c:277
+#: g10/import.c:278
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "�ȤФ�����������: %lu\n"
-#: g10/import.c:280
+#: g10/import.c:281
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �桼����ID�ʤ�: %lu\n"
-#: g10/import.c:282
+#: g10/import.c:283
#, c-format
msgid " imported: %lu"
msgstr " �ɹ���: %lu"
-#: g10/import.c:288
+#: g10/import.c:289
#, c-format
msgid " unchanged: %lu\n"
msgstr " �ѹ��ʤ�: %lu\n"
-#: g10/import.c:290
+#: g10/import.c:291
#, c-format
msgid " new user IDs: %lu\n"
msgstr "�������桼����ID: %lu\n"
-#: g10/import.c:292
+#: g10/import.c:293
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:294
+#: g10/import.c:295
#, c-format
msgid " new signatures: %lu\n"
msgstr " ��������̾: %lu\n"
-#: g10/import.c:296
+#: g10/import.c:297
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �����������: %lu\n"
-#: g10/import.c:298
+#: g10/import.c:299
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��̩�����ɽФ�: %lu\n"
-#: g10/import.c:300
+#: g10/import.c:301
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ��̩�����ɹ���: %lu\n"
-#: g10/import.c:302
+#: g10/import.c:303
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ̵�ѹ�����̩��: %lu\n"
-#: g10/import.c:304
+#: g10/import.c:305
#, c-format
msgid " not imported: %lu\n"
msgstr " ̤�ɹ���: %lu\n"
-#: g10/import.c:545
+#: g10/import.c:546
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
-#: g10/import.c:547
+#: g10/import.c:548
msgid "algorithms on these user IDs:\n"
msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
-#: g10/import.c:584
+#: g10/import.c:585
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": �Ź楢�르�ꥺ������� %s\n"
-#: g10/import.c:596
+#: g10/import.c:597
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ���󥢥르�ꥺ������� %s\n"
-#: g10/import.c:608
+#: g10/import.c:609
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": ���̥��르�ꥺ������� %s\n"
-#: g10/import.c:621
+#: g10/import.c:622
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "it is strongly suggested that you update your preferences and\n"
-#: g10/import.c:623
+#: g10/import.c:624
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
-#: g10/import.c:647
+#: g10/import.c:648
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
-#: g10/import.c:695 g10/import.c:1049
+#: g10/import.c:696 g10/import.c:1050
#, c-format
msgid "key %s: no user ID\n"
msgstr "��%s: �桼����ID������ޤ���\n"
-#: g10/import.c:715
+#: g10/import.c:716
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "��%s: PKS��������¤����\n"
-#: g10/import.c:730
+#: g10/import.c:731
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
-#: g10/import.c:736
+#: g10/import.c:737
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
-#: g10/import.c:738
+#: g10/import.c:739
msgid "this may be caused by a missing self-signature\n"
msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
-#: g10/import.c:748 g10/import.c:1170
+#: g10/import.c:749 g10/import.c:1171
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
-#: g10/import.c:754
+#: g10/import.c:755
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
-#: g10/import.c:763
+#: g10/import.c:764
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
-#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
+#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
#, c-format
msgid "writing to `%s'\n"
msgstr "��%s�פؤν����\n"
-#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
+#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232
+#: g10/import.c:2317 g10/import.c:2339
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/import.c:793
+#: g10/import.c:794
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
-#: g10/import.c:817
+#: g10/import.c:818
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
-#: g10/import.c:834 g10/import.c:1188
+#: g10/import.c:835 g10/import.c:1189
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
-#: g10/import.c:842 g10/import.c:1195
+#: g10/import.c:843 g10/import.c:1196
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
-#: g10/import.c:874
+#: g10/import.c:875
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
-#: g10/import.c:877
+#: g10/import.c:878
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
-#: g10/import.c:880
+#: g10/import.c:881
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "��%s:��%s�ɿ�������̾��1��\n"
-#: g10/import.c:883
+#: g10/import.c:884
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "��%s:��%s�ɿ�������̾��%d��\n"
-#: g10/import.c:886
+#: g10/import.c:887
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "��%s:��%s�ɿ�����������1��\n"
-#: g10/import.c:889
+#: g10/import.c:890
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "��%s:��%s�ɿ�����������%d��\n"
-#: g10/import.c:910
+#: g10/import.c:911
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "��%s:��%s���ѹ��ʤ�\n"
-#: g10/import.c:1055
+#: g10/import.c:1056
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1066
+#: g10/import.c:1067
msgid "importing secret keys not allowed\n"
msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
-#: g10/import.c:1083
+#: g10/import.c:1084 g10/import.c:2332
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "�������̩���ؤ�����ޤ���: %s\n"
-#: g10/import.c:1094
+#: g10/import.c:1095
#, c-format
msgid "key %s: secret key imported\n"
msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
-#: g10/import.c:1123
+#: g10/import.c:1124
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
-#: g10/import.c:1133
+#: g10/import.c:1134
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
-#: g10/import.c:1163
+#: g10/import.c:1164
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
-#: g10/import.c:1206
+#: g10/import.c:1207
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "��%s: ̵���ʼ���������: %s - ����\n"
-#: g10/import.c:1238
+#: g10/import.c:1239
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
-#: g10/import.c:1303
+#: g10/import.c:1304
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
-#: g10/import.c:1318
+#: g10/import.c:1319
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1320
+#: g10/import.c:1321
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
-#: g10/import.c:1338
+#: g10/import.c:1339
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "��%s: �����б���������������ޤ���\n"
-#: g10/import.c:1349 g10/import.c:1399
+#: g10/import.c:1350 g10/import.c:1400
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1351
+#: g10/import.c:1352
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "��%s: ̵�����������б��Ǥ�\n"
-#: g10/import.c:1366
+#: g10/import.c:1367
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "��%s: ¿���������б��������ޤ�\n"
-#: g10/import.c:1388
+#: g10/import.c:1389
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "��%s: �������ˤ�����������������ޤ���\n"
-#: g10/import.c:1401
+#: g10/import.c:1402
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "��%s: ̵�������������Ǥ�\n"
-#: g10/import.c:1416
+#: g10/import.c:1417
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
-#: g10/import.c:1458
+#: g10/import.c:1459
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "��%s: �ȤФ����桼����ID��%s��\n"
-#: g10/import.c:1479
+#: g10/import.c:1480
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "��%s: �ȤФ�������\n"
-#: g10/import.c:1506
+#: g10/import.c:1507
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
-#: g10/import.c:1516
+#: g10/import.c:1517
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1533
+#: g10/import.c:1534
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
-#: g10/import.c:1547
+#: g10/import.c:1548
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
-#: g10/import.c:1555
+#: g10/import.c:1556
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
-#: g10/import.c:1655
+#: g10/import.c:1577
+#, fuzzy, c-format
+msgid "key %s: expired signature from key %s - skipped\n"
+msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
+
+#: g10/import.c:1680
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
-#: g10/import.c:1717
+#: g10/import.c:1742
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
-#: g10/import.c:1731
+#: g10/import.c:1756
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
-#: g10/import.c:1790
+#: g10/import.c:1815
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "��%s:��%s�ɼ�����������ɲ�\n"
-#: g10/import.c:1824
+#: g10/import.c:1849
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
+#: g10/import.c:2238
+#, fuzzy
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "����������̩�����ȹ礷�ޤ���!\n"
+
+#: g10/import.c:2246
+#, fuzzy
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
+
+#: g10/import.c:2248
+#, fuzzy
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
+
#: g10/keydb.c:167
#, c-format
msgid "error creating keyring `%s': %s\n"
@@ -2362,51 +2386,51 @@ msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
msgid "failed to rebuild keyring cache: %s\n"
msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:253
+#: g10/keyedit.c:254
msgid "[revocation]"
msgstr "[����]"
-#: g10/keyedit.c:254
+#: g10/keyedit.c:255
msgid "[self-signature]"
msgstr "[���ʽ�̾]"
-#: g10/keyedit.c:332 g10/keylist.c:342
+#: g10/keyedit.c:333 g10/keylist.c:405
msgid "1 bad signature\n"
msgstr "�����ʽ�̾1��\n"
-#: g10/keyedit.c:334 g10/keylist.c:344
+#: g10/keyedit.c:335 g10/keylist.c:407
#, c-format
msgid "%d bad signatures\n"
msgstr "�����ʽ�̾%d��\n"
-#: g10/keyedit.c:336 g10/keylist.c:346
+#: g10/keyedit.c:337 g10/keylist.c:409
msgid "1 signature not checked due to a missing key\n"
msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:338 g10/keylist.c:348
+#: g10/keyedit.c:339 g10/keylist.c:411
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:340 g10/keylist.c:350
+#: g10/keyedit.c:341 g10/keylist.c:413
msgid "1 signature not checked due to an error\n"
msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:342 g10/keylist.c:352
+#: g10/keyedit.c:343 g10/keylist.c:415
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:344
+#: g10/keyedit.c:345
msgid "1 user ID without valid self-signature detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
-#: g10/keyedit.c:346
+#: g10/keyedit.c:347
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
-#: g10/keyedit.c:402 g10/pkclist.c:262
+#: g10/keyedit.c:403 g10/pkclist.c:262
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@ -2417,17 +2441,17 @@ msgstr ""
"��\n"
"(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
-#: g10/keyedit.c:406 g10/pkclist.c:274
+#: g10/keyedit.c:407 g10/pkclist.c:274
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = �������ٿ��Ѥ���\n"
-#: g10/keyedit.c:407 g10/pkclist.c:276
+#: g10/keyedit.c:408 g10/pkclist.c:276
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = �����˿��Ѥ���\n"
-#: g10/keyedit.c:426
+#: g10/keyedit.c:427
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2436,36 +2460,36 @@ msgstr ""
"���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
"������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
-#: g10/keyedit.c:442
+#: g10/keyedit.c:443
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
-#: g10/keyedit.c:584
+#: g10/keyedit.c:585
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1543
+#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800
+#: g10/keyedit.c:858 g10/keyedit.c:1596
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806
+#: g10/keyedit.c:1602
msgid " Unable to sign.\n"
msgstr " ��̾��ǽ��\n"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:637
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
-#: g10/keyedit.c:675
+#: g10/keyedit.c:676
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2474,11 +2498,11 @@ msgstr ""
"��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
"PGP 2.x�����ν�̾�Ǥ���\n"
-#: g10/keyedit.c:684
+#: g10/keyedit.c:685
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2487,11 +2511,11 @@ msgstr ""
"��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
"����λ�Ǥ���\n"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:703
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
-#: g10/keyedit.c:723
+#: g10/keyedit.c:724
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2500,53 +2524,53 @@ msgstr ""
"��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
"��������̾�Ǥ���\n"
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:748
+#: g10/keyedit.c:749
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:756
+#: g10/keyedit.c:757
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:778
+#: g10/keyedit.c:779
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
-#: g10/keyedit.c:793
+#: g10/keyedit.c:794
msgid "This key has expired!"
msgstr "���θ�����λ�Ǥ�!"
-#: g10/keyedit.c:813
+#: g10/keyedit.c:814
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���θ���%s����λ���ޤ���\n"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:818
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
-#: g10/keyedit.c:850
+#: g10/keyedit.c:851
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
-#: g10/keyedit.c:852
+#: g10/keyedit.c:853
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2555,32 +2579,32 @@ msgstr ""
"��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
-#: g10/keyedit.c:882
+#: g10/keyedit.c:883
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �����ޤ���%s\n"
-#: g10/keyedit.c:884
+#: g10/keyedit.c:885
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �������������Ƥ��ޤ���%s\n"
-#: g10/keyedit.c:886
+#: g10/keyedit.c:887
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ������������ޤ�����%s\n"
-#: g10/keyedit.c:888
+#: g10/keyedit.c:889
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
-#: g10/keyedit.c:894
+#: g10/keyedit.c:895
#, fuzzy
msgid "Your selection? (enter `?' for more information): "
msgstr "�����? (�ܺ٤� '?' ��): "
-#: g10/keyedit.c:918
+#: g10/keyedit.c:919
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@ -2589,66 +2613,75 @@ msgstr ""
"�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
"(%s)\n"
-#: g10/keyedit.c:925
+#: g10/keyedit.c:926
msgid "This will be a self-signature.\n"
msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
-#: g10/keyedit.c:931
+#: g10/keyedit.c:932
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:939
+#: g10/keyedit.c:940
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:950
msgid "The signature will be marked as non-exportable.\n"
msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:957
msgid "The signature will be marked as non-revocable.\n"
msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
msgid "I have not checked this key at all.\n"
msgstr "���θ����������������Ƥ��ޤ���\n"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
msgid "I have checked this key casually.\n"
msgstr "���θ��ϰ�����������ޤ�����\n"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:974
msgid "I have checked this key very carefully.\n"
msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:984
msgid "Really sign? (y/N) "
msgstr "�����˽�̾���ޤ���? (y/N) "
-#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110
-#: g10/sign.c:369
+#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177
+#: g10/keyedit.c:4238 g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1084
+#: g10/keyedit.c:1094
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr ""
+
+#: g10/keyedit.c:1105 g10/keygen.c:3056
msgid "This key is not protected.\n"
msgstr "���θ����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:1088
+#: g10/keyedit.c:1109 g10/keygen.c:3044
msgid "Secret parts of primary key are not available.\n"
msgstr "�縰����̩��ʬ�������ޤ���\n"
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1113 g10/keygen.c:3059
+#, fuzzy
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "�縰����̩��ʬ�������ޤ���\n"
+
+#: g10/keyedit.c:1117 g10/keygen.c:3063
msgid "Key is protected.\n"
msgstr "�����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:1112
+#: g10/keyedit.c:1141
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1147
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2656,11 +2689,11 @@ msgstr ""
"������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
"\n"
-#: g10/keyedit.c:1127 g10/keygen.c:1818
+#: g10/keyedit.c:1156 g10/keygen.c:1824
msgid "passphrase not correctly repeated; try again"
msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1161
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2669,354 +2702,398 @@ msgstr ""
"�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
"\n"
-#: g10/keyedit.c:1135
+#: g10/keyedit.c:1164
msgid "Do you really want to do this? (y/N) "
msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1235
msgid "moving a key signature to the correct place\n"
msgstr "���ν�̾�����������˰�ư���ޤ�\n"
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1319
msgid "save and quit"
msgstr "��¸���ƽ�λ"
-#: g10/keyedit.c:1290
-msgid "show fingerprint"
+#: g10/keyedit.c:1322
+#, fuzzy
+msgid "show key fingerprint"
msgstr "�����ɽ��"
-#: g10/keyedit.c:1291
+#: g10/keyedit.c:1323
msgid "list key and user IDs"
msgstr "���ȥ桼����ID�ΰ���"
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1325
msgid "select user ID N"
msgstr "�桼����ID N������"
-#: g10/keyedit.c:1294
-msgid "select secondary key N"
-msgstr "����N������"
+#: g10/keyedit.c:1326
+#, fuzzy
+msgid "select subkey N"
+msgstr "�桼����ID N������"
-#: g10/keyedit.c:1295
-msgid "list signatures"
-msgstr "��̾�ΰ���"
+#: g10/keyedit.c:1327
+#, fuzzy
+msgid "check signatures"
+msgstr "��̾�μ���"
-#: g10/keyedit.c:1297
-msgid "sign the key"
-msgstr "���ؽ�̾"
+#: g10/keyedit.c:1329
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr ""
-#: g10/keyedit.c:1301
-msgid "sign the key locally"
+#: g10/keyedit.c:1334
+#, fuzzy
+msgid "sign selected user IDs locally"
msgstr "��������Ū�˽�̾"
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1335
+#, fuzzy
+msgid "sign selected user IDs with a trust signature"
+msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
+
+#: g10/keyedit.c:1336
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr ""
+
+#: g10/keyedit.c:1338
msgid "add a user ID"
msgstr "�桼����ID���ɲ�"
-#: g10/keyedit.c:1304
+#: g10/keyedit.c:1339
msgid "add a photo ID"
msgstr "�ե���ID���ɲ�"
-#: g10/keyedit.c:1305
-msgid "delete user ID"
+#: g10/keyedit.c:1340
+#, fuzzy
+msgid "delete selected user IDs"
msgstr "�桼����ID�κ��"
-#: g10/keyedit.c:1308
-msgid "add a secondary key"
-msgstr "�������ɲ�"
+#: g10/keyedit.c:1343
+#, fuzzy
+msgid "add a subkey"
+msgstr "addkey"
-#: g10/keyedit.c:1310
+#: g10/keyedit.c:1345
msgid "add a key to a smartcard"
msgstr "���ޡ��ȥ����ɤظ����ɲ�"
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1346
msgid "move a key to a smartcard"
msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
-#: g10/keyedit.c:1313
-msgid "delete a secondary key"
+#: g10/keyedit.c:1348
+#, fuzzy
+msgid "delete selected subkeys"
msgstr "������"
-#: g10/keyedit.c:1314
+#: g10/keyedit.c:1349
msgid "add a revocation key"
msgstr "���������ɲ�"
-#: g10/keyedit.c:1315
-msgid "delete signatures"
-msgstr "��̾�κ��"
+#: g10/keyedit.c:1350
+#, fuzzy
+msgid "delete signatures from the selected user IDs"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
-#: g10/keyedit.c:1316
-msgid "change the expire date"
-msgstr "��λ�����ѹ�"
+#: g10/keyedit.c:1351
+#, fuzzy
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:1317
-msgid "flag user ID as primary"
+#: g10/keyedit.c:1352
+#, fuzzy
+msgid "flag the selected user ID as primary"
msgstr "�桼����ID���ˤ���"
-#: g10/keyedit.c:1318
-msgid "toggle between secret and public key listing"
+#: g10/keyedit.c:1353
+#, fuzzy
+msgid "toggle between the secret and public key listings"
msgstr "��̩���ȸ������ΰ�����ȿž"
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1355
msgid "list preferences (expert)"
msgstr "�����ΰ��� (�������ѡ���)"
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1356
msgid "list preferences (verbose)"
msgstr "�����ΰ��� (��Ĺ)"
-#: g10/keyedit.c:1322
-msgid "set preference list"
-msgstr "�������������"
-
-#: g10/keyedit.c:1323
-msgid "updated preferences"
-msgstr "�����ΰ����򹹿�"
+#: g10/keyedit.c:1357
+#, fuzzy
+msgid "set preference list for the selected user IDs"
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
-#: g10/keyedit.c:1324
-msgid "set preferred keyserver URL"
+#: g10/keyedit.c:1360
+#, fuzzy
+msgid "set preferred keyserver URL for the selected user IDs"
msgstr "��������������URI������"
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1364
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:1327
-msgid "revoke signatures"
-msgstr "��̾�μ���"
+#: g10/keyedit.c:1365
+#, fuzzy
+msgid "revoke signatures on the selected user IDs"
+msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
-#: g10/keyedit.c:1328
-msgid "revoke a user ID"
+#: g10/keyedit.c:1366
+#, fuzzy
+msgid "revoke selected user IDs"
msgstr "�桼����ID�μ���"
-#: g10/keyedit.c:1329
-msgid "revoke a secondary key"
+#: g10/keyedit.c:1369
+#, fuzzy
+msgid "revoke key or selected subkeys"
msgstr "�������"
-#: g10/keyedit.c:1330
-msgid "disable a key"
-msgstr "���λ��Ѥ�ػߤ���"
-
-#: g10/keyedit.c:1331
-msgid "enable a key"
+#: g10/keyedit.c:1370
+#, fuzzy
+msgid "enable key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/keyedit.c:1332
-msgid "show photo ID"
+#: g10/keyedit.c:1371
+#, fuzzy
+msgid "disable key"
+msgstr "���λ��Ѥ�ػߤ���"
+
+#: g10/keyedit.c:1372
+#, fuzzy
+msgid "show selected photo IDs"
msgstr "�ե���ID��ɽ��"
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1431
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1449
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:1481
+#: g10/keyedit.c:1526
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:1489
+#: g10/keyedit.c:1534
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1553
+msgid ""
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
+" a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+
+#: g10/keyedit.c:1590
msgid "Key is revoked."
msgstr "���ϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:1557
+#: g10/keyedit.c:1610
msgid "Really sign all user IDs? (y/N) "
msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
-#: g10/keyedit.c:1560
+#: g10/keyedit.c:1613
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:1568
+#: g10/keyedit.c:1621
#, fuzzy, c-format
msgid "Unknown signature type `%s'\n"
msgstr "̤�Τν�̾���饹�Ǥ�"
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1644
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
-#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736
+#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1668
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1670
msgid "Really remove all selected user IDs? (y/N) "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
-#: g10/keyedit.c:1618
+#: g10/keyedit.c:1671
msgid "Really remove this user ID? (y/N) "
msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
-#: g10/keyedit.c:1668
+#: g10/keyedit.c:1721
msgid "Really move the primary key? (y/N) "
msgstr "���μ縰�������˺�����ޤ���? (y/N) "
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1733
msgid "You must select exactly one key.\n"
msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1700 g10/keyedit.c:1755
+#: g10/keyedit.c:1753
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1703
+#: g10/keyedit.c:1756
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "���򤷤����������˺�����ޤ���? (y/N) "
-#: g10/keyedit.c:1704
+#: g10/keyedit.c:1757
msgid "Do you really want to delete this key? (y/N) "
msgstr "���θ��������˺�����ޤ���? (y/N) "
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1792
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
-#: g10/keyedit.c:1740
+#: g10/keyedit.c:1793
msgid "Really revoke this user ID? (y/N) "
msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
-#: g10/keyedit.c:1759
-msgid "Do you really want to revoke the selected keys? (y/N) "
+#: g10/keyedit.c:1811
+#, fuzzy
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "���θ��������˼������ޤ���? (y/N) "
+
+#: g10/keyedit.c:1822
+#, fuzzy
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "���򤷤����������˼������ޤ���? (y/N) "
-#: g10/keyedit.c:1760
-msgid "Do you really want to revoke this key? (y/N) "
+#: g10/keyedit.c:1824
+#, fuzzy
+msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "���θ��������˼������ޤ���? (y/N) "
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1865
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr ""
"���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
"����\n"
-#: g10/keyedit.c:1831
+#: g10/keyedit.c:1897
msgid "Set preference list to:\n"
msgstr "�������������:\n"
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1903
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
-#: g10/keyedit.c:1839
+#: g10/keyedit.c:1905
msgid "Really update the preferences? (y/N) "
msgstr "�����������˹������ޤ���? (y/N) "
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1955
msgid "Save changes? (y/N) "
msgstr "�ѹ�����¸���ޤ���? (y/N) "
-#: g10/keyedit.c:1892
+#: g10/keyedit.c:1958
msgid "Quit without saving? (y/N) "
msgstr "��¸�����˽�λ���ޤ���? (y/N) "
-#: g10/keyedit.c:1902
+#: g10/keyedit.c:1968
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1909
+#: g10/keyedit.c:1975
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1916
+#: g10/keyedit.c:1982
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:2054
msgid "Digest: "
msgstr "����: "
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2106
msgid "Features: "
msgstr "��ǽ: "
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2117
msgid "Keyserver no-modify"
msgstr "̵�����������С�"
-#: g10/keyedit.c:2066 g10/keylist.c:244
+#: g10/keyedit.c:2132 g10/keylist.c:307
msgid "Preferred keyserver: "
msgstr "������������: "
-#: g10/keyedit.c:2309
+#: g10/keyedit.c:2363
+#, fuzzy, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
+
+#: g10/keyedit.c:2384
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
-#: g10/keyedit.c:2315
+#: g10/keyedit.c:2390
msgid "(sensitive)"
msgstr "(�ǥꥱ����)"
-#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514
-#: g10/keyserver.c:366
+#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589
+#: g10/keylist.c:193 g10/keyserver.c:413
#, c-format
msgid "created: %s"
msgstr "����: %s"
-#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929
#, c-format
msgid "revoked: %s"
msgstr "����: %s"
-#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823
+#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886
#, c-format
msgid "expired: %s"
msgstr "��λ: %s"
-#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850
-#: g10/keyserver.c:372 g10/mainproc.c:935
+#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591
+#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935
#, c-format
msgid "expires: %s"
msgstr "��λ: %s"
-#: g10/keyedit.c:2340
+#: g10/keyedit.c:2415
#, c-format
msgid "usage: %s"
msgstr "����ˡ: %s"
-#: g10/keyedit.c:2355
+#: g10/keyedit.c:2430
#, c-format
msgid "trust: %s"
msgstr "����: %s"
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2434
#, c-format
msgid "validity: %s"
msgstr "ͭ����: %s"
-#: g10/keyedit.c:2366
+#: g10/keyedit.c:2441
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:2394
+#: g10/keyedit.c:2469 g10/keylist.c:199
msgid "card-no: "
msgstr "�������ֹ�: "
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2536
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
-#: g10/keyedit.c:2469
+#: g10/keyedit.c:2544
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3024,17 +3101,17 @@ msgstr ""
"�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
"�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
-#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575
#: g10/trustdb.c:1164
msgid "revoked"
msgstr "����"
-#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577
#: g10/trustdb.c:531
msgid "expired"
msgstr "��λ"
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2675
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@ -3042,7 +3119,7 @@ msgstr ""
"�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
" �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
-#: g10/keyedit.c:2660
+#: g10/keyedit.c:2735
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3051,45 +3128,45 @@ msgstr ""
"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:2665 g10/keyedit.c:2943
+#: g10/keyedit.c:2740 g10/keyedit.c:3018
msgid "Are you sure you still want to add it? (y/N) "
msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
-#: g10/keyedit.c:2671
+#: g10/keyedit.c:2746
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2886
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2821
+#: g10/keyedit.c:2896
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2825
+#: g10/keyedit.c:2900
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2831
+#: g10/keyedit.c:2906
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:2845
+#: g10/keyedit.c:2920
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2846
+#: g10/keyedit.c:2921
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2849
+#: g10/keyedit.c:2924
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:2938
+#: g10/keyedit.c:3013
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3098,154 +3175,166 @@ msgstr ""
"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:2949
+#: g10/keyedit.c:3024
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
-#: g10/keyedit.c:2969
+#: g10/keyedit.c:3044
msgid "Enter the user ID of the designated revoker: "
msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:3067
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:3007
+#: g10/keyedit.c:3082
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
-#: g10/keyedit.c:3029
+#: g10/keyedit.c:3104
msgid "this key has already been designated as a revoker\n"
msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3123
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3129
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3190
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:3121
-msgid "Please select at most one secondary key.\n"
+#: g10/keyedit.c:3196
+#, fuzzy
+msgid "Please select at most one subkey.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:3125
-msgid "Changing expiration time for a secondary key.\n"
+#: g10/keyedit.c:3200
+#, fuzzy
+msgid "Changing expiration time for a subkey.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3203
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:3174
+#: g10/keyedit.c:3249
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:3190
+#: g10/keyedit.c:3265
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:3270
+#: g10/keyedit.c:3345
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538
+#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
-#: g10/keyedit.c:3480
+#: g10/keyedit.c:3555
msgid "Enter your preferred keyserver URL: "
msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:3559
+#: g10/keyedit.c:3635
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�����˸򴹤������Ǥ���? (y/N) "
-#: g10/keyedit.c:3560
+#: g10/keyedit.c:3636
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�����˺���������Ǥ���? (y/N) "
-#: g10/keyedit.c:3622
+#: g10/keyedit.c:3698
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:3668
-#, c-format
-msgid "No secondary key with index %d\n"
-msgstr "%d�֤������Ϥ���ޤ���\n"
+#: g10/keyedit.c:3744
+#, fuzzy, c-format
+msgid "No subkey with index %d\n"
+msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:3785
+#: g10/keyedit.c:3861
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "�桼����ID:��%s��\n"
-#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895
+#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897
+#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973
msgid " (non-exportable)"
msgstr " (��Ф��Բ�)"
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3870
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ν�̾��%s����λ�Ǥ���\n"
-#: g10/keyedit.c:3798
+#: g10/keyedit.c:3874
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3878
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
-#: g10/keyedit.c:3829
+#: g10/keyedit.c:3905
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
-#: g10/keyedit.c:3855
+#: g10/keyedit.c:3931
msgid " (non-revocable)"
msgstr " (�����Բ�)"
-#: g10/keyedit.c:3862
+#: g10/keyedit.c:3938
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
-#: g10/keyedit.c:3884
+#: g10/keyedit.c:3960
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:3904
+#: g10/keyedit.c:3980
msgid "Really create the revocation certificates? (y/N) "
msgstr "����������������˺������ޤ���? (y/N) "
-#: g10/keyedit.c:3934
+#: g10/keyedit.c:4010
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
-#: g10/keyedit.c:4004
+#: g10/keyedit.c:4080
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-#: g10/keyedit.c:4021
+#: g10/keyedit.c:4097
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
-#: g10/keyedit.c:4190
+#: g10/keyedit.c:4161
+#, fuzzy, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:4223
+#, fuzzy, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:4318
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3272,143 +3361,143 @@ msgstr "¿�����밵������\n"
msgid "invalid item `%s' in preference string\n"
msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
-#: g10/keygen.c:827
+#: g10/keygen.c:829
msgid "writing direct signature\n"
msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:866
+#: g10/keygen.c:868
msgid "writing self signature\n"
msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:912
+#: g10/keygen.c:914
msgid "writing key binding signature\n"
msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
+#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
+#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:1247
+#: g10/keygen.c:1249
msgid "Sign"
msgstr "Sign"
-#: g10/keygen.c:1250
+#: g10/keygen.c:1252
msgid "Encrypt"
msgstr "Encrypt"
-#: g10/keygen.c:1253
+#: g10/keygen.c:1255
msgid "Authenticate"
msgstr "Authenticate"
-#: g10/keygen.c:1261
+#: g10/keygen.c:1263
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1276
+#: g10/keygen.c:1278
#, c-format
msgid "Possible actions for a %s key: "
msgstr "��%s�˲�ǽ�����: "
-#: g10/keygen.c:1280
+#: g10/keygen.c:1282
msgid "Current allowed actions: "
msgstr "������ǽ�����: "
-#: g10/keygen.c:1285
+#: g10/keygen.c:1287
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) ��̾�Ϥ�ȿž\n"
-#: g10/keygen.c:1288
+#: g10/keygen.c:1290
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) �Ź��Ϥ�ȿž\n"
-#: g10/keygen.c:1291
+#: g10/keygen.c:1293
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) ǧ���Ϥ�ȿž\n"
-#: g10/keygen.c:1294
+#: g10/keygen.c:1296
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) ��λ\n"
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
msgid "Please select what kind of key you want:\n"
msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA��Elgamal (����)\n"
-#: g10/keygen.c:1351
+#: g10/keygen.c:1353
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��̾�Τ�)\n"
-#: g10/keygen.c:1353
+#: g10/keygen.c:1355
#, fuzzy, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
-#: g10/keygen.c:1355
+#: g10/keygen.c:1357
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) Elgamal (�Ź沽�Τ�)\n"
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��̾�Τ�)\n"
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�Ź沽�Τ�)\n"
-#: g10/keygen.c:1360
+#: g10/keygen.c:1362
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
-#: g10/keygen.c:1429 g10/keygen.c:2502
+#: g10/keygen.c:1431 g10/keygen.c:2508
#, fuzzy, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-#: g10/keygen.c:1439
+#: g10/keygen.c:1441
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr ""
-#: g10/keygen.c:1446
+#: g10/keygen.c:1448
#, fuzzy, c-format
msgid "What keysize do you want? (%u) "
msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
-#: g10/keygen.c:1460
+#: g10/keygen.c:1462
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
-#: g10/keygen.c:1466
+#: g10/keygen.c:1468
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
-#: g10/keygen.c:1471 g10/keygen.c:1476
+#: g10/keygen.c:1473 g10/keygen.c:1478
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:1528
+#: g10/keygen.c:1530
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -3424,7 +3513,7 @@ msgstr ""
" <n>m = ���� n ����֤���λ\n"
" <n>y = ���� n ǯ�֤���λ\n"
-#: g10/keygen.c:1537
+#: g10/keygen.c:1539
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -3440,29 +3529,39 @@ msgstr ""
" <n>m = ��̾�� n ����֤���λ\n"
" <n>y = ��̾�� n ǯ�֤���λ\n"
-#: g10/keygen.c:1559
+#: g10/keygen.c:1561
msgid "Key is valid for? (0) "
msgstr "����ͭ�����֤�? (0)"
-#: g10/keygen.c:1561
+#: g10/keygen.c:1563
msgid "Signature is valid for? (0) "
msgstr "��̾��ͭ�����֤�? (0)"
-#: g10/keygen.c:1566
+#: g10/keygen.c:1568
msgid "invalid value\n"
msgstr "̵������\n"
-#: g10/keygen.c:1571
-#, c-format
-msgid "%s does not expire at all\n"
+#: g10/keygen.c:1575
+#, fuzzy
+msgid "Key does not expire at all\n"
msgstr "%s��̵���¤Ǥ�\n"
-#: g10/keygen.c:1578
-#, c-format
-msgid "%s expires at %s\n"
+#: g10/keygen.c:1576
+#, fuzzy
+msgid "Signature does not expire at all\n"
+msgstr "%s��̵���¤Ǥ�\n"
+
+#: g10/keygen.c:1583
+#, fuzzy, c-format
+msgid "Key expires at %s\n"
msgstr "%s��%s����λ���ޤ�\n"
#: g10/keygen.c:1584
+#, fuzzy, c-format
+msgid "Signature expires at %s\n"
+msgstr "���ν�̾��%s����λ�Ǥ�\n"
+
+#: g10/keygen.c:1590
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -3470,11 +3569,11 @@ msgstr ""
"���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
"2106ǯ�ޤǤʤ���������갷���ޤ���\n"
-#: g10/keygen.c:1589
+#: g10/keygen.c:1595
msgid "Is this correct? (y/N) "
msgstr "������������Ǥ���? (y/N) "
-#: g10/keygen.c:1632
+#: g10/keygen.c:1638
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3490,44 +3589,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1644
+#: g10/keygen.c:1650
msgid "Real name: "
msgstr "��̾: "
-#: g10/keygen.c:1652
+#: g10/keygen.c:1658
msgid "Invalid character in name\n"
msgstr "̾����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1654
+#: g10/keygen.c:1660
msgid "Name may not start with a digit\n"
msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
-#: g10/keygen.c:1656
+#: g10/keygen.c:1662
msgid "Name must be at least 5 characters long\n"
msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1670
msgid "Email address: "
msgstr "�Żҥ᡼�롦���ɥ쥹: "
-#: g10/keygen.c:1675
+#: g10/keygen.c:1681
msgid "Not a valid email address\n"
msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
-#: g10/keygen.c:1683
+#: g10/keygen.c:1689
msgid "Comment: "
msgstr "������: "
-#: g10/keygen.c:1689
+#: g10/keygen.c:1695
msgid "Invalid character in comment\n"
msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1712
+#: g10/keygen.c:1718
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
-#: g10/keygen.c:1718
+#: g10/keygen.c:1724
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3538,27 +3637,27 @@ msgstr ""
" ��%s��\n"
"\n"
-#: g10/keygen.c:1723
+#: g10/keygen.c:1729
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
-#: g10/keygen.c:1739
+#: g10/keygen.c:1745
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1749
+#: g10/keygen.c:1755
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
-#: g10/keygen.c:1750
+#: g10/keygen.c:1756
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
-#: g10/keygen.c:1769
+#: g10/keygen.c:1775
msgid "Please correct the error first\n"
msgstr "�ޤ����顼�������Ƥ�������\n"
-#: g10/keygen.c:1809
+#: g10/keygen.c:1815
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3566,12 +3665,12 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
"\n"
-#: g10/keygen.c:1819 g10/passphrase.c:1101
+#: g10/keygen.c:1825 g10/passphrase.c:1101
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1825
+#: g10/keygen.c:1831
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"
@@ -3583,7 +3682,7 @@ msgstr ""
"�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
"\n"
-#: g10/keygen.c:1847
+#: g10/keygen.c:1853
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"
@@ -3594,107 +3693,108 @@ msgstr ""
"�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
-#: g10/keygen.c:2571
+#: g10/keygen.c:2577
msgid "Key generation canceled.\n"
msgstr "�������������ä���ޤ�����\n"
-#: g10/keygen.c:2759 g10/keygen.c:2896
+#: g10/keygen.c:2765 g10/keygen.c:2909
#, c-format
msgid "writing public key to `%s'\n"
msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
-#: g10/keygen.c:2761 g10/keygen.c:2899
+#: g10/keygen.c:2767 g10/keygen.c:2912
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
-#: g10/keygen.c:2764 g10/keygen.c:2902
+#: g10/keygen.c:2770 g10/keygen.c:2915
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:2885
+#: g10/keygen.c:2898
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2891
+#: g10/keygen.c:2904
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2909
+#: g10/keygen.c:2922
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
-#: g10/keygen.c:2916
+#: g10/keygen.c:2929
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/keygen.c:2939
+#: g10/keygen.c:2952
msgid "public and secret key created and signed.\n"
msgstr "����������̩�������������̾���ޤ�����\n"
-#: g10/keygen.c:2950
+#: g10/keygen.c:2963
+#, fuzzy
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"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
"���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
"��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
-#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
+#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���������˼��Ԥ��ޤ���: %s\n"
-#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
+#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
-#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
+#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
-#: g10/keygen.c:3024 g10/keygen.c:3141
+#: g10/keygen.c:3038 g10/keygen.c:3168
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
-#: g10/keygen.c:3052 g10/keygen.c:3174
+#: g10/keygen.c:3077 g10/keygen.c:3201
msgid "Really create? (y/N) "
msgstr "�����˺������ޤ���? (y/N) "
-#: g10/keygen.c:3327
+#: g10/keygen.c:3354
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
-#: g10/keygen.c:3374
+#: g10/keygen.c:3401
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
-#: g10/keygen.c:3397
+#: g10/keygen.c:3424
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
-#: g10/keygen.c:3464
+#: g10/keygen.c:3491
#, c-format
msgid "length of RSA modulus is not %d\n"
msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
-#: g10/keygen.c:3470
+#: g10/keygen.c:3497
msgid "public exponent too large (more than 32 bits)\n"
msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
-#: g10/keygen.c:3476 g10/keygen.c:3482
+#: g10/keygen.c:3503 g10/keygen.c:3509
#, c-format
msgid "length of an RSA prime is not %d\n"
msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
@@ -3703,64 +3803,66 @@ msgstr "RSA���ǿ���%d�Ǥ���ޤ���\n"
msgid "never "
msgstr "̵���� "
-#: g10/keylist.c:201
+#: g10/keylist.c:264
msgid "Critical signature policy: "
msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
-#: g10/keylist.c:203
+#: g10/keylist.c:266
msgid "Signature policy: "
msgstr "��̾�ݥꥷ��: "
-#: g10/keylist.c:242
+#: g10/keylist.c:305
msgid "Critical preferred keyserver: "
msgstr "����������������: "
-#: g10/keylist.c:291 g10/keylist.c:335
+#: g10/keylist.c:354 g10/keylist.c:398
msgid "WARNING: invalid notation data found\n"
msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
-#: g10/keylist.c:309
+#: g10/keylist.c:372
msgid "Critical signature notation: "
msgstr "����ƥ�����ʽ�̾����: "
-#: g10/keylist.c:311
+#: g10/keylist.c:374
msgid "Signature notation: "
msgstr "��̾����: "
-#: g10/keylist.c:322
+#: g10/keylist.c:385
msgid "not human readable"
msgstr "�ͤˤ��ɤ�ޤ���"
-#: g10/keylist.c:423
+#: g10/keylist.c:486
msgid "Keyring"
msgstr "����"
-#: g10/keylist.c:729
+#: g10/keylist.c:792
#, c-format
msgid "expired: %s)"
msgstr "��λ: %s)"
-#: g10/keylist.c:1425
+#: g10/keylist.c:1488
msgid "Primary key fingerprint:"
msgstr "�縰�λ���:"
-#: g10/keylist.c:1427
+#: g10/keylist.c:1490
msgid " Subkey fingerprint:"
msgstr "�������:"
-#: g10/keylist.c:1434
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1497
msgid " Primary key fingerprint:"
msgstr " �縰�λ���:"
-#: g10/keylist.c:1436
+#: g10/keylist.c:1499
msgid " Subkey fingerprint:"
msgstr " �������:"
-#: g10/keylist.c:1440 g10/keylist.c:1444
+#: g10/keylist.c:1503 g10/keylist.c:1507
msgid " Key fingerprint ="
msgstr " ���� ="
-#: g10/keylist.c:1511
+#: g10/keylist.c:1574
msgid " Card serial no. ="
msgstr " �����ɤ����� ="
@@ -3813,123 +3915,123 @@ msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr ""
"�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
-#: g10/keyserver.c:378
+#: g10/keyserver.c:425
msgid "disabled"
msgstr "disabled"
-#: g10/keyserver.c:579
+#: g10/keyserver.c:626
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
-#: g10/keyserver.c:662 g10/keyserver.c:1147
+#: g10/keyserver.c:709 g10/keyserver.c:1229
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
-#: g10/keyserver.c:752
+#: g10/keyserver.c:799
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
-#: g10/keyserver.c:754
+#: g10/keyserver.c:801
msgid "key not found on keyserver\n"
msgstr "�����������С��˸��Ĥ���ޤ���\n"
-#: g10/keyserver.c:901
+#: g10/keyserver.c:976
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "��%s��%s���饵���С�%s���׵�\n"
-#: g10/keyserver.c:905
+#: g10/keyserver.c:980
#, c-format
msgid "requesting key %s from %s\n"
msgstr "��%s��%s���׵�\n"
-#: g10/keyserver.c:1050
+#: g10/keyserver.c:1132
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "��%s��%s������%s������\n"
-#: g10/keyserver.c:1054
+#: g10/keyserver.c:1136
#, c-format
msgid "sending key %s to %s\n"
msgstr "��%s��%s������\n"
-#: g10/keyserver.c:1097
+#: g10/keyserver.c:1179
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
-#: g10/keyserver.c:1100
+#: g10/keyserver.c:1182
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
-#: g10/keyserver.c:1107 g10/keyserver.c:1202
+#: g10/keyserver.c:1189 g10/keyserver.c:1284
msgid "no keyserver action!\n"
msgstr "�������С�����������󤬤���ޤ���!\n"
-#: g10/keyserver.c:1155
+#: g10/keyserver.c:1237
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
-#: g10/keyserver.c:1164
+#: g10/keyserver.c:1246
msgid "keyserver did not send VERSION\n"
msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
-#: g10/keyserver.c:1223
+#: g10/keyserver.c:1305
msgid "no keyserver known (use option --keyserver)\n"
msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
-#: g10/keyserver.c:1229
+#: g10/keyserver.c:1311
msgid "external keyserver calls are not supported in this build\n"
msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/keyserver.c:1241
+#: g10/keyserver.c:1323
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1328
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
-#: g10/keyserver.c:1254
+#: g10/keyserver.c:1336
#, c-format
msgid "gpgkeys_%s does not support handler version %d\n"
msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
-#: g10/keyserver.c:1261
+#: g10/keyserver.c:1342
msgid "keyserver timed out\n"
msgstr "�������С��Υ����ॢ����\n"
-#: g10/keyserver.c:1266
+#: g10/keyserver.c:1347
msgid "keyserver internal error\n"
msgstr "�������С����������顼\n"
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1356
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "�������С��̿����顼: %s\n"
-#: g10/keyserver.c:1300 g10/keyserver.c:1334
+#: g10/keyserver.c:1381 g10/keyserver.c:1415
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
-#: g10/keyserver.c:1585
+#: g10/keyserver.c:1666
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
-#: g10/keyserver.c:1607
+#: g10/keyserver.c:1688
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1�ܤθ���%s�������\n"
-#: g10/keyserver.c:1609
+#: g10/keyserver.c:1690
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d�ܤθ���%s�������\n"
@@ -4137,84 +4239,84 @@ msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
-#: g10/misc.c:105
+#: g10/misc.c:119
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
-#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239
#, c-format
msgid "fstat of `%s' failed in %s: %s\n"
msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
-#: g10/misc.c:190
+#: g10/misc.c:204
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
-#: g10/misc.c:299
+#: g10/misc.c:313
#, fuzzy, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
-#: g10/misc.c:314
+#: g10/misc.c:328
#, fuzzy, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
-#: g10/misc.c:329
+#: g10/misc.c:343
#, fuzzy, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
-#: g10/misc.c:334
+#: g10/misc.c:348
#, fuzzy, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/misc.c:430
+#: g10/misc.c:444
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
-#: g10/misc.c:431
+#: g10/misc.c:445
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
-#: g10/misc.c:664
+#: g10/misc.c:678
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
-#: g10/misc.c:668
+#: g10/misc.c:682
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
-#: g10/misc.c:670
+#: g10/misc.c:684
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
-#: g10/misc.c:681
+#: g10/misc.c:695
msgid "Uncompressed"
msgstr "̵����"
-#: g10/misc.c:706
+#: g10/misc.c:720
msgid "uncompressed|none"
msgstr "̵����|�ʤ�"
-#: g10/misc.c:816
+#: g10/misc.c:830
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
-#: g10/misc.c:973
+#: g10/misc.c:987
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "�����ޤ��ʥ��ץ�����%s��\n"
-#: g10/misc.c:998
+#: g10/misc.c:1012
#, c-format
msgid "unknown option `%s'\n"
msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -4261,16 +4363,16 @@ msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
msgid "directory `%s' created\n"
msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
-#: g10/parse-packet.c:119
+#: g10/parse-packet.c:137
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
-#: g10/parse-packet.c:688
+#: g10/parse-packet.c:707
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
-#: g10/parse-packet.c:1112
+#: g10/parse-packet.c:1132
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -4309,16 +4411,16 @@ msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent�Ȥ��̿��㳲\n"
-#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044
+#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046
msgid "problem with the agent - disabling agent use\n"
msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
-#: g10/passphrase.c:700 g10/passphrase.c:1205
+#: g10/passphrase.c:699 g10/passphrase.c:1205
#, c-format
msgid " (main key ID %s)"
msgstr " (�縰ID %s)"
-#: g10/passphrase.c:714
+#: g10/passphrase.c:713
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -4329,27 +4431,27 @@ msgstr ""
"\"%.*s\"\n"
"%u�ӥå�%s��, ID %s�������դ�%s%s\n"
-#: g10/passphrase.c:739
+#: g10/passphrase.c:738
msgid "Repeat passphrase\n"
msgstr "�ѥ��ե졼���������\n"
-#: g10/passphrase.c:741
+#: g10/passphrase.c:740
msgid "Enter passphrase\n"
msgstr "�ѥ��ե졼��������\n"
-#: g10/passphrase.c:779
+#: g10/passphrase.c:780
msgid "passphrase too long\n"
msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
-#: g10/passphrase.c:792
+#: g10/passphrase.c:793
msgid "invalid response from agent\n"
msgstr "����������Ȥ����̵���ʱ���\n"
-#: g10/passphrase.c:807 g10/passphrase.c:926
+#: g10/passphrase.c:808 g10/passphrase.c:928
msgid "cancelled by user\n"
msgstr "�桼�����ˤ���ä�\n"
-#: g10/passphrase.c:812 g10/passphrase.c:1015
+#: g10/passphrase.c:813 g10/passphrase.c:1017
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
@@ -4862,20 +4964,20 @@ msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
msgid "protection digest %d is not supported\n"
msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/seckey-cert.c:250
+#: g10/seckey-cert.c:265
msgid "Invalid passphrase; please try again"
msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
-#: g10/seckey-cert.c:251
+#: g10/seckey-cert.c:266
#, c-format
msgid "%s ...\n"
msgstr "%s ...\n"
-#: g10/seckey-cert.c:311
+#: g10/seckey-cert.c:326
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
-#: g10/seckey-cert.c:349
+#: g10/seckey-cert.c:364
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
@@ -5218,12 +5320,12 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
-#: g10/textfilter.c:142
+#: g10/textfilter.c:147
#, c-format
msgid "can't handle text lines longer than %d characters\n"
msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
-#: g10/textfilter.c:239
+#: g10/textfilter.c:244
#, c-format
msgid "input line longer than %d characters\n"
msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
@@ -5699,6 +5801,33 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
+#~ msgid "select secondary key N"
+#~ msgstr "����N������"
+
+#~ msgid "list signatures"
+#~ msgstr "��̾�ΰ���"
+
+#~ msgid "sign the key"
+#~ msgstr "���ؽ�̾"
+
+#~ msgid "add a secondary key"
+#~ msgstr "�������ɲ�"
+
+#~ msgid "delete signatures"
+#~ msgstr "��̾�κ��"
+
+#~ msgid "change the expire date"
+#~ msgstr "��λ�����ѹ�"
+
+#~ msgid "set preference list"
+#~ msgstr "�������������"
+
+#~ msgid "updated preferences"
+#~ msgstr "�����ΰ����򹹿�"
+
+#~ msgid "No secondary key with index %d\n"
+#~ msgstr "%d�֤������Ϥ���ޤ���\n"
+
#~ msgid "--nrsign-key user-id"
#~ msgstr "--nrsign-key �桼����id"
@@ -5810,9 +5939,6 @@ msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
#~ msgid "delphoto"
#~ msgstr "delphoto"
-#~ msgid "addkey"
-#~ msgstr "addkey"
-
#~ msgid "addcardkey"
#~ msgstr "addcardkey"