aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1962
1 files changed, 1085 insertions, 877 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dd683cdea..76d82e0bc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-06-16 12:05+0200\n"
"PO-Revision-Date: 2004-02-27 19:30+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -22,35 +23,38 @@ msgstr "���棺����ʹ�ò���ȫ���ڴ棡\n"
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:338
msgid "operation is not possible without initialized secure memory\n"
msgstr "��ȫ�ڴ�δ��ʼ�������ܽ��в���\n"
-#: util/secmem.c:327
+#: util/secmem.c:339
msgid "(you may have used the wrong program for this task)\n"
msgstr "(������ʹ���˴���ij�������ɴ�������)\n"
-#: util/miscutil.c:296 util/miscutil.c:331
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: 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
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: 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"
-#: util/miscutil.c:333 g10/keyedit.c:941
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: util/miscutil.c:348 g10/keyedit.c:980
msgid "quit"
msgstr "quit"
-#: util/miscutil.c:336
+#: util/miscutil.c:351
msgid "qQ"
msgstr "qQ"
@@ -273,62 +277,62 @@ msgstr "�������Ǹ�����ȱ��(%s:%d:%s)\n"
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 "��ⲻ�������Ѽ�ģ��\n"
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:387 g10/keygen.c:1927 g10/import.c:163
#, c-format
msgid "can't open `%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"
-#: cipher/random.c:390
+#: cipher/random.c:396
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "��%s������һ���Ϻ���׼���ļ������Ѻ���\n"
-#: cipher/random.c:395
+#: cipher/random.c:401
msgid "note: random_seed file is empty\n"
msgstr "ע�⣺����������ļ�Ϊ��\n"
-#: cipher/random.c:401
+#: cipher/random.c:407
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "���棺����������ļ���С��Ч����δʹ��\n"
-#: cipher/random.c:409
+#: cipher/random.c:415
#, c-format
msgid "can't read `%s': %s\n"
msgstr "�޷���ȡ��%s����%s\n"
-#: cipher/random.c:447
+#: cipher/random.c:453
msgid "note: random_seed file not updated\n"
msgstr "ע�⣺����������ļ�δ������\n"
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:473 g10/exec.c:481
#, c-format
msgid "can't create `%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"
-#: cipher/random.c:477
+#: cipher/random.c:483
#, c-format
msgid "can't close `%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"
-#: 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"
@@ -358,6 +362,11 @@ msgstr ""
msgid "digest algorithm `%s' is read-only in this release\n"
msgstr "��%s��ɢ���㷨�ڱ����а汾��ֻ��\n"
+#: cipher/md.c:147
+#, c-format
+msgid "WARNING: digest `%s' is not part of OpenPGP. Use at your own risk!\n"
+msgstr ""
+
#: cipher/rndegd.c:204
msgid ""
"Please wait, entropy is being gathered. Do some work if it would\n"
@@ -367,7 +376,12 @@ msgstr ""
"���Դ�Ƭ�̣�ϵͳ��ʱ�����Ѽ��������������������ĵĻ���\n"
"������Щ����£�ʵ�����������ܹ���������Ʒ�ʸ��á�\n"
-#: g10/g10.c:307
+#: cipher/primegen.c:310
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:322
msgid ""
"@Commands:\n"
" "
@@ -375,163 +389,163 @@ msgstr ""
"@ָ�\n"
" "
-#: g10/g10.c:309
+#: g10/g10.c:324
msgid "|[file]|make a signature"
msgstr "|[�ļ���]|����һ��ǩ��"
-#: g10/g10.c:310
+#: g10/g10.c:325
msgid "|[file]|make a clear text signature"
msgstr "|[�ļ���]|����һ������ǩ��"
-#: g10/g10.c:311
+#: g10/g10.c:326
msgid "make a detached signature"
msgstr "����һ�ݷ����ǩ��"
-#: g10/g10.c:312
+#: g10/g10.c:327
msgid "encrypt data"
msgstr "��������"
-#: g10/g10.c:313
+#: g10/g10.c:329
msgid "|[files]|encrypt files"
msgstr "|[�ļ���]|�����ļ�"
-#: g10/g10.c:314
+#: g10/g10.c:330
msgid "encryption only with symmetric cipher"
msgstr "��ʹ�öԳƼ���"
-#: g10/g10.c:315
+#: g10/g10.c:331
msgid "store only"
msgstr "������"
-#: g10/g10.c:316
+#: g10/g10.c:332
msgid "decrypt data (default)"
msgstr "��������(Ĭ��)"
-#: g10/g10.c:317
+#: g10/g10.c:333
msgid "|[files]|decrypt files"
msgstr "|[�ļ���]|�����ļ�"
-#: g10/g10.c:318
+#: g10/g10.c:334
msgid "verify a signature"
msgstr "��֤ǩ��"
-#: g10/g10.c:320
+#: g10/g10.c:336
msgid "list keys"
msgstr "�г���Կ"
-#: g10/g10.c:322
+#: g10/g10.c:338
msgid "list keys and signatures"
msgstr "�г���Կ��ǩ��"
-#: g10/g10.c:323
+#: g10/g10.c:339
msgid "check key signatures"
msgstr "�����Կǩ��"
-#: g10/g10.c:324
+#: g10/g10.c:340
msgid "list keys and fingerprints"
msgstr "�г���Կ��ָ��"
-#: g10/g10.c:325
+#: g10/g10.c:341
msgid "list secret keys"
msgstr "�г�˽Կ"
-#: g10/g10.c:326
+#: g10/g10.c:342
msgid "generate a new key pair"
msgstr "����һ���µ���Կ��"
-#: g10/g10.c:327
+#: g10/g10.c:343
msgid "remove keys from the public keyring"
msgstr "�ӹ�ԿԿ�׻���ɾ����Կ"
-#: g10/g10.c:329
+#: g10/g10.c:345
msgid "remove keys from the secret keyring"
msgstr "��˽ԿԿ�׻���ɾ����Կ"
-#: g10/g10.c:330
+#: g10/g10.c:346
msgid "sign a key"
msgstr "Ϊij����Կ����ǩ��"
-#: g10/g10.c:331
+#: g10/g10.c:347
msgid "sign a key locally"
msgstr "Ϊij����Կ���ӱ���ǩ��"
-#: g10/g10.c:332
+#: g10/g10.c:348
msgid "sign a key non-revocably"
msgstr "Ϊij����Կ���Ӳ��ɵ�����ǩ��"
-#: g10/g10.c:333
+#: g10/g10.c:349
msgid "sign a key locally and non-revocably"
msgstr "Ϊij����Կ���Ӳ��ɵ����ı���ǩ��"
-#: g10/g10.c:334
+#: g10/g10.c:350
msgid "sign or edit a key"
msgstr "�༭ij����Կ��Ϊ������ǩ��"
-#: g10/g10.c:335
+#: g10/g10.c:351
msgid "generate a revocation certificate"
msgstr "����һ�ݵ���֤��"
-#: g10/g10.c:337
+#: g10/g10.c:353
msgid "export keys"
msgstr "������Կ"
-#: g10/g10.c:338
+#: g10/g10.c:354
msgid "export keys to a key server"
msgstr "����Կ������ij����Կ��������"
-#: g10/g10.c:339
+#: g10/g10.c:355
msgid "import keys from a key server"
msgstr "�ӹ�Կ�������ϵ�����Կ"
-#: g10/g10.c:341
+#: g10/g10.c:357
msgid "search for keys on a key server"
msgstr "�ڹ�Կ����������Ѱ��Կ"
-#: g10/g10.c:343
+#: g10/g10.c:359
msgid "update all keys from a keyserver"
msgstr "�ӹ�Կ�������������еı�����Կ"
-#: g10/g10.c:347
+#: g10/g10.c:363
msgid "import/merge keys"
msgstr "����/�ϲ���Կ"
-#: g10/g10.c:349
+#: g10/g10.c:367
msgid "list only the sequence of packets"
msgstr "���������"
-#: g10/g10.c:351
+#: g10/g10.c:369
msgid "export the ownertrust values"
msgstr "�������ζ�"
-#: g10/g10.c:353
+#: g10/g10.c:371
msgid "import ownertrust values"
msgstr "�������ζ�"
-#: g10/g10.c:355
+#: g10/g10.c:373
msgid "update the trust database"
msgstr "�������ζ����ݿ�"
-#: g10/g10.c:357
+#: g10/g10.c:375
msgid "unattended trust database update"
msgstr "���ܸ�Ԥ�ظ������ζ����ݿ�"
-#: g10/g10.c:358
+#: g10/g10.c:376
msgid "fix a corrupted trust database"
msgstr "�޸�ij�����𻵵����ζ����ݿ�"
-#: g10/g10.c:359
+#: g10/g10.c:377
msgid "De-Armor a file or stdin"
msgstr "Ϊ�ļ����׼����⿪ ASCII ��װ"
-#: g10/g10.c:361
+#: g10/g10.c:379
msgid "En-Armor a file or stdin"
msgstr "Ϊ�ļ����׼������� ASCII ��װ"
-#: g10/g10.c:363
+#: g10/g10.c:381
msgid "|algo [files]|print message digests"
msgstr "|�㷨�� [�ļ���]|��ӡ����ɢ��ֵ��ʹ��ָ����ɢ���㷨"
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:385 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -541,195 +555,195 @@ msgstr ""
"ѡ�\n"
" "
-#: g10/g10.c:369
+#: g10/g10.c:387
msgid "create ascii armored output"
msgstr "����� ASCII ��װ"
-#: g10/g10.c:371
+#: g10/g10.c:389
msgid "|NAME|encrypt for NAME"
msgstr "|ij��|Ϊ�ռ��ߡ�ij�ס�����"
-#: g10/g10.c:374
+#: g10/g10.c:392
msgid "|NAME|use NAME as default recipient"
msgstr "|ij��|����ij�ס�ѡΪĬ�ϵ��ռ���"
-#: g10/g10.c:376
+#: g10/g10.c:394
msgid "use the default key as default recipient"
msgstr "��Ĭ�ϵ���Կ����Ĭ�ϵ��ռ���"
-#: g10/g10.c:382
+#: g10/g10.c:400
msgid "use this user-id to sign or decrypt"
msgstr "ʹ������û���ʶ��ǩ�ֻ����"
-#: g10/g10.c:383
+#: g10/g10.c:401
msgid "|N|set compress level N (0 disables)"
msgstr "|N|�趨ѹ���ȼ�Ϊ N(0 ��ʾ��ѹ��)"
-#: g10/g10.c:385
+#: g10/g10.c:404
msgid "use canonical text mode"
msgstr "ʹ�ñ�׼���ı�ģʽ"
-#: g10/g10.c:393
+#: g10/g10.c:414
msgid "use as output file"
msgstr "ָ������ļ�"
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:416 g10/gpgv.c:66
msgid "verbose"
msgstr "��ϸģʽ"
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:417 g10/gpgv.c:67
msgid "be somewhat more quiet"
msgstr "����������ʾ��Ϣ"
-#: g10/g10.c:396
+#: g10/g10.c:418
msgid "don't use the terminal at all"
msgstr "��ȫ��Ҫʹ���ն�"
-#: g10/g10.c:397
+#: g10/g10.c:419
msgid "force v3 signatures"
msgstr "ǿ��ʹ�� v3 ǩ��"
-#: g10/g10.c:398
+#: g10/g10.c:420
msgid "do not force v3 signatures"
msgstr "��Ҫǿ��ʹ�� v3 ǩ��"
-#: g10/g10.c:399
+#: g10/g10.c:421
msgid "force v4 key signatures"
msgstr "ǿ��ʹ�� v4 ��Կǩ��"
-#: g10/g10.c:400
+#: g10/g10.c:422
msgid "do not force v4 key signatures"
msgstr "��Ҫǿ��ʹ�� v4 ��Կǩ��"
-#: g10/g10.c:401
+#: g10/g10.c:423
msgid "always use a MDC for encryption"
msgstr "����ʱ��ʹ�ñ䶯�����"
-#: g10/g10.c:403
+#: g10/g10.c:425
msgid "never use a MDC for encryption"
msgstr "����ʱ��Զ��ʹ�ñ䶯�����"
-#: g10/g10.c:405
+#: g10/g10.c:427
msgid "do not make any changes"
msgstr "��Ҫ���κθı�"
-#: g10/g10.c:406
+#: g10/g10.c:428
msgid "prompt before overwriting"
msgstr "����ǰ��ѯ��"
-#: g10/g10.c:407
+#: g10/g10.c:429
msgid "use the gpg-agent"
msgstr "ʹ�� gpg-agent ��������"
-#: g10/g10.c:410
+#: g10/g10.c:432
msgid "batch mode: never ask"
msgstr "������ģʽ����Զ��ѯ��"
-#: g10/g10.c:411
+#: g10/g10.c:433
msgid "assume yes on most questions"
msgstr "�ٶ����������Ļش�Ϊ���ǡ�"
-#: g10/g10.c:412
+#: g10/g10.c:434
msgid "assume no on most questions"
msgstr "�ٶ����������Ļش�Ϊ����"
-#: g10/g10.c:413
+#: g10/g10.c:435
msgid "add this keyring to the list of keyrings"
msgstr "�����Կ�׻��ӽ�Կ�׻��嵥��"
-#: g10/g10.c:414
+#: g10/g10.c:436
msgid "add this secret keyring to the list"
msgstr "�����˽ԿԿ�׻��ӽ��嵥��"
-#: g10/g10.c:415
+#: g10/g10.c:437
msgid "show which keyring a listed key is on"
msgstr "��ʾ���г�����Կ����һ��Կ�׻���"
-#: g10/g10.c:416
+#: g10/g10.c:438
msgid "|NAME|use NAME as default secret key"
msgstr "|ij��|����ij�ס���ΪĬ��˽Կ"
-#: g10/g10.c:417
+#: g10/g10.c:439
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|������|ʹ�������Կ��������Ѱ����Կ"
-#: g10/g10.c:421
+#: g10/g10.c:443
msgid "|NAME|set terminal charset to NAME"
msgstr "|�ַ�����|�趨�ն�ʹ�õ��ַ���"
-#: g10/g10.c:422
+#: g10/g10.c:445
msgid "read options from file"
msgstr "���ļ���ȡѡ��"
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:449 g10/gpgv.c:71
msgid "|FD|write status info to this FD"
msgstr "|FD|��״̬��Ϣд���ļ������� FD"
-#: g10/g10.c:428
+#: g10/g10.c:451
msgid "|[file]|write status info to file"
msgstr "|[�ļ���]|��״̬��Ϣд���ļ�"
-#: g10/g10.c:440
+#: g10/g10.c:463
msgid "|KEYID|ultimately trust this key"
msgstr "|Կ�׺�|�������δ���Կ"
-#: g10/g10.c:441
+#: g10/g10.c:464
msgid "|FILE|load extension module FILE"
msgstr "|�ļ���|������չģ��"
-#: g10/g10.c:442
+#: g10/g10.c:470
msgid "emulate the mode described in RFC1991"
msgstr "���� RFC1991 ����������ģʽ"
-#: g10/g10.c:443
+#: g10/g10.c:472
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ OpenPGP ��ʽ"
-#: g10/g10.c:444
+#: g10/g10.c:473
msgid "set all packet, cipher and digest options to PGP 2.x behavior"
msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ PGP 2.x ��ʽ"
-#: g10/g10.c:452
+#: g10/g10.c:477
msgid "|N|use passphrase mode N"
msgstr "|N|ʹ��ģʽ N ������"
-#: g10/g10.c:454
+#: g10/g10.c:479
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|�㷨��|ָ������ʹ�õı���ɢ���㷨"
-#: g10/g10.c:456
+#: g10/g10.c:481
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|�㷨��|ָ������ʹ�õĶԳƼ����㷨"
-#: g10/g10.c:458
+#: g10/g10.c:483
msgid "|NAME|use cipher algorithm NAME"
msgstr "|�㷨��|ָ��ʹ�õĶԳƼ����㷨"
-#: g10/g10.c:459
+#: g10/g10.c:484
msgid "|NAME|use message digest algorithm NAME"
msgstr "|�㷨��|ָ��ʹ�õı���ɢ���㷨"
-#: g10/g10.c:461
+#: g10/g10.c:486
msgid "|N|use compress algorithm N"
msgstr "|N|ʹ�õ� N ��ѹ���㷨"
-#: g10/g10.c:462
+#: g10/g10.c:487
msgid "throw keyid field of encrypted packets"
msgstr "�����ռ���Կ�׺ż�����ܰ���"
-#: g10/g10.c:463
+#: g10/g10.c:488
msgid "Show Photo IDs"
msgstr "��ʾ��Ƭ��ʶ"
-#: g10/g10.c:464
+#: g10/g10.c:489
msgid "Don't show Photo IDs"
msgstr "����ʾ��Ƭ��ʶ"
-#: g10/g10.c:465
+#: g10/g10.c:490
msgid "Set command line to view Photo IDs"
msgstr "�趨�鿴��Ƭ��ʶʱʹ�õ�������"
-#: g10/g10.c:471
+#: g10/g10.c:497
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -737,7 +751,7 @@ msgstr ""
"@\n"
"(��ο�����˵���Ի�����������ѡ��������嵥)\n"
-#: g10/g10.c:474
+#: g10/g10.c:500
msgid ""
"@\n"
"Examples:\n"
@@ -757,15 +771,15 @@ msgstr ""
" --list-keys [ij��] ��ʾ��Կ\n"
" --fingerprint [ij��] ��ʾָ��\n"
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:666 g10/gpgv.c:95
msgid "Please report bugs to <[email protected]>.\n"
msgstr "���� <[email protected]> �������ȱ�ݡ�\n"
-#: g10/g10.c:638
+#: g10/g10.c:683
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�÷��� gpg [ѡ��] [�ļ�] (�� -h ����)"
-#: g10/g10.c:641
+#: g10/g10.c:686
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -775,7 +789,7 @@ msgstr ""
"ǩ�֡���顢���ܻ����\n"
"Ĭ�ϵIJ������������ݶ���\n"
-#: g10/g10.c:652
+#: g10/g10.c:697
msgid ""
"\n"
"Supported algorithms:\n"
@@ -783,331 +797,388 @@ msgstr ""
"\n"
"֧�ֵ��㷨��\n"
-#: g10/g10.c:655
+#: g10/g10.c:700
msgid "Pubkey: "
msgstr "��Կ��"
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:706 g10/keyedit.c:1572
msgid "Cipher: "
msgstr "�ԳƼ��ܣ�"
-#: g10/g10.c:667
+#: g10/g10.c:712
msgid "Hash: "
msgstr "ɢ�У�"
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:718 g10/keyedit.c:1618
msgid "Compression: "
msgstr "ѹ����"
-#: g10/g10.c:756
+#: g10/g10.c:801
msgid "usage: gpg [options] "
msgstr "�÷���gpg [ѡ��] "
-#: g10/g10.c:824
+#: g10/g10.c:869
msgid "conflicting commands\n"
msgstr "��ͻ��ָ��\n"
-#: g10/g10.c:842
+#: g10/g10.c:887
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "�ڡ�%s���鶨�����Ҳ����Ⱥ�(=)\n"
-#: g10/g10.c:1010
+#: g10/g10.c:1087
#, c-format
msgid "WARNING: unsafe ownership on %s \"%s\"\n"
msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1013
+#: g10/g10.c:1090
#, c-format
msgid "WARNING: unsafe permissions on %s \"%s\"\n"
msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1016
+#: g10/g10.c:1093
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
-#: g10/g10.c:1020
+#: g10/g10.c:1097
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1223
+#, fuzzy, c-format
+msgid "unknown configuration item \"%s\"\n"
+msgstr "�µ������ļ���%s���ѽ���\n"
+
+#: g10/g10.c:1437
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
-#: g10/g10.c:1232
+#: g10/g10.c:1473
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
-#: g10/g10.c:1236
+#: g10/g10.c:1477
#, c-format
msgid "option file `%s': %s\n"
msgstr "�������%s����%s\n"
-#: g10/g10.c:1243
+#: g10/g10.c:1484
#, c-format
msgid "reading options from `%s'\n"
msgstr "�ӡ�%s����ȡѡ��\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1693
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
-#: g10/g10.c:1569
+#: g10/g10.c:1828
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ����һ����Ч���ַ���\n"
-#: g10/g10.c:1587
+#: g10/g10.c:1846
msgid "could not parse keyserver URI\n"
msgstr "�޷�������Կ������ URI\n"
-#: g10/g10.c:1596
+#: g10/g10.c:1855
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:1599
+#: g10/g10.c:1858
msgid "invalid import options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:1606
+#: g10/g10.c:1865
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s��%d����Ч�ĵ���ѡ��\n"
-#: g10/g10.c:1609
+#: g10/g10.c:1868
msgid "invalid export options\n"
msgstr "��Ч�ĵ���ѡ��\n"
-#: g10/g10.c:1615
+#: g10/g10.c:1874
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�޷�������·����� %s\n"
-#: g10/g10.c:1742
+#: g10/g10.c:2032
msgid "WARNING: program may create a core file!\n"
msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
-#: g10/g10.c:1746
+#: g10/g10.c:2036
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:2043 g10/g10.c:2054
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ע�⣺һ������²����õ� %s��\n"
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:2045
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ������ %s ����\n"
-#: g10/g10.c:1758
+#: g10/g10.c:2048
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �� %s ���������壡\n"
-#: g10/g10.c:1784
+#: g10/g10.c:2069
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
-#: g10/g10.c:1790
+#: g10/g10.c:2075
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
-#: g10/g10.c:1796
+#: g10/g10.c:2081
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
-#: g10/g10.c:1809
+#: g10/g10.c:2094
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
-#: g10/g10.c:1834 g10/encode.c:418 g10/encode.c:470 g10/encode.c:725
-#: g10/sign.c:650 g10/sign.c:897
-#, c-format
-msgid "this message may not be usable by %s\n"
-msgstr "%s Ҳ������ʹ���������\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:2161 g10/g10.c:2179
msgid "selected cipher algorithm is invalid\n"
msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:2167 g10/g10.c:2185
msgid "selected digest algorithm is invalid\n"
msgstr "��ѡ��ɢ���㷨��Ч\n"
-#: g10/g10.c:1902
+#: g10/g10.c:2173
msgid "selected certification digest algorithm is invalid\n"
msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
-#: g10/g10.c:1917
+#: g10/g10.c:2189
+#, fuzzy, c-format
+msgid "compress algorithm `%s' is read-only in this release\n"
+msgstr "��%s��ɢ���㷨�ڱ����а汾��ֻ��\n"
+
+#: g10/g10.c:2193
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "ѹ���㷨һ��Ҫ���� %d �� %d ֮��\n"
-#: g10/g10.c:1919
+#: g10/g10.c:2195
msgid "completes-needed must be greater than 0\n"
msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
-#: g10/g10.c:1921
+#: g10/g10.c:2197
msgid "marginals-needed must be greater than 1\n"
msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
-#: g10/g10.c:1923
+#: g10/g10.c:2199
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
-#: g10/g10.c:1926
+#: g10/g10.c:2201
+#, fuzzy
+msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
+msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+
+#: g10/g10.c:2203
+#, fuzzy
+msgid "invalid min-cert-level; must be 1, 2, or 3\n"
+msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+
+#: g10/g10.c:2206
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
-#: g10/g10.c:1930
+#: g10/g10.c:2210
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
-#: g10/g10.c:1934
-msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
-
-#: g10/g10.c:1940
+#: g10/g10.c:2217
msgid "invalid default preferences\n"
msgstr "��Ч��Ĭ����ѡ��\n"
-#: g10/g10.c:1948
+#: g10/g10.c:2226
msgid "invalid personal cipher preferences\n"
msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
-#: g10/g10.c:1952
+#: g10/g10.c:2230
msgid "invalid personal digest preferences\n"
msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
-#: g10/g10.c:1956
+#: g10/g10.c:2234
msgid "invalid personal compress preferences\n"
msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
-#: g10/g10.c:2042
+#: g10/g10.c:2264
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s �� %s ���������壡\n"
+
+#: g10/g10.c:2308
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/g10.c:2313
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/g10.c:2318
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "�����ý� %s ���� %s ģʽ��\n"
+
+#: g10/g10.c:2410
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
-#: g10/g10.c:2052
+#: g10/g10.c:2421
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
-#: g10/g10.c:2062
+#: g10/g10.c:2432
msgid "--store [filename]"
msgstr "--store [���]"
-#: g10/g10.c:2069
+#: g10/g10.c:2439
msgid "--symmetric [filename]"
msgstr "--symmetric [���]"
-#: g10/g10.c:2077
+#: g10/g10.c:2451
msgid "--encrypt [filename]"
msgstr "--encrypt [���]"
-#: g10/g10.c:2094
+#: g10/g10.c:2466
msgid "--sign [filename]"
msgstr "--sign [���]"
-#: g10/g10.c:2107
+#: g10/g10.c:2479
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [���]"
-#: g10/g10.c:2121
+#: g10/g10.c:2493
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [���]"
-#: g10/g10.c:2130
+#: g10/g10.c:2502
msgid "--clearsign [filename]"
msgstr "--clearsign [���]"
-#: g10/g10.c:2148
+#: g10/g10.c:2527
msgid "--decrypt [filename]"
msgstr "--decrypt [���]"
-#: g10/g10.c:2159
+#: g10/g10.c:2535
msgid "--sign-key user-id"
msgstr "--sign-key �û���ʶ"
-#: g10/g10.c:2167
+#: g10/g10.c:2543
msgid "--lsign-key user-id"
msgstr "--lsign-key �û���ʶ"
-#: g10/g10.c:2175
+#: g10/g10.c:2551
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �û���ʶ"
-#: g10/g10.c:2183
+#: g10/g10.c:2559
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �û���ʶ"
-#: g10/g10.c:2191
+#: g10/g10.c:2567
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �û���ʶ [ָ��]"
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2623 g10/encode.c:423 g10/sign.c:809
#, c-format
msgid "can't open %s: %s\n"
msgstr "�޷��� %s��%s\n"
-#: g10/g10.c:2262
+#: g10/g10.c:2638
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
-#: g10/g10.c:2354
+#: g10/g10.c:2675
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "������Կʧ�ܣ�%s\n"
+
+#: g10/g10.c:2677
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "������Կʧ�ܣ�%s\n"
+
+#: g10/g10.c:2679
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "������Կʧ�ܣ�%s\n"
+
+#: g10/g10.c:2690
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "������Կʧ�ܣ�%s\n"
+
+#: g10/g10.c:2700
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "����˽Կʧ�ܣ�%s\n"
+
+#: g10/g10.c:2741
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
-#: g10/g10.c:2362
+#: g10/g10.c:2749
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "���� ASCII ��װʧ�ܣ�%s\n"
-#: g10/g10.c:2449
+#: g10/g10.c:2836
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "��Ч�ġ�%s��ɢ���㷨\n"
-#: g10/g10.c:2535
+#: g10/g10.c:2930
msgid "[filename]"
msgstr "[���]"
-#: g10/g10.c:2539
+#: g10/g10.c:2934
msgid "Go ahead and type your message ...\n"
msgstr "�뿪ʼ�������ı��ġ���\n"
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2937 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"
-#: g10/g10.c:2815
-msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
+#: g10/g10.c:3210
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
-#: g10/g10.c:2824
+#: g10/g10.c:3219
msgid "a user notation name must contain the '@' character\n"
msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
-#: g10/g10.c:2832
+#: g10/g10.c:3229
msgid "a notation value must not use any control characters\n"
msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
-#: g10/g10.c:2869
+#: g10/g10.c:3264
msgid "the given certification policy URL is invalid\n"
msgstr "�����ĵ���֤���� URL ��Ч\n"
-#: g10/g10.c:2871
+#: g10/g10.c:3266
msgid "the given signature policy URL is invalid\n"
msgstr "������ǩ�ֲ��� URL ��Ч\n"
@@ -1200,7 +1271,8 @@ msgid "invalid armor: line longer than %d characters\n"
msgstr "��Ч�� ASCII ��װ��һ�г��� %d �ַ�\n"
#: g10/armor.c:1082
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "��װ��������ϵĿɴ�ӡ�ַ�������������ȱ�ݵ��ż����������ɵ�\n"
#: g10/pkclist.c:63 g10/revoke.c:603
@@ -1246,11 +1318,11 @@ msgstr ""
"������Ŀû��ָ�����ζȣ�\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1496
msgid " aka \""
msgstr " �༴ \""
-#: g10/pkclist.c:301
+#: g10/pkclist.c:302
msgid ""
"Please decide how far you trust this user to correctly\n"
"verify other users' keys (by looking at passports,\n"
@@ -1261,90 +1333,91 @@ msgstr ""
"ͨ����ͬ���������ָ�Ƶ�)�������ж������أ�\n"
"\n"
-#: g10/pkclist.c:304
+#: g10/pkclist.c:305
#, c-format
msgid " %d = Don't know\n"
msgstr " %d = ��֪��\n"
-#: g10/pkclist.c:305
+#: g10/pkclist.c:306
#, c-format
msgid " %d = I do NOT trust\n"
msgstr " %d = �Ҳ�����\n"
-#: g10/pkclist.c:306
+#: g10/pkclist.c:307
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = ����ǿ����\n"
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = ����ȫ����\n"
-#: g10/pkclist.c:309
+#: g10/pkclist.c:310
#, c-format
msgid " %d = I trust ultimately\n"
msgstr " %d = �Ҿ�������\n"
#. not yet implemented
-#: g10/pkclist.c:312
+#: g10/pkclist.c:313
msgid " i = please show me more information\n"
msgstr " i = ������Ҹ�����Ϣ\n"
-#: g10/pkclist.c:315
+#: g10/pkclist.c:316
msgid " m = back to the main menu\n"
msgstr " m = �ص����˵�\n"
-#: g10/pkclist.c:318
+#: g10/pkclist.c:319
msgid " s = skip this key\n"
msgstr " s = ���������Կ\n"
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
msgid " q = quit\n"
msgstr " q = �˳�\n"
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:327 g10/revoke.c:632
msgid "Your decision? "
msgstr "���ľ�����ʲô��"
-#: g10/pkclist.c:347
+#: g10/pkclist.c:348
msgid "Do you really want to set this key to ultimate trust? "
msgstr "�����Ҫ�������Կ��ɾ������Σ�"
-#: g10/pkclist.c:361
+#: g10/pkclist.c:362
msgid "Certificates leading to an ultimately trusted key:\n"
msgstr "���������ε���Կ��֤�飺\n"
-#: g10/pkclist.c:436
+#: g10/pkclist.c:437
#, c-format
msgid "key %08lX: key has been revoked!\n"
msgstr "��Կ %08lX���Ѿ��������ˣ�\n"
-#: g10/pkclist.c:443 g10/pkclist.c:455 g10/pkclist.c:555
+#: g10/pkclist.c:444 g10/pkclist.c:456 g10/pkclist.c:556
msgid "Use this key anyway? "
msgstr "������λ���ʹ�������Կ�� "
-#: g10/pkclist.c:448
+#: g10/pkclist.c:449
#, c-format
msgid "key %08lX: subkey has been revoked!\n"
msgstr "��Կ %08lX����Կ�Ѿ��������ˣ�\n"
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
#, c-format
msgid "%08lX: key has expired\n"
msgstr "%08lX: ��Կ�Ѿ�������\n"
-#: g10/pkclist.c:479
+#: g10/pkclist.c:480
#, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
msgstr "%08lX��û��֤�ݱ��������Կ��������������Ƶij�����\n"
-#: g10/pkclist.c:485
+#: g10/pkclist.c:486
#, c-format
msgid "%08lX: We do NOT trust this key\n"
msgstr "%08lX�����Dz����������Կ\n"
-#: g10/pkclist.c:491
+#: g10/pkclist.c:492
#, c-format
msgid ""
"%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1353,15 +1426,15 @@ msgstr ""
"%08lX: �޷�ȷ�������Կ�Ƿ���������������Ƶij�����\n"
"������Կ�Ծɱ�������\n"
-#: g10/pkclist.c:497
+#: g10/pkclist.c:498
msgid "This key probably belongs to the owner\n"
msgstr "�����Կ�п����������������\n"
-#: g10/pkclist.c:502
+#: g10/pkclist.c:503
msgid "This key belongs to us\n"
msgstr "�����Կ���������ǵ�\n"
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
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"
@@ -1372,69 +1445,81 @@ msgstr ""
"��������֪���Լ�����ʲô��\n"
"����������һ������ش�yes\n"
-#: g10/pkclist.c:564 g10/pkclist.c:594
+#: g10/pkclist.c:565 g10/pkclist.c:595
msgid "WARNING: Using untrusted key!\n"
msgstr "���棺����ʹ�ò������ε���Կ��\n"
-#: g10/pkclist.c:605
+#: g10/pkclist.c:602
+#, fuzzy
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
+
+#: g10/pkclist.c:611
+#, fuzzy
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "���棺�����Կ�Ѿ������ij����ߵ����ˣ�\n"
+
+#: g10/pkclist.c:614
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "���棺�����Կ�Ѿ������ij����ߵ����ˣ�\n"
-#: g10/pkclist.c:606
+#: g10/pkclist.c:615
msgid " This could mean that the signature is forgery.\n"
msgstr " ��������ǩ���п�����α��ġ�\n"
-#: g10/pkclist.c:612
+#: g10/pkclist.c:621
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "���棺�����Կ�Ѿ������ij����˵����ˣ�\n"
-#: g10/pkclist.c:617
+#: g10/pkclist.c:626
msgid "Note: This key has been disabled.\n"
msgstr "ע�⣺�����Կ�Ѿ��������ˡ�\n"
-#: g10/pkclist.c:622
+#: g10/pkclist.c:631
msgid "Note: This key has expired!\n"
msgstr "ע�⣺�����Կ�Ѿ������ˣ�\n"
-#: g10/pkclist.c:633
+#: g10/pkclist.c:642
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "���棺�����Կδ�������ε�ǩ����֤��\n"
-#: g10/pkclist.c:635
-msgid " There is no indication that the signature belongs to the owner.\n"
+#: g10/pkclist.c:644
+msgid ""
+" There is no indication that the signature belongs to the owner.\n"
msgstr " û��֤�ݱ������ǩ�������������Ƶij����ߡ�\n"
-#: g10/pkclist.c:643
+#: g10/pkclist.c:652
msgid "WARNING: We do NOT trust this key!\n"
msgstr "���棺���Dz����������Կ��\n"
-#: g10/pkclist.c:644
+#: g10/pkclist.c:653
msgid " The signature is probably a FORGERY.\n"
msgstr " ���ǩ�ֺ��п�����α��ġ�\n"
-#: g10/pkclist.c:652
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+#: g10/pkclist.c:661
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "���棺�����Կδ�����㹻���ζȵ�ǩ������֤��\n"
-#: g10/pkclist.c:654
+#: g10/pkclist.c:663
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ���ǩ�ֲ���һ�������������Ƶij�����\n"
-#: g10/pkclist.c:808 g10/pkclist.c:832 g10/pkclist.c:990 g10/pkclist.c:1050
+#: g10/pkclist.c:817 g10/pkclist.c:841 g10/pkclist.c:999 g10/pkclist.c:1059
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s����������%s\n"
-#: g10/pkclist.c:818 g10/pkclist.c:1022
+#: g10/pkclist.c:827 g10/pkclist.c:1031
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ����������Կ�Ѵ���\n"
-#: g10/pkclist.c:849
+#: g10/pkclist.c:858
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "��û��ָ���û���ʶ��(�����������������á�-r��ָ��)\n"
-#: g10/pkclist.c:862
+#: g10/pkclist.c:871
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -1442,139 +1527,120 @@ msgstr ""
"\n"
"�����û���ʶ���Կհ��н�����"
-#: g10/pkclist.c:878
+#: g10/pkclist.c:887
msgid "No such user ID.\n"
msgstr "û������û���ʶ��\n"
-#: g10/pkclist.c:883 g10/pkclist.c:965
+#: g10/pkclist.c:892 g10/pkclist.c:974
msgid "skipped: public key already set as default recipient\n"
msgstr "����������Կ�ѱ���ΪĬ���ռ���\n"
-#: g10/pkclist.c:901
+#: g10/pkclist.c:910
msgid "Public key is disabled.\n"
msgstr "��Կ�����á�\n"
-#: g10/pkclist.c:908
+#: g10/pkclist.c:917
msgid "skipped: public key already set\n"
msgstr "����������Կ�ѱ��趨\n"
-#: g10/pkclist.c:957
+#: g10/pkclist.c:966
#, c-format
msgid "unknown default recipient `%s'\n"
msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
-#: g10/pkclist.c:1002
+#: g10/pkclist.c:1011
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s������������Կ�ѱ�����\n"
-#: g10/pkclist.c:1057
+#: g10/pkclist.c:1066
msgid "no valid addressees\n"
msgstr "û����Ч�ĵ�ַ\n"
-#: g10/keygen.c:191
+#: g10/keygen.c:198
#, c-format
msgid "preference %c%lu is not valid\n"
msgstr "��ѡ�� %c%lu ��Ч\n"
-#: g10/keygen.c:198
+#: g10/keygen.c:205
#, c-format
msgid "preference %c%lu duplicated\n"
msgstr "��ѡ�� %c%lu �ظ�\n"
-#: g10/keygen.c:203
+#: g10/keygen.c:210
#, c-format
msgid "too many `%c' preferences\n"
msgstr "̫����ѡ�%c��\n"
-#: g10/keygen.c:273
+#: g10/keygen.c:280
msgid "invalid character in preference string\n"
msgstr "��ѡ���ַ���������Ч���ַ�\n"
-#: g10/keygen.c:533
+#: g10/keygen.c:634
msgid "writing direct signature\n"
msgstr "����д��ֱ��ǩ��\n"
-#: g10/keygen.c:572
+#: g10/keygen.c:673
msgid "writing self signature\n"
msgstr "����д������ǩ��\n"
-#: g10/keygen.c:616
+#: g10/keygen.c:719
msgid "writing key binding signature\n"
msgstr "����д����Կ��ǩ��\n"
-#: g10/keygen.c:670 g10/keygen.c:754 g10/keygen.c:845
+#: g10/keygen.c:781 g10/keygen.c:865 g10/keygen.c:956
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "��Կ�ߴ���Ч������ %u �ֽ�\n"
-#: g10/keygen.c:675 g10/keygen.c:759 g10/keygen.c:850
+#: g10/keygen.c:786 g10/keygen.c:870 g10/keygen.c:961
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��Կ�ߴ����뵽 %u �ֽ�\n"
-#: g10/keygen.c:950
+#: g10/keygen.c:1061
msgid "Please select what kind of key you want:\n"
msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
-#: g10/keygen.c:952
+#: g10/keygen.c:1063
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA �� ElGamal (Ĭ��)\n"
-#: g10/keygen.c:953
+#: g10/keygen.c:1064
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (������ǩ��)\n"
-#: g10/keygen.c:955
+#: g10/keygen.c:1066
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (�����ڼ���)\n"
-#: g10/keygen.c:957
-#, c-format
-msgid " (%d) ElGamal (sign and encrypt)\n"
-msgstr " (%d) ElGamal (����ǩ�ּ�����)\n"
-
-#: g10/keygen.c:958
+#: g10/keygen.c:1067
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (������ǩ��)\n"
-#: g10/keygen.c:960
+#: g10/keygen.c:1069
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�����ڼ���)\n"
-#: g10/keygen.c:962
+#: g10/keygen.c:1071
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (����ǩ�ּ�����)\n"
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:1074
msgid "Your selection? "
msgstr "����ѡ�� "
-#: g10/keygen.c:991
-msgid ""
-"The use of this algorithm is only supported by GnuPG. You will not be\n"
-"able to use this key to communicate with PGP users. This algorithm is also\n"
-"very slow, and may not be as secure as the other choices.\n"
-msgstr ""
-"��ע�⣬ֻ�� GnuPG ��֧������㷨��������㷨���ɵ���Կ\n"
-"�޷��� PGP ʹ���߻�ͨ��ͬʱ����㷨�dz�������\n"
-"���ҿ���Ҳ���������㷨��ȫ��\n"
-
-#: g10/keygen.c:996
-msgid "Create anyway? "
-msgstr "������λ���Ҫ������ "
-
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1108 g10/keyedit.c:666 g10/revoke.c:665
msgid "Invalid selection.\n"
msgstr "��Ч��ѡ��\n"
-#: g10/keygen.c:1024
+#: g10/keygen.c:1121
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1587,19 +1653,19 @@ msgstr ""
" Ĭ�ϵ���Կ�ߴ��� 1024�ֽ�\n"
" �Ƽ��������Կ�ߴ��� 2048�ֽ�\n"
-#: g10/keygen.c:1033
+#: g10/keygen.c:1130
msgid "What keysize do you want? (1024) "
msgstr "����Ҫ�ö�����Կ�ߴ磿(1024)"
-#: g10/keygen.c:1038
+#: g10/keygen.c:1135
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA����Կ�ߴ�ֻ�ܽ��� 512 �� 1024 ֮��\n"
-#: g10/keygen.c:1040
+#: g10/keygen.c:1137
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
-#: g10/keygen.c:1043
+#: g10/keygen.c:1140
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
@@ -1611,12 +1677,12 @@ msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
#. * So, before you complain about this limitation, I suggest that
#. * you start a discussion with Marvin about this theme and then
#. * do whatever you want.
-#: g10/keygen.c:1054
+#: g10/keygen.c:1151
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Կ�ߴ�̫�����ֻ�ܹ��õ� %d��\n"
-#: g10/keygen.c:1059
+#: g10/keygen.c:1156
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1624,25 +1690,27 @@ msgstr ""
"������ʹ�óߴ���� 2048 ����Կ��\n"
"��Ϊ������ĻỨȥ�ܶ�ʱ�䣡\n"
-#: g10/keygen.c:1062
+#: g10/keygen.c:1159
msgid "Are you sure that you want this keysize? "
msgstr "��ȷ��Ҫ�������Կ�ߴ��� "
-#: g10/keygen.c:1063
-msgid "Okay, but keep in mind that your monitor and keyboard radiation is also very vulnerable to attacks!\n"
+#: g10/keygen.c:1160
+msgid ""
+"Okay, but keep in mind that your monitor and keyboard radiation is also very "
+"vulnerable to attacks!\n"
msgstr "�ðɣ��������ס������Ļ�ͼ���Ҳ���൱�ױ����ӵģ�\n"
-#: g10/keygen.c:1072
+#: g10/keygen.c:1169
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "����Ҫ�����Կ�ߴ��� %u �ֽ�\n"
-#: g10/keygen.c:1075 g10/keygen.c:1079
+#: g10/keygen.c:1172 g10/keygen.c:1176
#, c-format
msgid "rounded up to %u bits\n"
msgstr "���뵽 %u �ֽ�\n"
-#: g10/keygen.c:1130
+#: g10/keygen.c:1227
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1658,7 +1726,7 @@ msgstr ""
" <n>m = ��Կ�� n �º����\n"
" <n>y = ��Կ�� n ������\n"
-#: g10/keygen.c:1139
+#: g10/keygen.c:1236
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1674,30 +1742,30 @@ msgstr ""
" <n>m = ǩ���� n �º����\n"
" <n>y = ǩ���� n ������\n"
-#: g10/keygen.c:1161
+#: g10/keygen.c:1258
msgid "Key is valid for? (0) "
msgstr "��Կ����Ч�����ǣ�(0) "
-#: g10/keygen.c:1163
+#: g10/keygen.c:1260
msgid "Signature is valid for? (0) "
msgstr "ǩ�ֵ���Ч�����Ƕ�ã�(0) "
-#: g10/keygen.c:1168
+#: g10/keygen.c:1265
msgid "invalid value\n"
msgstr "��Ч����ֵ\n"
-#: g10/keygen.c:1173
+#: g10/keygen.c:1270
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ��Զ�������\n"
#. print the date when the key expires
-#: g10/keygen.c:1180
+#: g10/keygen.c:1277
#, c-format
msgid "%s expires at %s\n"
msgstr "%s ���� %s ����\n"
-#: g10/keygen.c:1186
+#: g10/keygen.c:1283
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1705,14 +1773,15 @@ msgstr ""
"����ϵͳ�޷���ʾ 2038 ���Ժ�����ڡ�\n"
"��������������ȷ���� 2106 ��֮ǰ����ݡ�\n"
-#: g10/keygen.c:1191
+#: g10/keygen.c:1288
msgid "Is this correct (y/n)? "
msgstr "������ȷ��(y/n)"
-#: g10/keygen.c:1234
+#: g10/keygen.c:1331
msgid ""
"\n"
-"You need a User-ID to identify your key; the software constructs the user id\n"
+"You need a User-ID to identify your key; the software constructs the user "
+"id\n"
"from Real Name, Comment and Email Address in this form:\n"
" \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
"\n"
@@ -1723,44 +1792,44 @@ msgstr ""
" ��Heinrich Heine (Der Dichter) <[email protected]>��\n"
"\n"
-#: g10/keygen.c:1246
+#: g10/keygen.c:1343
msgid "Real name: "
msgstr "��ʵ������"
-#: g10/keygen.c:1254
+#: g10/keygen.c:1351
msgid "Invalid character in name\n"
msgstr "����������Ч���ַ�\n"
-#: g10/keygen.c:1256
+#: g10/keygen.c:1353
msgid "Name may not start with a digit\n"
msgstr "���������������ֿ�ͷ\n"
-#: g10/keygen.c:1258
+#: g10/keygen.c:1355
msgid "Name must be at least 5 characters long\n"
msgstr "��������Ҫ������ַ���\n"
-#: g10/keygen.c:1266
+#: g10/keygen.c:1363
msgid "Email address: "
msgstr "�����ʼ���ַ��"
-#: g10/keygen.c:1277
+#: g10/keygen.c:1374
msgid "Not a valid email address\n"
msgstr "�����ʼ���ַ��Ч\n"
-#: g10/keygen.c:1285
+#: g10/keygen.c:1382
msgid "Comment: "
msgstr "ע�ͣ�"
-#: g10/keygen.c:1291
+#: g10/keygen.c:1388
msgid "Invalid character in comment\n"
msgstr "ע�ͺ�����Ч���ַ�\n"
-#: g10/keygen.c:1314
+#: g10/keygen.c:1411
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "������ʹ�á�%s���ַ�����\n"
-#: g10/keygen.c:1320
+#: g10/keygen.c:1417
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1771,27 +1840,27 @@ msgstr ""
" ��%s��\n"
"\n"
-#: g10/keygen.c:1324
+#: g10/keygen.c:1423
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�벻Ҫ�ѵ����ʼ���ַ�Ž�������ʵ������ע����\n"
-#: g10/keygen.c:1329
+#: g10/keygen.c:1428
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1339
+#: g10/keygen.c:1438
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)���˳�(Q)��"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1439
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)��ȷ��(O)/�˳�(Q)��"
-#: g10/keygen.c:1359
+#: g10/keygen.c:1458
msgid "Please correct the error first\n"
msgstr "���ȸ�������\n"
-#: g10/keygen.c:1398
+#: g10/keygen.c:1497
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1799,16 +1868,16 @@ msgstr ""
"����Ҫһ����������������˽Կ��\n"
"\n"
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1506 g10/keyedit.c:864
msgid "passphrase not correctly repeated; try again"
msgstr "�����ٴ�����ʱ���״����벻����������һ��"
-#: g10/keygen.c:1408
+#: g10/keygen.c:1507
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1414
+#: g10/keygen.c:1513
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"
@@ -1820,7 +1889,7 @@ msgstr ""
"����Ҫ�ٴ�ִ��������򣬲���ʹ�á�--edit-key��ѡ��ɡ�\n"
"\n"
-#: g10/keygen.c:1435
+#: g10/keygen.c:1535
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"
@@ -1831,53 +1900,53 @@ msgstr ""
"(�����ô���̡��ƶ���ꡢ��дӲ��֮���)\n"
"�����������ַ������и��õĻ������㹻��������\n"
-#: g10/keygen.c:2000
+#: g10/keygen.c:2110
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ��Կ�Ի��� 1024 �ֽڡ�\n"
-#: g10/keygen.c:2054
+#: g10/keygen.c:2174
msgid "Key generation canceled.\n"
msgstr "��Կ������ȡ����\n"
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2289 g10/keygen.c:2377
#, c-format
msgid "writing public key to `%s'\n"
msgstr "���ڽ���Կд��`%s'\n"
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2290 g10/keygen.c:2379
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "���ڽ�˽Կд��`%s'\n"
-#: g10/keygen.c:2238
+#: g10/keygen.c:2366
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�Ҳ�����д�Ĺ�ԿԿ�׻���%s\n"
-#: g10/keygen.c:2244
+#: g10/keygen.c:2372
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�Ҳ�����д��˽ԿԿ�׻���%s\n"
-#: g10/keygen.c:2258
+#: g10/keygen.c:2386
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "д�빫ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2265
+#: g10/keygen.c:2393
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2285
+#: g10/keygen.c:2413
msgid "public and secret key created and signed.\n"
msgstr "��Կ��˽Կ�Ѿ����ɲ���ǩ�֡�\n"
-#: g10/keygen.c:2286
+#: g10/keygen.c:2414
msgid "key marked as ultimately trusted.\n"
msgstr "��Կ�ѱ���dzɾ������Ρ�\n"
-#: g10/keygen.c:2297
+#: g10/keygen.c:2425
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"
@@ -1885,124 +1954,132 @@ msgstr ""
"��ע�������Կ�������������ܣ����������á�--edit-key��ָ��\n"
"�������ڼ��ܵ���Կ��\n"
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2437 g10/keygen.c:2559
#, c-format
msgid "Key generation failed: %s\n"
msgstr "������Կʧ�ܣ�%s\n"
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2487 g10/sign.c:261
#, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2489 g10/sign.c:263
#, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2366
+#: g10/keygen.c:2498
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ע�⣺Ϊ v3 ��Կ������Կ��ʧȥ OpenPGP ������\n"
-#: g10/keygen.c:2395
+#: g10/keygen.c:2526
msgid "Really create? "
msgstr "���Ҫ������ "
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:98 g10/encode.c:771
msgid "--output doesn't work for this command\n"
msgstr "--output ����������������\n"
-#: g10/encode.c:178 g10/tdbio.c:505 g10/tdbio.c:566 g10/openfile.c:180
+#: g10/encode.c:176 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180
#: g10/openfile.c:316
#, c-format
msgid "%s: can't open: %s\n"
msgstr "%s���޷��򿪣�%s\n"
-#: g10/encode.c:209 g10/sign.c:1056
+#: g10/encode.c:207 g10/sign.c:1063
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "���������ʱ��������%s\n"
-#: g10/encode.c:214
+#: g10/encode.c:212
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "�ڴ� S2K ģʽ���޷�ʹ�öԳƵ� ESK ��\n"
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:223
+#, fuzzy, c-format
+msgid "using cipher %s\n"
+msgstr "ǩ��ʱʧ�ܣ� %s\n"
+
+#: g10/encode.c:233 g10/encode.c:494
#, c-format
msgid "`%s' already compressed\n"
msgstr "��%s���ѱ�ѹ��\n"
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:531
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s�����棺���ļ�\n"
-#: g10/encode.c:416
+#: g10/encode.c:414
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:432
+#: g10/encode.c:429
#, c-format
msgid "reading from `%s'\n"
msgstr "���ڴӡ�%s����ȡ\n"
-#: g10/encode.c:468
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+#: g10/encode.c:465
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "����Ҫ�������ܵ�������Կ������ʹ�� IDEA �㷨��\n"
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:475 g10/encode.c:658
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:573 g10/sign.c:781
#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)ѹ���㷨�����ռ��ߵ���ѡ����\n"
-#: g10/encode.c:721
+#: g10/encode.c:717
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "�����ý� %s ���� %s ģʽ��\n"
-#: g10/encode.c:753
+#: g10/encode.c:744
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s �Ѿ����ܸ�����%s��\n"
-#: g10/export.c:190 g10/keyedit.c:2410 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2485 g10/delkey.c:74 g10/revoke.c:224
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�Ҳ�����%s����Կ��%s\n"
-#: g10/export.c:213 g10/delkey.c:81 g10/revoke.c:230 g10/revoke.c:454
+#: g10/export.c:180 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:454
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "��ȡ��Կ����ʱ��������%s\n"
-#: g10/export.c:222
+#: g10/export.c:189
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "��Կ %08lX������һ�� rfc2440 ��Կ����������\n"
-#: g10/export.c:238
+#: g10/export.c:205
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "��Կ %08lX��δ����������������\n"
-#: g10/export.c:246
+#: g10/export.c:213
#, c-format
msgid "key %08lX: PGP 2.x style key - skipped\n"
msgstr "��Կ %08lX��PGP 2.x ��ʽ����Կ����������\n"
# I hope this warning doesn't confuse people.
#. I hope this warning doesn't confuse people.
-#: g10/export.c:321
+#: g10/export.c:284
#, c-format
msgid "WARNING: secret key %08lX does not have a simple SK checksum\n"
msgstr "���棺˽Կ %08lX �����ڼ�SK�����\n"
-#: g10/export.c:347
+#: g10/export.c:310
msgid "WARNING: nothing exported\n"
msgstr "���棺û�е����κζ���\n"
@@ -2012,321 +2089,316 @@ 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:186 g10/getkey.c:2521
+#: g10/getkey.c:186 g10/getkey.c:2672
msgid "[User id not found]"
msgstr "[�Ҳ����û���ʶ]"
-#: g10/getkey.c:1557
+#: g10/getkey.c:1607
#, c-format
msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid ������Ч����Կ %08lX ��Ч\n"
-#: g10/getkey.c:2009
+#: g10/getkey.c:2160
#, c-format
msgid "no secret subkey for public subkey %08lX - ignoring\n"
msgstr "��Կ %08lX û�����Ӧ��˽Կ�������ں���\n"
-#: g10/getkey.c:2237
+#: g10/getkey.c:2388
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "ʹ����Կ %08lX ������Կ %08lX\n"
-#: g10/getkey.c:2284
+#: g10/getkey.c:2435
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "��Կ %08lX��ֻ��˽Կ��û�й�Կ����������\n"
-#: g10/import.c:259
+#: g10/import.c:227
#, c-format
msgid "skipping block of type %d\n"
msgstr "�������� %d ��ʽ������\n"
-#: g10/import.c:268
+#: g10/import.c:236
#, c-format
msgid "%lu keys so far processed\n"
msgstr "�Ѵ��� %lu ����Կ\n"
-#: g10/import.c:273
+#: g10/import.c:241
#, c-format
msgid "error reading `%s': %s\n"
msgstr "��ȡ��%s��ʱ������%s\n"
-#: g10/import.c:285
+#: g10/import.c:253
#, c-format
msgid "Total number processed: %lu\n"
msgstr "�ϼƱ�������������%lu\n"
-#: g10/import.c:287
+#: g10/import.c:255
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ������������Կ��%lu\n"
-#: g10/import.c:290
+#: g10/import.c:258
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ��ʧ���û���ʶ��%lu\n"
-#: g10/import.c:292
+#: g10/import.c:260
#, c-format
msgid " imported: %lu"
msgstr " �ѵ��룺%lu"
-#: g10/import.c:298
+#: g10/import.c:266
#, c-format
msgid " unchanged: %lu\n"
msgstr " δ�ı䣺%lu\n"
-#: g10/import.c:300
+#: g10/import.c:268
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ���û���ʶ��%lu\n"
-#: g10/import.c:302
+#: g10/import.c:270
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �µ���Կ��%lu\n"
-#: g10/import.c:304
+#: g10/import.c:272
#, c-format
msgid " new signatures: %lu\n"
msgstr " �µ�ǩ�֣�%lu\n"
-#: g10/import.c:306
+#: g10/import.c:274
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �µ���Կ������%lu\n"
-#: g10/import.c:308
+#: g10/import.c:276
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ��ȡ��˽Կ��%lu\n"
-#: g10/import.c:310
+#: g10/import.c:278
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " �����˽Կ��%lu\n"
-#: g10/import.c:312
+#: g10/import.c:280
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " δ�ı��˽Կ��%lu\n"
-#: g10/import.c:314
+#: g10/import.c:282
#, c-format
msgid " not imported: %lu\n"
msgstr " δ�����룺%lu\n"
-#: g10/import.c:599
-msgid "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#: g10/import.c:551
+msgid ""
+"NOTE: Elgamal primary key detected - this may take some time to import\n"
msgstr "ע�⣺��⵽ Elgamal ��Կ�������������Կ���ܻ�����һ��ʱ��\n"
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:565 g10/import.c:832
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "��Կ %08lX��û���û���ʶ\n"
-#: g10/import.c:634
+#: g10/import.c:587
#, c-format
msgid "key %08lX: HKP subkey corruption repaired\n"
msgstr "��Կ %08lX������� HKP ��Կ�ѱ��޸�\n"
-#: g10/import.c:649
+#: g10/import.c:602
#, c-format
msgid "key %08lX: accepted non self-signed user ID '%s'\n"
msgstr "��Կ %08lX����������ǩ�ֵ��û���ʶ��%s���ѱ�����\n"
-#: g10/import.c:656
+#: g10/import.c:608
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "��Կ %08lX��û����Ч���û���ʶ\n"
-#: g10/import.c:658
+#: g10/import.c:610
msgid "this may be caused by a missing self-signature\n"
msgstr "���������ʧ����ǩ������\n"
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:912
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "��Կ %08lX���Ҳ�����Կ��%s\n"
-#: g10/import.c:673
+#: g10/import.c:624
#, c-format
msgid "key %08lX: new key - skipped\n"
msgstr "��Կ %08lX������Կ����������\n"
-#: g10/import.c:683
+#: g10/import.c:634
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "�Ҳ�����д��Կ�׻���%s\n"
-#: g10/import.c:688 g10/sign.c:678 g10/sign.c:917 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:688 g10/sign.c:924 g10/openfile.c:254
#, c-format
msgid "writing to `%s'\n"
msgstr "����д�롮%s��\n"
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:645 g10/import.c:730 g10/import.c:859 g10/import.c:972
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "д��Կ�׻���%s��ʱ������ %s\n"
-#: g10/import.c:708
+#: g10/import.c:662
#, c-format
msgid "key %08lX: public key \"%s\" imported\n"
msgstr "��Կ %08lX����Կ��%s���ѵ���\n"
-#: g10/import.c:730
+#: g10/import.c:684
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "��Կ %08lX�������ǵĸ������Ǻ�\n"
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:701 g10/import.c:929
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "��Կ %08lX���޷���λԭʼ����Կ���飺%s\n"
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:708 g10/import.c:935
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "��Կ %08lX���޷���ȡԭʼ����Կ���飺 %s\n"
-#: g10/import.c:785
+#: g10/import.c:739
#, c-format
msgid "key %08lX: \"%s\" 1 new user ID\n"
msgstr "��Կ %08lX����%s��һ���µ��û���ʶ\n"
-#: g10/import.c:788
+#: g10/import.c:742
#, c-format
msgid "key %08lX: \"%s\" %d new user IDs\n"
msgstr "��Կ %08lX����%s��%d ���µ��û���ʶ\n"
-#: g10/import.c:791
+#: g10/import.c:745
#, c-format
msgid "key %08lX: \"%s\" 1 new signature\n"
msgstr "��Կ %08lX����%s��1 ���µ�ǩ��\n"
-#: g10/import.c:794
+#: g10/import.c:748
#, c-format
msgid "key %08lX: \"%s\" %d new signatures\n"
msgstr "��Կ %08lX����%s��%d ���µ�ǩ��\n"
-#: g10/import.c:797
+#: g10/import.c:751
#, c-format
msgid "key %08lX: \"%s\" 1 new subkey\n"
msgstr "��Կ %08lX����%s��1 ���µ���Կ\n"
-#: g10/import.c:800
+#: g10/import.c:754
#, c-format
msgid "key %08lX: \"%s\" %d new subkeys\n"
msgstr "��Կ %08lX����%s��%d ���µ���Կ\n"
-#: g10/import.c:819
+#: g10/import.c:773
#, c-format
msgid "key %08lX: \"%s\" not changed\n"
msgstr "��Կ %08lX����%s��û�б��ı�\n"
-#: g10/import.c:881
+#: g10/import.c:838
#, c-format
msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
msgstr "��Կ %08lX��˽Կʹ������Ч�ļ����㷨 %d����������\n"
-#: g10/import.c:896
+#: g10/import.c:853
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "û��Ĭ�ϵ�˽ԿԿ�׻��� %s\n"
-#: g10/import.c:907
+#: g10/import.c:864
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "��Կ %08lX��˽Կ�ѵ���\n"
#. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:870
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "��Կ %08lX������˽ԿԿ�׻�����\n"
-#: g10/import.c:920
+#: g10/import.c:877
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "��Կ %08lX���Ҳ���˽Կ��%s\n"
-#: g10/import.c:949
+#: g10/import.c:906
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr "��Կ %08lX��û�й�Կ�����޷�Ӧ�õ���֤��\n"
-#: g10/import.c:989
+#: g10/import.c:946
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s�����ܾ�\n"
-#: g10/import.c:1021
+#: g10/import.c:978
#, c-format
msgid "key %08lX: \"%s\" revocation certificate imported\n"
msgstr "��Կ %08lX����%s������֤���ѱ�����\n"
-#: g10/import.c:1084
+#: g10/import.c:1041
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "��Կ %08lX��ǩ��û���û���ʶ\n"
-#: g10/import.c:1097
+#: g10/import.c:1056
#, c-format
msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
msgstr "��Կ %08lX���û���ʶ��%s��ʹ���˲�֧�ֵĹ�Կ�㷨\n"
-#: g10/import.c:1099
+#: g10/import.c:1058
#, c-format
msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
msgstr "��Կ %08lX���û���ʶ��%s������ǩ����Ч\n"
-#: g10/import.c:1114
+#: g10/import.c:1075
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "��Կ %08lX��û�пɹ��󶨵���Կ\n"
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1084 g10/import.c:1128
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "��Կ %08lX����֧�ֵĹ�Կ�㷨\n"
-#: g10/import.c:1123
+#: g10/import.c:1085
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "��Կ %08lX����Ч����Կ��\n"
-#. Delete the last binding
-#. sig since this one is
-#. newer
-#: g10/import.c:1135
+#: g10/import.c:1098
#, c-format
msgid "key %08lX: removed multiple subkey binding\n"
msgstr "��Կ %08lX��������Կ���ѱ�ɾ��\n"
-#: g10/import.c:1155
+#: g10/import.c:1119
#, c-format
msgid "key %08lX: no subkey for key revocation\n"
msgstr "��Կ %08lX��û��������Կ��������Կ\n"
-#: g10/import.c:1164
+#: g10/import.c:1129
#, c-format
msgid "key %08lX: invalid subkey revocation\n"
msgstr "��Կ %08lX����Ч����Կ����\n"
-#. Delete the last revocation
-#. sig since this one is
-#. newer
-#: g10/import.c:1175
+#: g10/import.c:1142
#, c-format
msgid "key %08lX: removed multiple subkey revocation\n"
msgstr "��Կ %08lX��������Կ������ɾ��\n"
-#: g10/import.c:1212
+#: g10/import.c:1179
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "��Կ %08lX���������û���ʶ��"
-#: g10/import.c:1235
+#: g10/import.c:1202
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "��Կ %08lX����Կ������\n"
@@ -2335,56 +2407,52 @@ msgstr "��Կ %08lX����Կ������\n"
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
-#. 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:1261
+#: g10/import.c:1229
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "��Կ %08lX�����ɵ�����ǩ��(�ȼ� %02x)����������\n"
-#: g10/import.c:1270
+#: g10/import.c:1238
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "��Կ %08lX������֤��λ�ô��󡪡�������\n"
-#: g10/import.c:1287
+#: g10/import.c:1255
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s����������\n"
-#: g10/import.c:1299
+#: g10/import.c:1268
#, c-format
msgid "key %08lX: subkey signature in wrong place - skipped\n"
msgstr "��Կ %08lX����Կǩ��λ�ô��󡪡�������\n"
-#: g10/import.c:1307
+#: g10/import.c:1276
#, c-format
msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
msgstr "��Կ %08lX����Ԥ�ڲ�����ǩ�ֵȼ�(0x%02X)����������\n"
-#: g10/import.c:1405
+#: g10/import.c:1375
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "��Կ %08lX����⵽�ظ����û���ʶ�����Ѻϲ�\n"
-#: g10/import.c:1464
+#: g10/import.c:1434
#, c-format
msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
msgstr "���棺��Կ %08lX ���ܱ������ˣ�����ȡ�ص�����Կ %08lX\n"
-#: g10/import.c:1478
+#: g10/import.c:1448
#, c-format
msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
-#: g10/import.c:1535
+#: g10/import.c:1506
#, c-format
msgid "key %08lX: \"%s\" revocation certificate added\n"
msgstr "��Կ %08lX������������֤�顰%s��\n"
-#: g10/import.c:1566
+#: g10/import.c:1539
#, c-format
msgid "key %08lX: direct key signature added\n"
msgstr "��Կ %08lX��������ֱ����Կǩ��\n"
@@ -2397,29 +2465,29 @@ msgstr "[����]"
msgid "[self-signature]"
msgstr "[����ǩ��]"
-#: g10/keyedit.c:221 g10/keylist.c:148
+#: g10/keyedit.c:221 g10/keylist.c:169
msgid "1 bad signature\n"
msgstr "1 ���𻵵�ǩ��\n"
-#: g10/keyedit.c:223 g10/keylist.c:150
+#: g10/keyedit.c:223 g10/keylist.c:171
#, c-format
msgid "%d bad signatures\n"
msgstr "%d ���𻵵�ǩ��\n"
-#: g10/keyedit.c:225 g10/keylist.c:152
+#: g10/keyedit.c:225 g10/keylist.c:173
msgid "1 signature not checked due to a missing key\n"
msgstr "�� 1 ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
-#: g10/keyedit.c:227 g10/keylist.c:154
+#: g10/keyedit.c:227 g10/keylist.c:175
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "�� %d ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
-#: g10/keyedit.c:229 g10/keylist.c:156
+#: g10/keyedit.c:229 g10/keylist.c:177
msgid "1 signature not checked due to an error\n"
msgstr "�� 1 ��ǩ����Ϊij�������δ�����\n"
-#: g10/keyedit.c:231 g10/keylist.c:158
+#: g10/keyedit.c:231 g10/keylist.c:179
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "�� %d ��ǩ����ΪijЩ�����δ�����\n"
@@ -2438,20 +2506,27 @@ msgstr "��⵽ %d ��û����Ч����ǩ�ֵ��û���ʶ\n"
msgid "User ID \"%s\" is revoked."
msgstr "�û���ʶ��%s���ѱ�������"
-#: g10/keyedit.c:369 g10/keyedit.c:524 g10/keyedit.c:582 g10/keyedit.c:1182
+#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
+#: g10/keyedit.c:618 g10/keyedit.c:1221
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
-#: g10/keyedit.c:377 g10/keyedit.c:530 g10/keyedit.c:1188
+#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
+#: g10/keyedit.c:1227
msgid " Unable to sign.\n"
msgstr " �޷�����ǩ�֡�\n"
#: g10/keyedit.c:382
-#, c-format
-msgid "WARNING: user ID \"%s\" is not self-signed.\n"
+#, fuzzy, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "�û���ʶ��%s���ѱ�������"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
msgstr "���棺�û���ʶ��%s����������ǩ�֡�\n"
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2460,11 +2535,11 @@ msgstr ""
"��%s���������ǩ��\n"
"�� PGP 2.x ��ʽ��ǩ�֡�\n"
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "���Ƿ���Ҫ���������� OpenPGP ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2473,13 +2548,13 @@ msgstr ""
"��ĿǰΪ��%s����ǩ��\n"
"�Ѿ������ˡ�\n"
-#: g10/keyedit.c:428
+#: g10/keyedit.c:464
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:449
+#: g10/keyedit.c:485
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2488,83 +2563,90 @@ msgstr ""
"��Ŀǰ�ڡ�%s����ǩ��\n"
"��һ�ݱ���ǩ�֡�\n"
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "���Ƿ���Ҫ���������ɿ�����ȫ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
#, c-format
msgid "\"%s\" was already locally signed by key %08lX\n"
msgstr "��%s���Ѿ���Կ %08lX �ڱ���ǩ��\n"
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
#, c-format
msgid "\"%s\" was already signed by key %08lX\n"
msgstr "��%s���Ѿ���Կ %08lX ǩ��\n"
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "����Ȼ��ҪΪ���ٴ�ǩ����(y/N)"
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "û�ж�����������Կ %08lX ǩ��\n"
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
msgid "This key has expired!"
msgstr "�����Կ�Ѿ����ڣ�"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�����Կ���� %s ���ڡ�\n"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "����Ҫ������ǩ��Ҳͬʱ������ (Y/n) "
-#: g10/keyedit.c:575
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+#: g10/keyedit.c:611
+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:577
+#: g10/keyedit.c:613
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "����������Կ�� PGP 2.x ģʽ�²���ʹ�á�\n"
-#: g10/keyedit.c:600
+#: g10/keyedit.c:636
msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
"���ж�ô�����ؼ�����Ҫǩ�ֵ���Կ�Ƿ�ȷʵ�������������Ƶ��������أ�\n"
"�������֪���������Ĵ𰸣������롰0����\n"
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �Ҳ����� %s\n"
-#: g10/keyedit.c:605 g10/keyedit.c:607 g10/keyedit.c:609 g10/keyedit.c:611
+#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
msgid " (default)"
msgstr " (Ĭ��)"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �Ҹ���û�м����� %s\n"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ����������� %s\n"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) �ҷdz�С�ĵؼ����� %s\n"
-#: g10/keyedit.c:635
+#: g10/keyedit.c:652
+msgid "Your selection? (enter '?' for more information): "
+msgstr ""
+
+#: g10/keyedit.c:672
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2572,7 +2654,7 @@ msgstr ""
"�����ȷ��Ҫǩ�������Կ\n"
"ʹ��������Կ��\""
-#: g10/keyedit.c:644
+#: g10/keyedit.c:681
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2580,7 +2662,7 @@ msgstr ""
"\n"
"�⽫��������ǩ�֡�\n"
-#: g10/keyedit.c:648
+#: g10/keyedit.c:685
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2588,7 +2670,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ���Ϊ���ɵ�����\n"
-#: g10/keyedit.c:653
+#: g10/keyedit.c:690
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2596,7 +2678,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:697
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2604,7 +2686,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:664
+#: g10/keyedit.c:701
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2612,7 +2694,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:669
+#: g10/keyedit.c:706
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2620,7 +2702,7 @@ msgstr ""
"\n"
"�Ҹ���û�м��������Կ��\n"
-#: g10/keyedit.c:673
+#: g10/keyedit.c:710
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2628,7 +2710,7 @@ msgstr ""
"\n"
"��������������Կ��\n"
-#: g10/keyedit.c:677
+#: g10/keyedit.c:714
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2636,34 +2718,34 @@ msgstr ""
"\n"
"�ҷdz�С�ĵؼ��������Կ��\n"
-#: g10/keyedit.c:686
+#: g10/keyedit.c:723
msgid "Really sign? "
msgstr "���Ҫǩ���� "
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:765 g10/keyedit.c:3273 g10/keyedit.c:3364 g10/keyedit.c:3437
+#: g10/sign.c:318
#, c-format
msgid "signing failed: %s\n"
msgstr "ǩ��ʱʧ�ܣ� %s\n"
-#: g10/keyedit.c:784
+#: g10/keyedit.c:821
msgid "This key is not protected.\n"
msgstr "�����Կû�б�������\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:825
msgid "Secret parts of primary key are not available.\n"
msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:829
msgid "Key is protected.\n"
msgstr "��Կ�������ˡ�\n"
-#: g10/keyedit.c:812
+#: g10/keyedit.c:849
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "�޷��༭�����Կ�� %s\n"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:855
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2671,7 +2753,7 @@ msgstr ""
"����Ҫ�����˽Կ�õ������롣\n"
"\n"
-#: g10/keyedit.c:832
+#: g10/keyedit.c:869
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2679,491 +2761,492 @@ msgstr ""
"������Ҫ�����롪�������Ǹ������⣡\n"
"\n"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:872
msgid "Do you really want to do this? "
msgstr "�������Ҫ��ô���� "
-#: g10/keyedit.c:899
+#: g10/keyedit.c:938
msgid "moving a key signature to the correct place\n"
msgstr "���ڰ���Կ��ǩ���ƶ�����ȷ��λ��ȥ\n"
-#: g10/keyedit.c:941
+#: g10/keyedit.c:980
msgid "quit this menu"
msgstr "�뿪����˵�"
-#: g10/keyedit.c:942
+#: g10/keyedit.c:981
msgid "q"
msgstr "q"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:982
msgid "save"
msgstr "save"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:982
msgid "save and quit"
msgstr "���沢�뿪"
-#: g10/keyedit.c:944
+#: g10/keyedit.c:983
msgid "help"
msgstr "help"
-#: g10/keyedit.c:944
+#: g10/keyedit.c:983
msgid "show this help"
msgstr "��ʾ�������˵��"
-#: g10/keyedit.c:946
+#: g10/keyedit.c:985
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:946
+#: g10/keyedit.c:985
msgid "show fingerprint"
msgstr "��ʾָ��"
-#: g10/keyedit.c:947
+#: g10/keyedit.c:986
msgid "list"
msgstr "list"
-#: g10/keyedit.c:947
+#: g10/keyedit.c:986
msgid "list key and user IDs"
msgstr "�г���Կ���û���ʶ"
-#: g10/keyedit.c:948
+#: g10/keyedit.c:987
msgid "l"
msgstr "l"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:988
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:988
msgid "select user ID N"
msgstr "ѡ���û���ʶN"
-#: g10/keyedit.c:950
+#: g10/keyedit.c:989
msgid "key"
msgstr "key"
-#: g10/keyedit.c:950
+#: g10/keyedit.c:989
msgid "select secondary key N"
msgstr "ѡ����Կ N"
-#: g10/keyedit.c:951
+#: g10/keyedit.c:990
msgid "check"
msgstr "check"
-#: g10/keyedit.c:951
+#: g10/keyedit.c:990
msgid "list signatures"
msgstr "�г�ǩ��"
-#: g10/keyedit.c:952
+#: g10/keyedit.c:991
msgid "c"
msgstr "c"
-#: g10/keyedit.c:953
+#: g10/keyedit.c:992
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:953
+#: g10/keyedit.c:992
msgid "sign the key"
msgstr "Ϊ��Կ����ǩ��"
-#: g10/keyedit.c:954
+#: g10/keyedit.c:993
msgid "s"
msgstr "s"
-#: g10/keyedit.c:955
+#: g10/keyedit.c:994
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:955
+#: g10/keyedit.c:994
msgid "sign the key locally"
msgstr "Ϊ��Կ���ӱ���ǩ��"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:995
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:995
msgid "sign the key non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ���ǩ��"
-#: g10/keyedit.c:957
+#: g10/keyedit.c:996
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:957
+#: g10/keyedit.c:996
msgid "sign the key locally and non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ����ı���ǩ��"
-#: g10/keyedit.c:958
+#: g10/keyedit.c:997
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:959
+#: g10/keyedit.c:998
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:959
+#: g10/keyedit.c:998
msgid "add a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:960
+#: g10/keyedit.c:999
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:960
+#: g10/keyedit.c:999
msgid "add a photo ID"
msgstr "����һ����Ƭ��ʶ"
-#: g10/keyedit.c:961
+#: g10/keyedit.c:1000
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:961
+#: g10/keyedit.c:1000
msgid "delete user ID"
msgstr "ɾ��һ���û�/��Ƭ��ʶ"
#. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:1002
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1003
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1003
msgid "add a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1004
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1004
msgid "delete a secondary key"
msgstr "ɾ��һ����Կ"
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1005
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1005
msgid "add a revocation key"
msgstr "����һ�ѵ�����Կ"
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1006
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1006
msgid "delete signatures"
msgstr "ɾ��ǩ��"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1007
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1007
msgid "change the expire date"
msgstr "����ʹ������"
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1008
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1008
msgid "flag user ID as primary"
msgstr "�趨��ѡ�û���ʶ"
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1009
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1009
msgid "toggle between secret and public key listing"
msgstr "��˽Կ�͹�Կ�嵥���л�"
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1011
msgid "t"
msgstr "t"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1012
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1012
msgid "list preferences (expert)"
msgstr "�г���ѡ��(ר��ģʽ)"
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1013
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1013
msgid "list preferences (verbose)"
msgstr "�г���ѡ��(��ϸģʽ)"
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1014
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1014
msgid "set preference list"
msgstr "�趨��ѡ��"
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1015
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1015
msgid "updated preferences"
msgstr "���¹�����ѡ��"
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1016
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1016
msgid "change the passphrase"
msgstr "��������"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1017
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1017
msgid "change the ownertrust"
msgstr "�������ζ�"
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1018
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1018
msgid "revoke signatures"
msgstr "����ǩ��"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1019
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1019
msgid "revoke a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1020
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1020
msgid "revoke a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1021
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1021
msgid "disable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1022
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1022
msgid "enable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1023
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1023
msgid "show photo ID"
msgstr "��ʾ��Ƭ��ʶ"
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1043 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "�ò����޷���������ģʽ�н���\n"
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1081
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1099
msgid "Secret key is available.\n"
msgstr "˽Կ���á�\n"
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1130
msgid "Command> "
msgstr "����> "
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1162
msgid "Need the secret key to do this.\n"
msgstr "Ҫ��˽Կ������ô����\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1166
msgid "Please use the command \"toggle\" first.\n"
msgstr "����ʹ�á�toggle��ָ�\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1215
msgid "Key is revoked."
msgstr "��Կ�ѱ�������"
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1234
msgid "Really sign all user IDs? "
msgstr "���Ϊ���е��û���ʶǩ���� "
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1235
msgid "Hint: Select the user IDs to sign\n"
msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1260
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1282 g10/keyedit.c:1303 g10/keyedit.c:1363
msgid "You must select at least one user ID.\n"
msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1284
msgid "You can't delete the last user ID!\n"
msgstr "������ɾ�����һ���û���ʶ��\n"
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1287
msgid "Really remove all selected user IDs? "
msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1288
msgid "Really remove this user ID? "
msgstr "���Ҫɾ������û���ʶ�� "
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1326 g10/keyedit.c:1382
msgid "You must select at least one key.\n"
msgstr "������ѡ������һ����Կ��\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1330
msgid "Do you really want to delete the selected keys? "
msgstr "�������Ҫɾ����ѡ�����Կ�� "
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1331
msgid "Do you really want to delete this key? "
msgstr "�����Ҫɾ�������Կ�� "
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1366
msgid "Really revoke all selected user IDs? "
msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1367
msgid "Really revoke this user ID? "
msgstr "���Ҫ��������û���ʶ�� "
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1386
msgid "Do you really want to revoke the selected keys? "
msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1387
msgid "Do you really want to revoke this key? "
msgstr "�������Ҫ���������Կ�� "
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1456
msgid "Really update the preferences for the selected user IDs? "
msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1458
msgid "Really update the preferences? "
msgstr "���Ҫ������ѡ���� "
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1496
msgid "Save changes? "
msgstr "Ҫ����䶯�� "
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1499
msgid "Quit without saving? "
msgstr "Ҫ��������뿪�� "
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1510
#, c-format
msgid "update failed: %s\n"
msgstr "����ʧ�ܣ�%s\n"
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1517
#, c-format
msgid "update secret failed: %s\n"
msgstr "����˽Կʧ�ܣ�%s\n"
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1524
msgid "Key not changed so no update needed.\n"
msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1536
msgid "Invalid command (try \"help\")\n"
msgstr "��Ч��ָ��(���ԡ�help��)\n"
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1595
msgid "Digest: "
msgstr "ɢ�У�"
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1647
msgid "Features: "
msgstr "�ص㣺"
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1881
#, c-format
msgid "This key may be revoked by %s key "
msgstr "�����Կ�ɱ��� %s ��Կ������"
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1885
msgid " (sensitive)"
msgstr " (���е�)"
#. Note, we use the same format string as in other show
#. functions to make the translation job easier.
-#: g10/keyedit.c:1853 g10/keyedit.c:1879 g10/keyedit.c:1964 g10/keyedit.c:1979
+#: g10/keyedit.c:1891 g10/keyedit.c:1917 g10/keyedit.c:2002 g10/keyedit.c:2017
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX �����ڣ�%s ��Ч����%s"
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1900
#, c-format
msgid " trust: %c/%c"
msgstr " ���ζȣ� %c/%c"
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1904
msgid "This key has been disabled"
msgstr "�����Կ�Ѿ�������"
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1933
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! ��Կ�Ѿ���������%s\n"
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1936
msgid "rev- faked revocation found\n"
msgstr "rev- ����α��ĵ���\n"
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1938
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? ������ʱ�������⣺%s\n"
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1958 g10/keyedit.c:2041 g10/keylist.c:492 g10/keylist.c:532
+#: g10/mainproc.c:939
msgid "[revoked] "
msgstr "[�ѵ���]"
-#: g10/keyedit.c:1922
+#: g10/keyedit.c:1960 g10/keyedit.c:2043
msgid "[expired] "
msgstr "[�ѹ���]"
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1968
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1976
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3171,69 +3254,77 @@ msgstr ""
"��ע�⣬������������֮ǰ��\n"
"��ʾ����Կ��Ч��δ����ȷ��\n"
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2105
+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 ""
+
+#: g10/keyedit.c:2165
msgid ""
-"WARNING: This is a PGP2-style key. Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
" of PGP to reject this key.\n"
msgstr ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
-#: g10/keyedit.c:2100 g10/keyedit.c:2373
+#: g10/keyedit.c:2170 g10/keyedit.c:2443
msgid "Are you sure you still want to add it? (y/N) "
msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
-#: g10/keyedit.c:2106
+#: g10/keyedit.c:2176
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
msgid "Delete this good signature? (y/N/q)"
msgstr "ɾ�������õ�ǩ����(y/N/q)"
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
msgid "Delete this invalid signature? (y/N/q)"
msgstr "ɾ�������Ч��ǩ����(y/N/q)"
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
msgid "Delete this unknown signature? (y/N/q)"
msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
msgid "Really delete this self-signature? (y/N)"
msgstr "���Ҫɾ���������ǩ����(y/N)"
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
#, c-format
msgid "Deleted %d signature.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
msgid "Nothing deleted.\n"
msgstr "û�ж�����ɾ����\n"
-#: g10/keyedit.c:2368
+#: g10/keyedit.c:2438
msgid ""
-"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may cause\n"
+"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 ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
-#: g10/keyedit.c:2379
+#: g10/keyedit.c:2449
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
msgid "Enter the user ID of the designated revoker: "
msgstr "����ָ�������ߵ��û���ʶ��"
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2495
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\n"
@@ -3243,66 +3334,67 @@ 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:2427
+#: g10/keyedit.c:2505
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2524
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
-#: g10/keyedit.c:2452
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N): "
+#: g10/keyedit.c:2530
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2595
msgid "Please remove selections from the secret keys.\n"
msgstr "���˽Կ��ɾ��ѡ��\n"
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2601
msgid "Please select at most one secondary key.\n"
msgstr "������ѡ��һ����Կ��\n"
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2605
msgid "Changing expiration time for a secondary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2608
msgid "Changing expiration time for the primary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2654
msgid "You can't change the expiration date of a v3 key\n"
msgstr "�����ܱ��v3��Կ��ʹ������\n"
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2670
msgid "No corresponding signature in secret ring\n"
msgstr "��˽Կ����û��һ�µ�ǩ��\n"
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2750
msgid "Please select exactly one user ID.\n"
msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2789 g10/keyedit.c:2899
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2959
#, c-format
msgid "No user ID with index %d\n"
msgstr "û������Ϊ %d ���û���ʶ\n"
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:3005
#, c-format
msgid "No secondary key with index %d\n"
msgstr "û������Ϊ %d ����Կ\n"
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3119
msgid "user ID: \""
msgstr "�û���ʶ����"
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3124
#, c-format
msgid ""
"\"\n"
@@ -3311,7 +3403,7 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ����ǩ��\n"
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3127
#, c-format
msgid ""
"\"\n"
@@ -3320,56 +3412,56 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ���ӱ���ǩ��\n"
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3132
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ǩ������ %s ���ڡ�\n"
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3136
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3140
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3165
msgid "You have signed these user IDs:\n"
msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3184
#, c-format
msgid " signed by %08lX at %s%s%s\n"
msgstr " �� %08lX �� %s%s%s ����ǩ��\n"
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3192
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " �� %08lX ������ %s\n"
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3212
msgid "You are about to revoke these signatures:\n"
msgstr "�����ڵ�����Щǩ�֣�\n"
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3222
#, c-format
msgid " signed by %08lX at %s%s\n"
msgstr " �� %08lX �� %s%s ����ǩ��\n"
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3224
msgid " (non-exportable)"
msgstr " (���ɵ���)"
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3231
msgid "Really create the revocation certificates? (y/N) "
msgstr "���Ҫ���ɵ���֤����(y/N)"
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3261
msgid "no secret key\n"
msgstr "û��˽Կ\n"
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3331
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�û���ʶ��%s���Ѿ���������\n"
@@ -3378,70 +3470,73 @@ msgstr "�û���ʶ��%s���Ѿ���������\n"
#. created in the future, so we need to warn the user and
#. set our revocation timestamp one second after that so
#. everything comes out clean.
-#: g10/keyedit.c:3260
+#: g10/keyedit.c:3348
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3521
#, c-format
msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
-#: g10/keylist.c:91
+#: g10/keylist.c:112
+#, c-format
msgid "Critical signature policy: "
msgstr "�ؼ�ǩ�ֲ��ԣ�"
-#: g10/keylist.c:93
+#: g10/keylist.c:114
+#, c-format
msgid "Signature policy: "
msgstr "ǩ�ֲ��ԣ�"
-#: g10/keylist.c:118 g10/keylist.c:141 g10/mainproc.c:769 g10/mainproc.c:778
+#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:804 g10/mainproc.c:813
msgid "WARNING: invalid notation data found\n"
msgstr "���棺�ҵ���Ч�ı������\n"
-#: g10/keylist.c:127
+#: g10/keylist.c:148
+#, c-format
msgid "Critical signature notation: "
msgstr "�ؼ�ǩ�ֱ�ǣ�"
-#: g10/keylist.c:129
+#: g10/keylist.c:150
+#, c-format
msgid "Signature notation: "
msgstr "ǩ�ֱ�ǣ�"
-#: g10/keylist.c:136
+#: g10/keylist.c:157
msgid "not human readable"
msgstr "���������ܶ�����"
-#: g10/keylist.c:225
+#: g10/keylist.c:250
msgid "Keyring"
msgstr "Կ�׻�"
# of subkey
-#. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:534 g10/mainproc.c:941
#, c-format
msgid " [expires: %s]"
msgstr " [��������%s]"
-#: g10/keylist.c:1025
+#: g10/keylist.c:1046
msgid "Primary key fingerprint:"
msgstr "��Կָ�ƣ�"
-#: g10/keylist.c:1027
+#: g10/keylist.c:1048
msgid " Subkey fingerprint:"
msgstr "��Կָ�ƣ�"
-#: g10/keylist.c:1034
+#: g10/keylist.c:1055
msgid " Primary key fingerprint:"
msgstr " ��Կָ�ƣ�"
-#: g10/keylist.c:1036
+#: g10/keylist.c:1057
msgid " Subkey fingerprint:"
msgstr " ��Կָ�ƣ�"
# use tty
#. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1061 g10/keylist.c:1065
msgid " Key fingerprint ="
msgstr " ��Կָ�� ="
@@ -3450,266 +3545,308 @@ msgstr " ��Կָ�� ="
msgid "weird size for an encrypted session key (%d)\n"
msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
-#: g10/mainproc.c:259
-#, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "��⵽��Ч�ĶԳƼ����㷨 (%d)\n"
+#. There is no way to tell the difference here between a bad
+#. passphrase and a cipher algorithm that we don't have.
+#: g10/mainproc.c:262
+#, fuzzy, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "δ֪�ĶԳƼ����㷨"
+
+#: g10/mainproc.c:299
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
-#: g10/mainproc.c:288 g10/encr-data.c:66
+#: g10/mainproc.c:301 g10/encr-data.c:66
#, c-format
msgid "%s encrypted data\n"
msgstr "%s ���ܹ�������\n"
-#: g10/mainproc.c:290 g10/encr-data.c:68
+#: g10/mainproc.c:305 g10/encr-data.c:68
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "��δ֪���㷨 %d ����\n"
-#: g10/mainproc.c:318
+#: g10/mainproc.c:351
#, c-format
msgid "public key is %08lX\n"
msgstr "��Կ�� %08lX\n"
-#: g10/mainproc.c:364
+#: g10/mainproc.c:397
msgid "public key encrypted data: good DEK\n"
msgstr "��Կ���ܹ������ݣ���õ� DEK\n"
-#: g10/mainproc.c:416
+#: g10/mainproc.c:449
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "�ó���Ϊ %u �ֽڡ�����Ϊ %s��Կ�׺�Ϊ %08lX�������� %s ����Կ���ܹ�\n"
-#: g10/mainproc.c:426
+#: g10/mainproc.c:459
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "������Ϊ %s��Կ�׺�Ϊ %08lX ����Կ���ܹ�\n"
-#: g10/mainproc.c:440
+#: g10/mainproc.c:473
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "��Կ����ʧ�ܣ�%s\n"
-#: g10/mainproc.c:467 g10/mainproc.c:486
+#: g10/mainproc.c:487
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "��������һ������\n"
+
+#: g10/mainproc.c:489
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "��������һ������\n"
+
+#: g10/mainproc.c:505 g10/mainproc.c:524
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "�ٶ� %s Ϊ���ܹ�������\n"
-#: g10/mainproc.c:474
+#: g10/mainproc.c:512
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA �㷨�����ã����� %s ����\n"
-#: g10/mainproc.c:504
+#: g10/mainproc.c:542
msgid "decryption okay\n"
msgstr "���ܳɹ�\n"
-#: g10/mainproc.c:508
+#: g10/mainproc.c:546
msgid "WARNING: message was not integrity protected\n"
msgstr "���棺����δ�ܵ������ı���\n"
-#: g10/mainproc.c:511
+#: g10/mainproc.c:549
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "���棺���ܹ��ı����Ѿ����죡\n"
-#: g10/mainproc.c:517
+#: g10/mainproc.c:555
#, c-format
msgid "decryption failed: %s\n"
msgstr "����ʧ�ܣ�%s\n"
-#: g10/mainproc.c:536
+#: g10/mainproc.c:574
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "ע�⣺������Ҫ������ֻ�Ķ������̡�\n"
-#: g10/mainproc.c:538
+#: g10/mainproc.c:576
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ԭʼ�ļ��� =��%.*s��\n"
-#: g10/mainproc.c:713
+#: g10/mainproc.c:748
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "�����ĵ���֤�顪�����á�gpg --import����Ӧ��\n"
-#: g10/mainproc.c:781
+#: g10/mainproc.c:816
msgid "Notation: "
msgstr "��ǣ�"
-#: g10/mainproc.c:793
+#: g10/mainproc.c:828
msgid "Policy: "
msgstr "���ԣ�"
-#: g10/mainproc.c:1248
+#: g10/mainproc.c:1284
msgid "signature verification suppressed\n"
msgstr "ǩ����֤�ѱ�����\n"
#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1290 g10/mainproc.c:1300
+#: g10/mainproc.c:1326 g10/mainproc.c:1336
msgid "can't handle these multiple signatures\n"
msgstr "�޷�������Щ����ǩ��\n"
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1345
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "�� %.*s ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
-#: g10/mainproc.c:1360 g10/mainproc.c:1393
+#. According to my favorite copy editor, in English
+#. grammar, you say "at" if the key is located on a web
+#. page, but "from" if it is located on a keyserver. I'm
+#. not going to even try to make two strings here :)
+#: g10/mainproc.c:1374
+#, fuzzy
+msgid "Key available at: "
+msgstr "û�п��õİ���"
+
+#: g10/mainproc.c:1423 g10/mainproc.c:1456
msgid "BAD signature from \""
msgstr "���𻵵�ǩ�֣�������\""
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1424 g10/mainproc.c:1457
msgid "Expired signature from \""
msgstr "���ڵ�ǩ�֣�������\""
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1425 g10/mainproc.c:1458
msgid "Good signature from \""
msgstr "��õ�ǩ�֣�������\""
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1460
msgid "[uncertain]"
msgstr "[��ȷ��]"
-#: g10/mainproc.c:1491
+#: g10/mainproc.c:1559
#, c-format
msgid "Signature expired %s\n"
msgstr "���ǩ������ %s ���ڡ�\n"
-#: g10/mainproc.c:1496
+#: g10/mainproc.c:1564
#, c-format
msgid "Signature expires %s\n"
msgstr "���ǩ���� %s ���ڡ�\n"
-#: g10/mainproc.c:1499
+#: g10/mainproc.c:1567
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%sǩ�֣�ɢ���㷨 %s\n"
-#: g10/mainproc.c:1500
+#: g10/mainproc.c:1568
msgid "binary"
msgstr "������"
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1569
msgid "textmode"
msgstr "�ı�ģʽ"
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1569
msgid "unknown"
msgstr "δ֪"
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1589
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�޷����ǩ�֣�%s\n"
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1657 g10/mainproc.c:1673 g10/mainproc.c:1759
msgid "not a detached signature\n"
msgstr "����һ�ݷ����ǩ��\n"
-#: g10/mainproc.c:1617
-msgid "WARNING: multiple signatures detected. Only the first will be checked.\n"
+#: g10/mainproc.c:1700
+msgid ""
+"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "���棺��⵽����ǩ�֡�ֻ����һ��ǩ�֡�\n"
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1708
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "�ȼ� 0x%02x �Ķ���ǩ��\n"
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1765
msgid "old style (PGP 2.x) signature\n"
msgstr "��ʽ(PGP 2.x)ǩ��\n"
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1775
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�� proc_tree() �м�⵽��Ч�ĸ���\n"
-#: g10/misc.c:98
+#: g10/misc.c:99
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "�޷����ú����ڴ�ת����%s\n"
-#: g10/misc.c:162
+#: g10/misc.c:163
msgid "Experimental algorithms should not be used!\n"
msgstr "��Ӧʹ��ʵ���Ե��㷨��\n"
-#: g10/misc.c:192
+#: g10/misc.c:193
msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
msgstr "���Ƽ�ʹ����������㷨���뻻�ø����ϱ�׼���㷨��\n"
-#: g10/misc.c:300
+#: g10/misc.c:301
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA �㷨���������\n"
-#: g10/misc.c:301
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+#: g10/misc.c:302
+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
+#: g10/misc.c:534
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d�����鲻ʹ�õ�ѡ�%s��\n"
-#: g10/misc.c:513
+#: g10/misc.c:538
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "���棺��%s��ѡ���Ѳ�����ʹ��\n"
-#: g10/misc.c:515
+#: g10/misc.c:540
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "���ԡ�%s%s������\n"
-#: g10/parse-packet.c:120
+#: g10/misc.c:551
+#, fuzzy
+msgid "Uncompressed"
+msgstr "�����"
+
+#: g10/misc.c:629
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "%s Ҳ������ʹ���������\n"
+
+#: g10/parse-packet.c:119
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�޷�������Կ�㷨 %d\n"
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:688
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1106
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d �����Ӱ��趨�˹ؼ��ֽ�\n"
-#: g10/passphrase.c:455 g10/passphrase.c:502
+#: g10/passphrase.c:459 g10/passphrase.c:506
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent �ڴ˴��Ự���޷�ʹ��\n"
-#: g10/passphrase.c:463
+#: g10/passphrase.c:467
msgid "can't set client pid for the agent\n"
msgstr "�޷��趨��������ͻ��˵Ľ��̱�ʶ\n"
-#: g10/passphrase.c:471
+#: g10/passphrase.c:475
msgid "can't get server read FD for the agent\n"
msgstr "�޷�ȡ�ô�����������ķ�������ȡ�ļ�������\n"
-#: g10/passphrase.c:478
+#: g10/passphrase.c:482
msgid "can't get server write FD for the agent\n"
msgstr "�޷�ȡ�ô�����������ķ�����д���ļ�������\n"
-#: g10/passphrase.c:511
+#: g10/passphrase.c:515
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO ����������ʽ����\n"
-#: g10/passphrase.c:524
+#: g10/passphrase.c:528
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "��֧�� gpg-agent Э��汾 %d\n"
-#: g10/passphrase.c:545 g10/hkp.c:155
+#: g10/passphrase.c:549 g10/hkp.c:155
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "�޷���������%s����%s\n"
-#: g10/passphrase.c:567
+#: g10/passphrase.c:571
msgid "communication problem with gpg-agent\n"
msgstr "�� gpg-agent ͨѶ������\n"
-#: g10/passphrase.c:574 g10/passphrase.c:875 g10/passphrase.c:988
+#: g10/passphrase.c:578 g10/passphrase.c:879 g10/passphrase.c:992
msgid "problem with the agent - disabling agent use\n"
msgstr "������������⡪������ͣ�ô�������\n"
-#: g10/passphrase.c:676 g10/passphrase.c:1094
+#: g10/passphrase.c:680 g10/passphrase.c:1098
#, c-format
msgid " (main key ID %08lX)"
msgstr "(��Կ�׺� %08lX)"
-#: g10/passphrase.c:686
+#: g10/passphrase.c:690
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -3720,32 +3857,32 @@ msgstr ""
"��%.*s��\n"
"%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s%s\n"
-#: g10/passphrase.c:708
+#: g10/passphrase.c:712
msgid "Repeat passphrase\n"
msgstr "��������һ������\n"
-#: g10/passphrase.c:710
+#: g10/passphrase.c:714
msgid "Enter passphrase\n"
msgstr "����������\n"
-#: g10/passphrase.c:748
+#: g10/passphrase.c:752
msgid "passphrase too long\n"
msgstr "����̫��\n"
-#: g10/passphrase.c:761
+#: g10/passphrase.c:765
msgid "invalid response from agent\n"
msgstr "����������Ӧ��Ч\n"
-#: g10/passphrase.c:776 g10/passphrase.c:869
+#: g10/passphrase.c:780 g10/passphrase.c:873
msgid "cancelled by user\n"
msgstr "�û�ȡ��\n"
-#: g10/passphrase.c:781 g10/passphrase.c:959
+#: g10/passphrase.c:785 g10/passphrase.c:963
#, c-format
msgid "problem with the agent: agent returns 0x%lx\n"
msgstr "������������⣺�������򷵻� 0x%lx\n"
-#: g10/passphrase.c:1080
+#: g10/passphrase.c:1084
msgid ""
"\n"
"You need a passphrase to unlock the secret key for\n"
@@ -3755,49 +3892,49 @@ msgstr ""
"����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
"\""
-#: g10/passphrase.c:1089
+#: g10/passphrase.c:1093
#, c-format
msgid "%u-bit %s key, ID %08lX, created %s"
msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1145
msgid "can't query password in batchmode\n"
msgstr "��������ģʽ���޷�ѯ������\n"
-#: g10/passphrase.c:1145
+#: g10/passphrase.c:1149
msgid "Enter passphrase: "
msgstr "���������룺"
-#: g10/passphrase.c:1149
+#: g10/passphrase.c:1153
msgid "Repeat passphrase: "
msgstr "��������һ�����룺"
-#: g10/plaintext.c:67
+#: g10/plaintext.c:69
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "����δ�����棻���á�--output��ѡ������������\n"
-#: g10/plaintext.c:108
+#: g10/plaintext.c:110
#, c-format
msgid "error creating `%s': %s\n"
msgstr "������%s��ʱ��������%s\n"
-#: g10/plaintext.c:339
+#: g10/plaintext.c:387
msgid "Detached signature.\n"
msgstr "�����ǩ�֡�\n"
-#: g10/plaintext.c:343
+#: g10/plaintext.c:391
msgid "Please enter name of data file: "
msgstr "�����������ļ������ƣ� "
-#: g10/plaintext.c:364
+#: g10/plaintext.c:412
msgid "reading stdin ...\n"
msgstr "���ڴӱ�׼�����ȡ ...\n"
-#: g10/plaintext.c:398
+#: g10/plaintext.c:446
msgid "no signed data\n"
msgstr "����ǩ�ֵ�����\n"
-#: g10/plaintext.c:406
+#: g10/plaintext.c:454
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "�޷�����ǩ�ֵ����ݡ�%s��\n"
@@ -3820,17 +3957,17 @@ msgstr "��֧�־�ʽ�� DEK ����\n"
msgid "cipher algorithm %d%s is unknown or disabled\n"
msgstr "�ԳƼ����㷨 %d%s δ֪����ͣ��\n"
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:216
#, c-format
msgid "NOTE: cipher algorithm %d not found in preferences\n"
msgstr "ע�⣺��ѡ�����Ҳ��������㷨 %d\n"
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:237
#, c-format
msgid "NOTE: secret key %08lX expired at %s\n"
msgstr "ע�⣺˽Կ %08lX ���� %s ����\n"
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:243
msgid "NOTE: key has been revoked"
msgstr "ע�⣺��Կ�ѱ�����"
@@ -3844,31 +3981,31 @@ msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
msgid "can't get key from keyserver: %s\n"
msgstr "�޷��ӹ�Կ������ȡ����Կ�� %s\n"
-#: g10/hkp.c:179
+#: g10/hkp.c:183
#, c-format
msgid "error sending to `%s': %s\n"
msgstr "�ϴ�����%s����ʱ��������%s\n"
-#: g10/hkp.c:194
+#: g10/hkp.c:198
#, c-format
msgid "success sending to `%s' (status=%u)\n"
msgstr "�ɹ��ϴ�����%s��(״̬ = %u)\n"
-#: g10/hkp.c:197
+#: g10/hkp.c:201
#, c-format
msgid "failed sending to `%s': status=%u\n"
msgstr "�ϴ�����%s��ʧ�ܣ�״̬ = %u\n"
-#: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "�����Կ������������ȫ�� HKP ����\n"
+#: g10/hkp.c:373
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
-#: g10/hkp.c:519
+#: g10/hkp.c:523
#, c-format
msgid "searching for \"%s\" from HKP server %s\n"
msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
-#: g10/hkp.c:571
+#: g10/hkp.c:575
#, c-format
msgid "can't search keyserver: %s\n"
msgstr "�޷���Ѱ��Կ��������%s\n"
@@ -3899,114 +4036,136 @@ msgstr "���棺��⵽����Կ������������롣\n"
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr "���ڲ���˽Կ����ʹ�õľ�ʽ 16 �ֽ�У���\n"
-#: g10/sig-check.c:73
+#: g10/sig-check.c:70
msgid "WARNING: signature digest conflict in message\n"
msgstr "���棺ǩ��ɢ��ֵ�뱨�IJ�һ��\n"
-#: g10/sig-check.c:213
+#: g10/sig-check.c:93
#, c-format
-msgid "key %08lX: this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgid "WARNING: signing subkey %08lX is not cross-certified\n"
+msgstr ""
+
+#: g10/sig-check.c:96
+#, c-format
+msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n"
+msgstr ""
+
+#: g10/sig-check.c:233
+#, c-format
+msgid ""
+"key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
+"signatures!\n"
msgstr "��Կ %08lX�������� PGP ������ ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
-#: g10/sig-check.c:222
+#: g10/sig-check.c:242
#, c-format
msgid "public key %08lX is %lu second newer than the signature\n"
msgstr "��Կ %08lX ����ǩ��ǰ %lu ������\n"
-#: g10/sig-check.c:223
+#: g10/sig-check.c:243
#, c-format
msgid "public key %08lX is %lu seconds newer than the signature\n"
msgstr "��Կ %08lX ����ǩ��ǰ %lu ������\n"
-#: g10/sig-check.c:232
+#: g10/sig-check.c:252
#, c-format
-msgid "key %08lX has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key %08lX has been created %lu second in future (time warp or clock "
+"problem)\n"
msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/sig-check.c:234
+#: g10/sig-check.c:254
#, c-format
-msgid "key %08lX has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key %08lX has been created %lu seconds in future (time warp or clock "
+"problem)\n"
msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/sig-check.c:247
+#: g10/sig-check.c:267
#, c-format
msgid "NOTE: signature key %08lX expired %s\n"
msgstr "ע�⣺ǩ����Կ %08lX ���� %s ����\n"
-#: g10/sig-check.c:346
+#: g10/sig-check.c:370
#, c-format
msgid "assuming bad signature from key %08lX due to an unknown critical bit\n"
msgstr "�ٶ���Կ %08lX ��ǩ������ij��δ֪�Ĺؼ��ֽڳ�����������\n"
-#: g10/sig-check.c:552
+#: g10/sig-check.c:614
#, c-format
msgid "key %08lX: no subkey for subkey revocation packet\n"
msgstr "��Կ %08lX��û����Կ�������������Կ\n"
-#: g10/sign.c:78
+#: g10/sig-check.c:640
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "��Կ %08lX��û�пɹ��󶨵���Կ\n"
+
+#: g10/sign.c:84
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ���������\n"
-#: g10/sign.c:86
+#: g10/sign.c:92
msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
msgstr "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ���������\n"
-#: g10/sign.c:105
+#: g10/sign.c:111
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "���棺��� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
-#: g10/sign.c:134
+#: g10/sign.c:137
msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ������ URL\n"
-#: g10/sign.c:142
+#: g10/sign.c:145
msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
msgstr "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ������ URL\n"
-#: g10/sign.c:155
+#: g10/sign.c:158
#, c-format
-msgid "WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
msgstr "���棺���� URL �� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
-#: g10/sign.c:307
+#: g10/sign.c:313
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "����ѽ�����ǩ��ʱ�������� %s\n"
-#: g10/sign.c:316
+#: g10/sign.c:322
#, c-format
msgid "%s signature from: \"%s\"\n"
msgstr "%sǩ�����ԣ���%s��\n"
-#: g10/sign.c:465
+#: g10/sign.c:473
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "���棺��%s����һ�����ļ�\n"
-#: g10/sign.c:648
+#: g10/sign.c:659
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
-#: g10/sign.c:673 g10/sign.c:912
+#: g10/sign.c:683 g10/sign.c:919
#, c-format
msgid "can't create %s: %s\n"
msgstr "�޷����� %s��%s\n"
-#: g10/sign.c:702
+#: g10/sign.c:712
#, c-format
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "ǿ��ʹ�õ� %s (%d)ɢ���㷨�����ռ��ߵ���ѡ����\n"
-#: g10/sign.c:796
+#: g10/sign.c:804
msgid "signing:"
msgstr "����ǩ�֣�"
-#: g10/sign.c:895
+#: g10/sign.c:903
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:1050
+#: g10/sign.c:1057
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ���ܽ�������\n"
@@ -4021,12 +4180,12 @@ msgstr "�޷��������� %d �ַ����ı���\n"
msgid "input line longer than %d characters\n"
msgstr "�����г��ȳ��� %d �ַ�\n"
-#: g10/tdbio.c:128 g10/tdbio.c:1406
+#: g10/tdbio.c:128 g10/tdbio.c:1410
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "���ζ����ݿ��¼ %lu����������ʧ�ܣ�%s\n"
-#: g10/tdbio.c:134 g10/tdbio.c:1413
+#: g10/tdbio.c:134 g10/tdbio.c:1417
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "���ζ����ݿ��¼ %lu��д��ʧ�� (n=%d): %s\n"
@@ -4035,122 +4194,122 @@ msgstr "���ζ����ݿ��¼ %lu��д��ʧ�� (n=%d): %s\n"
msgid "trustdb transaction too large\n"
msgstr "���ζ����ݿ⴦��������\n"
-#: g10/tdbio.c:468
+#: g10/tdbio.c:471
#, c-format
msgid "%s: can't access: %s\n"
msgstr "%s���޷���ȡ��%s\n"
-#: g10/tdbio.c:483
+#: g10/tdbio.c:486
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s��Ŀ¼�����ڣ�\n"
-#: g10/tdbio.c:493 g10/tdbio.c:511 g10/tdbio.c:554
+#: g10/tdbio.c:496 g10/tdbio.c:514 g10/tdbio.c:557
#, c-format
msgid "%s: can't create lock\n"
msgstr "%s���޷�����\n"
-#: g10/tdbio.c:495 g10/tdbio.c:557
+#: g10/tdbio.c:498 g10/tdbio.c:560
#, c-format
msgid "%s: can't make lock\n"
msgstr "%s���޷�����\n"
-#: g10/tdbio.c:501 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1453
+#: g10/tdbio.c:504 g10/openfile.c:250 g10/openfile.c:325 g10/keyring.c:1460
#, c-format
msgid "%s: can't create: %s\n"
msgstr "%s���޷�������%s\n"
-#: g10/tdbio.c:516
+#: g10/tdbio.c:519
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s�������汾��¼ʧ�ܣ�%s"
-#: g10/tdbio.c:520
+#: g10/tdbio.c:523
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s����������Ч�����ζ����ݿ�\n"
-#: g10/tdbio.c:523
+#: g10/tdbio.c:526
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s�����������ζ����ݿ�\n"
-#: g10/tdbio.c:563
+#: g10/tdbio.c:566
msgid "NOTE: trustdb not writable\n"
msgstr "ע�⣺���ζ����ݿⲻ��д��\n"
-#: g10/tdbio.c:579
+#: g10/tdbio.c:582
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s����Ч�����ζ����ݿ�\n"
-#: g10/tdbio.c:611
+#: g10/tdbio.c:614
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s������ɢ�б�ʧ�ܣ�%s\n"
-#: g10/tdbio.c:619
+#: g10/tdbio.c:622
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s�����°汾��¼ʱ������ %s\n"
-#: g10/tdbio.c:635 g10/tdbio.c:671 g10/tdbio.c:685 g10/tdbio.c:715
-#: g10/tdbio.c:1339 g10/tdbio.c:1366
+#: g10/tdbio.c:638 g10/tdbio.c:674 g10/tdbio.c:688 g10/tdbio.c:724
+#: g10/tdbio.c:1343 g10/tdbio.c:1370
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s����ȡ�汾��¼ʱ������ %s\n"
-#: g10/tdbio.c:648 g10/tdbio.c:694
+#: g10/tdbio.c:651 g10/tdbio.c:703
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s��д��汾��¼ʱ������%s\n"
-#: g10/tdbio.c:1133
+#: g10/tdbio.c:1141
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "���ζ����ݿ⣺��������ʧ�ܣ�%s\n"
-#: g10/tdbio.c:1141
+#: g10/tdbio.c:1149
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "���ζ����ݿ⣺��ȡʧ��(n=%d)��%s\n"
-#: g10/tdbio.c:1162
+#: g10/tdbio.c:1170
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s������һ�����ζ����ݿ��ļ�\n"
-#: g10/tdbio.c:1182
+#: g10/tdbio.c:1188
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s����¼���Ϊ%lu�İ汾��¼\n"
-#: g10/tdbio.c:1187
+#: g10/tdbio.c:1193
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s����Ч���ļ��汾%d\n"
-#: g10/tdbio.c:1372
+#: g10/tdbio.c:1376
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s����ȡ���ɼ�¼ʱ������%s\n"
-#: g10/tdbio.c:1380
+#: g10/tdbio.c:1384
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s��д��Ŀ¼��¼ʱ������%s\n"
-#: g10/tdbio.c:1390
+#: g10/tdbio.c:1394
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s����¼����ʱʧ�ܣ�%s\n"
-#: g10/tdbio.c:1420
+#: g10/tdbio.c:1424
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s�����Ӽ�¼ʱʧ�ܣ�%s\n"
-#: g10/tdbio.c:1465
+#: g10/tdbio.c:1469
msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
msgstr "���ζ����ݿ����𻵣���ִ�С�gpg --fix-trustdb����\n"
@@ -4199,38 +4358,48 @@ msgstr "���μ�¼ %lu����� %d��д��ʧ�ܣ�%s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "���ζ����ݿ⣺ͬ��ʧ�ܣ�%s\n"
-#: g10/trustdb.c:460
+#: g10/trustdb.c:459
msgid "no need for a trustdb check\n"
msgstr "����Ҫ������ζ����ݿ�\n"
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:465 g10/trustdb.c:1814
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "�´����ζ����ݿ��齫�� %s ����\n"
-#: g10/trustdb.c:819
+#: g10/trustdb.c:835
msgid "please do a --check-trustdb\n"
msgstr "��ִ��һ�� --check-trustdb\n"
-#: g10/trustdb.c:823
+#: g10/trustdb.c:839
msgid "checking the trustdb\n"
msgstr "���ڼ�����ζ����ݿ�\n"
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1045
#, c-format
msgid "public key %08lX not found: %s\n"
msgstr "��Կ %08lX δ���ҵ���%s\n"
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1203
+#, c-format
+msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:1211
+#, c-format
+msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:1608
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "�Ѿ������� %d ����Կ(�����ѽ���� %d �ݵ���Ч��)\n"
-#: g10/trustdb.c:1619
+#: g10/trustdb.c:1666
msgid "no ultimately trusted keys found\n"
msgstr "û���ҵ��κξ������ε���Կ\n"
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1680
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr "�������ε���Կ %08lX �Ĺ�Կδ���ҵ�\n"
@@ -4238,7 +4407,7 @@ msgstr "�������ε���Կ %08lX �Ĺ�Կδ���ҵ�\n"
#. This should be valid=%d now, but I'm not changing it so I
#. don't break the translated strings in the stable branch.
#. Change it in devel. -dms
-#: g10/trustdb.c:1712
+#: g10/trustdb.c:1755
#, 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"
@@ -4278,7 +4447,9 @@ msgstr "��������˽Կ�Ѵ���\n"
#: g10/skclist.c:179
#, c-format
-msgid "skipped `%s': this is a PGP generated ElGamal key which is not secure for signatures!\n"
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
msgstr "��%s��������������һ���� PGP ���ɵ� ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
#. do not overwrite
@@ -4330,7 +4501,8 @@ msgid "%s: directory created\n"
msgstr "%s���Ѵ���Ŀ¼\n"
#: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "���棺���ı�ʹ�öԳƼ����㷨������Կ���ܡ�\n"
#: g10/encr-data.c:98
@@ -4346,41 +4518,41 @@ 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 "(��������ָ��ָ����Կ)\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:151
msgid "Delete this key from the keyring? "
msgstr "Ҫ��Կ�׻���ɾ�������Կ��"
-#: g10/delkey.c:158
+#: g10/delkey.c:159
msgid "This is a secret key! - really delete? "
msgstr "����һ��˽Կ���������Ҫɾ����"
-#: g10/delkey.c:168
+#: g10/delkey.c:169
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
-#: g10/delkey.c:178
+#: g10/delkey.c:179
msgid "ownertrust information cleared\n"
msgstr "���ζ���Ϣ�ѱ����\n"
-#: g10/delkey.c:206
+#: g10/delkey.c:207
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
msgstr "��Կ��%s���ж�Ӧ��˽Կ��\n"
-#: g10/delkey.c:208
+#: g10/delkey.c:209
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "����ʹ�á�--delete-secret-keys��ѡ����ɾ������\n"
@@ -4413,7 +4585,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr "������������Ҫʹ�����δ�����ε���Կ����ش�yes����"
#: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
msgstr "������Ҫ���͵ı��ĵĽ����ߵ��û���ʶ��"
#: g10/helptext.c:72
@@ -4425,7 +4598,8 @@ msgid ""
"DSA signatures are much faster than those of ElGamal.\n"
"\n"
"ElGamal is an algorithm which can be used for signatures and encryption.\n"
-"OpenPGP distinguishs between two flavors of this algorithms: an encrypt only\n"
+"OpenPGP distinguishs between two flavors of this algorithms: an encrypt "
+"only\n"
"and a sign+encrypt; actually it is the same, but some parameters must be\n"
"selected in a special way to create a safe key for signatures: this program\n"
"does this but other OpenPGP implementations are not required to understand\n"
@@ -4525,26 +4699,36 @@ msgid ""
"belongs to the person named in the user ID. It is useful for others to\n"
"know how carefully you verified this.\n"
"\n"
-"\"0\" means you make no particular claim as to how carefully you verified the\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
" key.\n"
"\n"
"\"1\" means you believe the key is owned by the person who claims to own it\n"
-" but you could not, or did not verify the key at all. This is useful for\n"
-" a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
"\n"
-"\"2\" means you did casual verification of the key. For example, this could\n"
-" mean that you verified the key fingerprint and checked the user ID on the\n"
+"\"2\" means you did casual verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
" key against a photo ID.\n"
"\n"
-"\"3\" means you did extensive verification of the key. For example, this could\n"
+"\"3\" means you did extensive verification of the key. For example, this "
+"could\n"
" mean that you verified the key fingerprint with the owner of the key in\n"
-" person, and that you checked, by means of a hard to forge document with a\n"
-" photo ID (such as a passport) that the name of the key owner matches the\n"
-" name in the user ID on the key, and finally that you verified (by exchange\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
" of email) that the email address on the key belongs to the key owner.\n"
"\n"
"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
"mean to you when you sign other keys.\n"
"\n"
"If you don't know what the right answer is, answer \"0\"."
@@ -4753,22 +4937,23 @@ msgstr "���޲�������ܵİ�ȫ��©��\n"
msgid "checking keyring `%s'\n"
msgstr "���ڼ��Կ�׻���%s��\n"
-#: g10/keyring.c:1381
+#: g10/keyring.c:1388
#, c-format
msgid "%lu keys so far checked (%lu signatures)\n"
msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
-#: g10/keyring.c:1392
+#: g10/keyring.c:1399
#, c-format
msgid "%lu keys checked (%lu signatures)\n"
msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
-#: g10/keyring.c:1458
+#: g10/keyring.c:1465
#, c-format
msgid "%s: keyring created\n"
msgstr "%s��Կ�׻��ѽ���\n"
#: g10/photoid.c:65
+#, c-format
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -4818,7 +5003,8 @@ 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"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
msgstr "���������ļ�Ȩ�޲���ȫ���ⲿ������ñ�����\n"
#: g10/exec.c:355
@@ -4859,7 +5045,7 @@ msgstr "���棺�޷�ɾ����ʱ�ļ�(%s)��%s����%s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "���棺�޷�ɾ����ʱĿ¼��%s����%s\n"
-#: g10/keyid.c:316 g10/keyid.c:328 g10/keyid.c:340
+#: g10/keyid.c:317 g10/keyid.c:329 g10/keyid.c:341
msgid "never "
msgstr "��������"
@@ -4955,33 +5141,33 @@ msgstr ""
"����ǧ��С�ģ����Ļ����ϵĴ�ӡϵͳ���ܻ��ڴ�ӡ��\n"
"���а���Щ������ʱ��ij��������Ҳ�ܹ����õ��ĵط���\n"
-#: g10/revoke.c:614
+#: g10/revoke.c:615
msgid "Please select the reason for the revocation:\n"
msgstr "��ѡ�������ԭ��\n"
-#: g10/revoke.c:624
+#: g10/revoke.c:625
msgid "Cancel"
msgstr "ȡ��"
-#: g10/revoke.c:626
+#: g10/revoke.c:627
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(Ҳ��������Ҫ������ѡ��%d)\n"
-#: g10/revoke.c:667
+#: g10/revoke.c:668
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "����������(��ѡ)���Կհ��н�����\n"
-#: g10/revoke.c:695
+#: g10/revoke.c:696
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "����ԭ��%s\n"
-#: g10/revoke.c:697
+#: g10/revoke.c:698
msgid "(No description given)\n"
msgstr "(����������)\n"
-#: g10/revoke.c:702
+#: g10/revoke.c:703
msgid "Is this okay? "
msgstr "���������� "
@@ -5025,3 +5211,25 @@ msgstr "Ѱ�����ζȼ�¼ʱ������%s\n"
#, c-format
msgid "read error: %s\n"
msgstr "��ȡ����%s\n"
+
+#~ msgid " (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr " (%d) ElGamal (����ǩ�ּ�����)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG. You will not be\n"
+#~ "able to use this key to communicate with PGP users. This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "��ע�⣬ֻ�� GnuPG ��֧������㷨��������㷨���ɵ���Կ\n"
+#~ "�޷��� PGP ʹ���߻�ͨ��ͬʱ����㷨�dz�������\n"
+#~ "���ҿ���Ҳ���������㷨��ȫ��\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "������λ���Ҫ������ "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "��⵽��Ч�ĶԳƼ����㷨 (%d)\n"
+
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "�����Կ������������ȫ�� HKP ����\n"