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.po802
1 files changed, 404 insertions, 398 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76d82e0bc..5820d2806 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\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"
+"POT-Creation-Date: 2004-07-20 14:26+0200\n"
+"PO-Revision-Date: 2004-07-20 15:50+0200\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@ msgid "nN"
msgstr "nN"
#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
-#: util/miscutil.c:348 g10/keyedit.c:980
+#: util/miscutil.c:348 g10/keyedit.c:996
msgid "quit"
msgstr "quit"
@@ -281,7 +281,7 @@ msgstr "���ҵ�һ������ȱ���ˡ���(%s:%d)\n"
msgid "no entropy gathering module detected\n"
msgstr "��ⲻ�������Ѽ�ģ��\n"
-#: cipher/random.c:387 g10/keygen.c:1927 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1931 g10/import.c:163
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�޷��򿪡�%s���� %s\n"
@@ -365,7 +365,7 @@ 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 ""
+msgstr "���棺ɢ���㷨��%s�������� OpenPGP ��һ���֡���Ҫʹ�ã�����Ը���\n"
#: cipher/rndegd.c:204
msgid ""
@@ -379,7 +379,7 @@ msgstr ""
#: cipher/primegen.c:310
#, c-format
msgid "can't generate a prime with less than %d bits\n"
-msgstr ""
+msgstr "�޷����ɶ��� %d λ������\n"
#: g10/g10.c:322
msgid ""
@@ -801,7 +801,7 @@ msgstr ""
msgid "Pubkey: "
msgstr "��Կ��"
-#: g10/g10.c:706 g10/keyedit.c:1572
+#: g10/g10.c:706 g10/keyedit.c:1588
msgid "Cipher: "
msgstr "�ԳƼ��ܣ�"
@@ -809,7 +809,7 @@ msgstr "�ԳƼ��ܣ�"
msgid "Hash: "
msgstr "ɢ�У�"
-#: g10/g10.c:718 g10/keyedit.c:1618
+#: g10/g10.c:718 g10/keyedit.c:1634
msgid "Compression: "
msgstr "ѹ����"
@@ -847,9 +847,9 @@ msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
#: g10/g10.c:1223
-#, fuzzy, c-format
+#, c-format
msgid "unknown configuration item \"%s\"\n"
-msgstr "�µ������ļ���%s���ѽ���\n"
+msgstr "δ֪�������%s��\n"
#: g10/g10.c:1437
#, c-format
@@ -961,9 +961,9 @@ msgid "selected certification digest algorithm is invalid\n"
msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
#: g10/g10.c:2189
-#, fuzzy, c-format
+#, c-format
msgid "compress algorithm `%s' is read-only in this release\n"
-msgstr "��%s��ɢ���㷨�ڱ����а汾��ֻ��\n"
+msgstr "��%s��ѹ���㷨�ڱ����а汾��ֻ��\n"
#: g10/g10.c:2193
#, c-format
@@ -983,14 +983,12 @@ msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
#: 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"
+msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
#: g10/g10.c:2206
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
@@ -1017,24 +1015,24 @@ msgid "invalid personal compress preferences\n"
msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
#: g10/g10.c:2264
-#, fuzzy, c-format
+#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s �� %s ���������壡\n"
+msgstr "%s Ŀǰ�޷��� %s ����\n"
#: g10/g10.c:2308
-#, fuzzy, c-format
+#, c-format
msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
-msgstr "�����ý� %s ���� %s ģʽ��\n"
+msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
#: g10/g10.c:2313
-#, fuzzy, c-format
+#, c-format
msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
-msgstr "�����ý� %s ���� %s ģʽ��\n"
+msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
#: g10/g10.c:2318
-#, fuzzy, c-format
+#, c-format
msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
-msgstr "�����ý� %s ���� %s ģʽ��\n"
+msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
#: g10/g10.c:2410
#, c-format
@@ -1107,29 +1105,29 @@ msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
#: g10/g10.c:2675
-#, fuzzy, c-format
+#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "�޷����͵���Կ��������%s\n"
#: g10/g10.c:2677
-#, fuzzy, c-format
+#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "�޷��ӹ�Կ���������գ�%s\n"
#: g10/g10.c:2679
-#, fuzzy, c-format
+#, c-format
msgid "key export failed: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "�޷�������Կ��%s\n"
#: g10/g10.c:2690
-#, fuzzy, c-format
+#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "�޷��ڹ�Կ��������������%s\n"
#: g10/g10.c:2700
-#, fuzzy, c-format
+#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "����˽Կʧ�ܣ�%s\n"
+msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
#: g10/g10.c:2741
#, c-format
@@ -1318,7 +1316,7 @@ msgstr ""
"������Ŀû��ָ�����ζȣ�\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:290 g10/mainproc.c:1496
+#: g10/pkclist.c:290 g10/mainproc.c:1503
msgid " aka \""
msgstr " �༴ \""
@@ -1450,14 +1448,12 @@ msgid "WARNING: Using untrusted key!\n"
msgstr "���棺����ʹ�ò������ε���Կ��\n"
#: g10/pkclist.c:602
-#, fuzzy
msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
+msgstr "���棺����Կ�����ѱ����� (������Կ������)\n"
#: g10/pkclist.c:611
-#, fuzzy
msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "���棺�����Կ�Ѿ������ij����ߵ����ˣ�\n"
+msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
#: g10/pkclist.c:614
msgid "WARNING: This key has been revoked by its owner!\n"
@@ -1576,71 +1572,71 @@ msgstr "̫����ѡ�%c��\n"
msgid "invalid character in preference string\n"
msgstr "��ѡ���ַ���������Ч���ַ�\n"
-#: g10/keygen.c:634
+#: g10/keygen.c:638
msgid "writing direct signature\n"
msgstr "����д��ֱ��ǩ��\n"
-#: g10/keygen.c:673
+#: g10/keygen.c:677
msgid "writing self signature\n"
msgstr "����д������ǩ��\n"
-#: g10/keygen.c:719
+#: g10/keygen.c:723
msgid "writing key binding signature\n"
msgstr "����д����Կ��ǩ��\n"
-#: g10/keygen.c:781 g10/keygen.c:865 g10/keygen.c:956
+#: g10/keygen.c:785 g10/keygen.c:869 g10/keygen.c:960
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "��Կ�ߴ���Ч������ %u �ֽ�\n"
-#: g10/keygen.c:786 g10/keygen.c:870 g10/keygen.c:961
+#: g10/keygen.c:790 g10/keygen.c:874 g10/keygen.c:965
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "��Կ�ߴ����뵽 %u �ֽ�\n"
-#: g10/keygen.c:1061
+#: g10/keygen.c:1065
msgid "Please select what kind of key you want:\n"
msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
-#: g10/keygen.c:1063
+#: g10/keygen.c:1067
#, c-format
msgid " (%d) DSA and ElGamal (default)\n"
msgstr " (%d) DSA �� ElGamal (Ĭ��)\n"
-#: g10/keygen.c:1064
+#: g10/keygen.c:1068
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (������ǩ��)\n"
-#: g10/keygen.c:1066
+#: g10/keygen.c:1070
#, c-format
msgid " (%d) ElGamal (encrypt only)\n"
msgstr " (%d) ElGamal (�����ڼ���)\n"
-#: g10/keygen.c:1067
+#: g10/keygen.c:1071
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (������ǩ��)\n"
-#: g10/keygen.c:1069
+#: g10/keygen.c:1073
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (�����ڼ���)\n"
-#: g10/keygen.c:1071
+#: g10/keygen.c:1075
#, c-format
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (����ǩ�ּ�����)\n"
-#: g10/keygen.c:1074
+#: g10/keygen.c:1078
msgid "Your selection? "
msgstr "����ѡ�� "
-#: g10/keygen.c:1108 g10/keyedit.c:666 g10/revoke.c:665
+#: g10/keygen.c:1112 g10/keyedit.c:682 g10/revoke.c:665
msgid "Invalid selection.\n"
msgstr "��Ч��ѡ��\n"
-#: g10/keygen.c:1121
+#: g10/keygen.c:1125
#, c-format
msgid ""
"About to generate a new %s keypair.\n"
@@ -1653,19 +1649,19 @@ msgstr ""
" Ĭ�ϵ���Կ�ߴ��� 1024�ֽ�\n"
" �Ƽ��������Կ�ߴ��� 2048�ֽ�\n"
-#: g10/keygen.c:1130
+#: g10/keygen.c:1134
msgid "What keysize do you want? (1024) "
msgstr "����Ҫ�ö�����Կ�ߴ磿(1024)"
-#: g10/keygen.c:1135
+#: g10/keygen.c:1139
msgid "DSA only allows keysizes from 512 to 1024\n"
msgstr "DSA����Կ�ߴ�ֻ�ܽ��� 512 �� 1024 ֮��\n"
-#: g10/keygen.c:1137
+#: g10/keygen.c:1141
msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
-#: g10/keygen.c:1140
+#: g10/keygen.c:1144
msgid "keysize too small; 768 is smallest value allowed.\n"
msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
@@ -1677,12 +1673,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:1151
+#: g10/keygen.c:1155
#, c-format
msgid "keysize too large; %d is largest value allowed.\n"
msgstr "��Կ�ߴ�̫�����ֻ�ܹ��õ� %d��\n"
-#: g10/keygen.c:1156
+#: g10/keygen.c:1160
msgid ""
"Keysizes larger than 2048 are not suggested because\n"
"computations take REALLY long!\n"
@@ -1690,27 +1686,27 @@ msgstr ""
"������ʹ�óߴ���� 2048 ����Կ��\n"
"��Ϊ������ĻỨȥ�ܶ�ʱ�䣡\n"
-#: g10/keygen.c:1159
+#: g10/keygen.c:1163
msgid "Are you sure that you want this keysize? "
msgstr "��ȷ��Ҫ�������Կ�ߴ��� "
-#: g10/keygen.c:1160
+#: g10/keygen.c:1164
msgid ""
"Okay, but keep in mind that your monitor and keyboard radiation is also very "
"vulnerable to attacks!\n"
msgstr "�ðɣ��������ס������Ļ�ͼ���Ҳ���൱�ױ����ӵģ�\n"
-#: g10/keygen.c:1169
+#: g10/keygen.c:1173
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "����Ҫ�����Կ�ߴ��� %u �ֽ�\n"
-#: g10/keygen.c:1172 g10/keygen.c:1176
+#: g10/keygen.c:1176 g10/keygen.c:1180
#, c-format
msgid "rounded up to %u bits\n"
msgstr "���뵽 %u �ֽ�\n"
-#: g10/keygen.c:1227
+#: g10/keygen.c:1231
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -1726,7 +1722,7 @@ msgstr ""
" <n>m = ��Կ�� n �º����\n"
" <n>y = ��Կ�� n ������\n"
-#: g10/keygen.c:1236
+#: g10/keygen.c:1240
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -1742,30 +1738,30 @@ msgstr ""
" <n>m = ǩ���� n �º����\n"
" <n>y = ǩ���� n ������\n"
-#: g10/keygen.c:1258
+#: g10/keygen.c:1262
msgid "Key is valid for? (0) "
msgstr "��Կ����Ч�����ǣ�(0) "
-#: g10/keygen.c:1260
+#: g10/keygen.c:1264
msgid "Signature is valid for? (0) "
msgstr "ǩ�ֵ���Ч�����Ƕ�ã�(0) "
-#: g10/keygen.c:1265
+#: g10/keygen.c:1269
msgid "invalid value\n"
msgstr "��Ч����ֵ\n"
-#: g10/keygen.c:1270
+#: g10/keygen.c:1274
#, c-format
msgid "%s does not expire at all\n"
msgstr "%s ��Զ�������\n"
#. print the date when the key expires
-#: g10/keygen.c:1277
+#: g10/keygen.c:1281
#, c-format
msgid "%s expires at %s\n"
msgstr "%s ���� %s ����\n"
-#: g10/keygen.c:1283
+#: g10/keygen.c:1287
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -1773,11 +1769,11 @@ msgstr ""
"����ϵͳ�޷���ʾ 2038 ���Ժ�����ڡ�\n"
"��������������ȷ���� 2106 ��֮ǰ����ݡ�\n"
-#: g10/keygen.c:1288
+#: g10/keygen.c:1292
msgid "Is this correct (y/n)? "
msgstr "������ȷ��(y/n)"
-#: g10/keygen.c:1331
+#: g10/keygen.c:1335
msgid ""
"\n"
"You need a User-ID to identify your key; the software constructs the user "
@@ -1792,44 +1788,44 @@ msgstr ""
" ��Heinrich Heine (Der Dichter) <[email protected]>��\n"
"\n"
-#: g10/keygen.c:1343
+#: g10/keygen.c:1347
msgid "Real name: "
msgstr "��ʵ������"
-#: g10/keygen.c:1351
+#: g10/keygen.c:1355
msgid "Invalid character in name\n"
msgstr "����������Ч���ַ�\n"
-#: g10/keygen.c:1353
+#: g10/keygen.c:1357
msgid "Name may not start with a digit\n"
msgstr "���������������ֿ�ͷ\n"
-#: g10/keygen.c:1355
+#: g10/keygen.c:1359
msgid "Name must be at least 5 characters long\n"
msgstr "��������Ҫ������ַ���\n"
-#: g10/keygen.c:1363
+#: g10/keygen.c:1367
msgid "Email address: "
msgstr "�����ʼ���ַ��"
-#: g10/keygen.c:1374
+#: g10/keygen.c:1378
msgid "Not a valid email address\n"
msgstr "�����ʼ���ַ��Ч\n"
-#: g10/keygen.c:1382
+#: g10/keygen.c:1386
msgid "Comment: "
msgstr "ע�ͣ�"
-#: g10/keygen.c:1388
+#: g10/keygen.c:1392
msgid "Invalid character in comment\n"
msgstr "ע�ͺ�����Ч���ַ�\n"
-#: g10/keygen.c:1411
+#: g10/keygen.c:1415
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "������ʹ�á�%s���ַ�����\n"
-#: g10/keygen.c:1417
+#: g10/keygen.c:1421
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -1840,27 +1836,27 @@ msgstr ""
" ��%s��\n"
"\n"
-#: g10/keygen.c:1423
+#: g10/keygen.c:1427
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�벻Ҫ�ѵ����ʼ���ַ�Ž�������ʵ������ע����\n"
-#: g10/keygen.c:1428
+#: g10/keygen.c:1432
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1438
+#: g10/keygen.c:1442
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)���˳�(Q)��"
-#: g10/keygen.c:1439
+#: g10/keygen.c:1443
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)��ȷ��(O)/�˳�(Q)��"
-#: g10/keygen.c:1458
+#: g10/keygen.c:1462
msgid "Please correct the error first\n"
msgstr "���ȸ�������\n"
-#: g10/keygen.c:1497
+#: g10/keygen.c:1501
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1868,16 +1864,16 @@ msgstr ""
"����Ҫһ����������������˽Կ��\n"
"\n"
-#: g10/keygen.c:1506 g10/keyedit.c:864
+#: g10/keygen.c:1510 g10/keyedit.c:880
msgid "passphrase not correctly repeated; try again"
msgstr "�����ٴ�����ʱ���״����벻����������һ��"
-#: g10/keygen.c:1507
+#: g10/keygen.c:1511
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1513
+#: g10/keygen.c:1517
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"
@@ -1889,7 +1885,7 @@ msgstr ""
"����Ҫ�ٴ�ִ��������򣬲���ʹ�á�--edit-key��ѡ��ɡ�\n"
"\n"
-#: g10/keygen.c:1535
+#: g10/keygen.c:1539
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"
@@ -1900,53 +1896,53 @@ msgstr ""
"(�����ô���̡��ƶ���ꡢ��дӲ��֮���)\n"
"�����������ַ������и��õĻ������㹻��������\n"
-#: g10/keygen.c:2110
+#: g10/keygen.c:2114
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ��Կ�Ի��� 1024 �ֽڡ�\n"
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
msgid "Key generation canceled.\n"
msgstr "��Կ������ȡ����\n"
-#: g10/keygen.c:2289 g10/keygen.c:2377
+#: g10/keygen.c:2293 g10/keygen.c:2381
#, c-format
msgid "writing public key to `%s'\n"
msgstr "���ڽ���Կд��`%s'\n"
-#: g10/keygen.c:2290 g10/keygen.c:2379
+#: g10/keygen.c:2294 g10/keygen.c:2383
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "���ڽ�˽Կд��`%s'\n"
-#: g10/keygen.c:2366
+#: g10/keygen.c:2370
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�Ҳ�����д�Ĺ�ԿԿ�׻���%s\n"
-#: g10/keygen.c:2372
+#: g10/keygen.c:2376
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�Ҳ�����д��˽ԿԿ�׻���%s\n"
-#: g10/keygen.c:2386
+#: g10/keygen.c:2390
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "д�빫ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2393
+#: g10/keygen.c:2397
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
-#: g10/keygen.c:2413
+#: g10/keygen.c:2417
msgid "public and secret key created and signed.\n"
msgstr "��Կ��˽Կ�Ѿ����ɲ���ǩ�֡�\n"
-#: g10/keygen.c:2414
+#: g10/keygen.c:2418
msgid "key marked as ultimately trusted.\n"
msgstr "��Կ�ѱ���dzɾ������Ρ�\n"
-#: g10/keygen.c:2425
+#: g10/keygen.c:2429
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"
@@ -1954,28 +1950,28 @@ msgstr ""
"��ע�������Կ�������������ܣ����������á�--edit-key��ָ��\n"
"�������ڼ��ܵ���Կ��\n"
-#: g10/keygen.c:2437 g10/keygen.c:2559
+#: g10/keygen.c:2441 g10/keygen.c:2563
#, c-format
msgid "Key generation failed: %s\n"
msgstr "������Կʧ�ܣ�%s\n"
-#: g10/keygen.c:2487 g10/sign.c:261
+#: g10/keygen.c:2491 g10/sign.c:261
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2489 g10/sign.c:263
+#: g10/keygen.c:2493 g10/sign.c:263
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
-#: g10/keygen.c:2498
+#: g10/keygen.c:2502
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ע�⣺Ϊ v3 ��Կ������Կ��ʧȥ OpenPGP ������\n"
-#: g10/keygen.c:2526
+#: g10/keygen.c:2530
msgid "Really create? "
msgstr "���Ҫ������ "
@@ -1999,9 +1995,9 @@ msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "�ڴ� S2K ģʽ���޷�ʹ�öԳƵ� ESK ��\n"
#: g10/encode.c:223
-#, fuzzy, c-format
+#, c-format
msgid "using cipher %s\n"
-msgstr "ǩ��ʱʧ�ܣ� %s\n"
+msgstr "ʹ�öԳƼ����㷨 %s\n"
#: g10/encode.c:233 g10/encode.c:494
#, c-format
@@ -2047,7 +2043,7 @@ msgstr "�����ý� %s ���� %s ģʽ��\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s �Ѿ����ܸ�����%s��\n"
-#: g10/export.c:157 g10/keyedit.c:2485 g10/delkey.c:74 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2501 g10/delkey.c:74 g10/revoke.c:224
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�Ҳ�����%s����Կ��%s\n"
@@ -2506,27 +2502,27 @@ msgstr "��⵽ %d ��û����Ч����ǩ�ֵ��û���ʶ\n"
msgid "User ID \"%s\" is revoked."
msgstr "�û���ʶ��%s���ѱ�������"
-#: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
-#: g10/keyedit.c:618 g10/keyedit.c:1221
+#: g10/keyedit.c:371 g10/keyedit.c:397 g10/keyedit.c:422 g10/keyedit.c:576
+#: g10/keyedit.c:634 g10/keyedit.c:1237
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
-#: g10/keyedit.c:377 g10/keyedit.c:397 g10/keyedit.c:418 g10/keyedit.c:566
-#: g10/keyedit.c:1227
+#: g10/keyedit.c:383 g10/keyedit.c:409 g10/keyedit.c:434 g10/keyedit.c:582
+#: g10/keyedit.c:1243
msgid " Unable to sign.\n"
msgstr " �޷�����ǩ�֡�\n"
-#: g10/keyedit.c:382
-#, fuzzy, c-format
+#: g10/keyedit.c:388
+#, c-format
msgid "User ID \"%s\" is expired."
-msgstr "�û���ʶ��%s���ѱ�������"
+msgstr "�û���ʶ��%s���ѹ��ڡ�"
-#: g10/keyedit.c:402
-#, fuzzy, c-format
+#: g10/keyedit.c:414
+#, c-format
msgid "User ID \"%s\" is not self-signed."
-msgstr "���棺�û���ʶ��%s����������ǩ�֡�\n"
+msgstr "���棺�û���ʶ��%s����������ǩ�֡�"
-#: g10/keyedit.c:437
+#: g10/keyedit.c:453
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2535,11 +2531,11 @@ msgstr ""
"��%s���������ǩ��\n"
"�� PGP 2.x ��ʽ��ǩ�֡�\n"
-#: g10/keyedit.c:446
+#: g10/keyedit.c:462
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "���Ƿ���Ҫ���������� OpenPGP ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:460
+#: g10/keyedit.c:476
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2548,13 +2544,13 @@ msgstr ""
"��ĿǰΪ��%s����ǩ��\n"
"�Ѿ������ˡ�\n"
-#: g10/keyedit.c:464
+#: g10/keyedit.c:480
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:485
+#: g10/keyedit.c:501
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2563,53 +2559,53 @@ msgstr ""
"��Ŀǰ�ڡ�%s����ǩ��\n"
"��һ�ݱ���ǩ�֡�\n"
-#: g10/keyedit.c:489
+#: g10/keyedit.c:505
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "���Ƿ���Ҫ���������ɿ�����ȫ������ǩ�֣�(y/N)"
-#: g10/keyedit.c:510
+#: g10/keyedit.c:526
#, c-format
msgid "\"%s\" was already locally signed by key %08lX\n"
msgstr "��%s���Ѿ���Կ %08lX �ڱ���ǩ��\n"
-#: g10/keyedit.c:514
+#: g10/keyedit.c:530
#, c-format
msgid "\"%s\" was already signed by key %08lX\n"
msgstr "��%s���Ѿ���Կ %08lX ǩ��\n"
-#: g10/keyedit.c:519
+#: g10/keyedit.c:535
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "����Ȼ��ҪΪ���ٴ�ǩ����(y/N)"
-#: g10/keyedit.c:539
+#: g10/keyedit.c:555
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "û�ж�����������Կ %08lX ǩ��\n"
-#: g10/keyedit.c:554
+#: g10/keyedit.c:570
msgid "This key has expired!"
msgstr "�����Կ�Ѿ����ڣ�"
-#: g10/keyedit.c:574
+#: g10/keyedit.c:590
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�����Կ���� %s ���ڡ�\n"
-#: g10/keyedit.c:578
+#: g10/keyedit.c:594
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "����Ҫ������ǩ��Ҳͬʱ������ (Y/n) "
-#: g10/keyedit.c:611
+#: g10/keyedit.c:627
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:613
+#: g10/keyedit.c:629
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "����������Կ�� PGP 2.x ģʽ�²���ʹ�á�\n"
-#: g10/keyedit.c:636
+#: g10/keyedit.c:652
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2618,35 +2614,35 @@ msgstr ""
"���ж�ô�����ؼ�����Ҫǩ�ֵ���Կ�Ƿ�ȷʵ�������������Ƶ��������أ�\n"
"�������֪���������Ĵ𰸣������롰0����\n"
-#: g10/keyedit.c:640
+#: g10/keyedit.c:656
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �Ҳ����� %s\n"
-#: g10/keyedit.c:641 g10/keyedit.c:643 g10/keyedit.c:645 g10/keyedit.c:647
+#: g10/keyedit.c:657 g10/keyedit.c:659 g10/keyedit.c:661 g10/keyedit.c:663
msgid " (default)"
msgstr " (Ĭ��)"
-#: g10/keyedit.c:642
+#: g10/keyedit.c:658
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �Ҹ���û�м����� %s\n"
-#: g10/keyedit.c:644
+#: g10/keyedit.c:660
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ����������� %s\n"
-#: g10/keyedit.c:646
+#: g10/keyedit.c:662
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) �ҷdz�С�ĵؼ����� %s\n"
-#: g10/keyedit.c:652
+#: g10/keyedit.c:668
msgid "Your selection? (enter '?' for more information): "
-msgstr ""
+msgstr "����ѡ��(���� ��?�� �Ի�ø������Ϣ)��"
-#: g10/keyedit.c:672
+#: g10/keyedit.c:688
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2654,7 +2650,7 @@ msgstr ""
"�����ȷ��Ҫǩ�������Կ\n"
"ʹ��������Կ��\""
-#: g10/keyedit.c:681
+#: g10/keyedit.c:697
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2662,7 +2658,7 @@ msgstr ""
"\n"
"�⽫��������ǩ�֡�\n"
-#: g10/keyedit.c:685
+#: g10/keyedit.c:701
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2670,7 +2666,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ���Ϊ���ɵ�����\n"
-#: g10/keyedit.c:690
+#: g10/keyedit.c:706
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2678,7 +2674,7 @@ msgstr ""
"\n"
"���棺���ǩ�ֲ��ᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:697
+#: g10/keyedit.c:713
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2686,7 +2682,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:701
+#: g10/keyedit.c:717
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2694,7 +2690,7 @@ msgstr ""
"\n"
"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
-#: g10/keyedit.c:706
+#: g10/keyedit.c:722
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2702,7 +2698,7 @@ msgstr ""
"\n"
"�Ҹ���û�м��������Կ��\n"
-#: g10/keyedit.c:710
+#: g10/keyedit.c:726
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2710,7 +2706,7 @@ msgstr ""
"\n"
"��������������Կ��\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:730
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2718,34 +2714,34 @@ msgstr ""
"\n"
"�ҷdz�С�ĵؼ��������Կ��\n"
-#: g10/keyedit.c:723
+#: g10/keyedit.c:739
msgid "Really sign? "
msgstr "���Ҫǩ���� "
-#: g10/keyedit.c:765 g10/keyedit.c:3273 g10/keyedit.c:3364 g10/keyedit.c:3437
+#: g10/keyedit.c:781 g10/keyedit.c:3289 g10/keyedit.c:3380 g10/keyedit.c:3453
#: g10/sign.c:318
#, c-format
msgid "signing failed: %s\n"
msgstr "ǩ��ʱʧ�ܣ� %s\n"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:837
msgid "This key is not protected.\n"
msgstr "�����Կû�б�������\n"
-#: g10/keyedit.c:825
+#: g10/keyedit.c:841
msgid "Secret parts of primary key are not available.\n"
msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
-#: g10/keyedit.c:829
+#: g10/keyedit.c:845
msgid "Key is protected.\n"
msgstr "��Կ�������ˡ�\n"
-#: g10/keyedit.c:849
+#: g10/keyedit.c:865
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "�޷��༭�����Կ�� %s\n"
-#: g10/keyedit.c:855
+#: g10/keyedit.c:871
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2753,7 +2749,7 @@ msgstr ""
"����Ҫ�����˽Կ�õ������롣\n"
"\n"
-#: g10/keyedit.c:869
+#: g10/keyedit.c:885
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2761,492 +2757,492 @@ msgstr ""
"������Ҫ�����롪�������Ǹ������⣡\n"
"\n"
-#: g10/keyedit.c:872
+#: g10/keyedit.c:888
msgid "Do you really want to do this? "
msgstr "�������Ҫ��ô���� "
-#: g10/keyedit.c:938
+#: g10/keyedit.c:954
msgid "moving a key signature to the correct place\n"
msgstr "���ڰ���Կ��ǩ���ƶ�����ȷ��λ��ȥ\n"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:996
msgid "quit this menu"
msgstr "�뿪����˵�"
-#: g10/keyedit.c:981
+#: g10/keyedit.c:997
msgid "q"
msgstr "q"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:998
msgid "save"
msgstr "save"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:998
msgid "save and quit"
msgstr "���沢�뿪"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:999
msgid "help"
msgstr "help"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:999
msgid "show this help"
msgstr "��ʾ�������˵��"
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1001
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:985
+#: g10/keyedit.c:1001
msgid "show fingerprint"
msgstr "��ʾָ��"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1002
msgid "list"
msgstr "list"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:1002
msgid "list key and user IDs"
msgstr "�г���Կ���û���ʶ"
-#: g10/keyedit.c:987
+#: g10/keyedit.c:1003
msgid "l"
msgstr "l"
-#: g10/keyedit.c:988
+#: g10/keyedit.c:1004
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:988
+#: g10/keyedit.c:1004
msgid "select user ID N"
msgstr "ѡ���û���ʶN"
-#: g10/keyedit.c:989
+#: g10/keyedit.c:1005
msgid "key"
msgstr "key"
-#: g10/keyedit.c:989
+#: g10/keyedit.c:1005
msgid "select secondary key N"
msgstr "ѡ����Կ N"
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1006
msgid "check"
msgstr "check"
-#: g10/keyedit.c:990
+#: g10/keyedit.c:1006
msgid "list signatures"
msgstr "�г�ǩ��"
-#: g10/keyedit.c:991
+#: g10/keyedit.c:1007
msgid "c"
msgstr "c"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1008
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:992
+#: g10/keyedit.c:1008
msgid "sign the key"
msgstr "Ϊ��Կ����ǩ��"
-#: g10/keyedit.c:993
+#: g10/keyedit.c:1009
msgid "s"
msgstr "s"
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1010
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:994
+#: g10/keyedit.c:1010
msgid "sign the key locally"
msgstr "Ϊ��Կ���ӱ���ǩ��"
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1011
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:995
+#: g10/keyedit.c:1011
msgid "sign the key non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ���ǩ��"
-#: g10/keyedit.c:996
+#: g10/keyedit.c:1012
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:996
+#: g10/keyedit.c:1012
msgid "sign the key locally and non-revocably"
msgstr "Ϊ��Կ���Ӳ��ɵ����ı���ǩ��"
-#: g10/keyedit.c:997
+#: g10/keyedit.c:1013
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1014
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1014
msgid "add a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:999
+#: g10/keyedit.c:1015
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:999
+#: g10/keyedit.c:1015
msgid "add a photo ID"
msgstr "����һ����Ƭ��ʶ"
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1016
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1016
msgid "delete user ID"
msgstr "ɾ��һ���û�/��Ƭ��ʶ"
#. delphoto is really deluid in disguise
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1018
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1019
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1019
msgid "add a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1004
+#: g10/keyedit.c:1020
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:1004
+#: g10/keyedit.c:1020
msgid "delete a secondary key"
msgstr "ɾ��һ����Կ"
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1021
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1021
msgid "add a revocation key"
msgstr "����һ�ѵ�����Կ"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1022
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1022
msgid "delete signatures"
msgstr "ɾ��ǩ��"
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1023
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1023
msgid "change the expire date"
msgstr "����ʹ������"
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1024
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:1008
+#: g10/keyedit.c:1024
msgid "flag user ID as primary"
msgstr "�趨��ѡ�û���ʶ"
-#: g10/keyedit.c:1009
+#: g10/keyedit.c:1025
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:1009
+#: g10/keyedit.c:1025
msgid "toggle between secret and public key listing"
msgstr "��˽Կ�͹�Կ�嵥���л�"
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1027
msgid "t"
msgstr "t"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1028
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1028
msgid "list preferences (expert)"
msgstr "�г���ѡ��(ר��ģʽ)"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1029
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1029
msgid "list preferences (verbose)"
msgstr "�г���ѡ��(��ϸģʽ)"
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1030
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1030
msgid "set preference list"
msgstr "�趨��ѡ��"
-#: g10/keyedit.c:1015
+#: g10/keyedit.c:1031
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:1015
+#: g10/keyedit.c:1031
msgid "updated preferences"
msgstr "���¹�����ѡ��"
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1032
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1032
msgid "change the passphrase"
msgstr "��������"
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1033
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1033
msgid "change the ownertrust"
msgstr "�������ζ�"
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1034
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1034
msgid "revoke signatures"
msgstr "����ǩ��"
-#: g10/keyedit.c:1019
+#: g10/keyedit.c:1035
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:1019
+#: g10/keyedit.c:1035
msgid "revoke a user ID"
msgstr "����һ���û���ʶ"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1036
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1036
msgid "revoke a secondary key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1037
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1037
msgid "disable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1038
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:1022
+#: g10/keyedit.c:1038
msgid "enable a key"
msgstr "����һ����Կ"
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1039
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:1023
+#: g10/keyedit.c:1039
msgid "show photo ID"
msgstr "��ʾ��Ƭ��ʶ"
-#: g10/keyedit.c:1043 g10/delkey.c:120
+#: g10/keyedit.c:1059 g10/delkey.c:120
msgid "can't do that in batchmode\n"
msgstr "�ò����޷���������ģʽ�н���\n"
-#: g10/keyedit.c:1081
+#: g10/keyedit.c:1097
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
-#: g10/keyedit.c:1099
+#: g10/keyedit.c:1115
msgid "Secret key is available.\n"
msgstr "˽Կ���á�\n"
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1146
msgid "Command> "
msgstr "����> "
-#: g10/keyedit.c:1162
+#: g10/keyedit.c:1178
msgid "Need the secret key to do this.\n"
msgstr "Ҫ��˽Կ������ô����\n"
-#: g10/keyedit.c:1166
+#: g10/keyedit.c:1182
msgid "Please use the command \"toggle\" first.\n"
msgstr "����ʹ�á�toggle��ָ�\n"
-#: g10/keyedit.c:1215
+#: g10/keyedit.c:1231
msgid "Key is revoked."
msgstr "��Կ�ѱ�������"
-#: g10/keyedit.c:1234
+#: g10/keyedit.c:1250
msgid "Really sign all user IDs? "
msgstr "���Ϊ���е��û���ʶǩ���� "
-#: g10/keyedit.c:1235
+#: g10/keyedit.c:1251
msgid "Hint: Select the user IDs to sign\n"
msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
-#: g10/keyedit.c:1260
+#: g10/keyedit.c:1276
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
-#: g10/keyedit.c:1282 g10/keyedit.c:1303 g10/keyedit.c:1363
+#: g10/keyedit.c:1298 g10/keyedit.c:1319 g10/keyedit.c:1379
msgid "You must select at least one user ID.\n"
msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1300
msgid "You can't delete the last user ID!\n"
msgstr "������ɾ�����һ���û���ʶ��\n"
-#: g10/keyedit.c:1287
+#: g10/keyedit.c:1303
msgid "Really remove all selected user IDs? "
msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1304
msgid "Really remove this user ID? "
msgstr "���Ҫɾ������û���ʶ�� "
-#: g10/keyedit.c:1326 g10/keyedit.c:1382
+#: g10/keyedit.c:1342 g10/keyedit.c:1398
msgid "You must select at least one key.\n"
msgstr "������ѡ������һ����Կ��\n"
-#: g10/keyedit.c:1330
+#: g10/keyedit.c:1346
msgid "Do you really want to delete the selected keys? "
msgstr "�������Ҫɾ����ѡ�����Կ�� "
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1347
msgid "Do you really want to delete this key? "
msgstr "�����Ҫɾ�������Կ�� "
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1382
msgid "Really revoke all selected user IDs? "
msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1383
msgid "Really revoke this user ID? "
msgstr "���Ҫ��������û���ʶ�� "
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1402
msgid "Do you really want to revoke the selected keys? "
msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
-#: g10/keyedit.c:1387
+#: g10/keyedit.c:1403
msgid "Do you really want to revoke this key? "
msgstr "�������Ҫ���������Կ�� "
-#: g10/keyedit.c:1456
+#: g10/keyedit.c:1472
msgid "Really update the preferences for the selected user IDs? "
msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1474
msgid "Really update the preferences? "
msgstr "���Ҫ������ѡ���� "
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1512
msgid "Save changes? "
msgstr "Ҫ����䶯�� "
-#: g10/keyedit.c:1499
+#: g10/keyedit.c:1515
msgid "Quit without saving? "
msgstr "Ҫ��������뿪�� "
-#: g10/keyedit.c:1510
+#: g10/keyedit.c:1526
#, c-format
msgid "update failed: %s\n"
msgstr "����ʧ�ܣ�%s\n"
-#: g10/keyedit.c:1517
+#: g10/keyedit.c:1533
#, c-format
msgid "update secret failed: %s\n"
msgstr "����˽Կʧ�ܣ�%s\n"
-#: g10/keyedit.c:1524
+#: g10/keyedit.c:1540
msgid "Key not changed so no update needed.\n"
msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1552
msgid "Invalid command (try \"help\")\n"
msgstr "��Ч��ָ��(���ԡ�help��)\n"
-#: g10/keyedit.c:1595
+#: g10/keyedit.c:1611
msgid "Digest: "
msgstr "ɢ�У�"
-#: g10/keyedit.c:1647
+#: g10/keyedit.c:1663
msgid "Features: "
msgstr "�ص㣺"
-#: g10/keyedit.c:1881
+#: g10/keyedit.c:1897
#, c-format
msgid "This key may be revoked by %s key "
msgstr "�����Կ�ɱ��� %s ��Կ������"
-#: g10/keyedit.c:1885
+#: g10/keyedit.c:1901
msgid " (sensitive)"
msgstr " (���е�)"
#. Note, we use the same format string as in other show
#. functions to make the translation job easier.
-#: g10/keyedit.c:1891 g10/keyedit.c:1917 g10/keyedit.c:2002 g10/keyedit.c:2017
+#: g10/keyedit.c:1907 g10/keyedit.c:1933 g10/keyedit.c:2018 g10/keyedit.c:2033
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX �����ڣ�%s ��Ч����%s"
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1916
#, c-format
msgid " trust: %c/%c"
msgstr " ���ζȣ� %c/%c"
-#: g10/keyedit.c:1904
+#: g10/keyedit.c:1920
msgid "This key has been disabled"
msgstr "�����Կ�Ѿ�������"
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1949
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! ��Կ�Ѿ���������%s\n"
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1952
msgid "rev- faked revocation found\n"
msgstr "rev- ����α��ĵ���\n"
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1954
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? ������ʱ�������⣺%s\n"
-#: g10/keyedit.c:1958 g10/keyedit.c:2041 g10/keylist.c:492 g10/keylist.c:532
-#: g10/mainproc.c:939
+#: g10/keyedit.c:1974 g10/keyedit.c:2057 g10/keylist.c:492 g10/keylist.c:532
+#: g10/mainproc.c:946
msgid "[revoked] "
msgstr "[�ѵ���]"
-#: g10/keyedit.c:1960 g10/keyedit.c:2043
+#: g10/keyedit.c:1976 g10/keyedit.c:2059
msgid "[expired] "
msgstr "[�ѹ���]"
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1984
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1992
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3254,13 +3250,15 @@ msgstr ""
"��ע�⣬������������֮ǰ��\n"
"��ʾ����Կ��Ч��δ����ȷ��\n"
-#: g10/keyedit.c:2105
+#: g10/keyedit.c:2121
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 ""
+"���棺û��һ���û���ʶ�����Ϊ��ѡ�û���ʶ����������ܼٶ�һ����ͬ\n"
+" ���û���ʶ����ѡ�û���ʶ��\n"
-#: g10/keyedit.c:2165
+#: g10/keyedit.c:2181
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3269,45 +3267,45 @@ msgstr ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
-#: g10/keyedit.c:2170 g10/keyedit.c:2443
+#: g10/keyedit.c:2186 g10/keyedit.c:2459
msgid "Are you sure you still want to add it? (y/N) "
msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
-#: g10/keyedit.c:2176
+#: g10/keyedit.c:2192
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
-#: g10/keyedit.c:2311
+#: g10/keyedit.c:2327
msgid "Delete this good signature? (y/N/q)"
msgstr "ɾ�������õ�ǩ����(y/N/q)"
-#: g10/keyedit.c:2321
+#: g10/keyedit.c:2337
msgid "Delete this invalid signature? (y/N/q)"
msgstr "ɾ�������Ч��ǩ����(y/N/q)"
-#: g10/keyedit.c:2325
+#: g10/keyedit.c:2341
msgid "Delete this unknown signature? (y/N/q)"
msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2347
msgid "Really delete this self-signature? (y/N)"
msgstr "���Ҫɾ���������ǩ����(y/N)"
-#: g10/keyedit.c:2345
+#: g10/keyedit.c:2361
#, c-format
msgid "Deleted %d signature.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2346
+#: g10/keyedit.c:2362
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
-#: g10/keyedit.c:2349
+#: g10/keyedit.c:2365
msgid "Nothing deleted.\n"
msgstr "û�ж�����ɾ����\n"
-#: g10/keyedit.c:2438
+#: g10/keyedit.c:2454
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3316,15 +3314,15 @@ msgstr ""
"���棺����һ�� PGP2 ��ʽ����Կ��\n"
" ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
-#: g10/keyedit.c:2449
+#: g10/keyedit.c:2465
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
-#: g10/keyedit.c:2472
+#: g10/keyedit.c:2488
msgid "Enter the user ID of the designated revoker: "
msgstr "����ָ�������ߵ��û���ʶ��"
-#: g10/keyedit.c:2495
+#: g10/keyedit.c:2511
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\n"
@@ -3334,67 +3332,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:2505
+#: g10/keyedit.c:2521
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
-#: g10/keyedit.c:2524
+#: g10/keyedit.c:2540
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
-#: g10/keyedit.c:2530
+#: g10/keyedit.c:2546
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2611
msgid "Please remove selections from the secret keys.\n"
msgstr "���˽Կ��ɾ��ѡ��\n"
-#: g10/keyedit.c:2601
+#: g10/keyedit.c:2617
msgid "Please select at most one secondary key.\n"
msgstr "������ѡ��һ����Կ��\n"
-#: g10/keyedit.c:2605
+#: g10/keyedit.c:2621
msgid "Changing expiration time for a secondary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2608
+#: g10/keyedit.c:2624
msgid "Changing expiration time for the primary key.\n"
msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
-#: g10/keyedit.c:2654
+#: g10/keyedit.c:2670
msgid "You can't change the expiration date of a v3 key\n"
msgstr "�����ܱ��v3��Կ��ʹ������\n"
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2686
msgid "No corresponding signature in secret ring\n"
msgstr "��˽Կ����û��һ�µ�ǩ��\n"
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2766
msgid "Please select exactly one user ID.\n"
msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
-#: g10/keyedit.c:2789 g10/keyedit.c:2899
+#: g10/keyedit.c:2805 g10/keyedit.c:2915
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
-#: g10/keyedit.c:2959
+#: g10/keyedit.c:2975
#, c-format
msgid "No user ID with index %d\n"
msgstr "û������Ϊ %d ���û���ʶ\n"
-#: g10/keyedit.c:3005
+#: g10/keyedit.c:3021
#, c-format
msgid "No secondary key with index %d\n"
msgstr "û������Ϊ %d ����Կ\n"
-#: g10/keyedit.c:3119
+#: g10/keyedit.c:3135
msgid "user ID: \""
msgstr "�û���ʶ����"
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3140
#, c-format
msgid ""
"\"\n"
@@ -3403,7 +3401,7 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ����ǩ��\n"
-#: g10/keyedit.c:3127
+#: g10/keyedit.c:3143
#, c-format
msgid ""
"\"\n"
@@ -3412,56 +3410,56 @@ msgstr ""
"��\n"
"�Ѿ�ʹ��������Կ %08lX �� %s ���ӱ���ǩ��\n"
-#: g10/keyedit.c:3132
+#: g10/keyedit.c:3148
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���ǩ������ %s ���ڡ�\n"
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3152
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
-#: g10/keyedit.c:3140
+#: g10/keyedit.c:3156
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
#. FIXME: detect duplicates here
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3181
msgid "You have signed these user IDs:\n"
msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
-#: g10/keyedit.c:3184
+#: g10/keyedit.c:3200
#, c-format
msgid " signed by %08lX at %s%s%s\n"
msgstr " �� %08lX �� %s%s%s ����ǩ��\n"
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3208
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " �� %08lX ������ %s\n"
-#: g10/keyedit.c:3212
+#: g10/keyedit.c:3228
msgid "You are about to revoke these signatures:\n"
msgstr "�����ڵ�����Щǩ�֣�\n"
-#: g10/keyedit.c:3222
+#: g10/keyedit.c:3238
#, c-format
msgid " signed by %08lX at %s%s\n"
msgstr " �� %08lX �� %s%s ����ǩ��\n"
-#: g10/keyedit.c:3224
+#: g10/keyedit.c:3240
msgid " (non-exportable)"
msgstr " (���ɵ���)"
-#: g10/keyedit.c:3231
+#: g10/keyedit.c:3247
msgid "Really create the revocation certificates? (y/N) "
msgstr "���Ҫ���ɵ���֤����(y/N)"
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3277
msgid "no secret key\n"
msgstr "û��˽Կ\n"
-#: g10/keyedit.c:3331
+#: g10/keyedit.c:3347
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�û���ʶ��%s���Ѿ���������\n"
@@ -3470,12 +3468,12 @@ 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:3348
+#: g10/keyedit.c:3364
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
-#: g10/keyedit.c:3521
+#: g10/keyedit.c:3537
#, c-format
msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
@@ -3490,7 +3488,7 @@ msgstr "�ؼ�ǩ�ֲ��ԣ�"
msgid "Signature policy: "
msgstr "ǩ�ֲ��ԣ�"
-#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:804 g10/mainproc.c:813
+#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:811 g10/mainproc.c:820
msgid "WARNING: invalid notation data found\n"
msgstr "���棺�ҵ���Ч�ı������\n"
@@ -3513,7 +3511,7 @@ msgid "Keyring"
msgstr "Կ�׻�"
# of subkey
-#: g10/keylist.c:534 g10/mainproc.c:941
+#: g10/keylist.c:534 g10/mainproc.c:948
#, c-format
msgid " [expires: %s]"
msgstr " [��������%s]"
@@ -3548,14 +3546,14 @@ 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
+#, c-format
msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "δ֪�ĶԳƼ����㷨"
+msgstr "����������δ֪�ĶԳƼ����㷨 (%d)\n"
#: g10/mainproc.c:299
-#, fuzzy, c-format
+#, c-format
msgid "%s encrypted session key\n"
-msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
+msgstr "%s ���ܹ��ĻỰ��Կ\n"
#: g10/mainproc.c:301 g10/encr-data.c:66
#, c-format
@@ -3567,98 +3565,102 @@ msgstr "%s ���ܹ�������\n"
msgid "encrypted with unknown algorithm %d\n"
msgstr "��δ֪���㷨 %d ����\n"
-#: g10/mainproc.c:351
+#: g10/mainproc.c:309
+#, fuzzy, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "��δ֪���㷨 %d ����\n"
+
+#: g10/mainproc.c:358
#, c-format
msgid "public key is %08lX\n"
msgstr "��Կ�� %08lX\n"
-#: g10/mainproc.c:397
+#: g10/mainproc.c:404
msgid "public key encrypted data: good DEK\n"
msgstr "��Կ���ܹ������ݣ���õ� DEK\n"
-#: g10/mainproc.c:449
+#: g10/mainproc.c:456
#, c-format
msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
msgstr "�ó���Ϊ %u �ֽڡ�����Ϊ %s��Կ�׺�Ϊ %08lX�������� %s ����Կ���ܹ�\n"
-#: g10/mainproc.c:459
+#: g10/mainproc.c:466
#, c-format
msgid "encrypted with %s key, ID %08lX\n"
msgstr "������Ϊ %s��Կ�׺�Ϊ %08lX ����Կ���ܹ�\n"
-#: g10/mainproc.c:473
+#: g10/mainproc.c:480
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "��Կ����ʧ�ܣ�%s\n"
-#: g10/mainproc.c:487
-#, fuzzy, c-format
+#: g10/mainproc.c:494
+#, c-format
msgid "encrypted with %lu passphrases\n"
-msgstr "��������һ������\n"
+msgstr "�� %lu ���������\n"
-#: g10/mainproc.c:489
-#, fuzzy
+#: g10/mainproc.c:496
msgid "encrypted with 1 passphrase\n"
-msgstr "��������һ������\n"
+msgstr "�� 1 ���������\n"
-#: g10/mainproc.c:505 g10/mainproc.c:524
+#: g10/mainproc.c:512 g10/mainproc.c:531
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "�ٶ� %s Ϊ���ܹ�������\n"
-#: g10/mainproc.c:512
+#: g10/mainproc.c:519
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA �㷨�����ã����� %s ����\n"
-#: g10/mainproc.c:542
+#: g10/mainproc.c:549
msgid "decryption okay\n"
msgstr "���ܳɹ�\n"
-#: g10/mainproc.c:546
+#: g10/mainproc.c:553
msgid "WARNING: message was not integrity protected\n"
msgstr "���棺����δ�ܵ������ı���\n"
-#: g10/mainproc.c:549
+#: g10/mainproc.c:556
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "���棺���ܹ��ı����Ѿ����죡\n"
-#: g10/mainproc.c:555
+#: g10/mainproc.c:562
#, c-format
msgid "decryption failed: %s\n"
msgstr "����ʧ�ܣ�%s\n"
-#: g10/mainproc.c:574
+#: g10/mainproc.c:581
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "ע�⣺������Ҫ������ֻ�Ķ������̡�\n"
-#: g10/mainproc.c:576
+#: g10/mainproc.c:583
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ԭʼ�ļ��� =��%.*s��\n"
-#: g10/mainproc.c:748
+#: g10/mainproc.c:755
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "�����ĵ���֤�顪�����á�gpg --import����Ӧ��\n"
-#: g10/mainproc.c:816
+#: g10/mainproc.c:823
msgid "Notation: "
msgstr "��ǣ�"
-#: g10/mainproc.c:828
+#: g10/mainproc.c:835
msgid "Policy: "
msgstr "���ԣ�"
-#: g10/mainproc.c:1284
+#: g10/mainproc.c:1291
msgid "signature verification suppressed\n"
msgstr "ǩ����֤�ѱ�����\n"
#. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1326 g10/mainproc.c:1336
+#: g10/mainproc.c:1333 g10/mainproc.c:1343
msgid "can't handle these multiple signatures\n"
msgstr "�޷�������Щ����ǩ��\n"
-#: g10/mainproc.c:1345
+#: g10/mainproc.c:1352
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "�� %.*s ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
@@ -3667,78 +3669,77 @@ msgstr "�� %.*s ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
#. 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
+#: g10/mainproc.c:1381
msgid "Key available at: "
-msgstr "û�п��õİ���"
+msgstr "��Կ��ȡ�ԣ�"
-#: g10/mainproc.c:1423 g10/mainproc.c:1456
+#: g10/mainproc.c:1430 g10/mainproc.c:1463
msgid "BAD signature from \""
msgstr "���𻵵�ǩ�֣�������\""
-#: g10/mainproc.c:1424 g10/mainproc.c:1457
+#: g10/mainproc.c:1431 g10/mainproc.c:1464
msgid "Expired signature from \""
msgstr "���ڵ�ǩ�֣�������\""
-#: g10/mainproc.c:1425 g10/mainproc.c:1458
+#: g10/mainproc.c:1432 g10/mainproc.c:1465
msgid "Good signature from \""
msgstr "��õ�ǩ�֣�������\""
-#: g10/mainproc.c:1460
+#: g10/mainproc.c:1467
msgid "[uncertain]"
msgstr "[��ȷ��]"
-#: g10/mainproc.c:1559
+#: g10/mainproc.c:1566
#, c-format
msgid "Signature expired %s\n"
msgstr "���ǩ������ %s ���ڡ�\n"
-#: g10/mainproc.c:1564
+#: g10/mainproc.c:1571
#, c-format
msgid "Signature expires %s\n"
msgstr "���ǩ���� %s ���ڡ�\n"
-#: g10/mainproc.c:1567
+#: g10/mainproc.c:1574
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%sǩ�֣�ɢ���㷨 %s\n"
-#: g10/mainproc.c:1568
+#: g10/mainproc.c:1575
msgid "binary"
msgstr "������"
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1576
msgid "textmode"
msgstr "�ı�ģʽ"
-#: g10/mainproc.c:1569
+#: g10/mainproc.c:1576
msgid "unknown"
msgstr "δ֪"
-#: g10/mainproc.c:1589
+#: g10/mainproc.c:1596
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�޷����ǩ�֣�%s\n"
-#: g10/mainproc.c:1657 g10/mainproc.c:1673 g10/mainproc.c:1759
+#: g10/mainproc.c:1664 g10/mainproc.c:1680 g10/mainproc.c:1766
msgid "not a detached signature\n"
msgstr "����һ�ݷ����ǩ��\n"
-#: g10/mainproc.c:1700
+#: g10/mainproc.c:1707
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "���棺��⵽����ǩ�֡�ֻ����һ��ǩ�֡�\n"
-#: g10/mainproc.c:1708
+#: g10/mainproc.c:1715
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "�ȼ� 0x%02x �Ķ���ǩ��\n"
-#: g10/mainproc.c:1765
+#: g10/mainproc.c:1772
msgid "old style (PGP 2.x) signature\n"
msgstr "��ʽ(PGP 2.x)ǩ��\n"
-#: g10/mainproc.c:1775
+#: g10/mainproc.c:1782
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�� proc_tree() �м�⵽��Ч�ĸ���\n"
@@ -3780,9 +3781,8 @@ msgid "please use \"%s%s\" instead\n"
msgstr "���ԡ�%s%s������\n"
#: g10/misc.c:551
-#, fuzzy
msgid "Uncompressed"
-msgstr "�����"
+msgstr "δ��ѹ��"
#: g10/misc.c:629
#, c-format
@@ -3796,7 +3796,7 @@ msgstr "�޷�������Կ�㷨 %d\n"
#: g10/parse-packet.c:688
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr ""
+msgstr "���棺����DZ�ڰ�ȫ��в�ĶԳƼ��ܻỰ��Կ\n"
#: g10/parse-packet.c:1106
#, c-format
@@ -3909,32 +3909,32 @@ msgstr "���������룺"
msgid "Repeat passphrase: "
msgstr "��������һ�����룺"
-#: g10/plaintext.c:69
+#: g10/plaintext.c:87
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "����δ�����棻���á�--output��ѡ������������\n"
-#: g10/plaintext.c:110
+#: g10/plaintext.c:128
#, c-format
msgid "error creating `%s': %s\n"
msgstr "������%s��ʱ��������%s\n"
-#: g10/plaintext.c:387
+#: g10/plaintext.c:405
msgid "Detached signature.\n"
msgstr "�����ǩ�֡�\n"
-#: g10/plaintext.c:391
+#: g10/plaintext.c:409
msgid "Please enter name of data file: "
msgstr "�����������ļ������ƣ� "
-#: g10/plaintext.c:412
+#: g10/plaintext.c:430
msgid "reading stdin ...\n"
msgstr "���ڴӱ�׼�����ȡ ...\n"
-#: g10/plaintext.c:446
+#: g10/plaintext.c:464
msgid "no signed data\n"
msgstr "����ǩ�ֵ�����\n"
-#: g10/plaintext.c:454
+#: g10/plaintext.c:472
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "�޷�����ǩ�ֵ����ݡ�%s��\n"
@@ -3998,7 +3998,7 @@ msgstr "�ϴ�����%s��ʧ�ܣ�״̬ = %u\n"
#: g10/hkp.c:373
msgid "this keyserver does not support --search-keys\n"
-msgstr ""
+msgstr "�˹�Կ��������֧�� --search-keys\n"
#: g10/hkp.c:523
#, c-format
@@ -4019,20 +4019,25 @@ msgstr "˽Կ���ֲ�����\n"
msgid "protection algorithm %d%s is not supported\n"
msgstr "�����㷨 %d%s δ��֧��\n"
-#: g10/seckey-cert.c:233
+#: g10/seckey-cert.c:70
+#, fuzzy, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "�����㷨 %d%s δ��֧��\n"
+
+#: g10/seckey-cert.c:239
msgid "Invalid passphrase; please try again"
msgstr "��Ч�����룻������һ��"
-#: g10/seckey-cert.c:234
+#: g10/seckey-cert.c:240
#, c-format
msgid "%s ...\n"
msgstr "%s ...\n"
-#: g10/seckey-cert.c:291
+#: g10/seckey-cert.c:297
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "���棺��⵽����Կ������������롣\n"
-#: g10/seckey-cert.c:329
+#: g10/seckey-cert.c:335
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr "���ڲ���˽Կ����ʹ�õľ�ʽ 16 �ֽ�У���\n"
@@ -4043,12 +4048,12 @@ msgstr "���棺ǩ��ɢ��ֵ�뱨�IJ�һ��\n"
#: g10/sig-check.c:93
#, c-format
msgid "WARNING: signing subkey %08lX is not cross-certified\n"
-msgstr ""
+msgstr "���棺ǩ����Կ %08lX δ��������֤\n"
#: g10/sig-check.c:96
#, c-format
msgid "WARNING: signing subkey %08lX has an invalid cross-certification\n"
-msgstr ""
+msgstr "���棺ǩ����Կ %08lX ������֤��Ч\n"
#: g10/sig-check.c:233
#, c-format
@@ -4097,9 +4102,9 @@ msgid "key %08lX: no subkey for subkey revocation packet\n"
msgstr "��Կ %08lX��û����Կ�������������Կ\n"
#: g10/sig-check.c:640
-#, fuzzy, c-format
+#, c-format
msgid "key %08lX: no subkey for subkey binding signature\n"
-msgstr "��Կ %08lX��û�пɹ��󶨵���Կ\n"
+msgstr "��Կ %08lX��û������Կ��ǩ�ֶ�Ӧ����Կ\n"
#: g10/sign.c:84
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -4383,12 +4388,13 @@ msgstr "��Կ %08lX δ���ҵ���%s\n"
#: g10/trustdb.c:1203
#, c-format
msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-msgstr ""
+msgstr "�� Elgamal ǩ����Կ %08lX Ϊ %08lX ����ǩ�ֱ�����\n"
+# FIXME: I added the format string at the end to avoid a format string vulnerability. This should be fixed properly of course - wk
#: g10/trustdb.c:1211
#, c-format
msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-msgstr ""
+msgstr "�� %08lX Ϊ Elgamal ǩ����Կ����ǩ�ֱ����� (%08lX)\n"
#: g10/trustdb.c:1608
#, c-format
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 05:49:16 +0000