aboutsummaryrefslogtreecommitdiffstats
path: root/po/ja.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ja.po')
-rw-r--r--po/ja.po4291
1 files changed, 2629 insertions, 1662 deletions
diff --git a/po/ja.po b/po/ja.po
index 8af08559c..31b39439b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,62 +1,79 @@
# Japanese messages for GnuPG
-# Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
-# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002.
+# Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002, 2003.
# Yoshihiro Kajiki <[email protected]>, 1999.
# This file is distributed under the same license as the GnuPG package.
# Special thanks to "Takashi P.KATOH".
#
msgid ""
msgstr ""
-"Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-09-11 15:11+0200\n"
-"PO-Revision-Date: 2002-05-10 07:28-0400\n"
+"Project-Id-Version: gnupg 1.2.1\n"
+"Report-Msgid-Bugs-To: [email protected]\n"
+"POT-Creation-Date: 2004-07-27 17:15+0200\n"
+"PO-Revision-Date: 2003-12-06 00:44+0900\n"
"Last-Translator: IIDA Yosiaki <[email protected]>\n"
"Language-Team: Japanese <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
-#: util/secmem.c:88
-#, fuzzy
+#: util/secmem.c:90
msgid "WARNING: using insecure memory!\n"
-msgstr "�ٹ�: ��Ф����꡼����Ѥ��Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
-#: util/secmem.c:89
+#: util/secmem.c:91
msgid "please see http://www.gnupg.org/faq.html for more information\n"
msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
-#: util/secmem.c:326
+#: util/secmem.c:340
msgid "operation is not possible without initialized secure memory\n"
msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
-#: util/secmem.c:327
+#: util/secmem.c:341
msgid "(you may have used the wrong program for this task)\n"
msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
-#: util/miscutil.c:296 util/miscutil.c:331
+#: util/miscutil.c:307 util/miscutil.c:344
msgid "yes"
msgstr "yes"
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:308 util/miscutil.c:349
msgid "yY"
msgstr "yY"
-#: util/miscutil.c:298 util/miscutil.c:332
+#: util/miscutil.c:310 util/miscutil.c:346
msgid "no"
msgstr "no"
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:311 util/miscutil.c:350
msgid "nN"
msgstr "nN"
-#: g10/keyedit.c:901 util/miscutil.c:333
+#: util/miscutil.c:348 g10/keyedit.c:1138
msgid "quit"
msgstr "quit"
-#: util/miscutil.c:336
+#: util/miscutil.c:351
msgid "qQ"
msgstr "qQ"
+#: util/miscutil.c:384
+msgid "okay|okay"
+msgstr ""
+
+#: util/miscutil.c:386
+msgid "cancel|cancel"
+msgstr ""
+
+#: util/miscutil.c:387
+msgid "oO"
+msgstr ""
+
+#: util/miscutil.c:388
+#, fuzzy
+msgid "cC"
+msgstr "c"
+
#: util/errors.c:54
msgid "general error"
msgstr "����Ū�ʥ��顼"
@@ -215,7 +232,7 @@ msgstr "ͽ�����̥ǡ����Ǥ�"
#: util/errors.c:93
msgid "timestamp conflict"
-msgstr "���դ����ͤ��Ƥ��ޤ�"
+msgstr "������̷�⤷�Ƥ��ޤ�"
#: util/errors.c:94
msgid "unusable pubkey algorithm"
@@ -253,7 +270,6 @@ msgstr "�Ź沽����Ƥ��ޤ���"
msgid "not processed"
msgstr "̤����"
-#. the key cannot be used for a specific usage
#: util/errors.c:105
msgid "unusable public key"
msgstr "���ѤǤ��ʤ��������Ǥ�"
@@ -266,73 +282,80 @@ msgstr "���ѤǤ��ʤ���̩���Ǥ�"
msgid "keyserver error"
msgstr "�������С��Υ��顼"
-#: util/logger.c:249
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr ""
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr ""
+
+#: util/logger.c:279
#, c-format
msgid "... this is a bug (%s:%d:%s)\n"
msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
-#: util/logger.c:255
+#: util/logger.c:285
#, c-format
msgid "you found a bug ... (%s:%d)\n"
msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
-#: cipher/random.c:157
+#: cipher/random.c:163
msgid "no entropy gathering module detected\n"
-msgstr ""
+msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
-#: cipher/random.c:381 g10/import.c:195 g10/keygen.c:1809
+#: cipher/random.c:387 g10/keygen.c:2032 g10/import.c:169
#, c-format
msgid "can't open `%s': %s\n"
-msgstr "`%s'�������ޤ���: %s\n"
+msgstr "��%s�פ������ޤ���: %s\n"
-#: cipher/random.c:385
+#: cipher/random.c:391
#, c-format
msgid "can't stat `%s': %s\n"
-msgstr "`%s'��Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
-#: cipher/random.c:390
+#: cipher/random.c:396
#, c-format
msgid "`%s' is not a regular file - ignored\n"
-msgstr "`%s' �����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
+msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
-#: cipher/random.c:395
+#: cipher/random.c:401
msgid "note: random_seed file is empty\n"
msgstr "����: random_seed �ե�����϶��Ǥ�\n"
-#: cipher/random.c:401
-#, fuzzy
+#: cipher/random.c:407
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
-#: cipher/random.c:409
+#: cipher/random.c:415
#, c-format
msgid "can't read `%s': %s\n"
-msgstr "`%s'���ɤ�ޤ���: %s\n"
+msgstr "��%s�פ��ɤ�ޤ���: %s\n"
-#: cipher/random.c:447
+#: cipher/random.c:453
msgid "note: random_seed file not updated\n"
msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
-#: cipher/random.c:467
+#: cipher/random.c:473 g10/exec.c:481
#, c-format
msgid "can't create `%s': %s\n"
-msgstr "`%s'���Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
-#: cipher/random.c:474
+#: cipher/random.c:480
#, c-format
msgid "can't write `%s': %s\n"
-msgstr "`%s'�˽񤱤ޤ���: %s\n"
+msgstr "��%s�פ˽񤱤ޤ���: %s\n"
-#: cipher/random.c:477
+#: cipher/random.c:483
#, c-format
msgid "can't close `%s': %s\n"
-msgstr "`%s'���Ĥ����ޤ���: %s\n"
+msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
-#: cipher/random.c:723
+#: cipher/random.c:728
msgid "WARNING: using insecure random number generator!!\n"
-msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
+msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
-#: cipher/random.c:724
+#: cipher/random.c:729
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -357,7 +380,31 @@ msgstr ""
"��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
"�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
-#: g10/g10.c:307
+#: cipher/md.c:137
+#, c-format
+msgid "digest algorithm `%s' is read-only in this release\n"
+msgstr "���󥢥르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
+
+#: cipher/rndegd.c:204
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
+"���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
+
+#: cipher/primegen.c:120
+#, fuzzy, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+
+#: cipher/primegen.c:311
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+
+#: g10/g10.c:354
msgid ""
"@Commands:\n"
" "
@@ -365,165 +412,128 @@ msgstr ""
"@���ޥ��:\n"
" "
-#: g10/g10.c:309
+#: g10/g10.c:356
msgid "|[file]|make a signature"
msgstr "|[�ե�����]|��̾�����"
-#: g10/g10.c:310
+#: g10/g10.c:357
msgid "|[file]|make a clear text signature"
msgstr "|[�ե�����]|���ꥢ��̾�����"
-#: g10/g10.c:311
+#: g10/g10.c:358
msgid "make a detached signature"
msgstr "ʬΥ��̾�����"
-#: g10/g10.c:312
+#: g10/g10.c:359
msgid "encrypt data"
msgstr "�ǡ�����Ź沽"
-#: g10/g10.c:313
-msgid "|[files]|encrypt files"
-msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
-
-#: g10/g10.c:314
+#: g10/g10.c:361
msgid "encryption only with symmetric cipher"
msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
-#: g10/g10.c:315
-msgid "store only"
-msgstr "��¸�Τ�"
-
-#: g10/g10.c:316
+#: g10/g10.c:363
msgid "decrypt data (default)"
msgstr "�ǡ��������� (����)"
-#: g10/g10.c:317
-msgid "|[files]|decrypt files"
-msgstr "|[�ե����뷲]|�ե����뷲������"
-
-#: g10/g10.c:318
+#: g10/g10.c:365
msgid "verify a signature"
msgstr "��̾�򸡾�"
-#: g10/g10.c:320
+#: g10/g10.c:367
msgid "list keys"
msgstr "�����"
-#: g10/g10.c:322
+#: g10/g10.c:369
msgid "list keys and signatures"
msgstr "���Ƚ�̾�ΰ���"
-#: g10/g10.c:323
-msgid "check key signatures"
-msgstr "���ν�̾�򸡾�"
+#: g10/g10.c:370
+#, fuzzy
+msgid "list and check key signatures"
+msgstr "���ν�̾�򸡺�"
-#: g10/g10.c:324
+#: g10/g10.c:371
msgid "list keys and fingerprints"
msgstr "���Ȼ���ΰ���"
-#: g10/g10.c:325
+#: g10/g10.c:372
msgid "list secret keys"
msgstr "��̩���ΰ���"
-#: g10/g10.c:326
+#: g10/g10.c:373
msgid "generate a new key pair"
msgstr "��������������"
-#: g10/g10.c:327
+#: g10/g10.c:374
msgid "remove keys from the public keyring"
msgstr "�������ؤ��鸰������"
-#: g10/g10.c:329
+#: g10/g10.c:376
msgid "remove keys from the secret keyring"
msgstr "��̩���ؤ��鸰������"
-#: g10/g10.c:330
+#: g10/g10.c:377
msgid "sign a key"
msgstr "���˽�̾"
-#: g10/g10.c:331
+#: g10/g10.c:378
msgid "sign a key locally"
msgstr "��������Ū�˽�̾"
-#: g10/g10.c:332
-msgid "sign a key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���˽�̾"
-
-#: g10/g10.c:333
-msgid "sign a key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
-
-#: g10/g10.c:334
+#: g10/g10.c:381
msgid "sign or edit a key"
msgstr "���ؤν�̾���Խ�"
-#: g10/g10.c:335
+#: g10/g10.c:382
msgid "generate a revocation certificate"
-msgstr "�˴������������"
+msgstr "���������������"
-#: g10/g10.c:337
+#: g10/g10.c:384
msgid "export keys"
msgstr "����񤭽Ф�"
-#: g10/g10.c:338
+#: g10/g10.c:385
msgid "export keys to a key server"
msgstr "�������С��˸���񤭽Ф�"
-#: g10/g10.c:339
+#: g10/g10.c:386
msgid "import keys from a key server"
msgstr "�������С����鸰���ɤ߹���"
-#: g10/g10.c:341
+#: g10/g10.c:388
msgid "search for keys on a key server"
msgstr "�������С��θ��򸡺�����"
-#: g10/g10.c:343
+#: g10/g10.c:390
msgid "update all keys from a keyserver"
msgstr "�������С����鸰��������������"
-#: g10/g10.c:347
+#: g10/g10.c:393
msgid "import/merge keys"
msgstr "�����ɹ���/ʻ��"
-#: g10/g10.c:349
-msgid "list only the sequence of packets"
-msgstr "�ѥ��å���Τߤΰ���"
+#: g10/g10.c:396
+msgid "print the card status"
+msgstr ""
-#: g10/g10.c:351
-msgid "export the ownertrust values"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
+#: g10/g10.c:397
+msgid "change data on a card"
+msgstr ""
-#: g10/g10.c:353
-msgid "import ownertrust values"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
+#: g10/g10.c:398
+msgid "change a card's PIN"
+msgstr ""
-#: g10/g10.c:355
+#: g10/g10.c:406
msgid "update the trust database"
msgstr "���ѥǡ����١����򹹿�"
-#: g10/g10.c:357
-msgid "unattended trust database update"
-msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
-
-#: g10/g10.c:358
-msgid "fix a corrupted trust database"
-msgstr "���줿���ѥǡ����١�������"
-
-#: g10/g10.c:359
-msgid "De-Armor a file or stdin"
-msgstr ""
-"�ե�����ޤ���ɸ�����Ϥ�\n"
-"��������"
-
-#: g10/g10.c:361
-msgid "En-Armor a file or stdin"
-msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
-
-#: g10/g10.c:363
+#: g10/g10.c:413
msgid "|algo [files]|print message digests"
msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
-#: g10/g10.c:367
+#: g10/g10.c:417 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -533,237 +543,59 @@ msgstr ""
"���ץ����:\n"
" "
-#: g10/g10.c:369
+#: g10/g10.c:419
msgid "create ascii armored output"
msgstr "ASCII���������������"
-#: g10/g10.c:371
+#: g10/g10.c:421
msgid "|NAME|encrypt for NAME"
msgstr "|̾��|��̾�����Ѥ˰Ź沽"
-#: g10/g10.c:374
-msgid "|NAME|use NAME as default recipient"
-msgstr ""
-"|̾��|����μ����ԤȤ���\n"
-"��̾���פ����"
-
-#: g10/g10.c:376
-msgid "use the default key as default recipient"
-msgstr "����μ����Ԥ˴���θ������"
-
-#: g10/g10.c:382
+#: g10/g10.c:432
msgid "use this user-id to sign or decrypt"
msgstr ""
"��̾������ˤ��Υ桼����id\n"
"�����"
-#: g10/g10.c:383
+#: g10/g10.c:433
msgid "|N|set compress level N (0 disables)"
msgstr ""
"|N|���̥�٥��N������\n"
"(0���󰵽�)"
-#: g10/g10.c:385
+#: g10/g10.c:438
msgid "use canonical text mode"
msgstr "����ƥ����ȡ��⡼�ɤ����"
-#: g10/g10.c:392
+#: g10/g10.c:448
msgid "use as output file"
msgstr "���ϥե�����Ȥ��ƻ���"
-#: g10/g10.c:393
+#: g10/g10.c:450 g10/gpgv.c:66
msgid "verbose"
msgstr "��Ĺ"
-#: g10/g10.c:394
-msgid "be somewhat more quiet"
-msgstr "����Ť�"
-
-#: g10/g10.c:395
-msgid "don't use the terminal at all"
-msgstr "ü�����Ի���"
-
-#: g10/g10.c:396
-msgid "force v3 signatures"
-msgstr "����Ū��v3��̾"
-
-#: g10/g10.c:397
-msgid "do not force v3 signatures"
-msgstr "v3��̾�������ʤ�"
-
-#: g10/g10.c:398
-msgid "force v4 key signatures"
-msgstr "����Ū��v4��̾"
-
-#: g10/g10.c:399
-msgid "do not force v4 key signatures"
-msgstr "v4��̾�������ʤ�"
-
-#: g10/g10.c:400
-msgid "always use a MDC for encryption"
-msgstr "�Ź沽�ˤϾ��MDC�����"
-
-#: g10/g10.c:402
-msgid "never use a MDC for encryption"
-msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
-
-#: g10/g10.c:404
+#: g10/g10.c:461
msgid "do not make any changes"
msgstr "̵�ѹ�"
-#: g10/g10.c:405
+#: g10/g10.c:462
msgid "prompt before overwriting"
-msgstr ""
-
-#: g10/g10.c:406
-msgid "use the gpg-agent"
-msgstr "gpg����������Ȥ����"
+msgstr "������˳�ǧ"
-#: g10/g10.c:409
-msgid "batch mode: never ask"
-msgstr "�Хå����⡼��: ��ǧ��ά"
-
-#: g10/g10.c:410
-msgid "assume yes on most questions"
+#: g10/g10.c:507
+msgid "use strict OpenPGP behavior"
msgstr ""
-"�����Ƥ��μ����������yes\n"
-"�Ȥߤʤ�"
-#: g10/g10.c:411
-msgid "assume no on most questions"
+#: g10/g10.c:508
+msgid "generate PGP 2.x compatible messages"
msgstr ""
-"�����Ƥ��μ����������no\n"
-"�Ȥߤʤ�"
-
-#: g10/g10.c:412
-msgid "add this keyring to the list of keyrings"
-msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
-
-#: g10/g10.c:413
-msgid "add this secret keyring to the list"
-msgstr "�����ˤ�����̩���ؤ��ɲ�"
-#: g10/g10.c:414
-msgid "show which keyring a listed key is on"
-msgstr "�����θ������븰�ؤ�ɽ��"
-
-#: g10/g10.c:415
-msgid "|NAME|use NAME as default secret key"
-msgstr ""
-"|̾��|�������̩���Ȥ���\n"
-"��̾���פ����"
-
-#: g10/g10.c:416
-msgid "|HOST|use this keyserver to lookup keys"
-msgstr "|�ۥ���|���θ����ˤ��θ������С������"
-
-#: g10/g10.c:420
-msgid "|NAME|set terminal charset to NAME"
-msgstr ""
-"|CHARSET̾|ü����charset���CHARSET̾��\n"
-"������"
-
-#: g10/g10.c:421
-msgid "read options from file"
-msgstr ""
-"�ե����뤫�饪�ץ�����\n"
-"�ɤ߹���"
-
-#: g10/g10.c:425
-msgid "|FD|write status info to this FD"
-msgstr ""
-"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
-"�񤭽Ф�"
-
-#: g10/g10.c:427
-msgid "|[file]|write status info to file"
-msgstr ""
-"|�ե�����|���ơ����������ե������\n"
-"�񤭽Ф�"
-
-#: g10/g10.c:439
-msgid "|KEYID|ultimately trust this key"
-msgstr "|��ID|���θ�����Ū�˿��Ѥ���"
-
-#: g10/g10.c:440
-msgid "|FILE|load extension module FILE"
-msgstr ""
-"|�ե�����|��ĥ�⥸�塼��Υե������\n"
-"�ɤ߹���"
-
-#: g10/g10.c:441
-msgid "emulate the mode described in RFC1991"
-msgstr ""
-"RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
-"����"
-
-#: g10/g10.c:442
-msgid "set all packet, cipher and digest options to OpenPGP behavior"
-msgstr ""
-"�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
-"�������OpenPGP��������"
-
-#: g10/g10.c:443
-msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#: g10/g10.c:530
+msgid "allow the use of admin card commands"
msgstr ""
-"�ѥ��åȤȰŹ������Υ��ץ���\n"
-"�������PGP 2.x��������"
-#: g10/g10.c:449
-msgid "|N|use passphrase mode N"
-msgstr "|N|�ѥ��ե졼�����⡼��N�����"
-
-#: g10/g10.c:451
-msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr ""
-"|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
-"���������󥢥르�ꥺ������"
-
-#: g10/g10.c:453
-msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr ""
-"|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
-"���르�ꥺ������"
-
-#: g10/g10.c:455
-msgid "|NAME|use cipher algorithm NAME"
-msgstr ""
-"|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
-"����"
-
-#: g10/g10.c:456
-msgid "|NAME|use message digest algorithm NAME"
-msgstr ""
-"|̾��|��̾���פΥ�å���������\n"
-"���르�ꥺ������"
-
-#: g10/g10.c:458
-msgid "|N|use compress algorithm N"
-msgstr ""
-"|̾��|��̾���פΰ��̥��르�ꥺ���\n"
-"����"
-
-#: g10/g10.c:459
-msgid "throw keyid field of encrypted packets"
-msgstr ""
-"�Ź�ѥ��åȤθ�ID�ե������\n"
-"������"
-
-#: g10/g10.c:460
-msgid "Show Photo IDs"
-msgstr "�ե���ID��ɽ��"
-
-#: g10/g10.c:461
-msgid "Don't show Photo IDs"
-msgstr "�ե���ID��ɽ�����ʤ�"
-
-#: g10/g10.c:462
-msgid "Set command line to view Photo IDs"
-msgstr ""
-"�ե���ID��������륳�ޥ�ɹ�\n"
-"������"
-
-#: g10/g10.c:468
+#: g10/g10.c:535
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -772,7 +604,7 @@ msgstr ""
"(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
"�ޥ˥奢�롦�ڡ���������������)\n"
-#: g10/g10.c:471
+#: g10/g10.c:538
msgid ""
"@\n"
"Examples:\n"
@@ -786,31 +618,31 @@ msgstr ""
"@\n"
"��:\n"
"\n"
-" -se -r Bob [�ե�����] �桼����Bob�ؤν�̾�ȰŹ沽\n"
-" --clearsign [�ե�����] ���ꥢ��̾������\n"
-" --detach-sign [�ե�����] ʬΥ��̾������\n"
+" -se -r Bob [�ե�����] ��̾�ȥ桼����Bob�ؤΰŹ沽\n"
+" --clearsign [�ե�����] ���ꥢ��̾�����\n"
+" --detach-sign [�ե�����] ʬΥ��̾�����\n"
" --list-keys [̾��] ����ɽ��\n"
" --fingerprint [̾��] �����ɽ��\n"
-#: g10/g10.c:623
+#: g10/g10.c:713 g10/gpgv.c:91
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
-#: g10/g10.c:627
+#: g10/g10.c:730
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
-#: g10/g10.c:630
+#: g10/g10.c:733
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"
msgstr ""
"��: gpg [���ץ����] [�ե�����]\n"
-"��̾�����ڡ��Ź沽������\n"
+"��̾���������Ź沽������\n"
"�����ư��ϡ����ϥǡ����˰�¸\n"
-#: g10/g10.c:641
+#: g10/g10.c:744
msgid ""
"\n"
"Supported algorithms:\n"
@@ -818,446 +650,650 @@ msgstr ""
"\n"
"���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
-#: g10/g10.c:745
+#: g10/g10.c:747
+msgid "Pubkey: "
+msgstr "������: "
+
+#: g10/g10.c:753 g10/keyedit.c:1737
+msgid "Cipher: "
+msgstr "��: "
+
+#: g10/g10.c:759
+msgid "Hash: "
+msgstr "�ϥå���: "
+
+#: g10/g10.c:765 g10/keyedit.c:1783
+msgid "Compression: "
+msgstr "����: "
+
+#: g10/g10.c:848
msgid "usage: gpg [options] "
msgstr "�Ȥ���: gpg [���ץ����] "
-#: g10/g10.c:802
+#: g10/g10.c:951
msgid "conflicting commands\n"
-msgstr "���ޥ�ɤξ���\n"
+msgstr "��Ω���륳�ޥ��\n"
-#: g10/g10.c:820
+#: g10/g10.c:969
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
-msgstr ""
+msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
-#: g10/g10.c:983
+#: g10/g10.c:1166
#, fuzzy, c-format
-msgid "WARNING: unsafe ownership on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
+msgid "WARNING: unsafe ownership on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:986
+#: g10/g10.c:1169
#, fuzzy, c-format
-msgid "WARNING: unsafe permissions on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
+msgid "WARNING: unsafe ownership on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:989
+#: g10/g10.c:1172
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ���ͭ��\n"
+msgid "WARNING: unsafe ownership on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
-#: g10/g10.c:993
+#: g10/g10.c:1178
#, fuzzy, c-format
-msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
-msgstr "�ٹ�: %s \"%s\" �ΰ����Ǥʤ�����\n"
+msgid "WARNING: unsafe permissions on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
-#: g10/g10.c:1168
+#: g10/g10.c:1181
#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+
+#: g10/g10.c:1184
+#, fuzzy, c-format
+msgid "WARNING: unsafe permissions on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+
+#: g10/g10.c:1190
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1193
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1196
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+
+#: g10/g10.c:1202
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1205
+#, fuzzy, c-format
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file \"%s"
+"\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1208
+#, fuzzy, c-format
+msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n"
+msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+
+#: g10/g10.c:1334
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+
+#: g10/g10.c:1601
+#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
+msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
-#: g10/g10.c:1204
+#: g10/g10.c:1637
#, c-format
msgid "NOTE: no default option file `%s'\n"
-msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
+msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
-#: g10/g10.c:1208
+#: g10/g10.c:1641
#, c-format
msgid "option file `%s': %s\n"
-msgstr "���ץ���󡦥ե�����`%s': %s\n"
+msgstr "���ץ���󡦥ե������%s��: %s\n"
-#: g10/g10.c:1215
+#: g10/g10.c:1648
#, c-format
msgid "reading options from `%s'\n"
-msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
+msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+
+#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "����: ����%s���Ѥ��ޤ���!\n"
-#: g10/g10.c:1390
+#: g10/g10.c:1887
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
-msgstr ""
+msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
-#: g10/g10.c:1523
+#: g10/g10.c:2099
#, c-format
msgid "%s is not a valid character set\n"
-msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
+msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
-#: g10/g10.c:1541
-msgid "could not parse keyserver URI\n"
+#: g10/g10.c:2118 g10/keyedit.c:3228
+#, fuzzy
+msgid "could not parse keyserver URL\n"
msgstr "�������С���URI�������ǽ\n"
-#: g10/g10.c:1550
+#: g10/g10.c:2124
#, fuzzy, c-format
-msgid "%s:%d: invalid import options\n"
-msgstr "%s: ̵���ʥե����롦�С������%d\n"
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:1553
+#: g10/g10.c:2127
#, fuzzy
+msgid "invalid keyserver options\n"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2134
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+
+#: g10/g10.c:2137
msgid "invalid import options\n"
-msgstr "̵���������Ǥ�"
+msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
-#: g10/g10.c:1560
-#, fuzzy, c-format
+#: g10/g10.c:2144
+#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s: ̵���ʥե����롦�С������%d\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:1563
-#, fuzzy
+#: g10/g10.c:2147
msgid "invalid export options\n"
-msgstr "���ؤ�̵���Ǥ�"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2172
+#, fuzzy, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+
+#: g10/g10.c:2175
+#, fuzzy
+msgid "invalid list options\n"
+msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
+
+#: g10/g10.c:2198
+#, fuzzy, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
-#: g10/g10.c:1569
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid verify options\n"
+msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+
+#: g10/g10.c:2208
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path��%s��������ǽ\n"
-#: g10/g10.c:1688
+#: g10/g10.c:2398
msgid "WARNING: program may create a core file!\n"
msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
-#: g10/g10.c:1692
+#: g10/g10.c:2402
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�ٹ�: %s��%s���ͥ��\n"
-#: g10/g10.c:1699 g10/g10.c:1710
-#, c-format
-msgid "NOTE: %s is not for normal use!\n"
-msgstr "����: ����%s���Ѥ��ޤ���!\n"
-
-#: g10/g10.c:1701 g10/g10.c:1721
+#: g10/g10.c:2411
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
-#: g10/g10.c:1704
+#: g10/g10.c:2414
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
-#: g10/g10.c:1731
+#: g10/g10.c:2435
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
-#: g10/g10.c:1737
+#: g10/g10.c:2441
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
-#: g10/g10.c:1743
+#: g10/g10.c:2447
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
-#: g10/g10.c:1756
+#: g10/g10.c:2460
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥ�IDEA�Ź椬�׵ᤵ��ޤ� \n"
-
-#: g10/encode.c:408 g10/encode.c:458 g10/encode.c:707 g10/g10.c:1770
-#: g10/sign.c:646 g10/sign.c:878
-#, fuzzy, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "���Υ�å�������PGP 2.x�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
-#: g10/g10.c:1818 g10/g10.c:1836
+#: g10/g10.c:2528 g10/g10.c:2552
msgid "selected cipher algorithm is invalid\n"
msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1824 g10/g10.c:1842
+#: g10/g10.c:2534 g10/g10.c:2558
msgid "selected digest algorithm is invalid\n"
-msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
+msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:1830
+#: g10/g10.c:2540
#, fuzzy
-msgid "selected certification digest algorithm is invalid\n"
-msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
+msgid "selected compression algorithm is invalid\n"
+msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
-#: g10/g10.c:1845
-#, c-format
-msgid "compress algorithm must be in range %d..%d\n"
-msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
+#: g10/g10.c:2546
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
-#: g10/g10.c:1847
+#: g10/g10.c:2561
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1849
+#: g10/g10.c:2563
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
-#: g10/g10.c:1851
-msgid "max-cert-depth must be in range 1 to 255\n"
+#: g10/g10.c:2565
+#, fuzzy
+msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1854
+#: g10/g10.c:2567
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:2569
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:2572
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
-#: g10/g10.c:1858
+#: g10/g10.c:2576
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:1862
-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:1868
-#, fuzzy
+#: g10/g10.c:2583
msgid "invalid default preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʴ��������\n"
-#: g10/g10.c:1876
-#, fuzzy
+#: g10/g10.c:2592
msgid "invalid personal cipher preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ��ѰŹ������\n"
-#: g10/g10.c:1880
-#, fuzzy
+#: g10/g10.c:2596
msgid "invalid personal digest preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ������������\n"
-#: g10/g10.c:1884
-#, fuzzy
+#: g10/g10.c:2600
msgid "invalid personal compress preferences\n"
-msgstr "̵����ͥ����\n"
+msgstr "̵���ʸĿ��Ѱ��̤�����\n"
+
+#: g10/g10.c:2633
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
+
+#: g10/g10.c:2680
+#, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2685
+#, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2690
+#, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/g10.c:1977
+#: g10/g10.c:2778
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:1987
+#: g10/g10.c:2789
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr ""
+msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
-#: g10/g10.c:1997
+#: g10/g10.c:2800
msgid "--store [filename]"
msgstr "--store [�ե�����̾]"
-#: g10/g10.c:2004
+#: g10/g10.c:2807
msgid "--symmetric [filename]"
msgstr "--symmetric [�ե�����̾]"
-#: g10/g10.c:2012
+#: g10/g10.c:2819
msgid "--encrypt [filename]"
msgstr "--encrypt [�ե�����̾]"
-#: g10/g10.c:2029
+#: g10/g10.c:2832
+#, fuzzy
+msgid "--symmetric --encrypt [filename]"
+msgstr "--sign --encrypt [�ե�����̾]"
+
+#: g10/g10.c:2834
+msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2837
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --encrypt while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2855
msgid "--sign [filename]"
msgstr "--sign [�ե�����̾]"
-#: g10/g10.c:2042
+#: g10/g10.c:2868
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ե�����̾]"
-#: g10/g10.c:2056
+#: g10/g10.c:2883
+#, fuzzy
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--sign --encrypt [�ե�����̾]"
+
+#: g10/g10.c:2885
+msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
+msgstr ""
+
+#: g10/g10.c:2888
+#, fuzzy, c-format
+msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/g10.c:2908
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ե�����̾]"
-#: g10/g10.c:2065
+#: g10/g10.c:2917
msgid "--clearsign [filename]"
msgstr "--clearsign [�ե�����̾]"
-#: g10/g10.c:2083
+#: g10/g10.c:2942
msgid "--decrypt [filename]"
msgstr "--decrypt [�ե�����̾]"
-#: g10/g10.c:2094
+#: g10/g10.c:2950
msgid "--sign-key user-id"
msgstr "--sign-key �桼����id"
-#: g10/g10.c:2102
+#: g10/g10.c:2954
msgid "--lsign-key user-id"
msgstr "--lsign-key �桼����id"
-#: g10/g10.c:2110
+#: g10/g10.c:2958
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �桼����id"
-#: g10/g10.c:2118
+#: g10/g10.c:2962
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �桼����id"
-#: g10/g10.c:2126
+#: g10/g10.c:2986
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �桼����id [���ޥ��]"
-#: g10/encode.c:416 g10/g10.c:2182 g10/sign.c:789
+#: g10/g10.c:3042 g10/encode.c:474 g10/sign.c:891
#, c-format
msgid "can't open %s: %s\n"
msgstr "%s�������ޤ���: %s\n"
-#: g10/g10.c:2197
+#: g10/g10.c:3057
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�桼����id] [����]"
-#: g10/g10.c:2289
+#: g10/g10.c:3094
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3096
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3098
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3109
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3119
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
+
+#: g10/g10.c:3160
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "��������˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:2297
+#: g10/g10.c:3168
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/g10.c:2384
+#: g10/g10.c:3255
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
-#: g10/g10.c:2470
+#: g10/g10.c:3378
msgid "[filename]"
msgstr "[�ե�����̾]"
-#: g10/g10.c:2474
+#: g10/g10.c:3382
msgid "Go ahead and type your message ...\n"
msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2477 g10/verify.c:94
-#: g10/verify.c:139
+#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95
+#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
-msgstr "`%s'�������ޤ���\n"
+msgstr "��%s�פ������ޤ���\n"
-#: g10/g10.c:2691
-#, fuzzy
+#: g10/g10.c:3659
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
-"����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
-"'='�ǽ����ʤ���Фʤ�ޤ���\n"
+"����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
+
+#: g10/g10.c:3668
+msgid "a user notation name must contain the '@' character\n"
+msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
-#: g10/g10.c:2700
+#: g10/g10.c:3678
msgid "a notation value must not use any control characters\n"
msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
-#: g10/g10.c:2737
+#: g10/g10.c:3712
msgid "the given certification policy URL is invalid\n"
msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/g10.c:2739
+#: g10/g10.c:3714
msgid "the given signature policy URL is invalid\n"
msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
-#: g10/armor.c:314
+#: g10/g10.c:3747
+#, fuzzy
+msgid "the given signature preferred keyserver URL is invalid\n"
+msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
+
+#: g10/gpgv.c:67
+msgid "be somewhat more quiet"
+msgstr "����Ť�"
+
+#: g10/gpgv.c:68
+msgid "take the keys from this keyring"
+msgstr "���θ����ؤ��������ޤ�"
+
+#: g10/gpgv.c:70
+msgid "make timestamp conflicts only a warning"
+msgstr "������̷���ٹ�����ˤ��ޤ�"
+
+#: g10/gpgv.c:71
+msgid "|FD|write status info to this FD"
+msgstr ""
+"|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
+"�񤭽Ф�"
+
+#: g10/gpgv.c:95
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "�Ȥ���: gpgv [���ץ����] [�ե�����] (�إ�פ� -h)"
+
+#: g10/gpgv.c:98
+msgid ""
+"Syntax: gpg [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"��ʸ: gpg [���ץ����] [�ե�����]\n"
+"���Ѥ������ǽ�̾�򸡺�\n"
+
+#: g10/armor.c:317
#, c-format
msgid "armor: %s\n"
msgstr "����: %s\n"
-#: g10/armor.c:343
+#: g10/armor.c:346
msgid "invalid armor header: "
msgstr "̵���������إå���: "
-#: g10/armor.c:350
+#: g10/armor.c:353
msgid "armor header: "
msgstr "�����إå���: "
-#: g10/armor.c:361
+#: g10/armor.c:364
msgid "invalid clearsig header\n"
msgstr "̵���ʥ��ꥢ��̾�إå���\n"
-#: g10/armor.c:413
+#: g10/armor.c:416
msgid "nested clear text signatures\n"
msgstr "����ҤΥ��ꥢ��̾\n"
-#: g10/armor.c:537
+#: g10/armor.c:553
msgid "invalid dash escaped line: "
msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
-#: g10/armor.c:549
+#: g10/armor.c:565
msgid "unexpected armor:"
msgstr "ͽ����������:"
-#: g10/armor.c:675 g10/armor.c:1242
+#: g10/armor.c:695 g10/armor.c:1276
#, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
-#: g10/armor.c:718
+#: g10/armor.c:738
msgid "premature eof (no CRC)\n"
msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
-#: g10/armor.c:752
+#: g10/armor.c:772
msgid "premature eof (in CRC)\n"
-msgstr "�ե������������᤹���ޤ� (CRC����ˤ���ޤ�)\n"
+msgstr "�ե������������᤹���ޤ� (CRC������)\n"
-#: g10/armor.c:756
+#: g10/armor.c:776
msgid "malformed CRC\n"
msgstr "CRC�ν񼰤�����������ޤ���\n"
-#: g10/armor.c:760 g10/armor.c:1279
+#: g10/armor.c:780 g10/armor.c:1313
#, c-format
msgid "CRC error; %06lx - %06lx\n"
msgstr "CRC���顼��%06lx - %06lx\n"
-#: g10/armor.c:780
+#: g10/armor.c:800
msgid "premature eof (in Trailer)\n"
msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
-#: g10/armor.c:784
+#: g10/armor.c:804
msgid "error in trailer line\n"
msgstr "�����ιԤ˥��顼������ޤ�\n"
-#: g10/armor.c:1057
+#: g10/armor.c:1091
msgid "no valid OpenPGP data found.\n"
msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
-#: g10/armor.c:1062
+#: g10/armor.c:1096
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
-#: g10/armor.c:1066
+#: g10/armor.c:1100
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"��������� quoted printable ʸ��������ޤ��������餯�Х��Τ���\n"
"MTA����Ѥ����ΤǤ��礦\n"
-#: g10/pkclist.c:61
+#: g10/pkclist.c:61 g10/revoke.c:576
msgid "No reason specified"
msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
-#: g10/pkclist.c:63
+#: g10/pkclist.c:63 g10/revoke.c:578
msgid "Key is superseded"
msgstr "�����Ȥ꤫��äƤ��ޤ�"
-#: g10/pkclist.c:65
+#: g10/pkclist.c:65 g10/revoke.c:577
msgid "Key has been compromised"
msgstr "�����ѥ����ޤ���"
-#: g10/pkclist.c:67
+#: g10/pkclist.c:67 g10/revoke.c:579
msgid "Key is no longer used"
msgstr "���Ϥ⤦�Ȥ��Ƥ��ޤ���"
-#: g10/pkclist.c:69
+#: g10/pkclist.c:69 g10/revoke.c:580
msgid "User ID is no longer valid"
msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
#: g10/pkclist.c:73
-#, fuzzy
msgid "reason for revocation: "
-msgstr "�˴���ͳ: "
+msgstr "������ͳ: "
#: g10/pkclist.c:90
-#, fuzzy
msgid "revocation comment: "
-msgstr "Ŭ��: "
+msgstr "������Ŭ��: "
-#. a string with valid answers
-#: g10/pkclist.c:252
+#: g10/pkclist.c:195
msgid "iImMqQsS"
msgstr "iImMqQsS"
-#: g10/pkclist.c:258
-#, c-format
-msgid ""
-"No trust value assigned to:\n"
-"%4u%c/%08lX %s \""
+#: g10/pkclist.c:203
+#, fuzzy
+msgid "No trust value assigned to:\n"
msgstr ""
"�����٤����ꤵ��Ƥ��ޤ���:\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:270
+#: g10/pkclist.c:207
+#, fuzzy
+msgid " \""
+msgstr " ��̾ \""
+
+#: g10/pkclist.c:234
+#, fuzzy
+msgid " aka \""
+msgstr " ��̾ \""
+
+#: g10/pkclist.c:246 g10/keyedit.c:311
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1265,188 +1301,208 @@ msgid ""
"\n"
msgstr ""
"¾�Υ桼�����θ������������ڤ��뤿��ˡ����Υ桼�����ο����٤����\n"
-"��������(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������Ⱦȹ礷����...)?\n"
+"��������(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺�������...)?\n"
"\n"
-#: g10/pkclist.c:273
-#, c-format
-msgid " %d = Don't know\n"
+#: g10/pkclist.c:250
+#, fuzzy, c-format
+msgid " %d = I don't know or won't say\n"
msgstr " %d = ̤��\n"
-#: g10/pkclist.c:274
+#: g10/pkclist.c:252
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = ���Ѥ� �ʤ�\n"
-#: g10/pkclist.c:275
+#: g10/pkclist.c:254
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = �������ٿ��Ѥ���\n"
-#: g10/pkclist.c:276
+#: g10/pkclist.c:256
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = �����˿��Ѥ���\n"
-#: g10/pkclist.c:278
+#: g10/pkclist.c:258
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = ����Ū�˿��Ѥ���\n"
-#. not yet implemented
-#: g10/pkclist.c:281
+#: g10/pkclist.c:261
msgid " i = please show me more information\n"
-msgstr " i = ���ܤ�������򸫤�\n"
+msgstr " i = ���ܤ��������ɽ������\n"
-#: g10/pkclist.c:284
+#: g10/pkclist.c:264
msgid " m = back to the main menu\n"
msgstr " m = �᡼�󡦥�˥塼�����\n"
-#: g10/pkclist.c:287
+#: g10/pkclist.c:267
msgid " s = skip this key\n"
msgstr " s = ���θ��ϤȤФ�\n"
-#: g10/pkclist.c:288
+#: g10/pkclist.c:268
msgid " q = quit\n"
msgstr " q = ��λ\n"
-#: g10/pkclist.c:295
+#: g10/pkclist.c:272
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+
+#: g10/pkclist.c:278 g10/revoke.c:605
msgid "Your decision? "
msgstr "���ʤ��η����? "
-#: g10/pkclist.c:316
+#: g10/pkclist.c:299
msgid "Do you really want to set this key to ultimate trust? "
msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? "
-#: g10/pkclist.c:330
+#: g10/pkclist.c:313
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
-#: g10/pkclist.c:405
+#: g10/pkclist.c:387
#, c-format
msgid "key %08lX: key has been revoked!\n"
-msgstr "��%08lX: �����˴��ѤߤǤ�!\n"
+msgstr "��%08lX: ���ϼ����ѤߤǤ�!\n"
-#: g10/pkclist.c:412 g10/pkclist.c:424 g10/pkclist.c:518
+#: g10/pkclist.c:394 g10/pkclist.c:406 g10/pkclist.c:505
msgid "Use this key anyway? "
msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? "
-#: g10/pkclist.c:417
+#: g10/pkclist.c:399
#, c-format
msgid "key %08lX: subkey has been revoked!\n"
-msgstr "��%08lX: �������˴��ѤߤǤ�!\n"
+msgstr "��%08lX: �����ϼ����ѤߤǤ�!\n"
-#: g10/pkclist.c:438
+#: g10/pkclist.c:420
#, c-format
msgid "%08lX: key has expired\n"
msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n"
-#: g10/pkclist.c:448
-#, c-format
-msgid ""
-"%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: ���θ����ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
+#: g10/pkclist.c:430
+#, fuzzy, c-format
+msgid "%08lX: There is no assurance this key belongs to the named user\n"
+msgstr "%08lX: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
-#: g10/pkclist.c:454
+#: g10/pkclist.c:436
#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX: ���θ��Ͽ��ѤǤ��� ����\n"
-#: g10/pkclist.c:460
-#, c-format
-msgid ""
-"%08lX: It is not sure that this key really belongs to the owner\n"
-"but it is accepted anyway\n"
-msgstr ""
-"%08lX: ���θ��ϼºݤ��ܿͤΤ�Τ��������Ǥ�����\n"
-"���������������ޤ�\n"
+#: g10/pkclist.c:441
+#, fuzzy, c-format
+msgid "%08lX: There is limited assurance this key belongs to the named user\n"
+msgstr "%08lX: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
-#: g10/pkclist.c:466
-msgid "This key probably belongs to the owner\n"
+#: g10/pkclist.c:447
+#, fuzzy
+msgid "This key probably belongs to the named user\n"
msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
-#: g10/pkclist.c:471
+#: g10/pkclist.c:452
msgid "This key belongs to us\n"
-msgstr "���θ��ϲ桹�Τ�ΤǤ�\n"
+msgstr "���θ��ϼ�ʬ�Τ�ΤǤ�\n"
-#: g10/pkclist.c:513
-#, fuzzy
+#: g10/pkclist.c:500
msgid ""
"It is NOT certain that the key belongs to the person named\n"
"in the user ID. If you *really* know what you are doing,\n"
"you may answer the next question with yes\n"
"\n"
msgstr ""
-"���θ����ܿͤΤ�Τ��ɤ����ο��Ǥ��� ����\n"
-"������Ԥ����Ȥ� *�μ¤�* ���򤷤Ƥ��ʤ����ˤϡ�\n"
+"���θ��ϡ����Υ桼����ID��ʤΤ��ܿͤΤ�Τ��ɤ����ο��Ǥ���\n"
+"���󡣺�����Ԥ����Ȥ� *�μ¤�* ���򤷤Ƥ��ʤ����ˤϡ�\n"
"���μ���ˤ�no�������Ƥ���������\n"
"\n"
-#: g10/pkclist.c:527 g10/pkclist.c:549
+#: g10/pkclist.c:514 g10/pkclist.c:544
msgid "WARNING: Using untrusted key!\n"
msgstr "�ٹ�: ���ѤǤ��ʤ������Ѥ��Ƥ��ޤ�!\n"
-#: g10/pkclist.c:568
+#: g10/pkclist.c:551
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
+
+#: g10/pkclist.c:560
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+
+#: g10/pkclist.c:563
msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
-#: g10/pkclist.c:569
+#: g10/pkclist.c:564
msgid " This could mean that the signature is forgery.\n"
msgstr " ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
-#: g10/pkclist.c:575
+#: g10/pkclist.c:570
msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "�ٹ�: �����������ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
+msgstr "�ٹ�: �����������ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
-#: g10/pkclist.c:580
+#: g10/pkclist.c:575
msgid "Note: This key has been disabled.\n"
msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
-#: g10/pkclist.c:585
+#: g10/pkclist.c:580
msgid "Note: This key has expired!\n"
msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
-#: g10/pkclist.c:596
+#: g10/pkclist.c:591
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
-#: g10/pkclist.c:598
+#: g10/pkclist.c:593
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
-#: g10/pkclist.c:606
+#: g10/pkclist.c:601
msgid "WARNING: We do NOT trust this key!\n"
msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
-#: g10/pkclist.c:607
+#: g10/pkclist.c:602
msgid " The signature is probably a FORGERY.\n"
msgstr " ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
-#: g10/pkclist.c:615
+#: g10/pkclist.c:610
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
-#: g10/pkclist.c:617
+#: g10/pkclist.c:612
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
-#: g10/pkclist.c:770 g10/pkclist.c:794 g10/pkclist.c:946 g10/pkclist.c:1006
+#: g10/pkclist.c:764 g10/pkclist.c:800 g10/encode.c:791
+#, c-format
+msgid "you may not use %s while in %s mode\n"
+msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+
+#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: �����å�: %s\n"
-#: g10/pkclist.c:780 g10/pkclist.c:978
+#: g10/pkclist.c:787 g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
-#: g10/pkclist.c:811
+#: g10/pkclist.c:829
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
-#: g10/pkclist.c:824
+#: g10/pkclist.c:845
+msgid "Current recipients:\n"
+msgstr ""
+
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1454,130 +1510,126 @@ msgstr ""
"\n"
"�桼����ID�����ϡ����Ԥǽ�λ: "
-#: g10/pkclist.c:840
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/pkclist.c:845 g10/pkclist.c:921
+#: g10/pkclist.c:892 g10/pkclist.c:954
msgid "skipped: public key already set as default recipient\n"
-msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
+msgstr "�����å�: �������ϴ���μ���ͤȤ�������ѤߤǤ�\n"
-#: g10/pkclist.c:863
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "�������ϻ��ѶػߤǤ���\n"
-#: g10/pkclist.c:870
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "�����å�: ������������ѤߤǤ�\n"
-#: g10/pkclist.c:913
+#: g10/pkclist.c:946
#, c-format
msgid "unknown default recipient `%s'\n"
-msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
+msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
-#: g10/pkclist.c:958
+#: g10/pkclist.c:991
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
-#: g10/pkclist.c:1013
+#: g10/pkclist.c:1046
msgid "no valid addressees\n"
msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
-#: g10/keygen.c:182
-#, c-format
-msgid "preference %c%lu is not valid\n"
-msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
-
-#: g10/keygen.c:189
-#, c-format
-msgid "preference %c%lu duplicated\n"
+#: g10/keygen.c:207
+#, fuzzy, c-format
+msgid "preference `%s' duplicated\n"
msgstr "����%c%lu�ν�ʣ\n"
-#: g10/keygen.c:194
-#, c-format
-msgid "too many `%c' preferences\n"
-msgstr "¿������`%c'����\n"
+#: g10/keygen.c:214
+#, fuzzy
+msgid "too many cipher preferences\n"
+msgstr "¿�������%c������\n"
-#: g10/keygen.c:264
-msgid "invalid character in preference string\n"
-msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+#: g10/keygen.c:216
+#, fuzzy
+msgid "too many digest preferences\n"
+msgstr "¿�������%c������\n"
-#: g10/keygen.c:524
+#: g10/keygen.c:218
#, fuzzy
+msgid "too many compression preferences\n"
+msgstr "¿�������%c������\n"
+
+#: g10/keygen.c:315
+#, fuzzy, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+
+#: g10/keygen.c:738
msgid "writing direct signature\n"
-msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
+msgstr "ľ�ܽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:563
+#: g10/keygen.c:777
msgid "writing self signature\n"
msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:607
+#: g10/keygen.c:823
msgid "writing key binding signature\n"
-msgstr "��̾���б����븰��񤭹��ߤޤ�\n"
+msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
-#: g10/keygen.c:661 g10/keygen.c:745 g10/keygen.c:836
+#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
-#: g10/keygen.c:666 g10/keygen.c:750 g10/keygen.c:841
+#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:941
+#: g10/keygen.c:1165
msgid "Please select what kind of key you want:\n"
msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
-#: g10/keygen.c:943
-#, c-format
-msgid " (%d) DSA and ElGamal (default)\n"
+#: g10/keygen.c:1167
+#, fuzzy, c-format
+msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA��ElGamal (����)\n"
-#: g10/keygen.c:944
+#: g10/keygen.c:1168
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (��̾�Τ�)\n"
-#: g10/keygen.c:946
-#, c-format
-msgid " (%d) ElGamal (encrypt only)\n"
+#: g10/keygen.c:1170
+#, fuzzy, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (�Ź沽�Τ�)\n"
-#: g10/keygen.c:948
-#, c-format
-msgid " (%d) ElGamal (sign and encrypt)\n"
-msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
-
-#: g10/keygen.c:949
+#: g10/keygen.c:1171
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (��̾�Τ�)\n"
-#: g10/keygen.c:951
+#: g10/keygen.c:1173
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�Ź沽�Τ�)\n"
-#: g10/keygen.c:953
-#, fuzzy, c-format
+#: g10/keygen.c:1175
+#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
-msgstr " (%d) ElGamal (��̾�ȰŹ沽)\n"
+msgstr " (%d) RSA (��̾�ȰŹ沽)\n"
-#: g10/keyedit.c:576 g10/keygen.c:956
+#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355
msgid "Your selection? "
msgstr "�ɤ�ˤ��ޤ���? "
-#: g10/keygen.c:966 g10/keygen.c:984
-msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr "���Υ��르�ꥺ���ȿ�Ф���Ƥ��ޤ� - ����Ǥ���ޤ���? "
-
-#: g10/keyedit.c:589 g10/keygen.c:998
+#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638
msgid "Invalid selection.\n"
msgstr "̵��������Ǥ���\n"
-#: g10/keygen.c:1011
+#: g10/keygen.c:1225
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1590,36 +1642,28 @@ msgstr ""
" ����θ�Ĺ�� 1024 �ӥå�\n"
" ����ο侩��Ĺ�� 2048 �ӥå�\n"
-#: g10/keygen.c:1020
+#: g10/keygen.c:1234
msgid "What keysize do you want? (1024) "
msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
-#: g10/keygen.c:1025
+#: g10/keygen.c:1239
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
-#: g10/keygen.c:1027
+#: g10/keygen.c:1241
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
-#: g10/keygen.c:1030
+#: g10/keygen.c:1244
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
-#. It is ridiculous and an annoyance to use larger key sizes!
-#. * GnuPG can handle much larger sizes; but it takes an eternity
-#. * to create such a key (but less than the time the Sirius
-#. * Computer Corporation needs to process one of the usual
-#. * complaints) and {de,en}cryption although needs some time.
-#. * 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:1041
+#: g10/keygen.c:1255
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
-#: g10/keygen.c:1046
+#: g10/keygen.c:1260
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1627,11 +1671,11 @@ msgstr ""
"2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
"�侩���ޤ���!\n"
-#: g10/keygen.c:1049
+#: g10/keygen.c:1263
msgid "Are you sure that you want this keysize? "
msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
-#: g10/keygen.c:1050
+#: g10/keygen.c:1264
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
@@ -1639,17 +1683,17 @@ msgstr ""
"�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
"����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
-#: g10/keygen.c:1059
+#: g10/keygen.c:1273
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
-#: g10/keygen.c:1062 g10/keygen.c:1066
+#: g10/keygen.c:1276 g10/keygen.c:1280
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
-#: g10/keygen.c:1117
+#: g10/keygen.c:1331
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1658,14 +1702,14 @@ msgid ""
" <n>m = key expires in n months\n"
" <n>y = key expires in n years\n"
msgstr ""
-"���δ��¤���Ƥ���������\n"
+"����ͭ�����¤���Ƥ���������\n"
" 0 = ̵����\n"
" <n> = ͭ������ n ����\n"
" <n>w = ͭ������ n ����\n"
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:1126
+#: g10/keygen.c:1340
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1674,37 +1718,36 @@ msgid ""
" <n>m = signature expires in n months\n"
" <n>y = signature expires in n years\n"
msgstr ""
-"��̾�δ��¤���Ƥ���������\n"
+"��̾��ͭ�����¤���Ƥ���������\n"
" 0 = ̵����\n"
" <n> = ͭ������ n ����\n"
" <n>w = ͭ������ n ����\n"
" <n>m = ͭ������ n �����\n"
" <n>y = ͭ������ n ǯ��\n"
-#: g10/keygen.c:1148
+#: g10/keygen.c:1362
msgid "Key is valid for? (0) "
msgstr "����ͭ�����֤�? (0)"
-#: g10/keygen.c:1150
+#: g10/keygen.c:1364
msgid "Signature is valid for? (0) "
msgstr "��̾��ͭ�����֤�? (0)"
-#: g10/keygen.c:1155
+#: g10/keygen.c:1369
msgid "invalid value\n"
msgstr "̵������\n"
-#: g10/keygen.c:1160
+#: g10/keygen.c:1374
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s��̵���¤Ǥ�\n"
-#. print the date when the key expires
-#: g10/keygen.c:1167
+#: g10/keygen.c:1381
#, c-format
msgid "%s expires at %s\n"
msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1387
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1712,11 +1755,11 @@ msgstr ""
"���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
"2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
-#: g10/keygen.c:1178
+#: g10/keygen.c:1392
msgid "Is this correct (y/n)? "
msgstr "����Ǥ����Ǥ��� (y/n)? "
-#: g10/keygen.c:1221
+#: g10/keygen.c:1435
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1732,75 +1775,75 @@ msgstr ""
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
-#: g10/keygen.c:1233
+#: g10/keygen.c:1447
msgid "Real name: "
msgstr "��̾: "
-#: g10/keygen.c:1241
+#: g10/keygen.c:1455
msgid "Invalid character in name\n"
msgstr "̾����̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1243
+#: g10/keygen.c:1457
msgid "Name may not start with a digit\n"
msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
-#: g10/keygen.c:1245
+#: g10/keygen.c:1459
msgid "Name must be at least 5 characters long\n"
msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
-#: g10/keygen.c:1253
+#: g10/keygen.c:1467
msgid "Email address: "
msgstr "�Żҥ᡼�롦���ɥ쥹: "
-#: g10/keygen.c:1264
+#: g10/keygen.c:1478
msgid "Not a valid email address\n"
msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
-#: g10/keygen.c:1272
+#: g10/keygen.c:1486
msgid "Comment: "
msgstr "������: "
-#: g10/keygen.c:1278
+#: g10/keygen.c:1492
msgid "Invalid character in comment\n"
msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
-#: g10/keygen.c:1301
+#: g10/keygen.c:1515
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
-#: g10/keygen.c:1307
+#: g10/keygen.c:1521
#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"���Υ桼����ID�����ꤷ�ޤ���:\n"
+"���Υ桼����ID�����򤷤ޤ���:\n"
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1311
+#: g10/keygen.c:1526
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
-#: g10/keygen.c:1316
+#: g10/keygen.c:1531
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1326
+#: g10/keygen.c:1541
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
-#: g10/keygen.c:1327
+#: g10/keygen.c:1542
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
-#: g10/keygen.c:1346
+#: g10/keygen.c:1561
msgid "Please correct the error first\n"
msgstr "�ޤ����顼�������Ƥ�������\n"
-#: g10/keygen.c:1385
+#: g10/keygen.c:1600
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1808,16 +1851,16 @@ msgstr ""
"��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
"\n"
-#: g10/keyedit.c:787 g10/keygen.c:1393
+#: g10/keygen.c:1609 g10/keyedit.c:1021
msgid "passphrase not correctly repeated; try again"
msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
-#: g10/keygen.c:1394
+#: g10/keygen.c:1610
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1400
+#: g10/keygen.c:1616
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"
@@ -1829,7 +1872,7 @@ msgstr ""
"�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
"\n"
-#: g10/keygen.c:1421
+#: g10/keygen.c:1638
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"
@@ -1840,53 +1883,58 @@ msgstr ""
"�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
-#: g10/keygen.c:1985
+#: g10/keygen.c:2206 g10/revoke.c:215 g10/revoke.c:415
+msgid "sorry, can't do this in batch mode\n"
+msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
+
+#: g10/keygen.c:2267
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-#: g10/keygen.c:2039
+#: g10/keygen.c:2335
msgid "Key generation canceled.\n"
msgstr "������������ߤ���ޤ�����\n"
-#: g10/keygen.c:2128 g10/keygen.c:2216
+#: g10/keygen.c:2451 g10/keygen.c:2576
#, c-format
msgid "writing public key to `%s'\n"
-msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
+msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
+
+#: g10/keygen.c:2453 g10/keygen.c:2579
+#, fuzzy, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:2129 g10/keygen.c:2218
+#: g10/keygen.c:2456 g10/keygen.c:2582
#, c-format
msgid "writing secret key to `%s'\n"
-msgstr "`%s'����̩����񤭹��ߤޤ�\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
-#: g10/keygen.c:2205
+#: g10/keygen.c:2565
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2211
+#: g10/keygen.c:2571
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
-#: g10/keygen.c:2225
+#: g10/keygen.c:2589
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "��������`%s'�ν���ߥ��顼: %s\n"
-#: g10/keygen.c:2232
+#: g10/keygen.c:2596
#, c-format
msgid "error writing secret keyring `%s': %s\n"
-msgstr "��̩����`%s'�ν���ߥ��顼: %s\n"
+msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/keygen.c:2252
+#: g10/keygen.c:2619
msgid "public and secret key created and signed.\n"
msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
-#: g10/keygen.c:2253
-msgid "key marked as ultimately trusted.\n"
-msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
-
-#: g10/keygen.c:2264
+#: g10/keygen.c:2630
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"
@@ -1894,563 +1942,640 @@ msgstr ""
"���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
"��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
-#: g10/keygen.c:2276 g10/keygen.c:2384
+#: g10/keygen.c:2642 g10/keygen.c:2755
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���������˼��Ԥ��ޤ���: %s\n"
-#: g10/keygen.c:2320 g10/sign.c:257
+#: g10/keygen.c:2691 g10/sign.c:290
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2322 g10/sign.c:259
+#: g10/keygen.c:2693 g10/sign.c:292
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/keygen.c:2331
+#: g10/keygen.c:2702
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
-#: g10/keygen.c:2360
+#: g10/keygen.c:2730
msgid "Really create? "
msgstr "�����˺��ޤ���? "
-#: g10/decrypt.c:92 g10/encode.c:762
+#: g10/decrypt.c:98 g10/encode.c:845
msgid "--output doesn't work for this command\n"
msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
-#: g10/encode.c:177 g10/openfile.c:180 g10/openfile.c:301 g10/tdbio.c:496
-#: g10/tdbio.c:557
+#: g10/encode.c:174 g10/tdbio.c:534 g10/tdbio.c:595 g10/openfile.c:179
+#: g10/openfile.c:313
#, c-format
msgid "%s: can't open: %s\n"
msgstr "%s: �����ޤ���: %s\n"
-#: g10/encode.c:205 g10/sign.c:1035
+#: g10/encode.c:203 g10/sign.c:1144
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "�ѥ��ե졼���κ������顼: %s\n"
-#: g10/encode.c:210
+#: g10/encode.c:208
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
+msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
+
+#: g10/encode.c:221
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/encode.c:229 g10/encode.c:486
+#: g10/encode.c:231 g10/encode.c:544
#, c-format
msgid "`%s' already compressed\n"
msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
-#: g10/encode.c:295 g10/encode.c:520
+#: g10/encode.c:301 g10/encode.c:590
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
-#: g10/encode.c:406
+#: g10/encode.c:465
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:422
+#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
msgstr "`%s'�����ɤ߹��ߤޤ�\n"
-#: g10/encode.c:456
+#: g10/encode.c:516
msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
-#: g10/encode.c:467 g10/encode.c:644
+#: g10/encode.c:526 g10/encode.c:721
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr ""
+msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/encode.c:558 g10/sign.c:758
-#, fuzzy, c-format
+#: g10/encode.c:634 g10/sign.c:863
+#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
-msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
-
-#: g10/encode.c:703
-#, fuzzy, c-format
-msgid "you may not use %s while in %s mode\n"
-msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/encode.c:735
-#, fuzzy, c-format
+#: g10/encode.c:818
+#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s�Ź沽 ������: %s\n"
+msgstr "%s/%s�Ź沽 ������: \"%s\"\n"
-#: g10/delkey.c:73 g10/export.c:190 g10/keyedit.c:2289
+#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225
#, c-format
msgid "key `%s' not found: %s\n"
-msgstr "��`%s'�����Ĥ���ޤ���: %s\n"
+msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
-#: g10/delkey.c:81 g10/export.c:213
+#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
-#: g10/export.c:222
-#, c-format
-msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
-
-#: g10/export.c:238
-#, c-format
-msgid "key %08lX: not protected - skipped\n"
+#: g10/export.c:198
+#, fuzzy, c-format
+msgid "key %s: not protected - skipped\n"
msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
-#: g10/export.c:246
-#, c-format
-msgid "key %08lX: PGP 2.x style key - skipped\n"
+#: g10/export.c:206
+#, fuzzy, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
-#: g10/export.c:347
+#: g10/export.c:353
+#, fuzzy, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "�ٹ�: ��̩��%08lX�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
+
+#: g10/export.c:385
msgid "WARNING: nothing exported\n"
msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
-#: g10/getkey.c:151
+#: g10/getkey.c:150
msgid "too many entries in pk cache - disabled\n"
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:2393
+#: g10/getkey.c:186 g10/getkey.c:2693
msgid "[User id not found]"
msgstr "[�桼����id�����Ĥ���ޤ���]"
-#: g10/getkey.c:1438
-#, c-format
-msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
+#: g10/getkey.c:1614
+#, fuzzy, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
-#: g10/getkey.c:2109
-#, c-format
-msgid "using secondary key %08lX instead of primary key %08lX\n"
+#: g10/getkey.c:2169
+#, fuzzy, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "��������%08lX�ˤ���������̩����������ޤ��� - ̵��\n"
+
+#: g10/getkey.c:2400
+#, fuzzy, c-format
+msgid "using secondary key %s instead of primary key %s\n"
msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
-#: g10/getkey.c:2156
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
+#: g10/getkey.c:2447
+#, fuzzy, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "��%08lX: �������Τʤ���̩���Ǥ� - �����å�\n"
-#: g10/import.c:258
+#: g10/import.c:241
#, c-format
msgid "skipping block of type %d\n"
msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
-#: g10/import.c:267
-#, c-format
-msgid "%lu keys so far processed\n"
+#: g10/import.c:250
+#, fuzzy, c-format
+msgid "%lu keys processed so far\n"
msgstr "%lu���ޤǽ���\n"
-#: g10/import.c:272
+#: g10/import.c:255
#, c-format
msgid "error reading `%s': %s\n"
msgstr "`%s'���ɹ��ߥ��顼: %s\n"
-#: g10/import.c:284
+#: g10/import.c:267
#, c-format
msgid "Total number processed: %lu\n"
msgstr " ��������: %lu\n"
-#: g10/import.c:286
+#: g10/import.c:269
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �����åפ�����������: %lu\n"
-#: g10/import.c:289
+#: g10/import.c:272
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �桼����ID�ʤ�: %lu\n"
-#: g10/import.c:291
+#: g10/import.c:274
#, c-format
msgid " imported: %lu"
msgstr " �ɹ���: %lu"
-#: g10/import.c:297
+#: g10/import.c:280
#, c-format
msgid " unchanged: %lu\n"
msgstr " �ѹ��ʤ�: %lu\n"
-#: g10/import.c:299
+#: g10/import.c:282
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �������桼����ID: %lu\n"
-#: g10/import.c:301
+#: g10/import.c:284
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ����������: %lu\n"
-#: g10/import.c:303
+#: g10/import.c:286
#, c-format
msgid " new signatures: %lu\n"
msgstr " ��������̾: %lu\n"
-#: g10/import.c:305
+#: g10/import.c:288
#, c-format
msgid " new key revocations: %lu\n"
-msgstr " �����������˴�: %lu\n"
+msgstr " �����������: %lu\n"
-#: g10/import.c:307
+#: g10/import.c:290
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��̩�����ɽФ�: %lu\n"
-#: g10/import.c:309
+#: g10/import.c:292
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ��̩�����ɹ���: %lu\n"
-#: g10/import.c:311
+#: g10/import.c:294
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ̵�ѹ�����̩��: %lu\n"
-#: g10/import.c:313
-#, fuzzy, c-format
+#: g10/import.c:296
+#, c-format
msgid " not imported: %lu\n"
-msgstr " �ɹ���: %lu"
+msgstr " ̤�ɹ���: %lu\n"
-#: g10/import.c:581 g10/import.c:830
+#: g10/import.c:537
#, c-format
-msgid "key %08lX: no user ID\n"
-msgstr "��%08lX: �桼����ID������ޤ���\n"
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr ""
+
+#: g10/import.c:539
+#, fuzzy
+msgid "algorithms on these user IDs:\n"
+msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/import.c:597
+#: g10/import.c:576
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:588
#, fuzzy, c-format
-msgid "key %08lX: HKP subkey corruption repaired\n"
-msgstr "��%08lX: �����б���������������ޤ���\n"
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
-#: g10/import.c:612
+#: g10/import.c:600
#, c-format
-msgid "key %08lX: accepted non self-signed user ID '%s'\n"
-msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr ""
+
+#: g10/import.c:613
+msgid "it is strongly suggested that you update your preferences and\n"
+msgstr ""
-#: g10/import.c:619
+#: g10/import.c:615
+msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
+msgstr ""
+
+#: g10/import.c:639
#, c-format
-msgid "key %08lX: no valid user IDs\n"
-msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
+msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
+msgstr ""
+
+#: g10/import.c:687 g10/import.c:1041
+#, fuzzy, c-format
+msgid "key %s: no user ID\n"
+msgstr "��%08lX: �桼����ID������ޤ���\n"
+
+#: g10/import.c:707
+#, fuzzy, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "��%08lX: HKP��������¤����\n"
-#: g10/import.c:621
+#: g10/import.c:722
+#, fuzzy, c-format
+msgid "key %s: accepted non self-signed user ID '%s'\n"
+msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
+
+#: g10/import.c:728
+#, fuzzy, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "��%08lX: ͭ���ʥ桼����ID������ޤ���\n"
+
+#: g10/import.c:730
msgid "this may be caused by a missing self-signature\n"
msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
-#: g10/import.c:631 g10/import.c:903
-#, c-format
-msgid "key %08lX: public key not found: %s\n"
+#: g10/import.c:740 g10/import.c:1151
+#, fuzzy, c-format
+msgid "key %s: public key not found: %s\n"
msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
-#: g10/import.c:636
-#, c-format
-msgid "key %08lX: new key - skipped\n"
+#: g10/import.c:746
+#, fuzzy, c-format
+msgid "key %s: new key - skipped\n"
msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
-#: g10/import.c:646
+#: g10/import.c:755
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
-#: g10/import.c:651 g10/openfile.c:244 g10/sign.c:670 g10/sign.c:897
+#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253
#, c-format
msgid "writing to `%s'\n"
-msgstr "`%s'�ؤν�Ф�\n"
+msgstr "��%s�פؤν�Ф�\n"
-#: g10/import.c:654 g10/import.c:731 g10/import.c:850 g10/import.c:963
+#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212
#, c-format
msgid "error writing keyring `%s': %s\n"
-msgstr "����`%s'�ν���ߥ��顼: %s\n"
+msgstr "���ء�%s�פν���ߥ��顼: %s\n"
-#: g10/import.c:663
+#: g10/import.c:785
#, fuzzy, c-format
-msgid "key %08lX: public key \"%s\" imported\n"
-msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "��%08lX: ��������%s�פ��ɤ߹��ߤޤ���\n"
-#: g10/import.c:685
-#, c-format
-msgid "key %08lX: doesn't match our copy\n"
+#: g10/import.c:809
+#, fuzzy, c-format
+msgid "key %s: doesn't match our copy\n"
msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
-#: g10/import.c:702 g10/import.c:920
-#, c-format
-msgid "key %08lX: can't locate original keyblock: %s\n"
+#: g10/import.c:826 g10/import.c:1169
+#, fuzzy, c-format
+msgid "key %s: can't locate original keyblock: %s\n"
msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
-#: g10/import.c:709 g10/import.c:926
-#, c-format
-msgid "key %08lX: can't read original keyblock: %s\n"
+#: g10/import.c:834 g10/import.c:1176
+#, fuzzy, c-format
+msgid "key %s: can't read original keyblock: %s\n"
msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
-#: g10/import.c:740
+#: g10/import.c:866
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new user ID\n"
-msgstr "��%08lX: �������桼����ID��1��\n"
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "��%08lX: ��%s�׿������桼����ID��1��\n"
-#: g10/import.c:743
+#: g10/import.c:869
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new user IDs\n"
-msgstr "��%08lX: �������桼����ID��%d��\n"
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "��%08lX: ��%s�׿������桼����ID��%d��\n"
-#: g10/import.c:746
+#: g10/import.c:872
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new signature\n"
-msgstr "��%08lX: ��������̾��1��\n"
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "��%08lX: ��%s�׿�������̾��1��\n"
-#: g10/import.c:749
+#: g10/import.c:875
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new signatures\n"
-msgstr "��%08lX: ��������̾��%d��\n"
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "��%08lX: ��%s�׿�������̾��%d��\n"
-#: g10/import.c:752
+#: g10/import.c:878
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" 1 new subkey\n"
-msgstr "��%08lX: ������������1��\n"
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "��%08lX: ��%s�׿�����������1��\n"
-#: g10/import.c:755
+#: g10/import.c:881
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "��%08lX: ��%s�׿�����������%d��\n"
+
+#: g10/import.c:902
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" %d new subkeys\n"
-msgstr "��%08lX: ������������%d��\n"
+msgid "key %s: \"%s\" not changed\n"
+msgstr "��%08lX: ��%s���ѹ��ʤ�\n"
-#: g10/import.c:774
+#: g10/import.c:1047
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" not changed\n"
-msgstr "��%08lX: �ѹ��ʤ�\n"
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "��%08lX: ̵���ʰŹ�%d����̩���Ǥ� - �����å�\n"
-#: g10/import.c:844
+#: g10/import.c:1064
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "�������̩���ؤ�����ޤ���: %s\n"
-#: g10/import.c:855
-#, c-format
-msgid "key %08lX: secret key imported\n"
+#: g10/import.c:1075
+#, fuzzy, c-format
+msgid "key %s: secret key imported\n"
msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
-#. we can't merge secret keys
-#: g10/import.c:861
-#, c-format
-msgid "key %08lX: already in secret keyring\n"
+#: g10/import.c:1104
+#, fuzzy, c-format
+msgid "key %s: already in secret keyring\n"
msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
-#: g10/import.c:868
-#, c-format
-msgid "key %08lX: secret key not found: %s\n"
+#: g10/import.c:1114
+#, fuzzy, c-format
+msgid "key %s: secret key not found: %s\n"
msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
-#: g10/import.c:897
-#, c-format
-msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
+#: g10/import.c:1144
+#, fuzzy, c-format
+msgid "key %s: no public key - can't apply revocation certificate\n"
+msgstr "��%08lX: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
-#: g10/import.c:937
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
+#: g10/import.c:1187
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - ����\n"
-#: g10/import.c:969
+#: g10/import.c:1219
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate imported\n"
-msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "��%08lX: ��%s�׼�����������ɤ߹��ߤޤ���\n"
-#: g10/import.c:1017
-#, c-format
-msgid "key %08lX: no user ID for signature\n"
+#: g10/import.c:1284
+#, fuzzy, c-format
+msgid "key %s: no user ID for signature\n"
msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
-#: g10/import.c:1030
-#, c-format
-msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
-msgstr ""
-"��%08lX: �桼����id \"%s\" �Υ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+#: g10/import.c:1299
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id��%s�פΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1032
-#, c-format
-msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+#: g10/import.c:1301
+#, fuzzy, c-format
+msgid "key %s: invalid self-signature on user id \"%s\"\n"
+msgstr "��%08lX: �桼����id��%s�פμ��ʽ�̾����̵���Ǥ�\n"
-#: g10/import.c:1047
-#, c-format
-msgid "key %08lX: no subkey for key binding\n"
+#: g10/import.c:1319
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
msgstr "��%08lX: �����б���������������ޤ���\n"
-#: g10/import.c:1055 g10/import.c:1096
-#, c-format
-msgid "key %08lX: unsupported public key algorithm\n"
+#: g10/import.c:1330 g10/import.c:1380
+#, fuzzy, c-format
+msgid "key %s: unsupported public key algorithm\n"
msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
-#: g10/import.c:1056
-#, c-format
-msgid "key %08lX: invalid subkey binding\n"
+#: g10/import.c:1332
+#, fuzzy, c-format
+msgid "key %s: invalid subkey binding\n"
msgstr "��%08lX: ̵�����������б��Ǥ�\n"
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1068
+#: g10/import.c:1347
#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey binding\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "��%08lX: ¿���������б��������ޤ�\n"
-#: g10/import.c:1088
+#: g10/import.c:1369
#, fuzzy, c-format
-msgid "key %08lX: no subkey for key revocation\n"
-msgstr "��%08lX: �����б���������������ޤ���\n"
+msgid "key %s: no subkey for key revocation\n"
+msgstr "��%08lX: �������ˤ�����������������ޤ���\n"
-#: g10/import.c:1097
+#: g10/import.c:1382
#, fuzzy, c-format
-msgid "key %08lX: invalid subkey revocation\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: invalid subkey revocation\n"
+msgstr "��%08lX: ̵�������������Ǥ�\n"
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1108
+#: g10/import.c:1397
#, fuzzy, c-format
-msgid "key %08lX: removed multiple subkey revocation\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "��%08lX: ̵���������μ����������ޤ�\n"
-#: g10/import.c:1145
-#, c-format
-msgid "key %08lX: skipped user ID '"
+#: g10/import.c:1439
+#, fuzzy, c-format
+msgid "key %s: skipped user ID '%s'\n"
msgstr "��%08lX: �����åפ����桼����ID '"
-#: g10/import.c:1168
-#, c-format
-msgid "key %08lX: skipped subkey\n"
+#: g10/import.c:1460
+#, fuzzy, c-format
+msgid "key %s: skipped subkey\n"
msgstr "��%08lX: �����åפ�������\n"
-#. here we violate the rfc a bit by still allowing
-#. * 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:1194
-#, c-format
-msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: non exportable signature (class %02x) - skipped\n"
msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
-#: g10/import.c:1203
-#, c-format
-msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+#: g10/import.c:1497
+#, fuzzy, c-format
+msgid "key %s: revocation certificate at wrong place - skipped\n"
+msgstr "��%08lX: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
-#: g10/import.c:1220
-#, c-format
-msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
+#: g10/import.c:1514
+#, fuzzy, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "��%08lX: ̵���ʼ���������: %s - �����å�\n"
-#: g10/import.c:1232
+#: g10/import.c:1528
#, fuzzy, c-format
-msgid "key %08lX: subkey signature in wrong place - skipped\n"
-msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+msgid "key %s: subkey signature in wrong place - skipped\n"
+msgstr "��%08lX: ������̾�ξ�꤬�����äƤ��ޤ� - �����å�\n"
-#: g10/import.c:1330
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
+#: g10/import.c:1536
+#, fuzzy, c-format
+msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
+msgstr "��%08lX: ͽ�����̽�̾���饹 (0x%02X) - �����å�\n"
+
+#: g10/import.c:1636
+#, fuzzy, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
-#: g10/import.c:1389
+#: g10/import.c:1698
#, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX�ΰ����Ф�\n"
+msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX�ΰ����Ф�\n"
-#: g10/import.c:1403
+#: g10/import.c:1711
#, fuzzy, c-format
-msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
-msgstr "�ٹ�: ��%08lX���˴����줿�褦�Ǥ�: �˴���%08lX���Ժߡ�\n"
+msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
+msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
-#: g10/import.c:1460
+#: g10/import.c:1770
#, fuzzy, c-format
-msgid "key %08lX: \"%s\" revocation certificate added\n"
-msgstr "��%08lX: �˴���������ɲ�\n"
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "��%08lX: ��%s�׼�����������ɲ�\n"
-#: g10/import.c:1491
-#, c-format
-msgid "key %08lX: direct key signature added\n"
+#: g10/import.c:1804
+#, fuzzy, c-format
+msgid "key %s: direct key signature added\n"
msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
-#: g10/keyedit.c:147
+#: g10/keyedit.c:159
msgid "[revocation]"
-msgstr "[�˴�]"
+msgstr "[����]"
-#: g10/keyedit.c:148
+#: g10/keyedit.c:160
msgid "[self-signature]"
msgstr "[���ʽ�̾]"
-#: g10/keyedit.c:219 g10/keylist.c:148
+#: g10/keyedit.c:237 g10/keylist.c:319
msgid "1 bad signature\n"
msgstr "̵���ʽ�̾1��\n"
-#: g10/keyedit.c:221 g10/keylist.c:150
+#: g10/keyedit.c:239 g10/keylist.c:321
#, c-format
msgid "%d bad signatures\n"
msgstr "̵���ʽ�̾%d��\n"
-#: g10/keyedit.c:223 g10/keylist.c:152
+#: g10/keyedit.c:241 g10/keylist.c:323
msgid "1 signature not checked due to a missing key\n"
-msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:225 g10/keylist.c:154
+#: g10/keyedit.c:243 g10/keylist.c:325
#, c-format
msgid "%d signatures not checked due to missing keys\n"
-msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:227 g10/keylist.c:156
+#: g10/keyedit.c:245 g10/keylist.c:327
msgid "1 signature not checked due to an error\n"
-msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:229 g10/keylist.c:158
+#: g10/keyedit.c:247 g10/keylist.c:329
#, c-format
msgid "%d signatures not checked due to errors\n"
-msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
+msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
-#: g10/keyedit.c:231
+#: g10/keyedit.c:249
msgid "1 user ID without valid self-signature detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
-#: g10/keyedit.c:233
+#: g10/keyedit.c:251
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
-#: g10/keyedit.c:360
+#: g10/keyedit.c:314
+#, fuzzy, c-format
+msgid " (%d) I trust marginally\n"
+msgstr " %d = �������ٿ��Ѥ���\n"
+
+#: g10/keyedit.c:315
+#, fuzzy, c-format
+msgid " (%d) I trust fully\n"
+msgstr " %d = �����˿��Ѥ���\n"
+
+#: g10/keyedit.c:334
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+
+#: g10/keyedit.c:350
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr ""
+
+#: g10/keyedit.c:493
#, c-format
msgid "User ID \"%s\" is revoked."
-msgstr "�桼����ID \"%s\" ���˴�����Ƥ��ޤ���"
+msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:367 g10/keyedit.c:484 g10/keyedit.c:542 g10/keyedit.c:1140
+#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708
+#: g10/keyedit.c:766 g10/keyedit.c:1370
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
-#: g10/keyedit.c:375 g10/keyedit.c:490 g10/keyedit.c:1146
+#: g10/keyedit.c:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714
+#: g10/keyedit.c:1376
msgid " Unable to sign.\n"
msgstr " ��̾��ǽ��\n"
-#: g10/keyedit.c:380
-#, fuzzy, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
-msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
+#: g10/keyedit.c:519
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�桼����ID��%s�פϡ������ڤ�Ǥ���"
-#: g10/keyedit.c:399
-#, fuzzy, c-format
+#: g10/keyedit.c:545
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "�桼����ID��%s�פϡ����ʽ�̾����Ƥ��ޤ���"
+
+#: g10/keyedit.c:584
+#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
-"������̾�Ǥ���\n"
+"\"%s\" �ˤ������뼫�ʽ�̾�ϡ�\n"
+"PGP 2.x�����ν�̾�Ǥ���\n"
-#: g10/keyedit.c:408
-#, fuzzy
+#: g10/keyedit.c:593
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:607
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"��%s�פˤ������뺣�Τ��ʤ��ν�̾��\n"
+"�����ڤ�Ǥ���\n"
+
+#: g10/keyedit.c:611
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
-#. It's a local sig, and we want to make a
-#. exportable sig.
-#: g10/keyedit.c:422
+#: g10/keyedit.c:632
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2459,175 +2584,183 @@ msgstr ""
"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
"������̾�Ǥ���\n"
-#: g10/keyedit.c:426
+#: g10/keyedit.c:636
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
-#: g10/keyedit.c:446
-#, c-format
-msgid "\"%s\" was already locally signed by key %08lX\n"
+#: g10/keyedit.c:657
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:450
-#, c-format
-msgid "\"%s\" was already signed by key %08lX\n"
+#: g10/keyedit.c:660
+#, fuzzy, c-format
+msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
-#: g10/keyedit.c:463
-#, c-format
-msgid "Nothing to sign with key %08lX\n"
+#: g10/keyedit.c:665
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "����Ǥ��̾�������Ǥ���? (y/N) "
+
+#: g10/keyedit.c:687
+#, fuzzy, c-format
+msgid "Nothing to sign with key %s\n"
msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
-#: g10/keyedit.c:478
+#: g10/keyedit.c:702
msgid "This key has expired!"
msgstr "���θ��ϴ����ڤ�Ǥ�!"
-#: g10/keyedit.c:498
+#: g10/keyedit.c:722
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
-#: g10/keyedit.c:502
+#: g10/keyedit.c:726
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
-#: g10/keyedit.c:535
+#: g10/keyedit.c:759
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:537
+#: g10/keyedit.c:761
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
-#: g10/keyedit.c:560
+#: g10/keyedit.c:786
msgid ""
"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"
+"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�פ����Ϥ��Ƥ���������\n"
-#: g10/keyedit.c:564
+#: g10/keyedit.c:791
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �����ޤ���%s\n"
-#: g10/keyedit.c:566
+#: g10/keyedit.c:793
#, c-format
msgid " (1) I have not checked at all.%s\n"
-msgstr " (1) ��������ǧ���Ƥ��ޤ���%s\n"
+msgstr " (1) �������������Ƥ��ޤ���%s\n"
-#: g10/keyedit.c:568
+#: g10/keyedit.c:795
#, c-format
msgid " (2) I have done casual checking.%s\n"
-msgstr " (2) �������ǧ���ޤ�����%s\n"
+msgstr " (2) ������������ޤ�����%s\n"
-#: g10/keyedit.c:570
+#: g10/keyedit.c:797
#, c-format
msgid " (3) I have done very careful checking.%s\n"
-msgstr " (3) ���ʤ����դ��Ƴ�ǧ���ޤ�����%s\n"
+msgstr " (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
+
+#: g10/keyedit.c:803
+msgid "Your selection? (enter '?' for more information): "
+msgstr "�����? (�ܺ٤ϡ�?�פ�): "
-#: g10/keyedit.c:595
+#: g10/keyedit.c:826
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
-#: g10/keyedit.c:604
-#, fuzzy
+#: g10/keyedit.c:835
msgid ""
"\n"
"This will be a self-signature.\n"
-msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
+msgstr ""
+"\n"
+"���ʽ�̾�ˤʤ�Ǥ��礦��\n"
-#: g10/keyedit.c:608
-#, fuzzy
+#: g10/keyedit.c:839
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
-"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+"�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:613
-#, fuzzy
+#: g10/keyedit.c:844
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
"\n"
-"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+"�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:620
+#: g10/keyedit.c:851
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
-"��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
+"��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:624
+#: g10/keyedit.c:855
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
-"��̾���˴��ԲĤ����ꤵ��ޤ���\n"
+"��̾�ϼ����ԲĤ����ꤵ��ޤ���\n"
-#: g10/keyedit.c:629
+#: g10/keyedit.c:860
msgid ""
"\n"
"I have not checked this key at all.\n"
msgstr ""
"\n"
-"���θ�����������ǧ���Ƥ��ޤ���\n"
+"���θ����������������Ƥ��ޤ���\n"
-#: g10/keyedit.c:633
+#: g10/keyedit.c:864
msgid ""
"\n"
"I have checked this key casually.\n"
msgstr ""
"\n"
-"���θ��ϰ������ǧ���ޤ�����\n"
+"���θ��ϰ�����������ޤ�����\n"
-#: g10/keyedit.c:637
+#: g10/keyedit.c:868
msgid ""
"\n"
"I have checked this key very carefully.\n"
msgstr ""
"\n"
-"���θ��ϡ����ʤ����դ��Ƴ�ǧ���ޤ�����\n"
+"���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
-#: g10/keyedit.c:646
+#: g10/keyedit.c:877
msgid "Really sign? "
msgstr "�����˽�̾���ޤ���? "
-#: g10/keyedit.c:688 g10/keyedit.c:3064 g10/keyedit.c:3126 g10/sign.c:308
+#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812
+#: g10/sign.c:369
#, c-format
msgid "signing failed: %s\n"
msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:744
+#: g10/keyedit.c:978
msgid "This key is not protected.\n"
msgstr "���θ����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:748
+#: g10/keyedit.c:982
msgid "Secret parts of primary key are not available.\n"
msgstr "�縰����̩��ʬ�������ޤ���\n"
-#: g10/keyedit.c:752
+#: g10/keyedit.c:986
msgid "Key is protected.\n"
msgstr "�����ݸ��Ƥ��ޤ���\n"
-#: g10/keyedit.c:772
+#: g10/keyedit.c:1006
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:778
+#: g10/keyedit.c:1012
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2635,7 +2768,7 @@ msgstr ""
"������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
"\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:1026
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2644,462 +2777,544 @@ msgstr ""
"�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
"\n"
-#: g10/keyedit.c:795
+#: g10/keyedit.c:1029
msgid "Do you really want to do this? "
msgstr "�����˼¹Ԥ��ޤ���? "
-#: g10/keyedit.c:859
+#: g10/keyedit.c:1095
msgid "moving a key signature to the correct place\n"
msgstr "���ν�̾�����������˰�ư���ޤ�\n"
-#: g10/keyedit.c:901
+#: g10/keyedit.c:1138
msgid "quit this menu"
msgstr "���Υ�˥塼��λ"
-#: g10/keyedit.c:902
+#: g10/keyedit.c:1139
msgid "q"
msgstr "q"
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
msgid "save"
msgstr "save"
-#: g10/keyedit.c:903
+#: g10/keyedit.c:1140
msgid "save and quit"
msgstr "��¸���ƽ�λ"
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
msgid "help"
msgstr "help"
-#: g10/keyedit.c:904
+#: g10/keyedit.c:1141
msgid "show this help"
-msgstr "���Υإ�פ򸫤�"
+msgstr "���Υإ�פ�ɽ��"
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:906
+#: g10/keyedit.c:1143
msgid "show fingerprint"
-msgstr "����򸫤�"
+msgstr "�����ɽ��"
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
msgid "list"
msgstr "list"
-#: g10/keyedit.c:907
+#: g10/keyedit.c:1144
msgid "list key and user IDs"
msgstr "���ȥ桼����ID�ΰ���"
-#: g10/keyedit.c:908
+#: g10/keyedit.c:1145
msgid "l"
msgstr "l"
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:909
+#: g10/keyedit.c:1146
msgid "select user ID N"
msgstr "�桼����ID N������"
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
msgid "key"
msgstr "key"
-#: g10/keyedit.c:910
+#: g10/keyedit.c:1147
msgid "select secondary key N"
msgstr "����N������"
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
msgid "check"
msgstr "check"
-#: g10/keyedit.c:911
+#: g10/keyedit.c:1148
msgid "list signatures"
msgstr "��̾�ΰ���"
-#: g10/keyedit.c:912
+#: g10/keyedit.c:1149
msgid "c"
msgstr "c"
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:913
+#: g10/keyedit.c:1150
msgid "sign the key"
msgstr "���ؽ�̾"
-#: g10/keyedit.c:914
+#: g10/keyedit.c:1151
msgid "s"
msgstr "s"
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "tsign"
+msgstr "sign"
+
+#: g10/keyedit.c:1152
+#, fuzzy
+msgid "make a trust signature"
+msgstr "ʬΥ��̾�����"
+
+#: g10/keyedit.c:1153
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:915
+#: g10/keyedit.c:1153
msgid "sign the key locally"
msgstr "��������Ū�˽�̾"
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:916
+#: g10/keyedit.c:1154
msgid "sign the key non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦���ؽ�̾"
+msgstr "�����Ǥ��ʤ��褦���ؽ�̾"
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:917
+#: g10/keyedit.c:1155
msgid "sign the key locally and non-revocably"
-msgstr "�˴��Ǥ��ʤ��褦��������Ū�˽�̾"
+msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
-#: g10/keyedit.c:918
+#: g10/keyedit.c:1156
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:919
+#: g10/keyedit.c:1157
msgid "add a user ID"
msgstr "�桼����ID���ɲ�"
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:920
+#: g10/keyedit.c:1158
msgid "add a photo ID"
msgstr "�ե���ID���ɲ�"
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:921
+#: g10/keyedit.c:1159
msgid "delete user ID"
msgstr "�桼����ID�κ��"
-#. delphoto is really deluid in disguise
-#: g10/keyedit.c:923
+#: g10/keyedit.c:1161
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:924
+#: g10/keyedit.c:1162
msgid "add a secondary key"
msgstr "�������ɲ�"
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:925
+#: g10/keyedit.c:1163
msgid "delete a secondary key"
msgstr "������"
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
msgid "addrevoker"
-msgstr "addkey"
+msgstr "addrevoker"
-#: g10/keyedit.c:926
-#, fuzzy
+#: g10/keyedit.c:1164
msgid "add a revocation key"
-msgstr "�������ɲ�"
+msgstr "���������ɲ�"
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:927
+#: g10/keyedit.c:1165
msgid "delete signatures"
msgstr "��̾�κ��"
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:928
+#: g10/keyedit.c:1166
msgid "change the expire date"
msgstr "ͭ�����¤��ѹ�"
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:929
+#: g10/keyedit.c:1167
msgid "flag user ID as primary"
msgstr "�桼����ID���ˤ���"
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:930
+#: g10/keyedit.c:1168
msgid "toggle between secret and public key listing"
msgstr "��̩���ȸ������ΰ��������ؤ�"
-#: g10/keyedit.c:932
+#: g10/keyedit.c:1170
msgid "t"
msgstr "t"
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:933
+#: g10/keyedit.c:1171
msgid "list preferences (expert)"
msgstr "�����ΰ��� (�������ѡ���)"
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:934
+#: g10/keyedit.c:1172
msgid "list preferences (verbose)"
msgstr "�����ΰ��� (��Ĺ)"
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:935
+#: g10/keyedit.c:1173
msgid "set preference list"
msgstr "�������������"
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:936
+#: g10/keyedit.c:1174
msgid "updated preferences"
msgstr "�����ΰ����򹹿�"
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "keyserver"
+msgstr "�������С��Υ��顼"
+
+#: g10/keyedit.c:1175
+#, fuzzy
+msgid "set preferred keyserver URL"
+msgstr "�������С���URI�������ǽ\n"
+
+#: g10/keyedit.c:1176
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:937
+#: g10/keyedit.c:1176
msgid "change the passphrase"
msgstr "�ѥ��ե졼�����ѹ�"
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:938
+#: g10/keyedit.c:1177
msgid "change the ownertrust"
msgstr "��ͭ�Կ��Ѥ��ѹ�"
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:939
+#: g10/keyedit.c:1178
msgid "revoke signatures"
-msgstr "��̾���˴�"
+msgstr "��̾�μ���"
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1179
+msgid "revuid"
+msgstr "revuid"
+
+#: g10/keyedit.c:1179
+msgid "revoke a user ID"
+msgstr "�桼����ID�μ���"
+
+#: g10/keyedit.c:1180
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:940
+#: g10/keyedit.c:1180
msgid "revoke a secondary key"
-msgstr "�������˴�"
+msgstr "�������"
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:941
+#: g10/keyedit.c:1181
msgid "disable a key"
msgstr "���λ��Ѥ�ػߤ���"
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:942
+#: g10/keyedit.c:1182
msgid "enable a key"
msgstr "���λ��Ѥ���Ĥ���"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:1183
msgid "show photo ID"
msgstr "�ե���ID��ɽ��"
-#: g10/delkey.c:119 g10/keyedit.c:963
+#: g10/keyedit.c:1202 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1233
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
-msgstr "��̩���֥��å�`%s'���ɹ��ߥ��顼: %s\n"
+msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1250
msgid "Secret key is available.\n"
msgstr "��̩�������ѤǤ��ޤ���\n"
-#: g10/keyedit.c:1049
+#: g10/keyedit.c:1282
msgid "Command> "
msgstr "���ޥ��> "
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1312
msgid "Need the secret key to do this.\n"
msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
-#: g10/keyedit.c:1085
+#: g10/keyedit.c:1316
msgid "Please use the command \"toggle\" first.\n"
msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
-#: g10/keyedit.c:1134
+#: g10/keyedit.c:1364
msgid "Key is revoked."
-msgstr "�����˴�����Ƥ��ޤ���"
+msgstr "���ϡ���������Ƥ��ޤ���"
-#: g10/keyedit.c:1153
+#: g10/keyedit.c:1383
msgid "Really sign all user IDs? "
msgstr "���������桼����ID�˽�̾���ޤ���? "
-#: g10/keyedit.c:1154
+#: g10/keyedit.c:1384
msgid "Hint: Select the user IDs to sign\n"
msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1409
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
-#: g10/keyedit.c:1199 g10/keyedit.c:1220
+#: g10/keyedit.c:1431 g10/keyedit.c:1452 g10/keyedit.c:1511
msgid "You must select at least one user ID.\n"
msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1433
msgid "You can't delete the last user ID!\n"
msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
-#: g10/keyedit.c:1204
+#: g10/keyedit.c:1436
msgid "Really remove all selected user IDs? "
msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1205
+#: g10/keyedit.c:1437
msgid "Really remove this user ID? "
msgstr "���Υ桼����ID�������˺�����ޤ���? "
-#: g10/keyedit.c:1243 g10/keyedit.c:1280
+#: g10/keyedit.c:1475 g10/keyedit.c:1530
msgid "You must select at least one key.\n"
msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1478
msgid "Do you really want to delete the selected keys? "
msgstr "���򤷤����������˺�����ޤ���? "
-#: g10/keyedit.c:1248
+#: g10/keyedit.c:1479
msgid "Do you really want to delete this key? "
msgstr "���θ��������˺�����ޤ���? "
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1514
+msgid "Really revoke all selected user IDs? "
+msgstr "���򤷤����桼����ID�������˼������ޤ���? "
+
+#: g10/keyedit.c:1515
+msgid "Really revoke this user ID? "
+msgstr "���Υ桼����ID�������˼������ޤ���? "
+
+#: g10/keyedit.c:1534
msgid "Do you really want to revoke the selected keys? "
-msgstr "���򤷤������������˴����ޤ���? "
+msgstr "���򤷤����������˼������ޤ���? "
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1535
msgid "Do you really want to revoke this key? "
-msgstr "���θ����������˴����ޤ���? "
+msgstr "���θ��������˼������ޤ���? "
-#: g10/keyedit.c:1354
+#: g10/keyedit.c:1574
+msgid ""
+"Owner trust may not be set while using an user provided trust database\n"
+msgstr ""
+
+#: g10/keyedit.c:1606
+#, fuzzy
+msgid "Set preference list to:\n"
+msgstr "�������������"
+
+#: g10/keyedit.c:1612
msgid "Really update the preferences for the selected user IDs? "
msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1614
msgid "Really update the preferences? "
msgstr "�����������˹������ޤ���? "
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1662
msgid "Save changes? "
msgstr "�ѹ�����¸���ޤ���? "
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1665
msgid "Quit without saving? "
msgstr "��¸�����˽�λ���ޤ���? "
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1675
#, c-format
msgid "update failed: %s\n"
msgstr "�����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1682
#, c-format
msgid "update secret failed: %s\n"
msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1689
msgid "Key not changed so no update needed.\n"
msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1701
msgid "Invalid command (try \"help\")\n"
msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
-#: g10/keyedit.c:1750
-#, fuzzy, c-format
+#: g10/keyedit.c:1760
+msgid "Digest: "
+msgstr "����: "
+
+#: g10/keyedit.c:1812
+msgid "Features: "
+msgstr "��ǽ: "
+
+#: g10/keyedit.c:1823
+msgid "Keyserver no-modify"
+msgstr ""
+
+#: g10/keyedit.c:2063
+#, c-format
msgid "This key may be revoked by %s key "
-msgstr "���θ���%s��%s%s�ˤ�ä��˴����줿�褦�Ǥ�\n"
+msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:2067
msgid " (sensitive)"
msgstr " (�ǥꥱ����)"
-#. Note, we use the same format string as in other show
-#. functions to make the translation job easier.
-#: g10/keyedit.c:1760 g10/keyedit.c:1786 g10/keyedit.c:1871 g10/keyedit.c:1886
-#, c-format
-msgid "%s%c %4u%c/%08lX created: %s expires: %s"
-msgstr "%s%c %4u%c/%08lX ����: %s ����: %s"
+#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253
+#, fuzzy, c-format
+msgid "created: %s"
+msgstr "%s������Ǥ��ޤ���: %s\n"
-#: g10/keyedit.c:1769
-#, c-format
-msgid " trust: %c/%c"
+#: g10/keyedit.c:2084
+#, fuzzy, c-format
+msgid "revoked: %s"
+msgstr "[����] "
+
+#: g10/keyedit.c:2086
+#, fuzzy, c-format
+msgid "expired: %s"
+msgstr " [ͭ������: %s]"
+
+#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255
+#, fuzzy, c-format
+msgid "expires: %s"
+msgstr " [ͭ������: %s]"
+
+#: g10/keyedit.c:2103
+#, fuzzy, c-format
+msgid "trust: %s"
msgstr " trust: %c/%c"
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:2107
+#, c-format
+msgid "validity: %s"
+msgstr ""
+
+#: g10/keyedit.c:2114
msgid "This key has been disabled"
msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
-#: g10/keyedit.c:1802
+#: g10/keyedit.c:2146
#, c-format
msgid "rev! subkey has been revoked: %s\n"
-msgstr "rev! �������˴��ѤߤǤ�: %s\n"
+msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:2149
msgid "rev- faked revocation found\n"
-msgstr "rev- �Ǥä��������˴���ȯ��\n"
+msgstr "rev- �Ǥä������μ�����ȯ��\n"
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:2151
#, c-format
msgid "rev? problem checking revocation: %s\n"
-msgstr "rev? �˴���ǧ�㳲: %s\n"
+msgstr "rev? ���������㳲: %s\n"
-#: g10/keyedit.c:1837
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
+#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124
+#, fuzzy
+msgid "revoked"
+msgstr "[����] "
-#: g10/keyedit.c:1845
+#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499
#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2199
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
+
+#: g10/keyedit.c:2207
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3107,7 +3322,23 @@ msgstr ""
"�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
"�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
-#: g10/keyedit.c:2001
+#: g10/keyedit.c:2272 g10/mainproc.c:930
+msgid "[revoked] "
+msgstr "[����] "
+
+#: g10/keyedit.c:2274
+msgid "[expired] "
+msgstr "[��λ] "
+
+#: g10/keyedit.c:2339
+msgid ""
+"WARNING: no user ID has been marked as primary. This command may\n"
+" cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"�ٹ�: ��Ȥʤ�桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
+" �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
+
+#: g10/keyedit.c:2399
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3116,477 +3347,613 @@ msgstr ""
"�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
" ���θ�����ݤ��뤫�⤷��ޤ���\n"
-#: g10/keyedit.c:2006
+#: g10/keyedit.c:2404 g10/keyedit.c:2677
msgid "Are you sure you still want to add it? (y/N) "
msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2410
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
-#: g10/keyedit.c:2147
+#: g10/keyedit.c:2545
msgid "Delete this good signature? (y/N/q)"
msgstr "������������̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2157
+#: g10/keyedit.c:2555
msgid "Delete this invalid signature? (y/N/q)"
msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2161
+#: g10/keyedit.c:2559
msgid "Delete this unknown signature? (y/N/q)"
msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
-#: g10/keyedit.c:2167
+#: g10/keyedit.c:2565
msgid "Really delete this self-signature? (y/N)"
msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2579
#, c-format
msgid "Deleted %d signature.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2182
+#: g10/keyedit.c:2580
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "%d�Ĥν�̾�������ޤ�����\n"
-#: g10/keyedit.c:2185
+#: g10/keyedit.c:2583
msgid "Nothing deleted.\n"
msgstr "���������Ƥ��ޤ���\n"
-#: g10/keyedit.c:2281
-#, fuzzy
+#: g10/keyedit.c:2672
+msgid ""
+"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
+"cause\n"
+" some versions of PGP to reject this key.\n"
+msgstr ""
+"�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
+" ���θ�����ݤ��뤫�⤷��ޤ���\n"
+
+#: g10/keyedit.c:2683
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
+
+#: g10/keyedit.c:2703
msgid "Enter the user ID of the designated revoker: "
-msgstr "����Ĺ�������Ϥ��Ƥ�������"
+msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2726
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr ""
+msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
-#. 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:2306
+#: g10/keyedit.c:2741
msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr ""
+msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
+
+#: g10/keyedit.c:2763
+#, fuzzy
+msgid "this key has already been designated as a revoker\n"
+msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+
+#: g10/keyedit.c:2782
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
-#: g10/keyedit.c:2393
+#: g10/keyedit.c:2788
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
+msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
+
+#: g10/keyedit.c:2849
msgid "Please remove selections from the secret keys.\n"
msgstr "��̩���������Ȥ��Ƥ���������\n"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2855
msgid "Please select at most one secondary key.\n"
msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
-#: g10/keyedit.c:2403
+#: g10/keyedit.c:2859
msgid "Changing expiration time for a secondary key.\n"
msgstr "������ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:2405
+#: g10/keyedit.c:2862
msgid "Changing expiration time for the primary key.\n"
msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2908
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
-#: g10/keyedit.c:2463
+#: g10/keyedit.c:2924
msgid "No corresponding signature in secret ring\n"
msgstr "��̩���ؤ��б������̾������ޤ���\n"
-#: g10/keyedit.c:2546
+#: g10/keyedit.c:3004
msgid "Please select exactly one user ID.\n"
msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
-#: g10/keyedit.c:2583 g10/keyedit.c:2690
-#, fuzzy, c-format
+#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267
+#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
-msgstr "��%08lX: �桼����id \"%s\" �μ��ʽ�̾��̵���Ǥ�\n"
+msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
+
+#: g10/keyedit.c:3215
+msgid "Enter your preferred keyserver URL: "
+msgstr ""
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:3331
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
-#: g10/keyedit.c:2796
+#: g10/keyedit.c:3377
#, c-format
msgid "No secondary key with index %d\n"
msgstr "%d�֤������Ϥ���ޤ���\n"
-#: g10/keyedit.c:2910
+#: g10/keyedit.c:3491
msgid "user ID: \""
msgstr "�桼����ID: \""
-#: g10/keyedit.c:2915
-#, c-format
+#: g10/keyedit.c:3496
+#, fuzzy, c-format
msgid ""
"\"\n"
-"signed with your key %08lX at %s\n"
+"signed with your key %s at %s\n"
msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2918
-#, c-format
+#: g10/keyedit.c:3499
+#, fuzzy, c-format
msgid ""
"\"\n"
-"locally signed with your key %08lX at %s\n"
+"locally signed with your key %s at %s\n"
msgstr ""
"\"\n"
"���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2923
+#: g10/keyedit.c:3504
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:3508
msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "����Ǥ��˴��������Ǥ���? (y/N) "
+msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:3512
msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N) "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
-#. FIXME: detect duplicates here
-#: g10/keyedit.c:2956
+#: g10/keyedit.c:3537
msgid "You have signed these user IDs:\n"
msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
-#: g10/keyedit.c:2975
-#, c-format
-msgid " signed by %08lX at %s%s%s\n"
+#: g10/keyedit.c:3558
+#, fuzzy, c-format
+msgid " signed by %s on %s%s%s\n"
msgstr " %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:2983
-#, c-format
-msgid " revoked by %08lX at %s\n"
-msgstr " %08lX��%s���˴�����Ƥ��ޤ�\n"
+#: g10/keyedit.c:3567
+#, fuzzy, c-format
+msgid " revoked by %s on %s\n"
+msgstr " %08lX��%s�˼�������Ƥ��ޤ�\n"
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:3587
msgid "You are about to revoke these signatures:\n"
-msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
+msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
-#: g10/keyedit.c:3013
-#, c-format
-msgid " signed by %08lX at %s%s\n"
+#: g10/keyedit.c:3597
+#, fuzzy, c-format
+msgid " signed by %s on %s%s\n"
msgstr " %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
-#: g10/keyedit.c:3015
+#: g10/keyedit.c:3599
msgid " (non-exportable)"
msgstr " (��Ф��Բ�)"
-#: g10/keyedit.c:3022
+#: g10/keyedit.c:3606
msgid "Really create the revocation certificates? (y/N) "
-msgstr "�˴�������������˺��ޤ���? (y/N) "
+msgstr "����������������˺��ޤ���? (y/N) "
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3636
msgid "no secret key\n"
msgstr "��̩��������ޤ���\n"
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3706
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3723
#, c-format
-msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
+
+#: g10/keyedit.c:3892
+#, fuzzy, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
-#: g10/keylist.c:91
-#, fuzzy
+#: g10/keylist.c:179
msgid "Critical signature policy: "
-msgstr "��̾�ݥꥷ��: "
+msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
-#: g10/keylist.c:93
+#: g10/keylist.c:181
msgid "Signature policy: "
msgstr "��̾�ݥꥷ��: "
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:768 g10/mainproc.c:777
+#: g10/keylist.c:220
+msgid "Critical preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:222
+msgid "Preferred keyserver: "
+msgstr ""
+
+#: g10/keylist.c:268 g10/keylist.c:312
msgid "WARNING: invalid notation data found\n"
msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
-#: g10/keylist.c:127
-#, fuzzy
+#: g10/keylist.c:286
msgid "Critical signature notation: "
-msgstr "��̾����: "
+msgstr "����ƥ�����ʽ�̾����: "
-#: g10/keylist.c:129
+#: g10/keylist.c:288
msgid "Signature notation: "
msgstr "��̾����: "
-#: g10/keylist.c:136
+#: g10/keylist.c:299
msgid "not human readable"
msgstr "�ͤˤ��ɤ�ޤ���"
-#: g10/keylist.c:225
+#: g10/keylist.c:400
msgid "Keyring"
msgstr "����"
-#. of subkey
-#: g10/keylist.c:478 g10/mainproc.c:904
+#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745
+#, fuzzy, c-format
+msgid " [expired: %s]"
+msgstr " [ͭ������: %s]"
+
+#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772
+#: g10/mainproc.c:932
#, c-format
msgid " [expires: %s]"
msgstr " [ͭ������: %s]"
-#: g10/keylist.c:1001
-#, fuzzy
+#: g10/keylist.c:646 g10/keylist.c:743
+#, fuzzy, c-format
+msgid " [revoked: %s]"
+msgstr "[����] "
+
+#: g10/keylist.c:1357
msgid "Primary key fingerprint:"
-msgstr "���Ȼ���ΰ���"
+msgstr "�縰�λ���:"
-#: g10/keylist.c:1003
-#, fuzzy
+#: g10/keylist.c:1359
msgid " Subkey fingerprint:"
-msgstr " ���� ="
+msgstr "�������:"
-#: g10/keylist.c:1010
-#, fuzzy
+#: g10/keylist.c:1366
msgid " Primary key fingerprint:"
-msgstr " ���� ="
+msgstr " �縰�λ���:"
-#: g10/keylist.c:1012
-#, fuzzy
+#: g10/keylist.c:1368
msgid " Subkey fingerprint:"
-msgstr " ���� ="
+msgstr " �������:"
-#. use tty
-#: g10/keylist.c:1016 g10/keylist.c:1020
-msgid " Key fingerprint ="
+#: g10/keylist.c:1372 g10/keylist.c:1376
+#, fuzzy
+msgid " Key fingerprint ="
msgstr " ���� ="
#: g10/mainproc.c:248
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
-msgstr ""
+msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
-#: g10/mainproc.c:258
-#, fuzzy, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
+#: g10/mainproc.c:262
+#, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "�����ʥѥ��ե졼���ޤ���̤�ΤΰŹ楢�르�ꥺ��Ǥ�(%d)\n"
+
+#: g10/mainproc.c:299
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s �Ź沽�Ѥߥ��å����\n"
-#: g10/encr-data.c:66 g10/mainproc.c:287
+#: g10/mainproc.c:301 g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s�Ź沽���줿�ǡ���\n"
+msgstr "%s�Ź沽�Ѥߥǡ���\n"
-#: g10/encr-data.c:68 g10/mainproc.c:289
+#: g10/mainproc.c:305 g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
-#: g10/mainproc.c:317
-#, c-format
-msgid "public key is %08lX\n"
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
+
+#: g10/mainproc.c:373
+#, fuzzy, c-format
+msgid "public key is %s\n"
msgstr "��������%08lX�Ǥ�\n"
-#: g10/mainproc.c:363
+#: g10/mainproc.c:428
msgid "public key encrypted data: good DEK\n"
msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
-#: g10/mainproc.c:415
-#, c-format
-msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
+#: g10/mainproc.c:462
+#, fuzzy, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
-#: g10/mainproc.c:425
-#, c-format
-msgid "encrypted with %s key, ID %08lX\n"
+#: g10/mainproc.c:472
+#, fuzzy, c-format
+msgid "encrypted with %s key, ID %s\n"
msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
-#: g10/mainproc.c:439
+#: g10/mainproc.c:486
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "������������˼��Ԥ��ޤ���: %s\n"
-#: g10/mainproc.c:466 g10/mainproc.c:485
+#: g10/mainproc.c:500
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
+
+#: g10/mainproc.c:502
+msgid "encrypted with 1 passphrase\n"
+msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
+
+#: g10/mainproc.c:530 g10/mainproc.c:552
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s�Ź沽���줿�ǡ�������\n"
-#: g10/mainproc.c:473
+#: g10/mainproc.c:538
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
-#: g10/mainproc.c:503
+#: g10/mainproc.c:570
msgid "decryption okay\n"
msgstr "���������\n"
-#: g10/mainproc.c:510
+#: g10/mainproc.c:574
+msgid "WARNING: message was not integrity protected\n"
+msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
+
+#: g10/mainproc.c:587
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
-#: g10/mainproc.c:516
+#: g10/mainproc.c:593
#, c-format
msgid "decryption failed: %s\n"
msgstr "����˼��Ԥ��ޤ���: %s\n"
-#: g10/mainproc.c:535
+#: g10/mainproc.c:613
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
-#: g10/mainproc.c:537
+#: g10/mainproc.c:615
#, c-format
msgid "original file name='%.*s'\n"
msgstr "���Υե�����̾='%.*s'\n"
-#: g10/mainproc.c:712
+#: g10/mainproc.c:787
msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
-
-#: g10/mainproc.c:780
-msgid "Notation: "
-msgstr "����: "
+msgstr "��Ω��������gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
-#: g10/mainproc.c:792
-msgid "Policy: "
-msgstr "�ݥꥷ��: "
-
-#: g10/mainproc.c:1247
+#: g10/mainproc.c:1283
msgid "signature verification suppressed\n"
msgstr "��̾�θ��ڤ��ά\n"
-#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1289 g10/mainproc.c:1299
+#: g10/mainproc.c:1325 g10/mainproc.c:1335
msgid "can't handle these multiple signatures\n"
msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
-#: g10/mainproc.c:1310
-#, c-format
-msgid "Signature made %.*s using %s key ID %08lX\n"
+#: g10/mainproc.c:1345
+#, fuzzy, c-format
+msgid "Signature made %s\n"
+msgstr "�����ڤ�ν�̾ %s\n"
+
+#: g10/mainproc.c:1346
+#, fuzzy, c-format
+msgid " using %s key %s\n"
+msgstr " ��̾ \""
+
+#: g10/mainproc.c:1350
+#, fuzzy, c-format
+msgid "Signature made %s using %s key ID %s\n"
msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
-#: g10/mainproc.c:1359 g10/mainproc.c:1392
+#: g10/mainproc.c:1370
+msgid "Key available at: "
+msgstr "�ʲ��˸�������ޤ�: "
+
+#: g10/mainproc.c:1470 g10/mainproc.c:1506
msgid "BAD signature from \""
msgstr "������ ��̾: \""
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#: g10/mainproc.c:1471 g10/mainproc.c:1507
msgid "Expired signature from \""
msgstr "�����ڤ�ν�̾: \""
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1472 g10/mainproc.c:1508
msgid "Good signature from \""
msgstr "��������̾: \""
-#: g10/mainproc.c:1396
+#: g10/mainproc.c:1510
msgid "[uncertain]"
msgstr "[�Գ���]"
-#: g10/mainproc.c:1427
+#: g10/mainproc.c:1543
msgid " aka \""
msgstr " ��̾ \""
-#: g10/mainproc.c:1488
+#: g10/mainproc.c:1638
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "�����ڤ�ν�̾ %s\n"
+
+#: g10/mainproc.c:1643
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ�\n"
+
+#: g10/mainproc.c:1646
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: g10/mainproc.c:1647
+msgid "binary"
+msgstr "�Х��ʥ꡼"
+
+#: g10/mainproc.c:1648
+msgid "textmode"
+msgstr "�ƥ����ȥ⡼��"
+
+#: g10/mainproc.c:1648 g10/trustdb.c:498
+msgid "unknown"
+msgstr "̤�Τ�"
+
+#: g10/mainproc.c:1668
#, c-format
msgid "Can't check signature: %s\n"
-msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
+msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
-#: g10/mainproc.c:1557 g10/mainproc.c:1573 g10/mainproc.c:1635
+#: g10/mainproc.c:1736 g10/mainproc.c:1752 g10/mainproc.c:1838
msgid "not a detached signature\n"
msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
-#: g10/mainproc.c:1584
+#: g10/mainproc.c:1779
+msgid ""
+"WARNING: multiple signatures detected. Only the first will be checked.\n"
+msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
+
+#: g10/mainproc.c:1787
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���饹0x%02x����Ω��̾\n"
-#: g10/mainproc.c:1641
+#: g10/mainproc.c:1844
msgid "old style (PGP 2.x) signature\n"
msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
-#: g10/mainproc.c:1648
+#: g10/mainproc.c:1854
msgid "invalid root packet detected in proc_tree()\n"
msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
-#: g10/misc.c:98
+#: g10/misc.c:82
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "����������פ�̵���ˤǤ��ޤ���: %s\n"
-#: g10/misc.c:162
+#: g10/misc.c:146
msgid "Experimental algorithms should not be used!\n"
msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
-#: g10/misc.c:192
+#: g10/misc.c:176
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr ""
-"���ΰŹ楢�르�ꥺ���ȿ�Ф���Ƥ��ޤ���\n"
+"���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
"��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
-#: g10/misc.c:300
+#: g10/misc.c:282
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
-#: g10/misc.c:301
+#: g10/misc.c:283
msgid ""
"please see http://www.gnupg.org/why-not-idea.html for more information\n"
msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
-#: g10/misc.c:509
-#, fuzzy, c-format
+#: g10/misc.c:491
+#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
-#: g10/misc.c:513
-#, fuzzy, c-format
+#: g10/misc.c:495
+#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "�ٹ�: %s��ȿ�Ф���Ƥ��륪�ץ����Ǥ���\n"
+msgstr "�ٹ�: ��%s�פϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
-#: g10/misc.c:515
-#, fuzzy, c-format
+#: g10/misc.c:497
+#, c-format
msgid "please use \"%s%s\" instead\n"
-msgstr "\"--keyserver-options %s\"������˻ȤäƤ�������\n"
+msgstr "��%s%s�פ�����˻ȤäƤ�������\n"
+
+#: g10/misc.c:508
+msgid "Uncompressed"
+msgstr "̤����"
+
+#: g10/misc.c:533
+#, fuzzy
+msgid "uncompressed|none"
+msgstr "̤����"
+
+#: g10/misc.c:643
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+
+#: g10/misc.c:777
+#, fuzzy, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+
+#: g10/misc.c:802
+#, fuzzy, c-format
+msgid "unknown option `%s'\n"
+msgstr "����μ���͡�%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:1065
+#: g10/parse-packet.c:703
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ楻�å���󸰤Ǥ�\n"
+
+#: g10/parse-packet.c:1128
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
-#: g10/passphrase.c:442 g10/passphrase.c:489
+#: g10/passphrase.c:461 g10/passphrase.c:508
msgid "gpg-agent is not available in this session\n"
msgstr "���Υ��å�����gpg����������Ȥ�̵���Ǥ�\n"
-#: g10/passphrase.c:450
+#: g10/passphrase.c:469
msgid "can't set client pid for the agent\n"
msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
-#: g10/passphrase.c:458
+#: g10/passphrase.c:477
msgid "can't get server read FD for the agent\n"
msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
-#: g10/passphrase.c:465
+#: g10/passphrase.c:484
msgid "can't get server write FD for the agent\n"
msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
-#: g10/passphrase.c:498
+#: g10/passphrase.c:517
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
-#: g10/passphrase.c:511
+#: g10/passphrase.c:530
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/hkp.c:151 g10/passphrase.c:532
+#: g10/passphrase.c:551
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
-#: g10/passphrase.c:554
+#: g10/passphrase.c:573
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent�Ȥ��̿��㳲\n"
-#: g10/passphrase.c:561 g10/passphrase.c:811 g10/passphrase.c:919
+#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992
msgid "problem with the agent - disabling agent use\n"
msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
-#: g10/passphrase.c:631 g10/passphrase.c:1017
+#: g10/passphrase.c:681
#, c-format
msgid " (main key ID %08lX)"
msgstr " (�縰ID %08lX)"
-#: g10/passphrase.c:641
+#: g10/passphrase.c:691
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -3597,32 +3964,40 @@ msgstr ""
"\"%.*s\"\n"
"%u�ӥå�%s��, ID %08lX�������դ�%s%s\n"
-#: g10/passphrase.c:662
-msgid "Enter passphrase\n"
-msgstr "�ѥ��ե졼��������\n"
-
-#: g10/passphrase.c:664
+#: g10/passphrase.c:713
msgid "Repeat passphrase\n"
msgstr "�ѥ��ե졼���������\n"
-#: g10/passphrase.c:705
+#: g10/passphrase.c:715
+msgid "Enter passphrase\n"
+msgstr "�ѥ��ե졼��������\n"
+
+#: g10/passphrase.c:753
msgid "passphrase too long\n"
msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
-#: g10/passphrase.c:718
+#: g10/passphrase.c:766
msgid "invalid response from agent\n"
msgstr "����������Ȥ����̵���ʱ���\n"
-#: g10/passphrase.c:727 g10/passphrase.c:808
+#: g10/passphrase.c:781 g10/passphrase.c:874
msgid "cancelled by user\n"
msgstr "�桼�����ˤ���ä�\n"
-#: g10/passphrase.c:729 g10/passphrase.c:890
+#: g10/passphrase.c:786 g10/passphrase.c:963
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
-#: g10/passphrase.c:1003
+#: g10/passphrase.c:1044 g10/passphrase.c:1204
+msgid "can't query password in batchmode\n"
+msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
+
+#: g10/passphrase.c:1049 g10/passphrase.c:1209
+msgid "Enter passphrase: "
+msgstr "�ѥ��ե졼��������: "
+
+#: g10/passphrase.c:1131
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -3632,250 +4007,248 @@ msgstr ""
"���Υ桼��������̩���Υ��å���������ˤ�\n"
"�ѥ��ե졼��������ޤ�: \""
-#: g10/passphrase.c:1012
-#, c-format
-msgid "%u-bit %s key, ID %08lX, created %s"
+#: g10/passphrase.c:1140
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
-#: g10/passphrase.c:1063
-msgid "can't query password in batchmode\n"
-msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
+#: g10/passphrase.c:1149
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr ""
-#: g10/passphrase.c:1067
-msgid "Enter passphrase: "
-msgstr "�ѥ��ե졼��������: "
+#: g10/passphrase.c:1153
+#, fuzzy, c-format
+msgid " (main key ID %s)"
+msgstr " (�縰ID %08lX)"
-#: g10/passphrase.c:1071
+#: g10/passphrase.c:1213
msgid "Repeat passphrase: "
msgstr "�ѥ��ե졼���������: "
-#: g10/plaintext.c:67
+#: g10/plaintext.c:90
msgid "data not saved; use option \"--output\" to save it\n"
msgstr ""
"�ǡ�������¸����Ƥ��ޤ���\n"
"��¸����ˤϡ�--output�ץ��ץ�������Ѥ��Ƥ�������\n"
-#: g10/plaintext.c:108
+#: g10/plaintext.c:132 g10/plaintext.c:150
#, c-format
msgid "error creating `%s': %s\n"
msgstr "`%s'�κ������顼: %s\n"
-#: g10/plaintext.c:337
+#: g10/plaintext.c:438
msgid "Detached signature.\n"
msgstr "ʬΥ��̾��\n"
-#: g10/plaintext.c:341
+#: g10/plaintext.c:442
msgid "Please enter name of data file: "
msgstr "�ǡ������ե������̾��������: "
-#: g10/plaintext.c:362
+#: g10/plaintext.c:463
msgid "reading stdin ...\n"
msgstr "ɸ�����Ϥ���ɹ����� ...\n"
-#: g10/plaintext.c:396
+#: g10/plaintext.c:497
msgid "no signed data\n"
msgstr "��̾���줿�ǡ���������ޤ���\n"
-#: g10/plaintext.c:404
+#: g10/plaintext.c:505
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
-#: g10/pubkey-enc.c:101
-#, c-format
-msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "ƿ̾�μ������ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
+#: g10/pubkey-enc.c:103
+#, fuzzy, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "ƿ̾�μ�����ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
-#: g10/pubkey-enc.c:107
+#: g10/pubkey-enc.c:119
msgid "okay, we are the anonymous recipient.\n"
-msgstr "��λ��ƿ̾�μ������ѤǤ���\n"
+msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
-#: g10/pubkey-enc.c:159
+#: g10/pubkey-enc.c:207
msgid "old encoding of the DEK is not supported\n"
msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/pubkey-enc.c:178
+#: g10/pubkey-enc.c:228
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�ݸ�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
+msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\n"
-#: g10/pubkey-enc.c:221
-#, c-format
-msgid "NOTE: cipher algorithm %d not found in preferences\n"
+#: g10/pubkey-enc.c:266
+#, fuzzy, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
-#: g10/pubkey-enc.c:243
-#, c-format
-msgid "NOTE: secret key %08lX expired at %s\n"
+#: g10/pubkey-enc.c:286
+#, fuzzy, c-format
+msgid "NOTE: secret key %s expired at %s\n"
msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
-#: g10/pubkey-enc.c:249
-#, fuzzy
+#: g10/pubkey-enc.c:292
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"
+msgstr "����: ���ϼ����ѤߤǤ�"
-#: g10/hkp.c:96
-#, c-format
-msgid "can't get key from keyserver: %s\n"
-msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
-
-#: g10/hkp.c:175
-#, c-format
-msgid "error sending to `%s': %s\n"
-msgstr "`%s'�ؤ��������顼: %s\n"
-
-#: g10/hkp.c:190
-#, c-format
-msgid "success sending to `%s' (status=%u)\n"
-msgstr "`%s'�ؤ����������� (����=%u)\n"
-
-#: g10/hkp.c:193
-#, c-format
-msgid "failed sending to `%s': status=%u\n"
-msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
-
-#: g10/hkp.c:363
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr ""
-
-#: g10/hkp.c:515
-#, c-format
-msgid "searching for \"%s\" from HKP server %s\n"
-msgstr "\"%s\"��HKP�����С�%s���鸡��\n"
-
-#: g10/hkp.c:565
-#, c-format
-msgid "can't search keyserver: %s\n"
-msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
-
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:54
msgid "secret key parts are not available\n"
msgstr "��̩��ʬ�������ޤ���\n"
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:60
#, c-format
msgid "protection algorithm %d%s is not supported\n"
msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
-#: g10/seckey-cert.c:224
+#: g10/seckey-cert.c:71
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: g10/seckey-cert.c:250
msgid "Invalid passphrase; please try again"
msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ�������"
-#: g10/seckey-cert.c:225
+#: g10/seckey-cert.c:251
#, c-format
msgid "%s ...\n"
msgstr "%s ...\n"
-#: g10/seckey-cert.c:282
+#: g10/seckey-cert.c:311
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
-#: g10/seckey-cert.c:320
+#: g10/seckey-cert.c:349
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "ȿ�Ф��줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
+msgstr "����뤵�줿16�ӥåȤΥ����å��������̩�����ݸ������\n"
-#: g10/sig-check.c:73
+#: g10/sig-check.c:75
msgid "WARNING: signature digest conflict in message\n"
+msgstr "�ٹ�: ��̾�����󤬡���å�������̷�⤷�ޤ�\n"
+
+#: g10/sig-check.c:99
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr ""
-#: g10/sig-check.c:215
+#: g10/sig-check.c:102
#, fuzzy, c-format
-msgid ""
-"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-"signatures!\n"
-msgstr ""
-"�����PGP����������ElGamal���Ǥ���\n"
-"��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
-#: g10/sig-check.c:224
+#: g10/sig-check.c:168
#, fuzzy, c-format
-msgid "public key %08lX is %lu second newer than the signature\n"
-msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "������%08lX�ϡ���̾��%lu�����Ǥ�\n"
-#: g10/sig-check.c:225
+#: g10/sig-check.c:169
#, fuzzy, c-format
-msgid "public key %08lX is %lu seconds newer than the signature\n"
-msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "������%08lX�ϡ���̾��%lu�����Ǥ�\n"
-#: g10/sig-check.c:234
+#: g10/sig-check.c:180
#, fuzzy, c-format
msgid ""
-"key %08lX has been created %lu second in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/sig-check.c:236
+#: g10/sig-check.c:182
#, fuzzy, c-format
msgid ""
-"key %08lX has been created %lu seconds in future (time warp or clock "
-"problem)\n"
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#: g10/sig-check.c:249
-#, c-format
-msgid "NOTE: signature key %08lX expired %s\n"
+#: g10/sig-check.c:192
+#, fuzzy, c-format
+msgid "NOTE: signature key %s expired %s\n"
msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\n"
-#: g10/sig-check.c:348
+#: g10/sig-check.c:275
#, fuzzy, c-format
-msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
-msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "̤�ΤΥ���ƥ����롦�ӥåȤˤ�ꡢ��%08lX�ν�̾�������Ȥߤʤ��ޤ�\n"
-#: g10/sign.c:103
+#: g10/sig-check.c:532
#, fuzzy, c-format
-msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
-msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "��%08lX: �������ѥ��åȤˤ�����������������ޤ���\n"
+
+#: g10/sig-check.c:558
+#, fuzzy, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "��%08lX: ���б��ؤν�̾���б���������������ޤ���\n"
+
+#: g10/sign.c:85
+msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
-#: g10/sign.c:151
+#: g10/sign.c:93
+msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
+msgstr "����ǡ����ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:112
#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr "�ٹ�: ɽ����%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
+
+#: g10/sign.c:138
+msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3��̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:146
+msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
+msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
+
+#: g10/sign.c:159
+#, fuzzy, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
+
+#: g10/sign.c:187
+#, fuzzy, c-format
msgid ""
-"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
-msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)��̤��ĥ����ѡ�\n"
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
-#: g10/sign.c:303
+#: g10/sign.c:364
#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "�������줿��̾�θ��ڤ˼���: %s\n"
+msgstr "�������줿��̾�θ����˼���: %s\n"
-#: g10/sign.c:312
+#: g10/sign.c:373
#, fuzzy, c-format
-msgid "%s signature from: \"%s\"\n"
-msgstr "%s��̾����̾��: %s\n"
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s��̾����̾��: \"%s\"\n"
-#: g10/sign.c:461
+#: g10/sign.c:550
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\n"
-#: g10/sign.c:644
-#, fuzzy
+#: g10/sign.c:741
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǽ�̾�Ǥ�������Ǥ�\n"
+msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
-#: g10/sign.c:665 g10/sign.c:892
+#: g10/sign.c:765 g10/sign.c:1001
#, c-format
msgid "can't create %s: %s\n"
msgstr "%s������Ǥ��ޤ���: %s\n"
-#: g10/sign.c:690
-#, fuzzy, c-format
+#: g10/sign.c:794
+#, c-format
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
+msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
-#: g10/sign.c:784
+#: g10/sign.c:886
msgid "signing:"
msgstr "��̾:"
-#: g10/sign.c:876
+#: g10/sign.c:985
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:1029
+#: g10/sign.c:1138
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -3890,12 +4263,12 @@ msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϻ��ѤǤ��ޤ���\n"
msgid "input line longer than %d characters\n"
msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
-#: g10/tdbio.c:128 g10/tdbio.c:1387
+#: g10/tdbio.c:128 g10/tdbio.c:1434
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "���ѥǡ����١��� �쥳����%lu: �������˼��Ԥ��ޤ���: %s\n"
-#: g10/tdbio.c:134 g10/tdbio.c:1394
+#: g10/tdbio.c:134 g10/tdbio.c:1441
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
@@ -3904,195 +4277,265 @@ msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
msgid "trustdb transaction too large\n"
msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
-#: g10/tdbio.c:459
+#: g10/tdbio.c:497
#, c-format
msgid "%s: can't access: %s\n"
msgstr "%s: ���������Ǥ��ޤ���: %s\n"
-#: g10/tdbio.c:474
+#: g10/tdbio.c:512
#, c-format
msgid "%s: directory does not exist!\n"
-msgstr "%s: ���񤬤���ޤ���!\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼������ޤ���!\n"
-#: g10/tdbio.c:484 g10/tdbio.c:502 g10/tdbio.c:545
+#: g10/tdbio.c:522 g10/tdbio.c:540 g10/tdbio.c:583
#, c-format
msgid "%s: can't create lock\n"
msgstr "%s: ���å����Ǥ��ޤ���\n"
-#: g10/tdbio.c:486 g10/tdbio.c:548
+#: g10/tdbio.c:524 g10/tdbio.c:586
#, c-format
msgid "%s: can't make lock\n"
msgstr "%s: ���å����Ǥ��ޤ���\n"
-#: g10/keyring.c:1448 g10/openfile.c:240 g10/openfile.c:310 g10/tdbio.c:492
+#: g10/tdbio.c:530 g10/openfile.c:249 g10/openfile.c:322 g10/keyring.c:1479
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s: �����Ǥ��ޤ���: %s\n"
-#: g10/tdbio.c:507
+#: g10/tdbio.c:545
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: �С�����󡦥쥳���ɤκ����˼��Ԥ��ޤ���: %s"
-#: g10/tdbio.c:511
+#: g10/tdbio.c:549
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ̵���ʿ��ѥǡ����١��������\n"
-#: g10/tdbio.c:514
+#: g10/tdbio.c:552
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
-#: g10/tdbio.c:554
+#: g10/tdbio.c:592
msgid "NOTE: trustdb not writable\n"
-msgstr ""
+msgstr "�ٹ�: ���ѥǡ����١��������������ǽ�Ǥ�\n"
-#: g10/tdbio.c:570
+#: g10/tdbio.c:608
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ̵���ʿ��ѥǡ����١���\n"
-#: g10/tdbio.c:602
+#: g10/tdbio.c:640
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
-#: g10/tdbio.c:610
+#: g10/tdbio.c:648
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: �С�����󡦥쥳���ɤι������顼: %s\n"
-#: g10/tdbio.c:626 g10/tdbio.c:662 g10/tdbio.c:676 g10/tdbio.c:706
-#: g10/tdbio.c:1320 g10/tdbio.c:1347
+#: g10/tdbio.c:665 g10/tdbio.c:685 g10/tdbio.c:701 g10/tdbio.c:715
+#: g10/tdbio.c:745 g10/tdbio.c:1367 g10/tdbio.c:1394
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: �С�����󡦥쥳���ɤ��ɽФ����顼: %s\n"
-#: g10/tdbio.c:639 g10/tdbio.c:685
+#: g10/tdbio.c:724
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: �С�����󡦥쥳���ɤν���ߥ��顼: %s\n"
-#: g10/tdbio.c:1124
+#: g10/tdbio.c:1163
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
-#: g10/tdbio.c:1132
+#: g10/tdbio.c:1171
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
-#: g10/tdbio.c:1153
+#: g10/tdbio.c:1192
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ���ѥǡ����١������ե�����ǤϤ���ޤ���\n"
-#: g10/tdbio.c:1170
+#: g10/tdbio.c:1210
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: �쥳�����ֹ�%lu�֤ΥС�����󡦥쥳����\n"
-#: g10/tdbio.c:1175
+#: g10/tdbio.c:1215
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ̵���ʥե����롦�С������%d\n"
-#: g10/tdbio.c:1353
+#: g10/tdbio.c:1400
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: �����쥳���ɤ��ɽФ����顼: %s\n"
-#: g10/tdbio.c:1361
+#: g10/tdbio.c:1408
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
-#: g10/tdbio.c:1371
+#: g10/tdbio.c:1418
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: �쥳���ɤν�����˼��Ԥ��ޤ���: %s\n"
-#: g10/tdbio.c:1401
+#: g10/tdbio.c:1448
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
-#: g10/tdbio.c:1446
+#: g10/tdbio.c:1493
msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr ""
"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
-#: g10/trustdb.c:200
+#: g10/trustdb.c:226
#, c-format
msgid "`%s' is not a valid long keyID\n"
-msgstr "`%s' ���������緿��ID�Ǥ���ޤ���\n"
+msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
-#: g10/trustdb.c:235
-#, c-format
-msgid "key %08lX: accepted as trusted key\n"
+#: g10/trustdb.c:257
+#, fuzzy, c-format
+msgid "key %s: accepted as trusted key\n"
msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\n"
-#: g10/trustdb.c:274
-#, c-format
-msgid "key %08lX occurs more than once in the trustdb\n"
+#: g10/trustdb.c:295
+#, fuzzy, c-format
+msgid "key %s occurs more than once in the trustdb\n"
msgstr "��%08lX�����ѥǡ����١�����ʣ������ޤ�\n"
-#: g10/trustdb.c:290
-#, c-format
-msgid "key %08lX: no public key for trusted key - skipped\n"
+#: g10/trustdb.c:310
+#, fuzzy, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
msgstr "�� %08lX: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
-#: g10/trustdb.c:332
+#: g10/trustdb.c:320
+#, fuzzy, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
+
+#: g10/trustdb.c:344
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "���ѥ쥳����%lu, �ꥯ�����ȡ�������%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
-#: g10/trustdb.c:338
+#: g10/trustdb.c:350
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
-#: g10/trustdb.c:353
+#: g10/trustdb.c:365 g10/tdbdump.c:59
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
-#: g10/trustdb.c:368
+#: g10/trustdb.c:380 g10/tdbdump.c:217
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "���ѥǡ����١���: Ʊ���˼��Ԥ��ޤ���: %s\n"
-#: g10/trustdb.c:468
+#: g10/trustdb.c:445
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:451
+#, c-format
+msgid "using %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:500
+msgid "undefined"
+msgstr ""
+
+#: g10/trustdb.c:501
+#, fuzzy
+msgid "never"
+msgstr "̵���� "
+
+#: g10/trustdb.c:502
+msgid "marginal"
+msgstr ""
+
+#: g10/trustdb.c:503
+msgid "full"
+msgstr ""
+
+#: g10/trustdb.c:504
+msgid "ultimate"
+msgstr ""
+
+#: g10/trustdb.c:544
msgid "no need for a trustdb check\n"
-msgstr "���ѥǡ����١����θ��ڤ����פǤ�\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
-#: g10/trustdb.c:474 g10/trustdb.c:1641
+#: g10/trustdb.c:550 g10/trustdb.c:2103
#, c-format
msgid "next trustdb check due at %s\n"
-msgstr "���ѥǡ����١����μ���θ��ڤ�%s�Ǥ�\n"
+msgstr "���ѥǡ����١����μ���θ����ϡ�%s�Ǥ�\n"
-#: g10/trustdb.c:779
-msgid "checking the trustdb\n"
-msgstr "���ѥǡ����١����θ���\n"
+#: g10/trustdb.c:559
+#, fuzzy, c-format
+msgid "no need for a trustdb check with \"%s\" trust model\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
-#: g10/trustdb.c:933
-#, c-format
-msgid "public key %08lX not found: %s\n"
+#: g10/trustdb.c:574
+#, fuzzy, c-format
+msgid "no need for a trustdb update with \"%s\" trust model\n"
+msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
+
+#: g10/trustdb.c:792 g10/trustdb.c:1222
+#, fuzzy, c-format
+msgid "public key %s not found: %s\n"
msgstr "������%08lX�����Ĥ���ޤ���: %s\n"
-#: g10/trustdb.c:1515
+#: g10/trustdb.c:987
+msgid "please do a --check-trustdb\n"
+msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
+
+#: g10/trustdb.c:991
+msgid "checking the trustdb\n"
+msgstr "���ѥǡ����١����θ���\n"
+
+#: g10/trustdb.c:1847
#, c-format
-msgid "public key of ultimately trusted key %08lX not found\n"
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
+
+#: g10/trustdb.c:1911
+msgid "no ultimately trusted keys found\n"
+msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
+
+#: g10/trustdb.c:1925
+#, fuzzy, c-format
+msgid "public key of ultimately trusted key %s not found\n"
msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
-#: g10/trustdb.c:1593
+#: g10/trustdb.c:1948
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr ""
+
+#: g10/trustdb.c:2034
#, c-format
-msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "����%d�Ǹ��ڡ���̾�Ѥ�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgid ""
+"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+
+#: g10/trustdb.c:2109
+#, fuzzy, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
-#: g10/verify.c:108
+#: g10/verify.c:110
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@ -4102,7 +4545,7 @@ msgstr ""
"(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
"�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
-#: g10/verify.c:173
+#: g10/verify.c:177
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
@@ -4110,37 +4553,36 @@ msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
#: 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"
"��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
#: g10/skclist.c:157
#, c-format
msgid "skipped `%s': duplicated\n"
-msgstr "`%s'�򥹥��å�: ��ʣ\n"
+msgstr "��%s�פ򥹥��å�: ��ʣ\n"
#: g10/skclist.c:164 g10/skclist.c:172
#, c-format
msgid "skipped `%s': %s\n"
-msgstr "`%s'�򥹥��å�: %s\n"
+msgstr "��%s�פ򥹥��å�: %s\n"
#: g10/skclist.c:168
msgid "skipped: secret key already present\n"
msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
#: g10/skclist.c:179
-#, c-format
+#, fuzzy, c-format
msgid ""
-"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
"signatures!\n"
msgstr ""
-"`%s'�򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
+"��%s�פ򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
"��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
-#. do not overwrite
#: g10/openfile.c:84
#, c-format
msgid "File `%s' exists. "
-msgstr "�ե�����`%s'�ϴ���¸�ߤ��ޤ���"
+msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
#: g10/openfile.c:86
msgid "Overwrite (y/N)? "
@@ -4155,29 +4597,34 @@ msgstr "%s: ̤�Τγ�ĥ��\n"
msgid "Enter new filename"
msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
-#: g10/openfile.c:184
+#: g10/openfile.c:183
msgid "writing to stdout\n"
msgstr "ɸ����Ϥ˽񤭽Ф��ޤ�\n"
-#: g10/openfile.c:273
+#: g10/openfile.c:282
#, c-format
msgid "assuming signed data in `%s'\n"
msgstr "��̾���줿�ǡ�����`%s'�ˤ�������ꤷ�ޤ�\n"
-#: g10/openfile.c:326
-#, fuzzy, c-format
+#: g10/openfile.c:349
+#, c-format
msgid "new configuration file `%s' created\n"
-msgstr "%s: ���������ץ���󡦥ե����뤬�Ǥ��ޤ���\n"
+msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+
+#: g10/openfile.c:351
+#, c-format
+msgid "WARNING: options in `%s' are not yet active during this run\n"
+msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
-#: g10/openfile.c:353
+#: g10/openfile.c:380
#, c-format
msgid "%s: can't create directory: %s\n"
-msgstr "%s: ���񤬤Ǥ��ޤ���: %s\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���: %s\n"
-#: g10/openfile.c:356
+#: g10/openfile.c:383
#, c-format
msgid "%s: directory created\n"
-msgstr "%s: ���񤬤Ǥ��ޤ���\n"
+msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���\n"
#: g10/encr-data.c:91
msgid ""
@@ -4197,45 +4644,45 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
-#: g10/seskey.c:200
+#: g10/seskey.c:210
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA�Ǥ�160�ӥåȤΥϥå��塦���르�ꥺ��λ��Ѥ�ɬ�פǤ�\n"
-#: g10/delkey.c:120 g10/delkey.c:127
+#: g10/delkey.c:121 g10/delkey.c:128
msgid "(unless you specify the key by fingerprint)\n"
-msgstr ""
+msgstr "(���뤤�ϡ�����Ǹ������)\n"
-#: g10/delkey.c:126
+#: g10/delkey.c:127
msgid "can't do that in batchmode without \"--yes\"\n"
msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
-#: g10/delkey.c:150
+#: g10/delkey.c:139
msgid "Delete this key from the keyring? "
msgstr "���θ����ؤ��������ޤ���? "
-#: g10/delkey.c:158
+#: g10/delkey.c:147
msgid "This is a secret key! - really delete? "
msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
-#: g10/delkey.c:168
+#: g10/delkey.c:157
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
-#: g10/delkey.c:178
+#: g10/delkey.c:167
msgid "ownertrust information cleared\n"
msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
-#: g10/delkey.c:206
+#: g10/delkey.c:195
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "���θ������ˤ���������̩�� \"%s\" ������ޤ�!\n"
+msgstr "���θ������ˤ���������̩����%s�פ�����ޤ�!\n"
-#: g10/delkey.c:208
+#: g10/delkey.c:197
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
-#: g10/helptext.c:47
+#: g10/helptext.c:48
msgid ""
"It's up to you to assign a value here; this value will never be exported\n"
"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
@@ -4245,7 +4692,7 @@ msgstr ""
"���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
"(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
-#: g10/helptext.c:53
+#: g10/helptext.c:54
msgid ""
"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
"ultimately trusted - those are usually the keys for which you have\n"
@@ -4255,84 +4702,55 @@ msgstr ""
"Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n"
"�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n"
"�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
-"\"yes\"�Ȥ�����������������\n"
+"��yes�פ������Ƥ���������\n"
-#: g10/helptext.c:60
+#: g10/helptext.c:61
msgid "If you want to use this revoked key anyway, answer \"yes\"."
-msgstr "�����˴����줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
+msgstr "���μ������줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
-#: g10/helptext.c:64
+#: g10/helptext.c:65
msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�פ������Ƥ���������"
-#: g10/helptext.c:68
+#: g10/helptext.c:69
msgid ""
"Enter the user ID of the addressee to whom you want to send the message."
msgstr "��å�������������ꥢ�ɥ쥹�Υ桼����ID�����Ϥ��Ƥ���������"
-#: g10/helptext.c:72
+#: g10/helptext.c:73
msgid ""
"Select the algorithm to use.\n"
"\n"
-"DSA (aka DSS) is the digital signature algorithm which can only be used\n"
-"for signatures. This is the suggested algorithm because verification of\n"
-"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"
-"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"
-"the signature+encryption flavor.\n"
-"\n"
-"The first (primary) key must always be a key which is capable of signing;\n"
-"this is the reason why the encryption only ElGamal key is not available in\n"
-"this menu."
-msgstr ""
-"���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
"\n"
-"DSA (��̾DSS) �ϡ���̾�ˤΤ��Ѥ��뤳�Ȥ��Ǥ����Żҽ�̾���르��\n"
-"����Ǥ���DSA��̾��ElGamalˡ�����®�˸��ڤǤ���Τǡ������\n"
-"�侩���륢�르�ꥺ��Ǥ���\n"
+"Elgamal is an encrypt-only algorithm.\n"
"\n"
-"ElGamal�ϡ���̾�ȰŹ沽���Ѥ��뤳�Ȥ��Ǥ��륢�르�ꥺ��Ǥ���\n"
-"OpenPGP�Ǥϡ����Υ��르�ꥺ��ΡְŹ沽�Τߡפȡֽ�̾+�Ź沽��\n"
-"��2�Ĥ���ˡ����̤��Ƥ��ޤ������ºݤˤ�Ʊ���Ǥ�������������̾��\n"
-"�ΰ����ʸ�����ˤϰ������ѿ������̤���ˡ�����򤷤ʤ���Фʤ�\n"
-"�ޤ��󡣤��Υץ������ǤϤ��줬��ǽ�Ǥ�����¾��OpenPGP�μ�����\n"
-"�ϡ��ֽ�̾+�Ź沽�פ���ˡ���ᤷ�ʤ����⤷��ޤ���\n"
+"RSA may be used for signatures or encryption.\n"
"\n"
-"�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ��󡣤��줬\n"
-"���Υ�˥塼�ˡְŹ沽�Τߡפ�ElGamal���Τʤ���ͳ�Ǥ���"
-
-#: g10/helptext.c:92
-msgid ""
-"Although these keys are defined in RFC2440 they are not suggested\n"
-"because they are not supported by all programs and signatures created\n"
-"with them are quite large and very slow to verify."
+"The first (primary) key must always be a key which is capable of signing."
msgstr ""
-"�����θ���RFC2440���������Ƥ��ޤ������侩���ޤ���\n"
-"�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
-"����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
-#: g10/helptext.c:98
+#: g10/helptext.c:87
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 ""
+"���̤ˡ���̾�ȰŹ��Ʊ������Ȥ��Τϡ������������ޤ���\n"
+"���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
+"�ޤ����������ƥ���������Ȥˤ����̤���������"
-#: g10/helptext.c:105
+#: g10/helptext.c:94
msgid "Enter the size of the key"
msgstr "����Ĺ�������Ϥ��Ƥ�������"
-#: 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
+#: g10/helptext.c:98 g10/helptext.c:103 g10/helptext.c:115 g10/helptext.c:147
+#: g10/helptext.c:175 g10/helptext.c:180 g10/helptext.c:185
msgid "Answer \"yes\" or \"no\""
msgstr "��yes�פ���no�פ������Ƥ�������"
-#: g10/helptext.c:119
+#: g10/helptext.c:108
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"
@@ -4344,19 +4762,19 @@ msgstr ""
"ɽ������ʤ��Ǥ��礦��������ꡢ�����ƥ�������ͤ���֤��Ѵ�����\n"
"�褦�˻�ߤޤ���"
-#: g10/helptext.c:131
+#: g10/helptext.c:120
msgid "Enter the name of the key holder"
msgstr "���ۥ����̾�������Ϥ��Ƥ�������"
-#: g10/helptext.c:136
+#: g10/helptext.c:125
msgid "please enter an optional but highly suggested email address"
msgstr "���ץ����Ǥ������Żҥ᡼��Υ��ɥ쥹�����Ϥ��뤳�Ȥ򶯤��侩���ޤ�"
-#: g10/helptext.c:140
+#: g10/helptext.c:129
msgid "Please enter an optional comment"
msgstr "���ץ����Υ����Ȥ����Ϥ��Ƥ�������"
-#: g10/helptext.c:145
+#: g10/helptext.c:134
msgid ""
"N to change the name.\n"
"C to change the comment.\n"
@@ -4370,11 +4788,11 @@ msgstr ""
"O ����������³�ԡ�\n"
"Q ������������ߡ�"
-#: g10/helptext.c:154
+#: g10/helptext.c:143
msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
msgstr "���������������硢��yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
-#: g10/helptext.c:162
+#: g10/helptext.c:151
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"
@@ -4427,13 +4845,13 @@ msgstr ""
" �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n"
"\n"
"\"2\" �ϡ����ʤ���������γ�ǧ�򤷤����Ȥ�����̣�Ǥ������Ȥ���\n"
-" ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID���ǧ\n"
+" ���λ���򸡾ڤ����ե���ID�ˤ������Ƹ��Υ桼����ID�򸡺�\n"
" ������礬�����Ǥ���\n"
"\n"
"\"3\" �ϡ����ʤ������ϰϤˤ錄�기�򸡾ڤ������Ȥ�����̣�Ǥ���\n"
" ���Ȥ��С����ν�ͭ���ܿͤȸ��λ���򸡾ڤ���(�ѥ��ݡ���\n"
" �Τ褦��) ��¤�Τ�Ĥ��������ե���ID�Ĥ��μ��ʤǡ����ν�\n"
-" ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ��ǧ��\n"
+" ͭ�Ԥ�̾���������Υ桼����ID��̾���Ȱ��פ��뤳�Ȥ򸡺���\n"
" �ơ�(�Żҥ᡼��θ򴹤ʤɤ�) �����Żҥ᡼�롦���ɥ쥹��\n"
" ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥ򸡾ڤ�����礬�����Ǥ���\n"
"\n"
@@ -4443,11 +4861,11 @@ msgstr ""
"\n"
"���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
-#: g10/helptext.c:200
+#: g10/helptext.c:189
msgid "Answer \"yes\" is you want to sign ALL the user IDs"
msgstr "���Ƥ� �桼����ID�˽�̾��������С���yes�פ������Ƥ�������"
-#: g10/helptext.c:204
+#: g10/helptext.c:193
msgid ""
"Answer \"yes\" if you really want to delete this user ID.\n"
"All certificates are then also lost!"
@@ -4455,11 +4873,11 @@ msgstr ""
"�����Υ桼����ID�������˺����������С���yes�פ������Ƥ���������\n"
"�����������Ʊ���˺�����ޤ�!"
-#: g10/helptext.c:209
+#: g10/helptext.c:198
msgid "Answer \"yes\" if it is okay to delete the subkey"
msgstr "�����������������硢��yes�פ������Ƥ�������"
-#: g10/helptext.c:214
+#: g10/helptext.c:203
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"
@@ -4469,19 +4887,19 @@ msgstr ""
"�Ϥʤ��Ǥ��礦���ʤ��ʤ顢���ν�̾�ϡ����ؤο��Ѥ��ؤκ����䡢\n"
"���θ��ˤ������ˤȤäƽ��פ�����Ǥ���"
-#: g10/helptext.c:219
+#: g10/helptext.c:208
msgid ""
"This signature can't be checked because you don't have the\n"
"corresponding key. You should postpone its deletion until you\n"
"know which key was used because this signing key might establish\n"
"a trust connection through another already certified key."
msgstr ""
-"���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ��ڤǤ��ޤ���\n"
+"���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ����Ǥ��ޤ���\n"
"���θ������Ѥ����ޤǤϡ����ʤ��Ϥ��ν�̾�κ������α����٤��Ǥ���\n"
"�ʤ��ʤ顢���ν�̾�θ��ϡ�¾�ξ������줿���ǿ��Ѥ��ؤ�������뤫��\n"
"����ʤ�����Ǥ���"
-#: g10/helptext.c:225
+#: g10/helptext.c:214
msgid ""
"The signature is not valid. It does make sense to remove it from\n"
"your keyring."
@@ -4489,7 +4907,7 @@ msgstr ""
"���ν�̾��ͭ���ǤϤ���ޤ��󡣤��Τ��Ȥϡ����ʤ��θ��ؤ��������٤���\n"
"�Ȥ�����̣�Ǥ���"
-#: g10/helptext.c:229
+#: g10/helptext.c:218
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"
@@ -4499,43 +4917,43 @@ msgid ""
msgstr ""
"����ϡ����Υ桼����ID���б�������̾�Ǥ����̾���ν�̾��������Τ�\n"
"�����ͤ��ǤϤ���ޤ��󡣼ºݤˤϡ�GnuPG�Ϥ�Ϥ䤳�θ���Ȥ��ʤ��Τ���\n"
-"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��̵���Ǥ��äơ�\n"
+"����ޤ��󡣤�äơ����μ��ʽ�̾�����餫����ͳ�ˤ��ͭ���ǤϤʤ��ơ�\n"
"���ؤȤʤ븰��������ˤΤߡ������¹Ԥ��Ƥ���������"
-#: g10/helptext.c:237
+#: g10/helptext.c:226
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"
"self-signatures will be advanced by one second.\n"
msgstr ""
"���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
-"���ޤ����ط����뼫�ʽ�̾�Υ����ॹ����פϡ�1�ä����ߤޤ���\n"
+"���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
-#: g10/helptext.c:244
+#: g10/helptext.c:233
msgid "Please enter the passhrase; this is a secret sentence \n"
msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
-#: g10/helptext.c:250
+#: g10/helptext.c:239
msgid "Please repeat the last passphrase, so you are sure what you typed in."
msgstr "���Ϥ����ѥ��ե졼���γ�ǧ�Τ��ᡢ�����Ϥ��Ƥ���������"
-#: g10/helptext.c:254
+#: g10/helptext.c:243
msgid "Give the name of the file to which the signature applies"
msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
-#: g10/helptext.c:259
+#: g10/helptext.c:248
msgid "Answer \"yes\" if it is okay to overwrite the file"
msgstr "��񤭤��Ƥ褱��С���yes�פ������Ƥ�������"
-#: g10/helptext.c:264
+#: g10/helptext.c:253
msgid ""
"Please enter a new filename. If you just hit RETURN the default\n"
"file (which is shown in brackets) will be used."
msgstr ""
"�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
-"(��̤ǰϤ��) ����Υե�����̾����Ѥ��ޤ���"
+"(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
-#: g10/helptext.c:270
+#: g10/helptext.c:259
msgid ""
"You should specify a reason for the certification. Depending on the\n"
"context you have the ability to choose from this list:\n"
@@ -4564,108 +4982,657 @@ msgstr ""
" �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
" ���˻Ȥ��ޤ���\n"
-#: g10/helptext.c:286
+#: g10/helptext.c:275
msgid ""
"If you like, you can enter a text describing why you issue this\n"
"revocation certificate. Please keep this text concise.\n"
"An empty line ends the text.\n"
msgstr ""
-"�⤷������������С��ʤ��˴��������ȯ�Ԥ���Τ������������\n"
+"�⤷������������С��ʤ������������ȯ�Ԥ���Τ������������\n"
"�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
"���Ԥǽ����ˤʤ�ޤ���\n"
-#: g10/helptext.c:301
+#: g10/helptext.c:290
msgid "No help available"
msgstr "�إ�פϤ���ޤ���"
-#: g10/helptext.c:309
+#: g10/helptext.c:298
#, c-format
msgid "No help available for `%s'"
-msgstr "`%s'�Υإ�פϤ���ޤ���"
+msgstr "��%s�פΥإ�פϤ���ޤ���"
-#: g10/keydb.c:178
+#: g10/keydb.c:189
#, c-format
msgid "error creating keyring `%s': %s\n"
-msgstr "����`%s'�κ������顼: %s\n"
+msgstr "���ء�%s�פκ������顼: %s\n"
-#: g10/keydb.c:185
+#: g10/keydb.c:196
#, c-format
msgid "keyring `%s' created\n"
-msgstr "���� `%s' ���Ǥ��ޤ���\n"
+msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
-#: g10/keydb.c:575
+#: g10/keydb.c:615
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
-#: g10/keyring.c:1226
+#: g10/keyring.c:1236
msgid "WARNING: 2 files with confidential information exists.\n"
msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
-#: g10/keyring.c:1228
+#: g10/keyring.c:1238
#, c-format
msgid "%s is the unchanged one\n"
msgstr "%s���ѹ��Τʤ����Ǥ�\n"
-#: g10/keyring.c:1229
+#: g10/keyring.c:1239
#, c-format
msgid "%s is the new one\n"
msgstr "%s�Ͽ��������Ǥ�\n"
-#: g10/keyring.c:1230
+#: g10/keyring.c:1240
msgid "Please fix this possible security flaw\n"
msgstr "���ΰ�����η�٤������Ƥ�������\n"
-#: g10/keyring.c:1346
+#: g10/keyring.c:1360
+#, fuzzy, c-format
+msgid "caching keyring `%s'\n"
+msgstr "���ء�%s�פ򸡺����Ƥ��ޤ�\n"
+
+#: g10/keyring.c:1406
+#, fuzzy, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+
+#: g10/keyring.c:1418
+#, fuzzy, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+
+#: g10/keyring.c:1484
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+
+#: g10/photoid.c:65
#, c-format
-msgid "checking keyring `%s'\n"
-msgstr "����`%s'�򸡾ڤ��Ƥ��ޤ�\n"
+msgid ""
+"\n"
+"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
+"Remember that the image is stored within your public key. If you use a\n"
+"very large picture, your key will become very large as well!\n"
+"Keeping the image close to 240x288 is a good size to use.\n"
+msgstr ""
+"\n"
+"���ʤ��Υե���ID�˻Ȥ���������Ƥ���������������JPEG�ե�����Ǥ���ɬ\n"
+"�פ�����ޤ��������ϸ������Ȥ��ä���˳�Ǽ����롢�Ȥ������Ȥ�ǰƬ�ˤ�\n"
+"���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
+"�ޤ�! ���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
-#: g10/keyring.c:1377
+#: g10/photoid.c:79
+msgid "Enter JPEG filename for photo ID: "
+msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
+
+#: g10/photoid.c:87
#, c-format
-msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgid "Unable to open photo \"%s\": %s\n"
+msgstr "�̿����%s�פ򳫤����Ȥ��Ǥ��ޤ���: %s\n"
+
+#: g10/photoid.c:97
+msgid "Are you sure you want to use it (y/N)? "
+msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
-#: g10/keyring.c:1388
+#: g10/photoid.c:112
#, c-format
-msgid "%lu keys checked (%lu signatures)\n"
-msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgid "\"%s\" is not a JPEG file\n"
+msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
+
+#: g10/photoid.c:129
+msgid "Is this photo correct (y/N/q)? "
+msgstr "���μ̿����������Ǥ��� (y/N/q)? "
+
+#: g10/photoid.c:331
+msgid "unable to display photo ID!\n"
+msgstr "�ե���ID��ɽ����ǽ!\n"
-#: g10/keyring.c:1453
+#: g10/exec.c:48
+msgid "no remote program execution supported\n"
+msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
+
+#: g10/exec.c:184
#, c-format
-msgid "%s: keyring created\n"
-msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
+msgid "can't create directory `%s': %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���: %s\n"
+
+#: g10/exec.c:325
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"���ץ���󡦥ե�����ε��ĥ⡼�ɤ��������ǤϤʤ��Τǡ�\n"
+"�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
+
+#: g10/exec.c:355
+msgid "this platform requires temp files when calling external programs\n"
+msgstr ""
+"���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
+
+#: g10/exec.c:432
+#, c-format
+msgid "unable to execute %s \"%s\": %s\n"
+msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
+
+#: g10/exec.c:513
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "�����ץ������θƽФ��ǥ����ƥࡦ���顼: %s\n"
+
+#: g10/exec.c:524 g10/exec.c:583
+msgid "unnatural exit of external program\n"
+msgstr "�����ץ�����ब���Լ����˽�λ\n"
+
+#: g10/exec.c:539
+msgid "unable to execute external program\n"
+msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
+
+#: g10/exec.c:548
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "�����ץ������α������ɤ߹���ޤ���: %s\n"
+
+#: g10/exec.c:594 g10/exec.c:601
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) `%s': %s\n"
+
+#: g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
+
+#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518
+msgid "never "
+msgstr "̵���� "
+
+#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
+#: g10/revoke.c:187 g10/revoke.c:541
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
+
+#: g10/revoke.c:146
+#, fuzzy, c-format
+msgid "key %s has no user IDs\n"
+msgstr "��%08lX: �桼����ID������ޤ���\n"
+
+#: g10/revoke.c:271
+msgid "To be revoked by:\n"
+msgstr "������:\n"
+
+#: g10/revoke.c:275
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
+
+#: g10/revoke.c:279 g10/revoke.c:476
+msgid "Create a revocation certificate for this key? "
+msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
+
+#: g10/revoke.c:292 g10/revoke.c:507
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII�������Ϥ������ޤ���\n"
+
+#: g10/revoke.c:306 g10/revoke.c:521
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
+
+#: g10/revoke.c:369
+msgid "Revocation certificate created.\n"
+msgstr "����������������\n"
+
+#: g10/revoke.c:375
+#, c-format
+msgid "no revocation keys found for `%s'\n"
+msgstr "��%s���Ѥμ������ϡ�����ޤ���\n"
+
+#: g10/revoke.c:429
+#, c-format
+msgid "secret key `%s' not found: %s\n"
+msgstr "��̩����%s�פ����Ĥ���ޤ���: %s\n"
+
+#: g10/revoke.c:458
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "�б����������������ޤ���: %s\n"
+
+#: g10/revoke.c:469
+msgid "public key does not match secret key!\n"
+msgstr "����������̩�����ȹ礷�ޤ���!\n"
+
+#: g10/revoke.c:492
+msgid "unknown protection algorithm\n"
+msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
+
+#: g10/revoke.c:496
+msgid "NOTE: This key is not protected!\n"
+msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
+
+#: g10/revoke.c:547
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"�����������������ޤ�����\n"
+"\n"
+"���Ĥ���ʤ��褦�����Τ˰�ư���Ƥ����������⤷��뤬���ξ�����ؤΥ�\n"
+"������������ȡ������Ĥ����ʤ��ξ������Ȥ��ʤ����뤳�Ȥ��Ǥ��ޤ���\n"
+"���Τ��ɽФ���ǽ�ˤʤä����������ơ����ξ��������������ݴɤ����\n"
+"�������Ǥ��������������դ��Ƥ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
+"����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
+
+#: g10/revoke.c:588
+msgid "Please select the reason for the revocation:\n"
+msgstr "��������ͳ�����򤷤Ƥ�������:\n"
+
+#: g10/revoke.c:598
+msgid "Cancel"
+msgstr "����󥻥�"
+
+#: g10/revoke.c:600
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(�����ǤϤ��ä�%d�����Ӥޤ�)\n"
+
+#: g10/revoke.c:641
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
+
+#: g10/revoke.c:669
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "������ͳ: %s\n"
+
+#: g10/revoke.c:671
+msgid "(No description given)\n"
+msgstr "(�����Ϥ���ޤ���)\n"
+
+#: g10/revoke.c:676
+msgid "Is this okay? "
+msgstr "��������Ǥ���? "
+
+#: g10/tdbdump.c:104
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# Sitei sareta sin'you no atai itiran %s\n"
+"# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\n"
+
+#: g10/tdbdump.c:140
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "�ե����뤬�����ޤ���: %s\n"
+
+#: g10/tdbdump.c:151
+msgid "line too long\n"
+msgstr "�Ԥ�Ĺ�᤮�ޤ�\n"
+
+#: g10/tdbdump.c:159
+msgid "error: missing colon\n"
+msgstr "���顼: ������ȴ���Ƥ��ޤ�\n"
+
+#: g10/tdbdump.c:164
+msgid "error: invalid fingerprint\n"
+msgstr "���顼: ̵���ʻ���\n"
+
+#: g10/tdbdump.c:168
+msgid "error: no ownertrust value\n"
+msgstr "���顼: ��ͭ�Ԥ��Ѥ����ͤ�����ޤ���\n"
+
+#: g10/tdbdump.c:204
+#, c-format
+msgid "error finding trust record: %s\n"
+msgstr "���ѥ쥳���ɤθ������顼: %s\n"
+
+#: g10/tdbdump.c:208
+#, c-format
+msgid "read error: %s\n"
+msgstr "�ɹ��ߥ��顼: %s\n"
-#, fuzzy
#~ msgid ""
-#~ "you have to start GnuPG again, so it can read the new configuration file\n"
-#~ msgstr "���ץ���󡦥ե�������ɤ�ľ���褦��GnuPG��Ƶ�ư���Ƥ�������\n"
+#~ "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
+#~ msgstr ""
+#~ "�ٹ�: �����%s�פϡ�OpenPGP�ΰ����Ǥ���ޤ��󡣤����Ȥ���Ǥ�ǻȤ�������"
+#~ "��!\n"
+
+#~ msgid "|[files]|encrypt files"
+#~ msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
-#~ msgid "changing permission of `%s' failed: %s\n"
-#~ msgstr "`%s' �ؤε��Ĥ��ѹ��˼���: %s\n"
+#~ msgid "store only"
+#~ msgstr "��¸�Τ�"
+
+#~ msgid "|[files]|decrypt files"
+#~ msgstr "|[�ե����뷲]|�ե����뷲������"
+
+#~ msgid "sign a key non-revocably"
+#~ msgstr "�����Ǥ��ʤ��褦���˽�̾"
+
+#~ msgid "sign a key locally and non-revocably"
+#~ msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
+
+#~ msgid "list only the sequence of packets"
+#~ msgstr "�ѥ��å���Τߤΰ���"
+
+#~ msgid "export the ownertrust values"
+#~ msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
+
+#~ msgid "import ownertrust values"
+#~ msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
+
+#~ msgid "unattended trust database update"
+#~ msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
+
+#~ msgid "fix a corrupted trust database"
+#~ msgstr "���줿���ѥǡ����١�������"
+
+#~ msgid "De-Armor a file or stdin"
+#~ msgstr ""
+#~ "�ե�����ޤ���ɸ�����Ϥ�\n"
+#~ "��������"
+
+#~ msgid "En-Armor a file or stdin"
+#~ msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
+
+#~ msgid "|NAME|use NAME as default recipient"
+#~ msgstr ""
+#~ "|̾��|����μ���ͤȤ���\n"
+#~ "��̾���פ����"
+
+#~ msgid "use the default key as default recipient"
+#~ msgstr "����μ���ͤ˴���θ������"
+
+#~ msgid "don't use the terminal at all"
+#~ msgstr "ü�����Ի���"
+
+#~ msgid "force v3 signatures"
+#~ msgstr "����Ū��v3��̾"
+
+#~ msgid "do not force v3 signatures"
+#~ msgstr "v3��̾�������ʤ�"
+
+#~ msgid "force v4 key signatures"
+#~ msgstr "����Ū��v4��̾"
+
+#~ msgid "do not force v4 key signatures"
+#~ msgstr "v4��̾�������ʤ�"
+
+#~ msgid "always use a MDC for encryption"
+#~ msgstr "�Ź沽�ˤϾ��MDC�����"
+
+#~ msgid "never use a MDC for encryption"
+#~ msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
+
+#~ msgid "use the gpg-agent"
+#~ msgstr "gpg����������Ȥ����"
+
+#~ msgid "batch mode: never ask"
+#~ msgstr "�Хå����⡼��: ��ǧ��ά"
+
+#~ msgid "assume yes on most questions"
+#~ msgstr ""
+#~ "�����Ƥ��μ����������yes\n"
+#~ "�Ȥߤʤ�"
+
+#~ msgid "assume no on most questions"
+#~ msgstr ""
+#~ "�����Ƥ��μ����������no\n"
+#~ "�Ȥߤʤ�"
+
+#~ msgid "add this keyring to the list of keyrings"
+#~ msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
+
+#~ msgid "add this secret keyring to the list"
+#~ msgstr "�����ˤ�����̩���ؤ��ɲ�"
+
+#~ msgid "show which keyring a listed key is on"
+#~ msgstr "�����θ������븰�ؤ�ɽ��"
+
+#~ msgid "|NAME|use NAME as default secret key"
+#~ msgstr ""
+#~ "|̾��|�������̩���Ȥ���\n"
+#~ "��̾���פ����"
-#~ msgid "|NAME=VALUE|use this notation data"
-#~ msgstr "|̾��=��|��������ǡ��������"
+#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgstr "|�ۥ���|���θ����ˤ��θ������С������"
+
+#~ msgid "|NAME|set terminal charset to NAME"
+#~ msgstr ""
+#~ "|CHARSET̾|ü����charset���CHARSET̾��\n"
+#~ "������"
+
+#~ msgid "read options from file"
+#~ msgstr ""
+#~ "�ե����뤫�饪�ץ�����\n"
+#~ "�ɤ߹���"
+
+#~ msgid "|[file]|write status info to file"
+#~ msgstr ""
+#~ "|�ե�����|���ơ����������ե������\n"
+#~ "�񤭽Ф�"
+
+#~ msgid "|KEYID|ultimately trust this key"
+#~ msgstr "|��ID|���θ�������Ū�˿��Ѥ���"
+
+#~ msgid "|FILE|load extension module FILE"
+#~ msgstr ""
+#~ "|�ե�����|��ĥ�⥸�塼��Υե������\n"
+#~ "�ɤ߹���"
+
+#~ msgid "emulate the mode described in RFC1991"
+#~ msgstr ""
+#~ "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
+#~ "����"
+
+#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
+#~ msgstr ""
+#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
+#~ "�������OpenPGP��������"
+
+#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
+#~ msgstr ""
+#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
+#~ "�������PGP 2.x��������"
+
+#~ msgid "|N|use passphrase mode N"
+#~ msgstr "|N|�ѥ��ե졼�����⡼��N�����"
+
+#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
+#~ "���������󥢥르�ꥺ������"
+
+#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
+#~ msgstr ""
+#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
+#~ "���르�ꥺ������"
+
+#~ msgid "|NAME|use cipher algorithm NAME"
+#~ msgstr ""
+#~ "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
+#~ "����"
+
+#~ msgid "|NAME|use message digest algorithm NAME"
+#~ msgstr ""
+#~ "|̾��|��̾���פΥ�å���������\n"
+#~ "���르�ꥺ������"
+
+#~ msgid "|N|use compress algorithm N"
+#~ msgstr ""
+#~ "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
+#~ "����"
+
+#~ msgid "throw keyid field of encrypted packets"
+#~ msgstr ""
+#~ "�Ź�ѥ��åȤθ�ID�ե������\n"
+#~ "������"
+
+#~ msgid "Show Photo IDs"
+#~ msgstr "�ե���ID��ɽ��"
+
+#~ msgid "Don't show Photo IDs"
+#~ msgstr "�ե���ID��ɽ�����ʤ�"
+
+#~ msgid "Set command line to view Photo IDs"
+#~ msgstr ""
+#~ "�ե���ID��������륳�ޥ�ɹ�\n"
+#~ "������"
+
+#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgstr "���̥��르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
+
+#~ msgid "compress algorithm must be in range %d..%d\n"
+#~ msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
+
+#~ msgid ""
+#~ "%08lX: It is not sure that this key really belongs to the owner\n"
+#~ "but it is accepted anyway\n"
+#~ msgstr ""
+#~ "%08lX: ���θ��ϼºݤ��ܿͤΤ�Τ��������Ǥ�����\n"
+#~ "���������������ޤ�\n"
+
+#~ msgid "preference %c%lu is not valid\n"
+#~ msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
+
+#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
+#~ msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
+
+#~ msgid ""
+#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgstr "����: ElGamal�μ縰�򸡽� - �����ˤ����ɹ��ߤ˻��֤�������ޤ�\n"
+
+#~ msgid " (default)"
+#~ msgstr " (����)"
+
+#~ msgid "%s%c %4u%c/%08lX created: %s expires: %s"
+#~ msgstr "%s%c %4u%c/%08lX ����: %s ����: %s"
+
+#~ msgid "Notation: "
+#~ msgstr "����: "
+
+#~ msgid "Policy: "
+#~ msgstr "�ݥꥷ��: "
+
+#~ msgid "requesting key %08lX from %s\n"
+#~ msgstr "��%08lX��%s���׵�\n"
+
+#~ msgid "can't get key from keyserver: %s\n"
+#~ msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
+
+#~ msgid "error sending to `%s': %s\n"
+#~ msgstr "`%s'�ؤ��������顼: %s\n"
+
+#~ msgid "success sending to `%s' (status=%u)\n"
+#~ msgstr "`%s'�ؤ����������� (����=%u)\n"
+
+#~ msgid "failed sending to `%s': status=%u\n"
+#~ msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
+
+#~ msgid "this keyserver does not support --search-keys\n"
+#~ msgstr "���θ������С��ϡ�--search-keys�򥵥ݡ��Ȥ��ޤ���\n"
+
+#~ msgid "searching for \"%s\" from HKP server %s\n"
+#~ msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
+
+#~ msgid "can't search keyserver: %s\n"
+#~ msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
+
+#~ msgid ""
+#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+#~ "signatures!\n"
+#~ msgstr ""
+#~ "��%08lX: ����ϡ�PGP����������ElGamal�Ǥ���\n"
+#~ "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
#~ msgid ""
-#~ "the first character of a notation name must be a letter or an underscore\n"
-#~ msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
+#~ "key %08lX has been created %lu second in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-#~ msgid "dots in a notation name must be surrounded by other characters\n"
-#~ msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
+#~ msgid ""
+#~ "key %08lX has been created %lu seconds in future (time warp or clock "
+#~ "problem)\n"
+#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+
+#~ msgid "key %08lX marked as ultimately trusted\n"
+#~ msgstr "����Ū�˿��Ѥ������Ȥ��Ƹ� %08lX ��Ͽ���ޤ���\n"
+
+#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+#~ msgstr "ElGamal��̾�� %08lX ���� %08lX �ޤǤν�̾�򥹥��å�\n"
+
+#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+#~ msgstr "%08lX ����ElGamal��̾�� %08lX �ޤǤν�̾�򥹥��å�\n"
+
+#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+#~ msgstr "����%d�Ǹ�������̾�Ѥ�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+
+#~ msgid ""
+#~ "Select the algorithm to use.\n"
+#~ "\n"
+#~ "DSA (aka DSS) is the digital signature algorithm which can only be used\n"
+#~ "for signatures. This is the suggested algorithm because verification of\n"
+#~ "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"
+#~ "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"
+#~ "the signature+encryption flavor.\n"
+#~ "\n"
+#~ "The first (primary) key must always be a key which is capable of "
+#~ "signing;\n"
+#~ "this is the reason why the encryption only ElGamal key is not available "
+#~ "in\n"
+#~ "this menu."
+#~ msgstr ""
+#~ "���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+#~ "\n"
+#~ "DSA (��̾DSS) �ϡ���̾�ˤΤ��Ѥ��뤳�Ȥ��Ǥ����Żҽ�̾���르��\n"
+#~ "����Ǥ���DSA��̾��ElGamalˡ�����®�˸��ڤǤ���Τǡ������\n"
+#~ "�侩���륢�르�ꥺ��Ǥ���\n"
+#~ "\n"
+#~ "ElGamal�ϡ���̾�ȰŹ沽���Ѥ��뤳�Ȥ��Ǥ��륢�르�ꥺ��Ǥ���\n"
+#~ "OpenPGP�Ǥϡ����Υ��르�ꥺ��ΡְŹ沽�Τߡפȡֽ�̾+�Ź沽��\n"
+#~ "��2�Ĥ���ˡ����̤��Ƥ��ޤ������ºݤˤ�Ʊ���Ǥ�������������̾��\n"
+#~ "�ΰ����ʸ�����ˤϰ������ѿ������̤���ˡ�����򤷤ʤ���Фʤ�\n"
+#~ "�ޤ��󡣤��Υץ������ǤϤ��줬��ǽ�Ǥ�����¾��OpenPGP�μ�����\n"
+#~ "�ϡ��ֽ�̾+�Ź沽�פ���ˡ���ᤷ�ʤ����⤷��ޤ���\n"
+#~ "\n"
+#~ "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ��󡣤��줬\n"
+#~ "���Υ�˥塼�ˡְŹ沽�Τߡפ�ElGamal���Τʤ���ͳ�Ǥ���"
#~ msgid ""
-#~ "WARNING: This key already has a photo ID.\n"
-#~ " Adding another photo ID may confuse some versions of PGP.\n"
+#~ "Although these keys are defined in RFC2440 they are not suggested\n"
+#~ "because they are not supported by all programs and signatures created\n"
+#~ "with them are quite large and very slow to verify."
#~ msgstr ""
-#~ "�ٹ�: ���θ��ˤϤ⤦�ե���ID������ޤ���\n"
-#~ " �㤦�ե���ID���ɲä���ȡ��������Ǥ�PGP�Ϻ��𤹤뤫�⤷��ޤ���\n"
+#~ "�����θ���RFC2440���������Ƥ��ޤ������侩���ޤ���\n"
+#~ "�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
+#~ "����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
-#~ msgid "You may only have one photo ID on a key.\n"
-#~ msgstr "1�ܤθ��ˤϥե���ID��ҤȤ��դ���������Ǥ���\n"
+#~ msgid "%lu keys so far checked (%lu signatures)\n"
+#~ msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
-#~ msgid "Fingerprint:"
-#~ msgstr "����:"
+#~ msgid "key incomplete\n"
+#~ msgstr "�Դ����ʸ�\n"
-#~ msgid " Fingerprint:"
-#~ msgstr " ����:"
+#~ msgid "key %08lX incomplete\n"
+#~ msgstr "��%08lX: �Դ���\n"