aboutsummaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po1753
1 files changed, 1009 insertions, 744 deletions
diff --git a/po/ja.po b/po/ja.po
index d82181a06..e18ec9103 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-04-29 17:09+0200\n"
+"POT-Creation-Date: 2002-08-04 23:31+0200\n"
"PO-Revision-Date: 2002-05-10 07:28-0400\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
@@ -17,7 +17,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: util/secmem.c:88
-msgid "Warning: using insecure memory!\n"
+#, fuzzy
+msgid "WARNING: using insecure memory!\n"
msgstr "�ٹ�: ��Ф����꡼����Ѥ��Ƥ��ޤ�!\n"
#: util/secmem.c:89
@@ -48,7 +49,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:815 util/miscutil.c:333
+#: g10/keyedit.c:898 util/miscutil.c:333
msgid "quit"
msgstr "quit"
@@ -275,58 +276,59 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1565
+#: cipher/random.c:352 g10/import.c:193 g10/keygen.c:1809
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s'�������ޤ���: %s\n"
-#: cipher/random.c:324
+#: cipher/random.c:356
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "`%s'��Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
-#: cipher/random.c:329
+#: cipher/random.c:361
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' �����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
-#: cipher/random.c:334
+#: cipher/random.c:366
msgid "note: random_seed file is empty\n"
msgstr "����: random_seed �ե�����϶��Ǥ�\n"
-#: cipher/random.c:340
-msgid "warning: invalid size of random_seed file - not used\n"
+#: cipher/random.c:372
+#, fuzzy
+msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
-#: cipher/random.c:348
+#: cipher/random.c:380
#, c-format
msgid "can't read `%s': %s\n"
msgstr "`%s'���ɤ�ޤ���: %s\n"
-#: cipher/random.c:386
+#: cipher/random.c:418
msgid "note: random_seed file not updated\n"
msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
-#: cipher/random.c:406
+#: cipher/random.c:438
#, c-format
msgid "can't create `%s': %s\n"
msgstr "`%s'���Ǥ��ޤ���: %s\n"
-#: cipher/random.c:413
+#: cipher/random.c:445
#, c-format
msgid "can't write `%s': %s\n"
msgstr "`%s'�˽񤱤ޤ���: %s\n"
-#: cipher/random.c:416
+#: cipher/random.c:448
#, c-format
msgid "can't close `%s': %s\n"
msgstr "`%s'���Ĥ����ޤ���: %s\n"
-#: cipher/random.c:662
+#: cipher/random.c:694
msgid "WARNING: using insecure random number generator!!\n"
msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
-#: cipher/random.c:663
+#: cipher/random.c:695
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -340,7 +342,7 @@ msgstr ""
"���Υץ����������������ǡ�������ڻ��Ѥ��ƤϤ����ޤ���!!\n"
"\n"
-#: cipher/rndlinux.c:142
+#: cipher/rndlinux.c:134
#, c-format
msgid ""
"\n"
@@ -351,7 +353,7 @@ msgstr ""
"��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
"�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
-#: g10/g10.c:287
+#: g10/g10.c:304
msgid ""
"@Commands:\n"
" "
@@ -359,165 +361,165 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:289
+#: g10/g10.c:306
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/g10.c:290
+#: g10/g10.c:307
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/g10.c:291
+#: g10/g10.c:308
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:292
+#: g10/g10.c:309
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:293
+#: g10/g10.c:310
msgid "|[files]|encrypt files"
msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
-#: g10/g10.c:294
+#: g10/g10.c:311
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:295
+#: g10/g10.c:312
msgid "store only"
msgstr "��¸�Τ�"
-#: g10/g10.c:296
+#: g10/g10.c:313
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/g10.c:297
+#: g10/g10.c:314
msgid "|[files]|decrypt files"
msgstr "|[�ե����뷲]|�ե����뷲������"
-#: g10/g10.c:298
+#: g10/g10.c:315
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:300
+#: g10/g10.c:317
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:302
+#: g10/g10.c:319
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:303
+#: g10/g10.c:320
msgid "check key signatures"
msgstr "���ν�̾�򸡾�"
-#: g10/g10.c:304
+#: g10/g10.c:321
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:305
+#: g10/g10.c:322
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:306
+#: g10/g10.c:323
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/g10.c:307
+#: g10/g10.c:324
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/g10.c:309
+#: g10/g10.c:326
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/g10.c:310
+#: g10/g10.c:327
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:311
+#: g10/g10.c:328
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/g10.c:312
+#: g10/g10.c:329
msgid "sign a key non-revocably"
msgstr "�˴��Ǥ��ʤ��褦���˽�̾"
-#: g10/g10.c:313
+#: g10/g10.c:330
msgid "sign a key locally and non-revocably"
msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
-#: g10/g10.c:314
+#: g10/g10.c:331
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/g10.c:315
+#: g10/g10.c:332
msgid "generate a revocation certificate"
msgstr "�˴������������"
-#: g10/g10.c:316
+#: g10/g10.c:334
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:317
+#: g10/g10.c:335
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/g10.c:318
+#: g10/g10.c:336
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:320
+#: g10/g10.c:338
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/g10.c:322
+#: g10/g10.c:340
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/g10.c:326
+#: g10/g10.c:344
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/g10.c:328
+#: g10/g10.c:346
msgid "list only the sequence of packets"
msgstr "�ѥ��å���Τߤΰ���"
-#: g10/g10.c:330
+#: g10/g10.c:348
msgid "export the ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
-#: g10/g10.c:332
+#: g10/g10.c:350
msgid "import ownertrust values"
msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
-#: g10/g10.c:334
+#: g10/g10.c:352
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:336
+#: g10/g10.c:354
msgid "unattended trust database update"
msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
-#: g10/g10.c:337
+#: g10/g10.c:355
msgid "fix a corrupted trust database"
msgstr "���줿���ѥǡ����١�������"
-#: g10/g10.c:338
+#: g10/g10.c:356
msgid "De-Armor a file or stdin"
msgstr ""
"�ե�����ޤ���ɸ�����Ϥ�\n"
"��������"
-#: g10/g10.c:340
+#: g10/g10.c:358
msgid "En-Armor a file or stdin"
msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
-#: g10/g10.c:342
+#: g10/g10.c:360
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
-#: g10/g10.c:346
+#: g10/g10.c:364
msgid ""
"@\n"
"Options:\n"
@@ -527,238 +529,234 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:348
+#: g10/g10.c:366
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/g10.c:350
+#: g10/g10.c:368
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/g10.c:353
+#: g10/g10.c:371
msgid "|NAME|use NAME as default recipient"
msgstr ""
"|̾��|����μ����ԤȤ���\n"
"��̾���פ����"
-#: g10/g10.c:355
+#: g10/g10.c:373
msgid "use the default key as default recipient"
msgstr "����μ����Ԥ˴���θ������"
-#: g10/g10.c:361
+#: g10/g10.c:379
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/g10.c:362
+#: g10/g10.c:380
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/g10.c:364
+#: g10/g10.c:382
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/g10.c:371
+#: g10/g10.c:389
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/g10.c:372
+#: g10/g10.c:390
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:373
+#: g10/g10.c:391
msgid "be somewhat more quiet"
msgstr "����Ť�"
-#: g10/g10.c:374
+#: g10/g10.c:392
msgid "don't use the terminal at all"
msgstr "ü�����Ի���"
-#: g10/g10.c:375
+#: g10/g10.c:393
msgid "force v3 signatures"
msgstr "����Ū��v3��̾"
-#: g10/g10.c:376
+#: g10/g10.c:394
msgid "do not force v3 signatures"
msgstr "v3��̾�������ʤ�"
-#: g10/g10.c:377
+#: g10/g10.c:395
msgid "force v4 key signatures"
msgstr "����Ū��v4��̾"
-#: g10/g10.c:378
+#: g10/g10.c:396
msgid "do not force v4 key signatures"
msgstr "v4��̾�������ʤ�"
-#: g10/g10.c:379
+#: g10/g10.c:397
msgid "always use a MDC for encryption"
msgstr "�Ź沽�ˤϾ��MDC�����"
-#: g10/g10.c:381
+#: g10/g10.c:399
msgid "never use a MDC for encryption"
msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
-#: g10/g10.c:383
+#: g10/g10.c:401
msgid "do not make any changes"
msgstr "̵�ѹ�"
#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:385
+#: g10/g10.c:403
msgid "use the gpg-agent"
msgstr "gpg����������Ȥ����"
-#: g10/g10.c:388
+#: g10/g10.c:406
msgid "batch mode: never ask"
msgstr "�Хå����⡼��: ��ǧ��ά"
-#: g10/g10.c:389
+#: g10/g10.c:407
msgid "assume yes on most questions"
msgstr ""
"�����Ƥ��μ����������yes\n"
"�Ȥߤʤ�"
-#: g10/g10.c:390
+#: g10/g10.c:408
msgid "assume no on most questions"
msgstr ""
"�����Ƥ��μ����������no\n"
"�Ȥߤʤ�"
-#: g10/g10.c:391
+#: g10/g10.c:409
msgid "add this keyring to the list of keyrings"
msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
-#: g10/g10.c:392
+#: g10/g10.c:410
msgid "add this secret keyring to the list"
msgstr "�����ˤ�����̩���ؤ��ɲ�"
-#: g10/g10.c:393
+#: g10/g10.c:411
msgid "show which keyring a listed key is on"
msgstr "�����θ������븰�ؤ�ɽ��"
-#: g10/g10.c:394
+#: g10/g10.c:412
msgid "|NAME|use NAME as default secret key"
msgstr ""
"|̾��|�������̩���Ȥ���\n"
"��̾���פ����"
-#: g10/g10.c:395
+#: g10/g10.c:413
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|�ۥ���|���θ����ˤ��θ������С������"
-#: g10/g10.c:397
+#: g10/g10.c:417
msgid "|NAME|set terminal charset to NAME"
msgstr ""
"|CHARSET̾|ü����charset���CHARSET̾��\n"
"������"
-#: g10/g10.c:398
+#: g10/g10.c:418
msgid "read options from file"
msgstr ""
"�ե����뤫�饪�ץ�����\n"
"�ɤ߹���"
-#: g10/g10.c:402
+#: g10/g10.c:422
msgid "|FD|write status info to this FD"
msgstr ""
"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
"�񤭽Ф�"
-#: g10/g10.c:404
+#: g10/g10.c:424
msgid "|[file]|write status info to file"
msgstr ""
"|�ե�����|���ơ����������ե������\n"
"�񤭽Ф�"
-#: g10/g10.c:410
+#: g10/g10.c:436
msgid "|KEYID|ultimately trust this key"
msgstr "|��ID|���θ�����Ū�˿��Ѥ���"
-#: g10/g10.c:411
+#: g10/g10.c:437
msgid "|FILE|load extension module FILE"
msgstr ""
"|�ե�����|��ĥ�⥸�塼��Υե������\n"
"�ɤ߹���"
-#: g10/g10.c:412
+#: g10/g10.c:438
msgid "emulate the mode described in RFC1991"
msgstr ""
"RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
"����"
-#: g10/g10.c:413
+#: g10/g10.c:439
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr ""
"�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
"�������OpenPGP��������"
-#: g10/g10.c:414
+#: g10/g10.c:440
msgid "set all packet, cipher and digest options to PGP 2.x behavior"
msgstr ""
"�ѥ��åȤȰŹ������Υ��ץ���\n"
"�������PGP 2.x��������"
-#: g10/g10.c:418
+#: g10/g10.c:446
msgid "|N|use passphrase mode N"
msgstr "|N|�ѥ��ե졼�����⡼��N�����"
-#: g10/g10.c:420
+#: g10/g10.c:448
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr ""
"|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
"���������󥢥르�ꥺ������"
-#: g10/g10.c:422
+#: g10/g10.c:450
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr ""
"|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
"���르�ꥺ������"
-#: g10/g10.c:424
+#: g10/g10.c:452
msgid "|NAME|use cipher algorithm NAME"
msgstr ""
"|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
"����"
-#: g10/g10.c:425
+#: g10/g10.c:453
msgid "|NAME|use message digest algorithm NAME"
msgstr ""
"|̾��|��̾���פΥ�å���������\n"
"���르�ꥺ������"
-#: g10/g10.c:426
+#: g10/g10.c:455
msgid "|N|use compress algorithm N"
msgstr ""
"|̾��|��̾���פΰ��̥��르�ꥺ���\n"
"����"
-#: g10/g10.c:427
+#: g10/g10.c:456
msgid "throw keyid field of encrypted packets"
msgstr ""
"�Ź�ѥ��åȤθ�ID�ե������\n"
"������"
-#: g10/g10.c:428
+#: g10/g10.c:457
msgid "Show Photo IDs"
msgstr "�ե���ID��ɽ��"
-#: g10/g10.c:429
+#: g10/g10.c:458
msgid "Don't show Photo IDs"
msgstr "�ե���ID��ɽ�����ʤ�"
-#: g10/g10.c:430
+#: g10/g10.c:459
msgid "Set command line to view Photo IDs"
msgstr ""
"�ե���ID��������륳�ޥ�ɹ�\n"
"������"
-#: g10/g10.c:431
-msgid "|NAME=VALUE|use this notation data"
-msgstr "|̾��=��|��������ǡ��������"
-
-#: g10/g10.c:434
+#: g10/g10.c:465
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -767,7 +765,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/g10.c:437
+#: g10/g10.c:468
msgid ""
"@\n"
"Examples:\n"
@@ -787,15 +785,15 @@ msgstr ""
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/g10.c:579
+#: g10/g10.c:620
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/g10.c:583
+#: g10/g10.c:624
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:586
+#: g10/g10.c:627
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -805,7 +803,7 @@ msgstr ""
"��̾�����ڡ��Ź沽������\n"
"�����ư��ϡ����ϥǡ����˰�¸\n"
-#: g10/g10.c:597
+#: g10/g10.c:638
msgid ""
"\n"
"Supported algorithms:\n"
@@ -813,258 +811,295 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:671
+#: g10/g10.c:742
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/g10.c:728
+#: g10/g10.c:799
msgid "conflicting commands\n"
msgstr "���ޥ�ɤξ���\n"
-#: g10/g10.c:903
+#: g10/g10.c:817
+#, c-format
+msgid "no values for group \"%s\"\n"
+msgstr ""
+
+#: g10/g10.c:1010
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
-#: g10/g10.c:907
+#: g10/g10.c:1014
#, c-format
msgid "option file `%s': %s\n"
msgstr "���ץ���󡦥ե�����`%s': %s\n"
-#: g10/g10.c:914
+#: g10/g10.c:1021
#, c-format
msgid "reading options from `%s'\n"
msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
-#: g10/g10.c:1197
+#: g10/g10.c:1323
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
-#: g10/g10.c:1214
+#: g10/g10.c:1341
msgid "could not parse keyserver URI\n"
msgstr "�������С���URI�������ǽ\n"
-#: g10/g10.c:1228
-#, c-format
-msgid "unable to set exec-path to %s\n"
-msgstr "exec-path��%s��������ǽ\n"
+#: g10/g10.c:1350
+#, fuzzy, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s: ̵���ʥե����롦�С������%d\n"
-#: g10/g10.c:1251 g10/g10.c:1267
-#, c-format
-msgid "WARNING: %s is a deprecated option.\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+#: g10/g10.c:1353
+#, fuzzy
+msgid "invalid import options\n"
+msgstr "̵���������Ǥ�"
+
+#: g10/g10.c:1360
+#, fuzzy, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s: ̵���ʥե����롦�С������%d\n"
-#: g10/g10.c:1253 g10/g10.c:1270
+#: g10/g10.c:1363
+#, fuzzy
+msgid "invalid export options\n"
+msgstr "���ؤ�̵���Ǥ�"
+
+#: g10/g10.c:1369
#, c-format
-msgid "please use \"--keyserver-options %s\" instead\n"
-msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+msgid "unable to set exec-path to %s\n"
+msgstr "exec-path��%s��������ǽ\n"
-#: g10/g10.c:1347
+#: g10/g10.c:1506
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/g10.c:1351
+#: g10/g10.c:1510
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/g10.c:1358 g10/g10.c:1369
+#: g10/g10.c:1517 g10/g10.c:1528
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "����: ����%s���Ѥ��ޤ���!\n"
-#: g10/g10.c:1360 g10/g10.c:1380
+#: g10/g10.c:1519 g10/g10.c:1539
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:1363
+#: g10/g10.c:1522
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
-#: g10/g10.c:1389
+#: g10/g10.c:1549
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/g10.c:1395
+#: g10/g10.c:1555
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
-#: g10/g10.c:1401
+#: g10/g10.c:1561
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/g10.c:1414
+#: g10/g10.c:1574
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥ�IDEA�Ź椬�׵ᤵ��ޤ� \n"
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1428 g10/sign.c:620 g10/sign.c:798
+#: g10/encode.c:348 g10/encode.c:410 g10/g10.c:1588 g10/sign.c:646
+#: g10/sign.c:878
msgid "this message may not be usable by PGP 2.x\n"
msgstr "���Υ�å�������PGP 2.x�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
-#: g10/g10.c:1470 g10/g10.c:1482
+#: g10/g10.c:1635 g10/g10.c:1653
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1476 g10/g10.c:1488
+#: g10/g10.c:1641 g10/g10.c:1659
msgid "selected digest algorithm is invalid\n"
msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1492
-msgid "the given signature policy URL is invalid\n"
-msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-
-#: g10/g10.c:1496
-msgid "the given certification policy URL is invalid\n"
-msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
+#: g10/g10.c:1647
+#, fuzzy
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1499
+#: g10/g10.c:1662
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1501
+#: g10/g10.c:1664
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1503
+#: g10/g10.c:1666
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1505
+#: g10/g10.c:1668
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1508
+#: g10/g10.c:1671
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:1512
+#: g10/g10.c:1675
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1516
+#: g10/g10.c:1679
msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1519
-msgid "invalid preferences\n"
+#: g10/g10.c:1685
+#, fuzzy
+msgid "invalid default preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1693
+#, fuzzy
+msgid "invalid personal cipher preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1697
+#, fuzzy
+msgid "invalid personal digest preferences\n"
msgstr "̵����ͥ����\n"
-#: g10/g10.c:1613
+#: g10/g10.c:1701
+#, fuzzy
+msgid "invalid personal compress preferences\n"
+msgstr "̵����ͥ����\n"
+
+#: g10/g10.c:1795
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1633
+#: g10/g10.c:1805
+msgid "WARNING: recipients (-r) given without using public key encryption\n"
+msgstr ""
+
+#: g10/g10.c:1815
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:1640
+#: g10/g10.c:1822
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:1648
+#: g10/g10.c:1830
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:1665
+#: g10/g10.c:1847
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:1678
+#: g10/g10.c:1860
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:1692
+#: g10/g10.c:1874
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/g10.c:1701
+#: g10/g10.c:1883
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:1719
+#: g10/g10.c:1901
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:1730
+#: g10/g10.c:1912
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/g10.c:1738
+#: g10/g10.c:1920
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/g10.c:1746
+#: g10/g10.c:1928
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �桼����id"
-#: g10/g10.c:1754
+#: g10/g10.c:1936
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �桼����id"
-#: g10/g10.c:1762
+#: g10/g10.c:1944
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/encode.c:307 g10/g10.c:1818 g10/sign.c:709
+#: g10/encode.c:368 g10/g10.c:2000 g10/sign.c:789
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s�������ޤ���: %s\n"
-#: g10/g10.c:1833
+#: g10/g10.c:2015
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/g10.c:1916
+#: g10/g10.c:2107
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1924
+#: g10/g10.c:2115
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:2011
+#: g10/g10.c:2202
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
-#: g10/g10.c:2097
+#: g10/g10.c:2288
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:2101
+#: g10/g10.c:2292
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2104 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2295 g10/verify.c:94
+#: g10/verify.c:139
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s'�������ޤ���\n"
-#: g10/g10.c:2313
-msgid "the first character of a notation name must be a letter or an underscore\n"
-msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
-
-#: g10/g10.c:2319
-msgid "a notation name must have only letters, digits, dots or underscores and end with an '='\n"
+#: g10/g10.c:2509
+#, fuzzy
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
msgstr ""
"����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
"'='�ǽ����ʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2325
-msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
-
-#: g10/g10.c:2333
+#: g10/g10.c:2518
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
+#: g10/g10.c:2555
+msgid "the given certification policy URL is invalid\n"
+msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
+
+#: g10/g10.c:2557
+msgid "the given signature policy URL is invalid\n"
+msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
+
#: g10/armor.c:314
#, c-format
msgid "armor: %s\n"
@@ -1134,7 +1169,8 @@ msgid "invalid armor: line longer than %d characters\n"
msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
#: g10/armor.c:1066
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"��������� quoted printable ʸ��������ޤ��������餯�Х��Τ���\n"
"MTA����Ѥ����ΤǤ��礦\n"
@@ -1160,11 +1196,13 @@ msgid "User ID is no longer valid"
msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
#: g10/pkclist.c:73
-msgid "Reason for revocation: "
+#, fuzzy
+msgid "reason for revocation: "
msgstr "�˴���ͳ: "
#: g10/pkclist.c:90
-msgid "Revocation comment: "
+#, fuzzy
+msgid "revocation comment: "
msgstr "Ŭ��: "
#. a string with valid answers
@@ -1266,7 +1304,8 @@ msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n"
#: g10/pkclist.c:442
#, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
msgstr "%08lX: ���θ����ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
#: g10/pkclist.c:448
@@ -1332,7 +1371,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
#: g10/pkclist.c:592
-msgid " There is no indication that the signature belongs to the owner.\n"
+msgid ""
+" There is no indication that the signature belongs to the owner.\n"
msgstr " ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
#: g10/pkclist.c:600
@@ -1344,28 +1384,29 @@ msgid " The signature is probably a FORGERY.\n"
msgstr " ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
#: g10/pkclist.c:609
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
#: g10/pkclist.c:611
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
-#: g10/pkclist.c:714 g10/pkclist.c:737 g10/pkclist.c:882 g10/pkclist.c:937
+#: g10/pkclist.c:764 g10/pkclist.c:787 g10/pkclist.c:938 g10/pkclist.c:993
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: �����å�: %s\n"
-#: g10/pkclist.c:723 g10/pkclist.c:911
+#: g10/pkclist.c:773 g10/pkclist.c:967
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
-#: g10/pkclist.c:752
+#: g10/pkclist.c:803
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
-#: g10/pkclist.c:762
+#: g10/pkclist.c:816
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1373,120 +1414,130 @@ msgstr ""
"\n"
"�桼����ID�����ϡ����Ԥǽ�λ: "
-#: g10/pkclist.c:776
+#: g10/pkclist.c:832
msgid "No such user ID.\n"
msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/pkclist.c:781 g10/pkclist.c:857
+#: g10/pkclist.c:837 g10/pkclist.c:913
msgid "skipped: public key already set as default recipient\n"
msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
-#: g10/pkclist.c:799
+#: g10/pkclist.c:855
msgid "Public key is disabled.\n"
msgstr "�������ϻ��ѶػߤǤ���\n"
-#: g10/pkclist.c:806
+#: g10/pkclist.c:862
msgid "skipped: public key already set\n"
msgstr "�����å�: ������������ѤߤǤ�\n"
-#: g10/pkclist.c:849
+#: g10/pkclist.c:905
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
-#: g10/pkclist.c:893
+#: g10/pkclist.c:949
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
-#: g10/pkclist.c:943
+#: g10/pkclist.c:999
msgid "no valid addressees\n"
msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
-#: g10/keygen.c:180
+#: g10/keygen.c:182
#, c-format
msgid "preference %c%lu is not valid\n"
msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
-#: g10/keygen.c:187
+#: g10/keygen.c:189
#, c-format
msgid "preference %c%lu duplicated\n"
msgstr "����%c%lu�ν�ʣ\n"
-#: g10/keygen.c:192
+#: g10/keygen.c:194
#, c-format
msgid "too many `%c' preferences\n"
msgstr "¿������`%c'����\n"
-#: g10/keygen.c:257
+#: g10/keygen.c:264
msgid "invalid character in preference string\n"
msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:399
+#: g10/keygen.c:524
+#, fuzzy
+msgid "writing direct signature\n"
+msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
+
+#: g10/keygen.c:563
msgid "writing self signature\n"
msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:443
+#: g10/keygen.c:607
msgid "writing key binding signature\n"
msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
-#: g10/keygen.c:497 g10/keygen.c:581 g10/keygen.c:672
+#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
-#: g10/keygen.c:502 g10/keygen.c:586 g10/keygen.c:677
+#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:777
+#: g10/keygen.c:941
msgid "Please select what kind of key you want:\n"
msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
-#: g10/keygen.c:779
+#: g10/keygen.c:943
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA��ElGamal (����)\n"
-#: g10/keygen.c:780
+#: g10/keygen.c:944
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��̾�Τ�)\n"
-#: g10/keygen.c:782
+#: g10/keygen.c:946
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (�Ź沽�Τ�)\n"
-#: g10/keygen.c:783
+#: g10/keygen.c:948
#, c-format
msgid " (%d) ElGamal (sign and encrypt)\n"
msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
-#: g10/keygen.c:784
+#: g10/keygen.c:949
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��̾�Τ�)\n"
-#: g10/keygen.c:786
+#: g10/keygen.c:951
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�Ź沽�Τ�)\n"
-#: g10/keyedit.c:516 g10/keygen.c:789
+#: g10/keygen.c:953
+#, fuzzy, c-format
+msgid " (%d) RSA (sign and encrypt)\n"
+msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
+
+#: g10/keyedit.c:573 g10/keygen.c:956
msgid "Your selection? "
msgstr "�ɤ�ˤ��ޤ���? "
-#: g10/keygen.c:809
+#: g10/keygen.c:966 g10/keygen.c:984
msgid "The use of this algorithm is deprecated - create anyway? "
msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? "
-#: g10/keyedit.c:529 g10/keygen.c:823
+#: g10/keyedit.c:586 g10/keygen.c:998
msgid "Invalid selection.\n"
msgstr "̵��������Ǥ���\n"
-#: g10/keygen.c:836
+#: g10/keygen.c:1011
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1499,19 +1550,19 @@ msgstr ""
" ����θ�Ĺ�� 1024 �ӥå�\n"
" ����ο侩��Ĺ�� 2048 �ӥå�\n"
-#: g10/keygen.c:845
+#: g10/keygen.c:1020
msgid "What keysize do you want? (1024) "
msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
-#: g10/keygen.c:850
+#: g10/keygen.c:1025
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
-#: g10/keygen.c:852
+#: g10/keygen.c:1027
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
-#: g10/keygen.c:855
+#: g10/keygen.c:1030
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
@@ -1523,12 +1574,12 @@ msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:866
+#: g10/keygen.c:1041
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
-#: g10/keygen.c:871
+#: g10/keygen.c:1046
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1536,27 +1587,29 @@ msgstr ""
"2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
"�侩���ޤ���!\n"
-#: g10/keygen.c:874
+#: g10/keygen.c:1049
msgid "Are you sure that you want this keysize? "
msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
-#: g10/keygen.c:875
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1050
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
msgstr ""
"�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
"����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
-#: g10/keygen.c:884
+#: g10/keygen.c:1059
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
-#: g10/keygen.c:887 g10/keygen.c:891
+#: g10/keygen.c:1062 g10/keygen.c:1066
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:942
+#: g10/keygen.c:1117
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1572,7 +1625,7 @@ msgstr ""
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:951
+#: g10/keygen.c:1126
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1588,30 +1641,30 @@ msgstr ""
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:973
+#: g10/keygen.c:1148
msgid "Key is valid for? (0) "
msgstr "����ͭ�����֤�? (0)"
-#: g10/keygen.c:975
+#: g10/keygen.c:1150
msgid "Signature is valid for? (0) "
msgstr "��̾��ͭ�����֤�? (0)"
-#: g10/keygen.c:980
+#: g10/keygen.c:1155
msgid "invalid value\n"
msgstr "̵������\n"
-#: g10/keygen.c:985
+#: g10/keygen.c:1160
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s��̵���¤Ǥ�\n"
#. print the date when the key expires
-#: g10/keygen.c:992
+#: g10/keygen.c:1167
#, c-format
msgid "%s expires at %s\n"
msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
-#: g10/keygen.c:998
+#: g10/keygen.c:1173
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1619,14 +1672,15 @@ msgstr ""
"���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
"2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
-#: g10/keygen.c:1003
+#: g10/keygen.c:1178
msgid "Is this correct (y/n)? "
msgstr "����Ǥ����Ǥ��� (y/n)? "
-#: g10/keygen.c:1046
+#: g10/keygen.c:1221
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
"from Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
@@ -1638,44 +1692,44 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1058
+#: g10/keygen.c:1233
msgid "Real name: "
msgstr "��̾: "
-#: g10/keygen.c:1066
+#: g10/keygen.c:1241
msgid "Invalid character in name\n"
msgstr "̾����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1068
+#: g10/keygen.c:1243
msgid "Name may not start with a digit\n"
msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
-#: g10/keygen.c:1070
+#: g10/keygen.c:1245
msgid "Name must be at least 5 characters long\n"
msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/keygen.c:1078
+#: g10/keygen.c:1253
msgid "Email address: "
msgstr "�Żҥ᡼�롦���ɥ쥹: "
-#: g10/keygen.c:1089
+#: g10/keygen.c:1264
msgid "Not a valid email address\n"
msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
-#: g10/keygen.c:1097
+#: g10/keygen.c:1272
msgid "Comment: "
msgstr "������: "
-#: g10/keygen.c:1103
+#: g10/keygen.c:1278
msgid "Invalid character in comment\n"
msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1126
+#: g10/keygen.c:1301
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
-#: g10/keygen.c:1132
+#: g10/keygen.c:1307
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1686,27 +1740,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1136
+#: g10/keygen.c:1311
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
-#: g10/keygen.c:1141
+#: g10/keygen.c:1316
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1151
+#: g10/keygen.c:1326
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
-#: g10/keygen.c:1152
+#: g10/keygen.c:1327
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
-#: g10/keygen.c:1171
+#: g10/keygen.c:1346
msgid "Please correct the error first\n"
msgstr "�ޤ����顼�������Ƥ�������\n"
-#: g10/keygen.c:1210
+#: g10/keygen.c:1385
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1714,16 +1768,16 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
"\n"
-#: g10/keyedit.c:701 g10/keygen.c:1218
+#: g10/keyedit.c:784 g10/keygen.c:1393
msgid "passphrase not correctly repeated; try again"
msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/keygen.c:1219
+#: g10/keygen.c:1394
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1225
+#: g10/keygen.c:1400
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"
@@ -1735,7 +1789,7 @@ msgstr ""
"�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
"\n"
-#: g10/keygen.c:1246
+#: g10/keygen.c:1421
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"
@@ -1746,53 +1800,53 @@ msgstr ""
"�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
-#: g10/keygen.c:1741
+#: g10/keygen.c:1985
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-#: g10/keygen.c:1795
+#: g10/keygen.c:2039
msgid "Key generation canceled.\n"
msgstr "������������ߤ���ޤ�����\n"
-#: g10/keygen.c:1883 g10/keygen.c:1963
+#: g10/keygen.c:2128 g10/keygen.c:2216
#, c-format
msgid "writing public key to `%s'\n"
msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
-#: g10/keygen.c:1884 g10/keygen.c:1965
+#: g10/keygen.c:2129 g10/keygen.c:2218
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "`%s'����̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:1952
+#: g10/keygen.c:2205
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:2211
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:1972
+#: g10/keygen.c:2225
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "��������`%s'�ν���ߥ��顼: %s\n"
-#: g10/keygen.c:1979
+#: g10/keygen.c:2232
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "��̩����`%s'�ν���ߥ��顼: %s\n"
-#: g10/keygen.c:1999
+#: g10/keygen.c:2252
msgid "public and secret key created and signed.\n"
msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
-#: g10/keygen.c:2000
+#: g10/keygen.c:2253
msgid "key marked as ultimately trusted.\n"
msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2264
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"
@@ -1800,97 +1854,111 @@ msgstr ""
"���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
"��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
-#: g10/keygen.c:2023 g10/keygen.c:2131
+#: g10/keygen.c:2276 g10/keygen.c:2384
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���������˼��Ԥ��ޤ���: %s\n"
-#: g10/keygen.c:2067 g10/sig-check.c:223 g10/sign.c:228
+#: g10/keygen.c:2320 g10/sig-check.c:228 g10/sign.c:257
#, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2069 g10/sig-check.c:225 g10/sign.c:230
+#: g10/keygen.c:2322 g10/sig-check.c:230 g10/sign.c:259
#, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2078
+#: g10/keygen.c:2331
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
-#: g10/keygen.c:2107
+#: g10/keygen.c:2360
msgid "Really create? "
msgstr "�����˺��ޤ���? "
-#: g10/decrypt.c:92 g10/encode.c:590
+#: g10/decrypt.c:92 g10/encode.c:679
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-#: g10/encode.c:92 g10/encode.c:296
+#: g10/encode.c:132 g10/encode.c:357
#, c-format
msgid "`%s' already compressed\n"
msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
-#: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492 g10/tdbio.c:552
+#: g10/encode.c:140 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
+#: g10/tdbio.c:552
#, c-format
msgid "%s: can't open: %s\n"
msgstr "%s: �����ޤ���: %s\n"
-#: g10/encode.c:122 g10/sign.c:959
+#: g10/encode.c:168 g10/sign.c:1035
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "�ѥ��ե졼���κ������顼: %s\n"
-#: g10/encode.c:185 g10/encode.c:383
+#: g10/encode.c:242 g10/encode.c:453
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
-#: g10/encode.c:285
+#: g10/encode.c:346
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
-#: g10/encode.c:313
+#: g10/encode.c:374
#, c-format
msgid "reading from `%s'\n"
msgstr "`%s'�����ɤ߹��ߤޤ�\n"
-#: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:408
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
-#: g10/encode.c:563
+#: g10/encode.c:419 g10/encode.c:573
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr ""
+
+#: g10/encode.c:491 g10/sign.c:758
+#, fuzzy, c-format
+msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+
+#: g10/encode.c:652
#, c-format
msgid "%s/%s encrypted for: %s\n"
msgstr "%s/%s�Ź沽 ������: %s\n"
-#: g10/delkey.c:69 g10/export.c:141
+#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2218
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "��`%s'�����Ĥ���ޤ���: %s\n"
-#: g10/delkey.c:77 g10/export.c:161
+#: g10/delkey.c:81 g10/export.c:213
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
-#: g10/export.c:169
+#: g10/export.c:222
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
-#: g10/export.c:180
+#: g10/export.c:238
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
-#: g10/export.c:188
+#: g10/export.c:246
#, c-format
msgid "key %08lX: PGP 2.x style key - skipped\n"
msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
-#: g10/export.c:255
+#: g10/export.c:344
msgid "WARNING: nothing exported\n"
msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
@@ -1900,271 +1968,282 @@ msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
#. fixme: returning translatable constants instead of a user ID is
#. * not good because they are probably not utf-8 encoded.
-#: g10/getkey.c:187 g10/getkey.c:2272
+#: g10/getkey.c:187 g10/getkey.c:2383
msgid "[User id not found]"
msgstr "[�桼����id�����Ĥ���ޤ���]"
-#: g10/getkey.c:1360
+#: g10/getkey.c:1438
#, c-format
msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
-#: g10/getkey.c:1989
+#: g10/getkey.c:2100
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
-#: g10/getkey.c:2036
+#: g10/getkey.c:2147
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
-#: g10/import.c:206
+#: g10/import.c:256
#, c-format
msgid "skipping block of type %d\n"
msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
-#: g10/import.c:213
+#: g10/import.c:263
#, c-format
msgid "%lu keys so far processed\n"
msgstr "%lu���ޤǽ���\n"
-#: g10/import.c:218
+#: g10/import.c:268
#, c-format
msgid "error reading `%s': %s\n"
msgstr "`%s'���ɹ��ߥ��顼: %s\n"
-#: g10/import.c:230
+#: g10/import.c:280
#, c-format
msgid "Total number processed: %lu\n"
msgstr " ��������: %lu\n"
-#: g10/import.c:232
+#: g10/import.c:282
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �����åפ�����������: %lu\n"
-#: g10/import.c:235
+#: g10/import.c:285
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �桼����ID�ʤ�: %lu\n"
-#: g10/import.c:237
+#: g10/import.c:287
#, c-format
msgid " imported: %lu"
msgstr " �ɹ���: %lu"
-#: g10/import.c:243
+#: g10/import.c:293
#, c-format
msgid " unchanged: %lu\n"
msgstr " �ѹ��ʤ�: %lu\n"
-#: g10/import.c:245
+#: g10/import.c:295
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �������桼����ID: %lu\n"
-#: g10/import.c:247
+#: g10/import.c:297
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:249
+#: g10/import.c:299
#, c-format
msgid " new signatures: %lu\n"
msgstr " ��������̾: %lu\n"
-#: g10/import.c:251
+#: g10/import.c:301
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �����������˴�: %lu\n"
-#: g10/import.c:253
+#: g10/import.c:303
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��̩�����ɽФ�: %lu\n"
-#: g10/import.c:255
+#: g10/import.c:305
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ��̩�����ɹ���: %lu\n"
-#: g10/import.c:257
+#: g10/import.c:307
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ̵�ѹ�����̩��: %lu\n"
-#: g10/import.c:438 g10/import.c:657
+#: g10/import.c:593
+#, fuzzy, c-format
+msgid "key %08lX: removed multiple subkey binding\n"
+msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+
+#: g10/import.c:641 g10/import.c:875
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "��%08lX: �桼����ID������ޤ���\n"
-#: g10/import.c:455
+#: g10/import.c:648
+#, fuzzy, c-format
+msgid "key %08lX: HKP subkey corruption repaired\n"
+msgstr "��%08lX: �����б���������������ޤ���\n"
+
+#: g10/import.c:663
#, c-format
msgid "key %08lX: accepted non self-signed user ID '%s'\n"
msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
-#: g10/import.c:462
+#: g10/import.c:670
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
-#: g10/import.c:464
+#: g10/import.c:672
msgid "this may be caused by a missing self-signature\n"
msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
-#: g10/import.c:474 g10/import.c:726
+#: g10/import.c:682 g10/import.c:944
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
-#: g10/import.c:479
+#: g10/import.c:687
#, c-format
msgid "key %08lX: new key - skipped\n"
msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
-#: g10/import.c:489
+#: g10/import.c:697
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
-#: g10/import.c:494 g10/openfile.c:244 g10/sign.c:648 g10/sign.c:817
+#: g10/import.c:702 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
#, c-format
msgid "writing to `%s'\n"
msgstr "`%s'�ؤν�Ф�\n"
-#: g10/import.c:497 g10/import.c:571 g10/import.c:677 g10/import.c:786
+#: g10/import.c:706 g10/import.c:783 g10/import.c:895 g10/import.c:1004
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "����`%s'�ν���ߥ��顼: %s\n"
-#: g10/import.c:505
-#, c-format
-msgid "key %08lX: public key imported\n"
+#: g10/import.c:715
+#, fuzzy, c-format
+msgid "key %08lX: public key \"%s\" imported\n"
msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
-#: g10/import.c:524
+#: g10/import.c:736
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
-#: g10/import.c:542 g10/import.c:743
+#: g10/import.c:753 g10/import.c:961
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
-#: g10/import.c:549 g10/import.c:749
+#: g10/import.c:760 g10/import.c:967
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
-#: g10/import.c:579
-#, c-format
-msgid "key %08lX: 1 new user ID\n"
+#: g10/import.c:792
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new user ID\n"
msgstr "��%08lX: �������桼����ID��1��\n"
-#: g10/import.c:582
-#, c-format
-msgid "key %08lX: %d new user IDs\n"
+#: g10/import.c:795
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new user IDs\n"
msgstr "��%08lX: �������桼����ID��%d��\n"
-#: g10/import.c:585
-#, c-format
-msgid "key %08lX: 1 new signature\n"
+#: g10/import.c:798
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new signature\n"
msgstr "��%08lX: ��������̾��1��\n"
-#: g10/import.c:588
-#, c-format
-msgid "key %08lX: %d new signatures\n"
+#: g10/import.c:801
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new signatures\n"
msgstr "��%08lX: ��������̾��%d��\n"
-#: g10/import.c:591
-#, c-format
-msgid "key %08lX: 1 new subkey\n"
+#: g10/import.c:804
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" 1 new subkey\n"
msgstr "��%08lX: ������������1��\n"
-#: g10/import.c:594
-#, c-format
-msgid "key %08lX: %d new subkeys\n"
+#: g10/import.c:807
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" %d new subkeys\n"
msgstr "��%08lX: ������������%d��\n"
-#: g10/import.c:604
-#, c-format
-msgid "key %08lX: not changed\n"
+#: g10/import.c:819
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" not changed\n"
msgstr "��%08lX: �ѹ��ʤ�\n"
-#: g10/import.c:671
+#: g10/import.c:889
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "�������̩���ؤ�����ޤ���: %s\n"
-#: g10/import.c:682
+#: g10/import.c:900
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
#. we can't merge secret keys
-#: g10/import.c:686
+#: g10/import.c:904
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
-#: g10/import.c:691
+#: g10/import.c:909
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
-#: g10/import.c:720
+#: g10/import.c:938
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
-#: g10/import.c:760
+#: g10/import.c:978
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
-#: g10/import.c:791
-#, c-format
-msgid "key %08lX: revocation certificate imported\n"
+#: g10/import.c:1010
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate imported\n"
msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
-#: g10/import.c:826
+#: g10/import.c:1047
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
-#: g10/import.c:839
+#: g10/import.c:1060
#, c-format
msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+msgstr ""
+"��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:841
+#: g10/import.c:1062
#, c-format
msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
-#: g10/import.c:858
+#: g10/import.c:1079
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "��%08lX: �����б���������������ޤ���\n"
-#: g10/import.c:868
+#: g10/import.c:1089
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:869
+#: g10/import.c:1090
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "��%08lX: ̵�����������б��Ǥ�\n"
-#: g10/import.c:899
+#: g10/import.c:1121
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "��%08lX: �����åפ����桼����ID '"
-#: g10/import.c:922
+#: g10/import.c:1144
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "��%08lX: �����åפ�������\n"
@@ -2173,106 +2252,130 @@ msgstr "��%08lX: �����åפ�������\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:945
+#: g10/import.c:1170
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
-#: g10/import.c:954
+#: g10/import.c:1179
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
-#: g10/import.c:971
+#: g10/import.c:1196
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
-#: g10/import.c:1072
+#: g10/import.c:1208
+#, fuzzy, c-format
+msgid "key %08lX: subkey signature in wrong place - skipped\n"
+msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+
+#: g10/import.c:1306
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
-#: g10/import.c:1131
-#, c-format
-msgid "Warning: key %08lX may be revoked: fetching revocation key %08lX\n"
+#: g10/import.c:1365
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n"
-#: g10/import.c:1145
-#, c-format
-msgid "Warning: key %08lX may be revoked: revocation key %08lX not present.\n"
+#: g10/import.c:1379
+#, fuzzy, c-format
+msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n"
-#: g10/import.c:1201
-#, c-format
-msgid "key %08lX: revocation certificate added\n"
+#: g10/import.c:1436
+#, fuzzy, c-format
+msgid "key %08lX: \"%s\" revocation certificate added\n"
msgstr "��%08lX: �˴���������ɲ�\n"
-#: g10/import.c:1231
+#: g10/import.c:1467
#, c-format
msgid "key %08lX: direct key signature added\n"
msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
-#: g10/keyedit.c:142
+#: g10/keyedit.c:144
msgid "[revocation]"
msgstr "[�˴�]"
-#: g10/keyedit.c:143
+#: g10/keyedit.c:145
msgid "[self-signature]"
msgstr "[���ʽ�̾]"
-#: g10/keyedit.c:214 g10/keylist.c:139
+#: g10/keyedit.c:216 g10/keylist.c:148
msgid "1 bad signature\n"
msgstr "̵���ʽ�̾1��\n"
-#: g10/keyedit.c:216 g10/keylist.c:141
+#: g10/keyedit.c:218 g10/keylist.c:150
#, c-format
msgid "%d bad signatures\n"
msgstr "̵���ʽ�̾%d��\n"
-#: g10/keyedit.c:218 g10/keylist.c:143
+#: g10/keyedit.c:220 g10/keylist.c:152
msgid "1 signature not checked due to a missing key\n"
msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
-#: g10/keyedit.c:220 g10/keylist.c:145
+#: g10/keyedit.c:222 g10/keylist.c:154
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
-#: g10/keyedit.c:222 g10/keylist.c:147
+#: g10/keyedit.c:224 g10/keylist.c:156
msgid "1 signature not checked due to an error\n"
msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
-#: g10/keyedit.c:224 g10/keylist.c:149
+#: g10/keyedit.c:226 g10/keylist.c:158
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
-#: g10/keyedit.c:226
+#: g10/keyedit.c:228
msgid "1 user ID without valid self-signature detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
-#: g10/keyedit.c:228
+#: g10/keyedit.c:230
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
-#: g10/keyedit.c:335
+#: g10/keyedit.c:357
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�桼����ID \"%s\" ���˴�����Ƥ��ޤ���"
-#: g10/keyedit.c:343 g10/keyedit.c:426 g10/keyedit.c:484 g10/keyedit.c:1053
+#: g10/keyedit.c:364 g10/keyedit.c:481 g10/keyedit.c:539 g10/keyedit.c:1137
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:350 g10/keyedit.c:432 g10/keyedit.c:1059
+#: g10/keyedit.c:372 g10/keyedit.c:487 g10/keyedit.c:1143
msgid " Unable to sign.\n"
msgstr " ��̾��ǽ��\n"
+#: g10/keyedit.c:377
+#, fuzzy, c-format
+msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+
+#: g10/keyedit.c:396
+#, fuzzy, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
+"������̾�Ǥ���\n"
+
+#: g10/keyedit.c:405
+#, fuzzy
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+
#. It's a local sig, and we want to make a
#. exportable sig.
-#: g10/keyedit.c:364
+#: g10/keyedit.c:419
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2281,81 +2384,109 @@ msgstr ""
"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
"������̾�Ǥ���\n"
-#: g10/keyedit.c:368
+#: g10/keyedit.c:423
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:388
+#: g10/keyedit.c:443
#, c-format
msgid "\"%s\" was already locally signed by key %08lX\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:393
+#: g10/keyedit.c:447
#, c-format
msgid "\"%s\" was already signed by key %08lX\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:405
+#: g10/keyedit.c:460
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
-#: g10/keyedit.c:420
+#: g10/keyedit.c:475
msgid "This key has expired!"
msgstr "���θ��ϴ����ڤ�Ǥ�!"
-#: g10/keyedit.c:440
+#: g10/keyedit.c:495
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
-#: g10/keyedit.c:444
+#: g10/keyedit.c:499
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
-#: g10/keyedit.c:477
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+#: g10/keyedit.c:532
+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:479
+#: g10/keyedit.c:534
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
-#: g10/keyedit.c:500
+#: g10/keyedit.c:557
msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
"��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ����\"0\"�����Ϥ��Ƥ���������\n"
-#: g10/keyedit.c:504
+#: g10/keyedit.c:561
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �����ޤ���%s\n"
-#: g10/keyedit.c:506
+#: g10/keyedit.c:563
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) ��������ǧ���Ƥ��ޤ���%s\n"
-#: g10/keyedit.c:508
+#: g10/keyedit.c:565
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) �������ǧ���ޤ�����%s\n"
-#: g10/keyedit.c:510
+#: g10/keyedit.c:567
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ���ʤ����դ��Ƴ�ǧ���ޤ�����%s\n"
-#: g10/keyedit.c:535
+#: g10/keyedit.c:592
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
-#: g10/keyedit.c:544
+#: g10/keyedit.c:601
+#, fuzzy
+msgid ""
+"\n"
+"This will be a self-signature.\n"
+msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
+
+#: g10/keyedit.c:605
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-exportable.\n"
+msgstr ""
+"\n"
+"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+
+#: g10/keyedit.c:610
+#, fuzzy
+msgid ""
+"\n"
+"WARNING: the signature will not be marked as non-revocable.\n"
+msgstr ""
+"\n"
+"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+
+#: g10/keyedit.c:617
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2363,7 +2494,7 @@ msgstr ""
"\n"
"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:548
+#: g10/keyedit.c:621
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2371,7 +2502,7 @@ msgstr ""
"\n"
"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:553
+#: g10/keyedit.c:626
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2379,7 +2510,7 @@ msgstr ""
"\n"
"���θ�����������ǧ���Ƥ��ޤ���\n"
-#: g10/keyedit.c:557
+#: g10/keyedit.c:630
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2387,7 +2518,7 @@ msgstr ""
"\n"
"���θ��ϰ������ǧ���ޤ�����\n"
-#: g10/keyedit.c:561
+#: g10/keyedit.c:634
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2395,33 +2526,33 @@ msgstr ""
"\n"
"���θ��ϡ����ʤ����դ��Ƴ�ǧ���ޤ�����\n"
-#: g10/keyedit.c:569
+#: g10/keyedit.c:643
msgid "Really sign? "
msgstr "�����˽�̾���ޤ���? "
-#: g10/keyedit.c:602 g10/keyedit.c:2593 g10/keyedit.c:2652 g10/sign.c:279
+#: g10/keyedit.c:685 g10/keyedit.c:2993 g10/keyedit.c:3052 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:658
+#: g10/keyedit.c:741
msgid "This key is not protected.\n"
msgstr "���θ����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:662
+#: g10/keyedit.c:745
msgid "Secret parts of primary key are not available.\n"
msgstr "�縰����̩��ʬ�������ޤ���\n"
-#: g10/keyedit.c:666
+#: g10/keyedit.c:749
msgid "Key is protected.\n"
msgstr "�����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:686
+#: g10/keyedit.c:769
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:692
+#: g10/keyedit.c:775
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2429,7 +2560,7 @@ msgstr ""
"������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
"\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:789
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2438,553 +2569,578 @@ msgstr ""
"�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
"\n"
-#: g10/keyedit.c:709
+#: g10/keyedit.c:792
msgid "Do you really want to do this? "
msgstr "�����˼¹Ԥ��ޤ���? "
-#: g10/keyedit.c:773
+#: g10/keyedit.c:856
msgid "moving a key signature to the correct place\n"
msgstr "���ν�̾�����������˰�ư���ޤ�\n"
-#: g10/keyedit.c:815
+#: g10/keyedit.c:898
msgid "quit this menu"
msgstr "���Υ�˥塼��λ"
-#: g10/keyedit.c:816
+#: g10/keyedit.c:899
msgid "q"
msgstr "q"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
msgid "save"
msgstr "save"
-#: g10/keyedit.c:817
+#: g10/keyedit.c:900
msgid "save and quit"
msgstr "��¸���ƽ�λ"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
msgid "help"
msgstr "help"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:901
msgid "show this help"
msgstr "���Υإ�פ򸫤�"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:903
msgid "show fingerprint"
msgstr "����򸫤�"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
msgid "list"
msgstr "list"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:904
msgid "list key and user IDs"
msgstr "���ȥ桼����ID�ΰ���"
-#: g10/keyedit.c:822
+#: g10/keyedit.c:905
msgid "l"
msgstr "l"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:906
msgid "select user ID N"
msgstr "�桼����ID N������"
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
msgid "key"
msgstr "key"
-#: g10/keyedit.c:824
+#: g10/keyedit.c:907
msgid "select secondary key N"
msgstr "����N������"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
msgid "check"
msgstr "check"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:908
msgid "list signatures"
msgstr "��̾�ΰ���"
-#: g10/keyedit.c:826
+#: g10/keyedit.c:909
msgid "c"
msgstr "c"
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:827
+#: g10/keyedit.c:910
msgid "sign the key"
msgstr "���ؽ�̾"
-#: g10/keyedit.c:828
+#: g10/keyedit.c:911
msgid "s"
msgstr "s"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:912
msgid "sign the key locally"
msgstr "��������Ū�˽�̾"
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:830
+#: g10/keyedit.c:913
msgid "sign the key non-revocably"
msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾"
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:831
+#: g10/keyedit.c:914
msgid "sign the key locally and non-revocably"
msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
-#: g10/keyedit.c:832
+#: g10/keyedit.c:915
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:833
+#: g10/keyedit.c:916
msgid "add a user ID"
msgstr "�桼����ID���ɲ�"
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:834
+#: g10/keyedit.c:917
msgid "add a photo ID"
msgstr "�ե���ID���ɲ�"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:918
msgid "delete user ID"
msgstr "�桼����ID�κ��"
#. delphoto is really deluid in disguise
-#: g10/keyedit.c:837
+#: g10/keyedit.c:920
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:838
+#: g10/keyedit.c:921
msgid "add a secondary key"
msgstr "�������ɲ�"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:839
+#: g10/keyedit.c:922
msgid "delete a secondary key"
msgstr "������"
-#: g10/keyedit.c:840
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "addrevoker"
+msgstr "addkey"
+
+#: g10/keyedit.c:923
+#, fuzzy
+msgid "add a revocation key"
+msgstr "�������ɲ�"
+
+#: g10/keyedit.c:924
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:840
+#: g10/keyedit.c:924
msgid "delete signatures"
msgstr "��̾�κ��"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:925
msgid "change the expire date"
msgstr "ͭ�����¤��ѹ�"
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:842
+#: g10/keyedit.c:926
msgid "flag user ID as primary"
msgstr "�桼����ID���ˤ���"
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:843
+#: g10/keyedit.c:927
msgid "toggle between secret and public key listing"
msgstr "��̩���ȸ������ΰ��������ؤ�"
-#: g10/keyedit.c:845
+#: g10/keyedit.c:929
msgid "t"
msgstr "t"
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:846
+#: g10/keyedit.c:930
msgid "list preferences (expert)"
msgstr "�����ΰ��� (�������ѡ���)"
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:847
+#: g10/keyedit.c:931
msgid "list preferences (verbose)"
msgstr "�����ΰ��� (��Ĺ)"
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:848
+#: g10/keyedit.c:932
msgid "set preference list"
msgstr "�������������"
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:849
+#: g10/keyedit.c:933
msgid "updated preferences"
msgstr "�����ΰ����򹹿�"
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:850
+#: g10/keyedit.c:934
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:851
+#: g10/keyedit.c:935
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:852
+#: g10/keyedit.c:936
msgid "revoke signatures"
msgstr "��̾���˴�"
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:853
+#: g10/keyedit.c:937
msgid "revoke a secondary key"
msgstr "�������˴�"
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:854
+#: g10/keyedit.c:938
msgid "disable a key"
msgstr "���λ��Ѥ�ػߤ���"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:939
msgid "enable a key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:856
+#: g10/keyedit.c:940
msgid "show photo ID"
msgstr "�ե���ID��ɽ��"
-#: g10/delkey.c:112 g10/keyedit.c:876
+#: g10/delkey.c:119 g10/keyedit.c:960
msgid "can't do that in batchmode\n"
msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/keyedit.c:913
+#: g10/keyedit.c:997
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "��̩���֥��å�`%s'���ɹ��ߥ��顼: %s\n"
-#: g10/keyedit.c:931
+#: g10/keyedit.c:1015
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:962
+#: g10/keyedit.c:1046
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1078
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1082
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
-#: g10/keyedit.c:1047
+#: g10/keyedit.c:1131
msgid "Key is revoked."
msgstr "�����˴�����Ƥ��ޤ���"
-#: g10/keyedit.c:1066
+#: g10/keyedit.c:1150
msgid "Really sign all user IDs? "
msgstr "���������桼����ID�˽�̾���ޤ���? "
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1151
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:1092
+#: g10/keyedit.c:1176
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/keyedit.c:1112 g10/keyedit.c:1133
+#: g10/keyedit.c:1196 g10/keyedit.c:1217
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1114
+#: g10/keyedit.c:1198
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:1117
+#: g10/keyedit.c:1201
msgid "Really remove all selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1118
+#: g10/keyedit.c:1202
msgid "Really remove this user ID? "
msgstr "���Υ桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1156 g10/keyedit.c:1178
+#: g10/keyedit.c:1240 g10/keyedit.c:1277
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1244
msgid "Do you really want to delete the selected keys? "
msgstr "���򤷤����������˺�����ޤ���? "
-#: g10/keyedit.c:1161
+#: g10/keyedit.c:1245
msgid "Do you really want to delete this key? "
msgstr "���θ��������˺�����ޤ���? "
-#: g10/keyedit.c:1182
+#: g10/keyedit.c:1281
msgid "Do you really want to revoke the selected keys? "
msgstr "���򤷤������������˴����ޤ���? "
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1282
msgid "Do you really want to revoke this key? "
msgstr "���θ����������˴����ޤ���? "
-#: g10/keyedit.c:1252
+#: g10/keyedit.c:1351
msgid "Really update the preferences for the selected user IDs? "
msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
-#: g10/keyedit.c:1254
+#: g10/keyedit.c:1353
msgid "Really update the preferences? "
msgstr "�����������˹������ޤ���? "
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1391
msgid "Save changes? "
msgstr "�ѹ�����¸���ޤ���? "
-#: g10/keyedit.c:1295
+#: g10/keyedit.c:1394
msgid "Quit without saving? "
msgstr "��¸�����˽�λ���ޤ���? "
-#: g10/keyedit.c:1306
+#: g10/keyedit.c:1405
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1412
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1320
+#: g10/keyedit.c:1419
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
-#: g10/keyedit.c:1332
+#: g10/keyedit.c:1431
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
-#: g10/keyedit.c:1489
-#, c-format
-msgid "This key may be revoked by %s key %s%s\n"
+#: g10/keyedit.c:1747
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key "
msgstr "���θ���%s��%s%s�ˤ�ä��˴����줿�褦�Ǥ�\n"
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1751
msgid " (sensitive)"
msgstr " (�ǥꥱ����)"
-#: g10/keyedit.c:1497 g10/keyedit.c:1523
+#: g10/keyedit.c:1757 g10/keyedit.c:1783
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX ����: %s ����: %s"
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1766
#, c-format
msgid " trust: %c/%c"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1770
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:1539
+#: g10/keyedit.c:1799
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! �������˴��ѤߤǤ�: %s\n"
-#: g10/keyedit.c:1542
+#: g10/keyedit.c:1802
msgid "rev- faked revocation found\n"
msgstr "rev- �Ǥä��������˴���ȯ��\n"
-#: g10/keyedit.c:1544
+#: g10/keyedit.c:1804
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? �˴���ǧ�㳲: %s\n"
-#: g10/keyedit.c:1574
+#: g10/keyedit.c:1834
+msgid "There are no preferences on a PGP 2.x-style key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1842
+#, fuzzy
msgid ""
-"Please note that the shown key validity is not necessary correct\n"
+"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
"�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
"�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
-#: g10/keyedit.c:1660
+#: g10/keyedit.c:1930
msgid ""
-"WARNING: This key already has a photo ID.\n"
-" Adding another photo ID may confuse some versions of PGP.\n"
-msgstr ""
-"�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
-" �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
-
-#: g10/keyedit.c:1664 g10/keyedit.c:1691
-msgid "Are you sure you still want to add it? (y/N) "
-msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
-
-#: g10/keyedit.c:1672
-msgid "You may only have one photo ID on a key.\n"
-msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
-
-#: g10/keyedit.c:1686
-msgid ""
-"WARNING: This is a PGP2-style key. Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
" of PGP to reject this key.\n"
msgstr ""
"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:1697
+#: g10/keyedit.c:1935
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:1941
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
-#: g10/keyedit.c:1832
+#: g10/keyedit.c:2076
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1842
+#: g10/keyedit.c:2086
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1846
+#: g10/keyedit.c:2090
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:1852
+#: g10/keyedit.c:2096
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:2110
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1867
+#: g10/keyedit.c:2111
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:2114
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:1943
+#: g10/keyedit.c:2210
+#, fuzzy
+msgid "Enter the user ID of the designated revoker: "
+msgstr "����Ĺ�������Ϥ��Ƥ�������"
+
+#: g10/keyedit.c:2225
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr ""
+
+#. This actually causes no harm (after all, a key that
+#. designates itself as a revoker is the same as a
+#. regular key), but it's easy enough to check.
+#: g10/keyedit.c:2235
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr ""
+
+#: g10/keyedit.c:2322
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:1949
+#: g10/keyedit.c:2328
msgid "Please select at most one secondary key.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:1953
+#: g10/keyedit.c:2332
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:2334
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:1997
+#: g10/keyedit.c:2376
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2392
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2475
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:2284
+#: g10/keyedit.c:2512 g10/keyedit.c:2619
+#, fuzzy, c-format
+msgid "skipping v3 self-signature on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+
+#: g10/keyedit.c:2679
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:2330
+#: g10/keyedit.c:2725
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d�֤������Ϥ���ޤ���\n"
-#: g10/keyedit.c:2444
+#: g10/keyedit.c:2839
msgid "user ID: \""
msgstr "�桼����ID: \""
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2844
#, c-format
msgid ""
"\"\n"
@@ -2993,7 +3149,7 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2452
+#: g10/keyedit.c:2847
#, c-format
msgid ""
"\"\n"
@@ -3002,234 +3158,251 @@ msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2457
+#: g10/keyedit.c:2852
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
-#: g10/keyedit.c:2461
+#: g10/keyedit.c:2856
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "����Ǥ��˴��������Ǥ���? (y/N) "
-#: g10/keyedit.c:2465
+#: g10/keyedit.c:2860
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
#. FIXME: detect duplicates here
-#: g10/keyedit.c:2490
+#: g10/keyedit.c:2885
msgid "You have signed these user IDs:\n"
msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/keyedit.c:2504
+#: g10/keyedit.c:2904
#, c-format
msgid " signed by %08lX at %s%s%s\n"
msgstr " %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2512
+#: g10/keyedit.c:2912
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " %08lX��%s���˴�����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2532
+#: g10/keyedit.c:2932
msgid "You are about to revoke these signatures:\n"
msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:2542
+#: g10/keyedit.c:2942
#, c-format
msgid " signed by %08lX at %s%s\n"
msgstr " %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2544
+#: g10/keyedit.c:2944
msgid " (non-exportable)"
msgstr " (��Ф��Բ�)"
-#: g10/keyedit.c:2551
+#: g10/keyedit.c:2951
msgid "Really create the revocation certificates? (y/N) "
msgstr "�˴�������������˺��ޤ���? (y/N) "
-#: g10/keyedit.c:2581
+#: g10/keyedit.c:2981
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
-#: g10/keyedit.c:2730
+#: g10/keyedit.c:3133
#, c-format
msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
-#. This isn't UTF8 as it is a URL(?)
-#: g10/keylist.c:87
+#: g10/keylist.c:91
+#, fuzzy
+msgid "Critical signature policy: "
+msgstr "��̾�ݥꥷ��: "
+
+#: g10/keylist.c:93
msgid "Signature policy: "
msgstr "��̾�ݥꥷ��: "
-#: g10/keylist.c:112 g10/keylist.c:132 g10/mainproc.c:721 g10/mainproc.c:730
+#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:763 g10/mainproc.c:772
msgid "WARNING: invalid notation data found\n"
msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
-#. This is UTF8
-#: g10/keylist.c:120
+#: g10/keylist.c:127
+#, fuzzy
+msgid "Critical signature notation: "
+msgstr "��̾����: "
+
+#: g10/keylist.c:129
msgid "Signature notation: "
msgstr "��̾����: "
-#: g10/keylist.c:127
+#: g10/keylist.c:136
msgid "not human readable"
msgstr "�ͤˤ��ɤ�ޤ���"
-#: g10/keylist.c:216
+#: g10/keylist.c:225
msgid "Keyring"
msgstr "����"
#. of subkey
-#: g10/keylist.c:423 g10/mainproc.c:856
+#: g10/keylist.c:478 g10/mainproc.c:899
#, c-format
msgid " [expires: %s]"
msgstr " [ͭ������: %s]"
-#: g10/keylist.c:889
-msgid "Fingerprint:"
-msgstr "����:"
+#: g10/keylist.c:995
+#, fuzzy
+msgid "Primary key fingerprint:"
+msgstr "���Ȼ���ΰ���"
-#. use tty
-#. Translators: this should fit into 24 bytes to that the fingerprint
-#. * data is properly aligned with the user ID
-#: g10/keylist.c:895
-msgid " Fingerprint:"
-msgstr " ����:"
+#: g10/keylist.c:997
+#, fuzzy
+msgid " Subkey fingerprint:"
+msgstr " ���� ="
-#: g10/keylist.c:899
+#: g10/keylist.c:1004
+#, fuzzy
+msgid " Primary key fingerprint:"
+msgstr " ���� ="
+
+#: g10/keylist.c:1006
+#, fuzzy
+msgid " Subkey fingerprint:"
+msgstr " ���� ="
+
+#: g10/keylist.c:1010
msgid " Key fingerprint ="
msgstr " ���� ="
-#: g10/encr-data.c:66 g10/mainproc.c:255
+#: g10/encr-data.c:66 g10/mainproc.c:282
#, c-format
msgid "%s encrypted data\n"
msgstr "%s�Ź沽���줿�ǡ���\n"
-#: g10/encr-data.c:68 g10/mainproc.c:257
+#: g10/encr-data.c:68 g10/mainproc.c:284
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
-#: g10/mainproc.c:280
+#: g10/mainproc.c:312
#, c-format
msgid "public key is %08lX\n"
msgstr "��������%08lX�Ǥ�\n"
-#: g10/mainproc.c:326
+#: g10/mainproc.c:358
msgid "public key encrypted data: good DEK\n"
msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
-#: g10/mainproc.c:378
+#: g10/mainproc.c:410
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
-#: g10/mainproc.c:388
+#: g10/mainproc.c:420
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
-#: g10/mainproc.c:402
+#: g10/mainproc.c:434
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "������������˼��Ԥ��ޤ���: %s\n"
-#: g10/mainproc.c:429 g10/mainproc.c:448
+#: g10/mainproc.c:461 g10/mainproc.c:480
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s�Ź沽���줿�ǡ�������\n"
-#: g10/mainproc.c:436
+#: g10/mainproc.c:468
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
-#: g10/mainproc.c:466
+#: g10/mainproc.c:498
msgid "decryption okay\n"
msgstr "���������\n"
-#: g10/mainproc.c:471
+#: g10/mainproc.c:505
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
-#: g10/mainproc.c:476
+#: g10/mainproc.c:511
#, c-format
msgid "decryption failed: %s\n"
msgstr "����˼��Ԥ��ޤ���: %s\n"
-#: g10/mainproc.c:495
+#: g10/mainproc.c:530
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
-#: g10/mainproc.c:497
+#: g10/mainproc.c:532
#, c-format
msgid "original file name='%.*s'\n"
msgstr "���Υե�����̾='%.*s'\n"
-#: g10/mainproc.c:672
+#: g10/mainproc.c:707
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
-#: g10/mainproc.c:733
+#: g10/mainproc.c:775
msgid "Notation: "
msgstr "����: "
-#: g10/mainproc.c:745
+#: g10/mainproc.c:787
msgid "Policy: "
msgstr "�ݥꥷ��: "
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1242
msgid "signature verification suppressed\n"
msgstr "��̾�θ��ڤ��ά\n"
#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1240 g10/mainproc.c:1250
+#: g10/mainproc.c:1284 g10/mainproc.c:1294
msgid "can't handle these multiple signatures\n"
msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
-#: g10/mainproc.c:1261
+#: g10/mainproc.c:1305
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
-#: g10/mainproc.c:1305 g10/mainproc.c:1327
+#: g10/mainproc.c:1354 g10/mainproc.c:1387
msgid "BAD signature from \""
msgstr "������ ��̾: \""
-#: g10/mainproc.c:1306 g10/mainproc.c:1328
+#: g10/mainproc.c:1355 g10/mainproc.c:1388
msgid "Expired signature from \""
msgstr "�����ڤ�ν�̾: \""
-#: g10/mainproc.c:1307 g10/mainproc.c:1329
+#: g10/mainproc.c:1356 g10/mainproc.c:1389
msgid "Good signature from \""
msgstr "��������̾: \""
-#: g10/mainproc.c:1331
+#: g10/mainproc.c:1391
msgid "[uncertain]"
msgstr "[�Գ���]"
-#: g10/mainproc.c:1351
+#: g10/mainproc.c:1422
msgid " aka \""
msgstr " ��̾ \""
-#: g10/mainproc.c:1412
+#: g10/mainproc.c:1483
#, c-format
msgid "Can't check signature: %s\n"
msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
-#: g10/mainproc.c:1481 g10/mainproc.c:1497 g10/mainproc.c:1559
+#: g10/mainproc.c:1552 g10/mainproc.c:1568 g10/mainproc.c:1630
msgid "not a detached signature\n"
msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1579
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���饹0x%02x����Ω��̾\n"
-#: g10/mainproc.c:1565
+#: g10/mainproc.c:1636
msgid "old style (PGP 2.x) signature\n"
msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
-#: g10/mainproc.c:1572
+#: g10/mainproc.c:1643
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
@@ -3248,30 +3421,46 @@ msgstr ""
"���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ���\n"
"��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
-#: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#: g10/misc.c:386
+#, fuzzy, c-format
+msgid "WARNING: unsafe ownership on %s \"%s\"\n"
msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
-#: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#: g10/misc.c:418
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on %s \"%s\"\n"
msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
-#: g10/misc.c:435
+#: g10/misc.c:443
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
-#: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:444
+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/parse-packet.c:119
+#: g10/misc.c:652
+#, fuzzy, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+
+#: g10/misc.c:656
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+
+#: g10/misc.c:658
+#, fuzzy, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+
+#: g10/parse-packet.c:120
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
-#: g10/parse-packet.c:1053
+#: g10/parse-packet.c:1057
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -3301,7 +3490,7 @@ msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/hkp.c:147 g10/passphrase.c:532
+#: g10/hkp.c:151 g10/passphrase.c:532
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
@@ -3414,66 +3603,74 @@ msgstr "��̾���줿�ǡ���������ޤ���\n"
msgid "can't open signed data `%s'\n"
msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
-#: g10/pubkey-enc.c:100
+#: g10/pubkey-enc.c:101
#, c-format
msgid "anonymous recipient; trying secret key %08lX ...\n"
msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
-#: g10/pubkey-enc.c:106
+#: g10/pubkey-enc.c:107
msgid "okay, we are the anonymous recipient.\n"
msgstr "��λ��ƿ̾�μ������ѤǤ���\n"
-#: g10/pubkey-enc.c:158
+#: g10/pubkey-enc.c:159
msgid "old encoding of the DEK is not supported\n"
msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/pubkey-enc.c:177
+#: g10/pubkey-enc.c:178
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ݸ�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
-#: g10/pubkey-enc.c:220
+#: g10/pubkey-enc.c:221
#, c-format
msgid "NOTE: cipher algorithm %d not found in preferences\n"
msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
-#: g10/pubkey-enc.c:242
+#: g10/pubkey-enc.c:243
#, c-format
msgid "NOTE: secret key %08lX expired at %s\n"
msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
-#. HKP does not support v3 fingerprints
-#: g10/hkp.c:70
-#, c-format
-msgid "requesting key %08lX from HKP keyserver %s\n"
+#: g10/pubkey-enc.c:249
+#, fuzzy
+msgid "NOTE: key has been revoked"
+msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
+
+#: g10/hkp.c:71
+#, fuzzy, c-format
+msgid "requesting key %08lX from %s\n"
msgstr "��%08lX��HKP�������С�%s���׵�\n"
-#: g10/hkp.c:94
+#: g10/hkp.c:96
#, c-format
msgid "can't get key from keyserver: %s\n"
msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
-#: g10/hkp.c:171
+#: g10/hkp.c:175
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "`%s'�ؤ��������顼: %s\n"
-#: g10/hkp.c:186
+#: g10/hkp.c:190
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "`%s'�ؤ����������� (����=%u)\n"
-#: g10/hkp.c:189
+#: g10/hkp.c:193
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
-#: g10/hkp.c:471
+#: g10/hkp.c:287
+msgid "this keyserver is not fully HKP compatible\n"
+msgstr ""
+
+#: g10/hkp.c:497
#, c-format
msgid "searching for \"%s\" from HKP server %s\n"
msgstr "\"%s\"��HKP�����С�%s���鸡��\n"
-#: g10/hkp.c:521
+#: g10/hkp.c:547
#, c-format
msgid "can't search keyserver: %s\n"
msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
@@ -3504,69 +3701,82 @@ msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr "ȿ�Ф��줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
-#: g10/sig-check.c:205
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+#: g10/sig-check.c:210
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
msgstr ""
"�����PGP����������ElGamal���Ǥ���\n"
"��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
-#: g10/sig-check.c:213
+#: g10/sig-check.c:218
#, c-format
msgid "public key is %lu second newer than the signature\n"
msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
-#: g10/sig-check.c:214
+#: g10/sig-check.c:219
#, c-format
msgid "public key is %lu seconds newer than the signature\n"
msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
-#: g10/sig-check.c:237
+#: g10/sig-check.c:242
#, c-format
msgid "NOTE: signature key %08lX expired %s\n"
msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\n"
-#: g10/sig-check.c:318
+#: g10/sig-check.c:328
msgid "assuming bad signature due to an unknown critical bit\n"
msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
-#: g10/sign.c:115
+#: g10/sign.c:103
+#, fuzzy, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+
+#: g10/sign.c:151
#, c-format
-msgid "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
-#: g10/sign.c:274
+#: g10/sign.c:303
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "�������줿��̾�θ��ڤ˼���: %s\n"
-#: g10/sign.c:283
+#: g10/sign.c:312
#, c-format
msgid "%s signature from: %s\n"
msgstr "%s��̾����̾��: %s\n"
-#: g10/sign.c:430
+#: g10/sign.c:461
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
-#: g10/sign.c:618
-msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
+#: g10/sign.c:644
+#, fuzzy
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǽ�̾�Ǥ�������Ǥ�\n"
-#: g10/sign.c:643 g10/sign.c:812
+#: g10/sign.c:665 g10/sign.c:892
#, c-format
msgid "can't create %s: %s\n"
msgstr "%s������Ǥ��ޤ���: %s\n"
-#: g10/sign.c:704
+#: g10/sign.c:690
+#, fuzzy, c-format
+msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+
+#: g10/sign.c:784
msgid "signing:"
msgstr "��̾:"
-#: g10/sign.c:796
+#: g10/sign.c:876
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
-#: g10/sign.c:953
+#: g10/sign.c:1029
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -3650,7 +3860,8 @@ msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
msgid "%s: error updating version record: %s\n"
msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
-#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701 g10/tdbio.c:1315 g10/tdbio.c:1342
+#: g10/tdbio.c:621 g10/tdbio.c:657 g10/tdbio.c:671 g10/tdbio.c:701
+#: g10/tdbio.c:1315 g10/tdbio.c:1342
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
@@ -3707,7 +3918,8 @@ msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
#: g10/tdbio.c:1441
msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
+msgstr ""
+"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
#: g10/trustdb.c:200
#, c-format
@@ -3792,29 +4004,31 @@ msgstr ""
msgid "input line %u too long or missing LF\n"
msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
-#: g10/skclist.c:110 g10/skclist.c:166
+#: g10/skclist.c:129 g10/skclist.c:185
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr ""
"��Ф��Ƥ⤤���ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
"��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
-#: g10/skclist.c:138
+#: g10/skclist.c:157
#, c-format
msgid "skipped `%s': duplicated\n"
msgstr "`%s'�򥹥��å�: ��ʣ\n"
-#: g10/skclist.c:145 g10/skclist.c:153
+#: g10/skclist.c:164 g10/skclist.c:172
#, c-format
msgid "skipped `%s': %s\n"
msgstr "`%s'�򥹥��å�: %s\n"
-#: g10/skclist.c:149
+#: g10/skclist.c:168
msgid "skipped: secret key already present\n"
msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
-#: g10/skclist.c:160
+#: g10/skclist.c:179
#, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
msgstr ""
"`%s'�򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
"��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
@@ -3867,7 +4081,8 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
#: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
#: g10/encr-data.c:98
@@ -3887,33 +4102,37 @@ msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
-#: g10/delkey.c:116
+#: g10/delkey.c:120 g10/delkey.c:127
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr ""
+
+#: g10/delkey.c:126
msgid "can't do that in batchmode without \"--yes\"\n"
msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/delkey.c:138
+#: g10/delkey.c:150
msgid "Delete this key from the keyring? "
msgstr "���θ����ؤ��������ޤ���? "
-#: g10/delkey.c:146
+#: g10/delkey.c:158
msgid "This is a secret key! - really delete? "
msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
-#: g10/delkey.c:156
+#: g10/delkey.c:168
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
-#: g10/delkey.c:166
+#: g10/delkey.c:178
msgid "ownertrust information cleared\n"
msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
-#: g10/delkey.c:194
+#: g10/delkey.c:206
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "���θ������ˤ���������̩�� \"%s\" ������ޤ�!\n"
-#: g10/delkey.c:196
+#: g10/delkey.c:208
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
@@ -3948,7 +4167,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�פ������Ƥ���������"
#: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
msgstr "��å�������������ꥢ�ɥ쥹�Υ桼����ID�����Ϥ��Ƥ���������"
#: g10/helptext.c:72
@@ -3960,7 +4180,8 @@ msgid ""
"DSA signatures are much faster than those of ElGamal.\n"
"\n"
"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
"and a sign+encrypt; actually it is the same, but some parameters must be\n"
"selected in a special way to create a safe key for signatures: this program\n"
"does this but other OpenPGP implementations are not required to understand\n"
@@ -3996,15 +4217,23 @@ msgstr ""
"�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
"����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
-#: g10/helptext.c:99
+#: g10/helptext.c:98
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+
+#: g10/helptext.c:105
msgid "Enter the size of the key"
msgstr "����Ĺ�������Ϥ��Ƥ�������"
-#: g10/helptext.c:103 g10/helptext.c:108 g10/helptext.c:120 g10/helptext.c:152 g10/helptext.c:180 g10/helptext.c:185 g10/helptext.c:190
+#: g10/helptext.c:109 g10/helptext.c:114 g10/helptext.c:126 g10/helptext.c:158
+#: g10/helptext.c:186 g10/helptext.c:191 g10/helptext.c:196
msgid "Answer \"yes\" or \"no\""
msgstr "��yes�פ���no�פ������Ƥ�������"
-#: g10/helptext.c:113
+#: g10/helptext.c:119
msgid ""
"Enter the required value as shown in the prompt.\n"
"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -4016,19 +4245,19 @@ msgstr ""
"ɽ������ʤ��Ǥ��礦��������ꡢ�����ƥ�������ͤ���֤��Ѵ�����\n"
"�褦�˻�ߤޤ���"
-#: g10/helptext.c:125
+#: g10/helptext.c:131
msgid "Enter the name of the key holder"
msgstr "���ۥ����̾�������Ϥ��Ƥ�������"
-#: g10/helptext.c:130
+#: g10/helptext.c:136
msgid "please enter an optional but highly suggested email address"
msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
-#: g10/helptext.c:134
+#: g10/helptext.c:140
msgid "Please enter an optional comment"
msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
-#: g10/helptext.c:139
+#: g10/helptext.c:145
msgid ""
"N to change the name.\n"
"C to change the comment.\n"
@@ -4042,36 +4271,46 @@ msgstr ""
"O ����������³�ԡ�\n"
"Q ������������ߡ�"
-#: g10/helptext.c:148
+#: g10/helptext.c:154
msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr "���������������硢��yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
-#: g10/helptext.c:156
+#: g10/helptext.c:162
msgid ""
"When you sign a user ID on a key, you should first verify that the key\n"
"belongs to the person named in the user ID. It is useful for others to\n"
"know how carefully you verified this.\n"
"\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
" key.\n"
"\n"
"\"1\" means you believe the key is owned by the person who claims to own it\n"
-" but you could not, or did not verify the key at all. This is useful for\n"
-" a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
"\n"
-"\"2\" means you did casual verification of the key. For example, this could\n"
-" mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
" key against a photo ID.\n"
"\n"
-"\"3\" means you did extensive verification of the key. For example, this could\n"
+"\"3\" means you did extensive verification of the key. For example, this "
+"could\n"
" mean that you verified the key fingerprint with the owner of the key in\n"
-" person, and that you checked, by means of a hard to forge document with a\n"
-" photo ID (such as a passport) that the name of the key owner matches the\n"
-" name in the user ID on the key, and finally that you verified (by exchange\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
" of email) that the email address on the key belongs to the key owner.\n"
"\n"
"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
"mean to you when you sign other keys.\n"
"\n"
"If you don't know what the right answer is, answer \"0\"."
@@ -4105,11 +4344,11 @@ msgstr ""
"\n"
"���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
-#: g10/helptext.c:194
+#: g10/helptext.c:200
msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�פ������Ƥ�������"
-#: g10/helptext.c:198
+#: g10/helptext.c:204
msgid ""
"Answer \"yes\" if you really want to delete this user ID.\n"
"All certificates are then also lost!"
@@ -4117,11 +4356,11 @@ msgstr ""
"�����Υ桼����ID�������˺����������С���yes�פ������Ƥ���������\n"
"�����������Ʊ���˺�����ޤ�!"
-#: g10/helptext.c:203
+#: g10/helptext.c:209
msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr "�����������������硢��yes�פ������Ƥ�������"
-#: g10/helptext.c:208
+#: g10/helptext.c:214
msgid ""
"This is a valid signature on the key; you normally don't want\n"
"to delete this signature because it may be important to establish a\n"
@@ -4131,7 +4370,7 @@ msgstr ""
"�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
"���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
-#: g10/helptext.c:213
+#: g10/helptext.c:219
msgid ""
"This signature can't be checked because you don't have the\n"
"corresponding key. You should postpone its deletion until you\n"
@@ -4143,7 +4382,7 @@ msgstr ""
"�ʤ��ʤ顢���ν�̾�θ��ϡ�¾�ξ������줿���ǿ��Ѥ��ؤ�������뤫��\n"
"����ʤ�����Ǥ���"
-#: g10/helptext.c:219
+#: g10/helptext.c:225
msgid ""
"The signature is not valid. It does make sense to remove it from\n"
"your keyring."
@@ -4151,7 +4390,7 @@ msgstr ""
"���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
"�Ȥ�����̣�Ǥ���"
-#: g10/helptext.c:223
+#: g10/helptext.c:229
msgid ""
"This is a signature which binds the user ID to the key. It is\n"
"usually not a good idea to remove such a signature. Actually\n"
@@ -4164,7 +4403,7 @@ msgstr ""
"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��̵���Ǥ��äơ�\n"
"���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
-#: g10/helptext.c:231
+#: g10/helptext.c:237
msgid ""
"Change the preferences of all user IDs (or just of the selected ones)\n"
"to the current list of preferences. The timestamp of all affected\n"
@@ -4173,23 +4412,23 @@ msgstr ""
"���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
"���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n"
-#: g10/helptext.c:238
+#: g10/helptext.c:244
msgid "Please enter the passhrase; this is a secret sentence \n"
msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
-#: g10/helptext.c:244
+#: g10/helptext.c:250
msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
-#: g10/helptext.c:248
+#: g10/helptext.c:254
msgid "Give the name of the file to which the signature applies"
msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
-#: g10/helptext.c:253
+#: g10/helptext.c:259
msgid "Answer \"yes\" if it is okay to overwrite the file"
msgstr "��񤭤��Ƥ褱��С���yes�פ������Ƥ�������"
-#: g10/helptext.c:258
+#: g10/helptext.c:264
msgid ""
"Please enter a new filename. If you just hit RETURN the default\n"
"file (which is shown in brackets) will be used."
@@ -4197,7 +4436,7 @@ msgstr ""
"�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
"(��̤ǰϤ��) ����Υե�����̾����Ѥ��ޤ���"
-#: g10/helptext.c:264
+#: g10/helptext.c:270
msgid ""
"You should specify a reason for the certification. Depending on the\n"
"context you have the ability to choose from this list:\n"
@@ -4226,7 +4465,7 @@ msgstr ""
" �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
" ���˻Ȥ��ޤ���\n"
-#: g10/helptext.c:280
+#: g10/helptext.c:286
msgid ""
"If you like, you can enter a text describing why you issue this\n"
"revocation certificate. Please keep this text concise.\n"
@@ -4236,11 +4475,11 @@ msgstr ""
"�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
"���Ԥǽ����ˤʤ�ޤ���\n"
-#: g10/helptext.c:295
+#: g10/helptext.c:301
msgid "No help available"
msgstr "�إ�פϤ���ޤ���"
-#: g10/helptext.c:303
+#: g10/helptext.c:309
#, c-format
msgid "No help available for `%s'"
msgstr "`%s'�Υإ�פϤ���ޤ���"
@@ -4302,3 +4541,29 @@ msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
#, c-format
msgid "%s: keyring created\n"
msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#~ msgid "|NAME=VALUE|use this notation data"
+#~ msgstr "|̾��=��|��������ǡ��������"
+
+#~ msgid ""
+#~ "the first character of a notation name must be a letter or an underscore\n"
+#~ msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
+
+#~ msgid "dots in a notation name must be surrounded by other characters\n"
+#~ msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
+
+#~ msgid ""
+#~ "WARNING: This key already has a photo ID.\n"
+#~ " Adding another photo ID may confuse some versions of PGP.\n"
+#~ msgstr ""
+#~ "�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
+#~ " �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
+
+#~ msgid "You may only have one photo ID on a key.\n"
+#~ msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
+
+#~ msgid "Fingerprint:"
+#~ msgstr "����:"
+
+#~ msgid " Fingerprint:"
+#~ msgstr " ����:"