aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po1293
1 files changed, 678 insertions, 615 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 11d1fc15a..b2b1d6274 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,5 +1,6 @@
# Traditional Chinese(zh-tw) messages for GnuPG
# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
# Jedi <[email protected]>, 2003.
#
# Special thanks to "Autrijus Tang <[email protected]>".
@@ -7,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-05-01 13:05+0200\n"
-"PO-Revision-Date: 2003-05-01 12:00+0200\n"
+"POT-Creation-Date: 2003-06-19 12:07+0200\n"
+"PO-Revision-Date: 2003-05-13 15:48+0800\n"
"Last-Translator: Jedi <[email protected]>\n"
"Language-Team: Chinese (traditional) <[email protected]>\n"
"MIME-Version: 1.0\n"
@@ -47,7 +48,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
-#: util/miscutil.c:333 g10/keyedit.c:941
+#: util/miscutil.c:333 g10/keyedit.c:977
msgid "quit"
msgstr "quit"
@@ -274,62 +275,62 @@ msgstr "... �o�O�ӷ岫 (%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
-#: cipher/random.c:157
+#: cipher/random.c:160
msgid "no entropy gathering module detected\n"
msgstr "��������üƻ`���Ҳ�\n"
-#: cipher/random.c:381 g10/keygen.c:1824 g10/import.c:196
+#: cipher/random.c:384 g10/keygen.c:1826 g10/import.c:162
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�L�k�}�� `%s' �G %s\n"
-#: cipher/random.c:385
+#: cipher/random.c:388
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "�L�k���o�ɮ� `%s' ����T�G %s\n"
-#: cipher/random.c:390
+#: cipher/random.c:393
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' ���O�@�ӼзǪ��ɮ� �w �w���L\n"
-#: cipher/random.c:395
+#: cipher/random.c:398
msgid "note: random_seed file is empty\n"
msgstr "�Ъ`�N�G random_seed �ɮ׬O�Ū�\n"
-#: cipher/random.c:401
+#: cipher/random.c:404
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "ĵ�i�G random_seed �ɮפj�p�L�� �w �����ĥ�\n"
-#: cipher/random.c:409
+#: cipher/random.c:412
#, c-format
msgid "can't read `%s': %s\n"
msgstr "�L�k�� `%s' �G %s\n"
-#: cipher/random.c:447
+#: cipher/random.c:450
msgid "note: random_seed file not updated\n"
msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
-#: cipher/random.c:467 g10/exec.c:481
+#: cipher/random.c:470 g10/exec.c:481
#, c-format
msgid "can't create `%s': %s\n"
msgstr "�L�k�إ� `%s' �G %s\n"
-#: cipher/random.c:474
+#: cipher/random.c:477
#, c-format
msgid "can't write `%s': %s\n"
msgstr "�L�k�g�J `%s' �G %s\n"
-#: cipher/random.c:477
+#: cipher/random.c:480
#, c-format
msgid "can't close `%s': %s\n"
msgstr "�L�k���� `%s' �G %s\n"
-#: cipher/random.c:723
+#: cipher/random.c:725
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ĵ�i�G���b�ϥΤ��w�����H���Ʀr���;��I�I\n"
-#: cipher/random.c:724
+#: cipher/random.c:726
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@ -359,6 +360,11 @@ msgstr ""
msgid "digest algorithm `%s' is read-only in this release\n"
msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\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"
@@ -368,7 +374,7 @@ msgstr ""
"�еy�ݤ���A�t�Φ��ɥ��b�`���üơC�p�G�p�|ı�o�L�᪺�ܡA\n"
"�������ǧO���ơA�o�ˤl�Ʀܯ�����üƪ��~���n�C\n"
-#: g10/g10.c:307
+#: g10/g10.c:304
msgid ""
"@Commands:\n"
" "
@@ -376,163 +382,163 @@ msgstr ""
"@���O�G\n"
" "
-#: g10/g10.c:309
+#: g10/g10.c:306
msgid "|[file]|make a signature"
msgstr "|[�ɮ�]|�إߤ@��ñ��"
-#: g10/g10.c:310
+#: g10/g10.c:307
msgid "|[file]|make a clear text signature"
msgstr "|[�ɮ�]|�إߤ@������ñ��"
-#: g10/g10.c:311
+#: g10/g10.c:308
msgid "make a detached signature"
msgstr "�إߤ@��������ñ��"
-#: g10/g10.c:312
+#: g10/g10.c:309
msgid "encrypt data"
msgstr "�[�K���"
-#: g10/g10.c:313
+#: g10/g10.c:310
msgid "|[files]|encrypt files"
msgstr "|[�ɮ�]|�[�K�ɮ�"
-#: g10/g10.c:314
+#: g10/g10.c:311
msgid "encryption only with symmetric cipher"
msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
-#: g10/g10.c:315
+#: g10/g10.c:312
msgid "store only"
msgstr "���x�s"
-#: g10/g10.c:316
+#: g10/g10.c:313
msgid "decrypt data (default)"
msgstr "��ƸѱK(�w�])"
-#: g10/g10.c:317
+#: g10/g10.c:314
msgid "|[files]|decrypt files"
msgstr "|[�ɮ�]|�ɮ׸ѱK"
-#: g10/g10.c:318
+#: g10/g10.c:315
msgid "verify a signature"
msgstr "���ҬY��ñ��"
-#: g10/g10.c:320
+#: g10/g10.c:317
msgid "list keys"
msgstr "�C�X���_"
-#: g10/g10.c:322
+#: g10/g10.c:319
msgid "list keys and signatures"
msgstr "�C�X���_�Mñ��"
-#: g10/g10.c:323
+#: g10/g10.c:320
msgid "check key signatures"
msgstr "�ˬd���_ñ��"
-#: g10/g10.c:324
+#: g10/g10.c:321
msgid "list keys and fingerprints"
msgstr "�C�X���_�M����"
-#: g10/g10.c:325
+#: g10/g10.c:322
msgid "list secret keys"
msgstr "�C�X�p�_"
-#: g10/g10.c:326
+#: g10/g10.c:323
msgid "generate a new key pair"
msgstr "���ͤ@���s�����_��"
-#: g10/g10.c:327
+#: g10/g10.c:324
msgid "remove keys from the public keyring"
msgstr "�q���_�_�Ͱ�̲��h���_"
-#: g10/g10.c:329
+#: g10/g10.c:326
msgid "remove keys from the secret keyring"
msgstr "�q�p�_�_�Ͱ�̲��h���_"
-#: g10/g10.c:330
+#: g10/g10.c:327
msgid "sign a key"
msgstr "ñ�p�Y����_"
-#: g10/g10.c:331
+#: g10/g10.c:328
msgid "sign a key locally"
msgstr "�Ȧb���añ�p�Y����_"
-#: g10/g10.c:332
+#: g10/g10.c:329
msgid "sign a key non-revocably"
msgstr "�H���i�M�P�Ҧ���ñ�p�Y����_"
-#: g10/g10.c:333
+#: g10/g10.c:330
msgid "sign a key locally and non-revocably"
msgstr "�Ȧb���a�H���i�M�P�Ҧ���ñ�p�Y����_"
-#: g10/g10.c:334
+#: g10/g10.c:331
msgid "sign or edit a key"
msgstr "ñ�p�νs��Y����_"
-#: g10/g10.c:335
+#: g10/g10.c:332
msgid "generate a revocation certificate"
msgstr "���ͤ@���M�P����"
-#: g10/g10.c:337
+#: g10/g10.c:334
msgid "export keys"
msgstr "�ץX���_"
-#: g10/g10.c:338
+#: g10/g10.c:335
msgid "export keys to a key server"
msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
-#: g10/g10.c:339
+#: g10/g10.c:336
msgid "import keys from a key server"
msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
-#: g10/g10.c:341
+#: g10/g10.c:338
msgid "search for keys on a key server"
msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
-#: g10/g10.c:343
+#: g10/g10.c:340
msgid "update all keys from a keyserver"
msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
-#: g10/g10.c:347
+#: g10/g10.c:344
msgid "import/merge keys"
msgstr "�פJ/�X�֪��_"
-#: g10/g10.c:349
+#: g10/g10.c:346
msgid "list only the sequence of packets"
msgstr "�ȦC�X�ʥ]�ǦC"
-#: g10/g10.c:351
+#: g10/g10.c:348
msgid "export the ownertrust values"
msgstr "�ץX�D�[�H����"
-#: g10/g10.c:353
+#: g10/g10.c:350
msgid "import ownertrust values"
msgstr "�פJ�D�[�H����"
-#: g10/g10.c:355
+#: g10/g10.c:352
msgid "update the trust database"
msgstr "��s�H����Ʈw"
-#: g10/g10.c:357
+#: g10/g10.c:354
msgid "unattended trust database update"
msgstr "��s�����[���H����Ʈw"
-#: g10/g10.c:358
+#: g10/g10.c:355
msgid "fix a corrupted trust database"
msgstr "�״_�Y�Ӥw�l�����H����Ʈw"
-#: g10/g10.c:359
+#: g10/g10.c:356
msgid "De-Armor a file or stdin"
msgstr "�q�ɮשμзǿ�J�Ѷ}�ʸ�"
-#: g10/g10.c:361
+#: g10/g10.c:358
msgid "En-Armor a file or stdin"
msgstr "�q�ɮשμзǿ�J�i��ʸ�"
-#: g10/g10.c:363
+#: g10/g10.c:360
msgid "|algo [files]|print message digests"
msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
-#: g10/g10.c:367 g10/gpgv.c:64
+#: g10/g10.c:364 g10/gpgv.c:64
msgid ""
"@\n"
"Options:\n"
@@ -542,195 +548,195 @@ msgstr ""
"�ﶵ�G\n"
" "
-#: g10/g10.c:369
+#: g10/g10.c:366
msgid "create ascii armored output"
msgstr "�إߥH ASCII �ʸ˹L����X"
-#: g10/g10.c:371
+#: g10/g10.c:368
msgid "|NAME|encrypt for NAME"
msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
-#: g10/g10.c:374
+#: g10/g10.c:371
msgid "|NAME|use NAME as default recipient"
msgstr "|�W�r|�H�u�W�r�v�אּ�w�]�������"
-#: g10/g10.c:376
+#: g10/g10.c:373
msgid "use the default key as default recipient"
msgstr "��w�]�����_���@�w�]�������"
-#: g10/g10.c:382
+#: g10/g10.c:379
msgid "use this user-id to sign or decrypt"
msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
-#: g10/g10.c:383
+#: g10/g10.c:380
msgid "|N|set compress level N (0 disables)"
msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
-#: g10/g10.c:385
+#: g10/g10.c:382
msgid "use canonical text mode"
msgstr "�ϥμзǪ���r�Ҧ�"
-#: g10/g10.c:393
+#: g10/g10.c:390
msgid "use as output file"
msgstr "���@��X�ɮרӨϥ�"
-#: g10/g10.c:394 g10/gpgv.c:66
+#: g10/g10.c:391 g10/gpgv.c:66
msgid "verbose"
-msgstr "�o��"
+msgstr "�o���Ҧ�"
-#: g10/g10.c:395 g10/gpgv.c:67
+#: g10/g10.c:392 g10/gpgv.c:67
msgid "be somewhat more quiet"
msgstr "�ɶq�w�R��"
-#: g10/g10.c:396
+#: g10/g10.c:393
msgid "don't use the terminal at all"
msgstr "�������n�ϥβ׺�"
-#: g10/g10.c:397
+#: g10/g10.c:394
msgid "force v3 signatures"
msgstr "�j���ϥβĤT��ñ��"
-#: g10/g10.c:398
+#: g10/g10.c:395
msgid "do not force v3 signatures"
msgstr "���n�j���ϥβĤT��ñ��"
-#: g10/g10.c:399
+#: g10/g10.c:396
msgid "force v4 key signatures"
msgstr "�j���ϥβĥ|�����_ñ��"
-#: g10/g10.c:400
+#: g10/g10.c:397
msgid "do not force v4 key signatures"
msgstr "���n�j���ϥβĥ|�����_ñ��"
-#: g10/g10.c:401
+#: g10/g10.c:398
msgid "always use a MDC for encryption"
msgstr "�`�O�� MDC �ӥ[�K"
-#: g10/g10.c:403
+#: g10/g10.c:400
msgid "never use a MDC for encryption"
msgstr "�û����n�� MDC �ӥ[�K"
-#: g10/g10.c:405
+#: g10/g10.c:402
msgid "do not make any changes"
msgstr "���n���������"
-#: g10/g10.c:406
+#: g10/g10.c:403
msgid "prompt before overwriting"
msgstr "�мg�e���߰�"
-#: g10/g10.c:407
+#: g10/g10.c:404
msgid "use the gpg-agent"
msgstr "�ϥ� gpg-agent �N�z�{��"
-#: g10/g10.c:410
+#: g10/g10.c:407
msgid "batch mode: never ask"
msgstr "�妸�Ҧ��G�û����߰�"
-#: g10/g10.c:411
+#: g10/g10.c:408
msgid "assume yes on most questions"
msgstr "���]�j�h�ư��D���^�����u�O�v"
-#: g10/g10.c:412
+#: g10/g10.c:409
msgid "assume no on most questions"
msgstr "���]�j�h�ư��D���^�����u�_�v"
-#: g10/g10.c:413
+#: g10/g10.c:410
msgid "add this keyring to the list of keyrings"
msgstr "��o���_�Ͱ�[�i�_�Ͱ�M�椤"
-#: g10/g10.c:414
+#: g10/g10.c:411
msgid "add this secret keyring to the list"
msgstr "��o�Өp�_�_�Ͱ�[�i�M�椤"
-#: g10/g10.c:415
+#: g10/g10.c:412
msgid "show which keyring a listed key is on"
msgstr "��ܳQ�C�X�����_�b���@���_�Ͱ�W"
-#: g10/g10.c:416
+#: g10/g10.c:413
msgid "|NAME|use NAME as default secret key"
msgstr "|�W�r|�ϥΡu�W�r�v���@�w�]�p�_"
-#: g10/g10.c:417
+#: g10/g10.c:414
msgid "|HOST|use this keyserver to lookup keys"
msgstr "|�D��|�ϥγo�Ӫ��_���A���ӴM����_"
-#: g10/g10.c:421
+#: g10/g10.c:418
msgid "|NAME|set terminal charset to NAME"
msgstr "|�W��|�]�w�׺ݦr�������u�W�١v"
-#: g10/g10.c:422
+#: g10/g10.c:419
msgid "read options from file"
msgstr "�q�ɮ�Ū���ﶵ"
-#: g10/g10.c:426 g10/gpgv.c:71
+#: g10/g10.c:423 g10/gpgv.c:71
msgid "|FD|write status info to this FD"
msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
-#: g10/g10.c:428
+#: g10/g10.c:425
msgid "|[file]|write status info to file"
msgstr "|[�ɮ�]|�⪬�A��T�g�J�ɮ�"
-#: g10/g10.c:440
+#: g10/g10.c:437
msgid "|KEYID|ultimately trust this key"
msgstr "|���_ID|�����H�������_"
-#: g10/g10.c:441
+#: g10/g10.c:438
msgid "|FILE|load extension module FILE"
msgstr "|�ɮ�|���J�����Ҳ��ɮ�"
-#: g10/g10.c:442
+#: g10/g10.c:444
msgid "emulate the mode described in RFC1991"
msgstr "�ɶq�ҥ� RFC1991 �̩Ҵy�z���Ҧ�"
-#: g10/g10.c:443
+#: g10/g10.c:445
msgid "set all packet, cipher and digest options to OpenPGP behavior"
msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 OpenPGP ���A"
-#: g10/g10.c:444
+#: g10/g10.c:446
msgid "set all packet, cipher and digest options to PGP 2.x behavior"
msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 PGP 2.x ���A"
-#: g10/g10.c:452
+#: g10/g10.c:450
msgid "|N|use passphrase mode N"
msgstr "|N|�ϥμҦ� N ���K�X��"
-#: g10/g10.c:454
+#: g10/g10.c:452
msgid "|NAME|use message digest algorithm NAME for passphrases"
msgstr "|�W��|�K�X��ϥΡu�W�١v�T���K�n�t��k"
-#: g10/g10.c:456
+#: g10/g10.c:454
msgid "|NAME|use cipher algorithm NAME for passphrases"
msgstr "|�W��|�K�X��ϥΡu�W�١v�s�K�t��k"
-#: g10/g10.c:458
+#: g10/g10.c:456
msgid "|NAME|use cipher algorithm NAME"
msgstr "|�W��|�ϥΡu�W�١v�s�K�t��k"
-#: g10/g10.c:459
+#: g10/g10.c:457
msgid "|NAME|use message digest algorithm NAME"
msgstr "|�W��|�ϥΡu�W�١v�T���K�n�t��k"
-#: g10/g10.c:461
+#: g10/g10.c:459
msgid "|N|use compress algorithm N"
msgstr "|N|�ϥ� N ���Y�t��k"
-#: g10/g10.c:462
+#: g10/g10.c:460
msgid "throw keyid field of encrypted packets"
msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
-#: g10/g10.c:463
+#: g10/g10.c:461
msgid "Show Photo IDs"
msgstr "��ܷӤ� ID"
-#: g10/g10.c:464
+#: g10/g10.c:462
msgid "Don't show Photo IDs"
msgstr "����ܷӤ� ID"
-#: g10/g10.c:465
+#: g10/g10.c:463
msgid "Set command line to view Photo IDs"
msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
-#: g10/g10.c:471
+#: g10/g10.c:470
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -738,7 +744,7 @@ msgstr ""
"@\n"
"(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
-#: g10/g10.c:474
+#: g10/g10.c:473
msgid ""
"@\n"
"Examples:\n"
@@ -758,15 +764,15 @@ msgstr ""
" --list-keys [�W�r] ��ܪ��_\n"
" --fingerprint [�W�r] ��ܫ���\n"
-#: g10/g10.c:634 g10/gpgv.c:95
+#: g10/g10.c:633 g10/gpgv.c:95
msgid "Please report bugs to <[email protected]>.\n"
msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
-#: g10/g10.c:638
+#: g10/g10.c:637
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
-#: g10/g10.c:641
+#: g10/g10.c:640
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -776,7 +782,7 @@ msgstr ""
"ñ�p�B�ˬd�B�[�K�θѱK\n"
"�w�]���ާ@�|�̿�J��Ʀөw\n"
-#: g10/g10.c:652
+#: g10/g10.c:651
msgid ""
"\n"
"Supported algorithms:\n"
@@ -784,333 +790,367 @@ msgstr ""
"\n"
"�w�Q�䴩���t��k�G\n"
-#: g10/g10.c:655
+#: g10/g10.c:654
msgid "Pubkey: "
msgstr "���_�G "
-#: g10/g10.c:661 g10/keyedit.c:1531
+#: g10/g10.c:660 g10/keyedit.c:1567
msgid "Cipher: "
msgstr "�s�K�k�G "
-#: g10/g10.c:667
+#: g10/g10.c:666
msgid "Hash: "
msgstr "����G "
-#: g10/g10.c:673 g10/keyedit.c:1577
+#: g10/g10.c:672 g10/keyedit.c:1613
msgid "Compression: "
msgstr "���Y�G "
-#: g10/g10.c:756
+#: g10/g10.c:755
msgid "usage: gpg [options] "
msgstr "�Ϊk�G gpg [�ﶵ] "
-#: g10/g10.c:824
+#: g10/g10.c:823
msgid "conflicting commands\n"
msgstr "���O�����٬�\n"
-#: g10/g10.c:842
+#: g10/g10.c:841
#, c-format
msgid "no = sign found in group definition \"%s\"\n"
msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
-#: g10/g10.c:1010
+#: g10/g10.c:1009
#, c-format
msgid "WARNING: unsafe ownership on %s \"%s\"\n"
msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
-#: g10/g10.c:1013
+#: g10/g10.c:1012
#, c-format
msgid "WARNING: unsafe permissions on %s \"%s\"\n"
msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
-#: g10/g10.c:1016
+#: g10/g10.c:1015
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
-#: g10/g10.c:1020
+#: g10/g10.c:1019
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
-#: g10/g10.c:1196
+#: g10/g10.c:1195
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
-#: g10/g10.c:1232
+#: g10/g10.c:1231
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
-#: g10/g10.c:1236
+#: g10/g10.c:1235
#, c-format
msgid "option file `%s': %s\n"
msgstr "�ﶵ�� `%s' �G %s\n"
-#: g10/g10.c:1243
+#: g10/g10.c:1242
#, c-format
msgid "reading options from `%s'\n"
msgstr "�q `%s' Ū���ﶵ\n"
-#: g10/g10.c:1429
+#: g10/g10.c:1428
#, c-format
msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n"
msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
-#: g10/g10.c:1569
+#: g10/g10.c:1559
#, c-format
msgid "%s is not a valid character set\n"
msgstr "%s ���O�@�Ӧ��Ī��r����\n"
-#: g10/g10.c:1587
+#: g10/g10.c:1577
msgid "could not parse keyserver URI\n"
msgstr "�L�k���R���_���A�� URI\n"
-#: g10/g10.c:1596
+#: g10/g10.c:1586
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:1599
+#: g10/g10.c:1589
msgid "invalid import options\n"
msgstr "�L�Ī��פJ�ﶵ\n"
-#: g10/g10.c:1606
+#: g10/g10.c:1596
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:1609
+#: g10/g10.c:1599
msgid "invalid export options\n"
msgstr "�L�Ī��ץX�ﶵ\n"
-#: g10/g10.c:1615
+#: g10/g10.c:1605
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�L�k������ɸ��|�]�� %s\n"
-#: g10/g10.c:1742
+#: g10/g10.c:1732
msgid "WARNING: program may create a core file!\n"
msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
-#: g10/g10.c:1746
+#: g10/g10.c:1736
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
-#: g10/g10.c:1753 g10/g10.c:1764
+#: g10/g10.c:1743 g10/g10.c:1754
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
-#: g10/g10.c:1755 g10/g10.c:1774
+#: g10/g10.c:1745
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ���Q���\�� %s �֥�\n"
-#: g10/g10.c:1758
+#: g10/g10.c:1748
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
-#: g10/g10.c:1784
+#: g10/g10.c:1769
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
-#: g10/g10.c:1790
+#: g10/g10.c:1775
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�ɡA����P��ñ�p�M�[�K\n"
-#: g10/g10.c:1796
+#: g10/g10.c:1781
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
-#: g10/g10.c:1809
+#: g10/g10.c:1794
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\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 "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
-
-#: g10/g10.c:1890 g10/g10.c:1908
+#: g10/g10.c:1865 g10/g10.c:1883
msgid "selected cipher algorithm is invalid\n"
msgstr "�ҿ諸�s�K�t��k�L��\n"
-#: g10/g10.c:1896 g10/g10.c:1914
+#: g10/g10.c:1871 g10/g10.c:1889
msgid "selected digest algorithm is invalid\n"
msgstr "�ҿ諸�K�n�t��k�L��\n"
-#: g10/g10.c:1902
+#: g10/g10.c:1877
msgid "selected certification digest algorithm is invalid\n"
msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
-#: g10/g10.c:1917
+#: g10/g10.c:1892
#, c-format
msgid "compress algorithm must be in range %d..%d\n"
msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
-#: g10/g10.c:1919
+#: g10/g10.c:1894
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed �@�w�n�j�� 0\n"
-#: g10/g10.c:1921
+#: g10/g10.c:1896
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed �@�w�n�j�� 1\n"
-#: g10/g10.c:1923
+#: g10/g10.c:1898
msgid "max-cert-depth must be in range 1 to 255\n"
msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
-#: g10/g10.c:1926
+#: g10/g10.c:1901
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
-#: g10/g10.c:1930
+#: g10/g10.c:1905
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
-#: g10/g10.c:1934
+#: g10/g10.c:1909
msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
msgstr "�L�� default-check-level �F�@�w�n�O 0 �B 1 �B 2 �� 3\n"
-#: g10/g10.c:1940
+#: g10/g10.c:1915
msgid "invalid default preferences\n"
msgstr "�L���w�]���n\n"
-#: g10/g10.c:1948
+#: g10/g10.c:1923
msgid "invalid personal cipher preferences\n"
msgstr "�L�Ī��ӤH�s�K�k���n\n"
-#: g10/g10.c:1952
+#: g10/g10.c:1927
msgid "invalid personal digest preferences\n"
msgstr "�L�Ī��ӤH�K�n���n\n"
-#: g10/g10.c:1956
+#: g10/g10.c:1931
msgid "invalid personal compress preferences\n"
msgstr "�L�Ī��ӤH���Y���n\n"
-#: g10/g10.c:2042
+#: g10/g10.c:1974
+#, fuzzy, c-format
+msgid "you may not use cipher algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:1979
+#, fuzzy, c-format
+msgid "you may not use digest algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:1984
+#, fuzzy, c-format
+msgid "you may not use compression algorithm \"%s\" while in %s mode\n"
+msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
+
+#: g10/g10.c:2077
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�H����Ʈw�ҩl���ѡG %s\n"
-#: g10/g10.c:2052
+#: g10/g10.c:2087
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
-#: g10/g10.c:2062
+#: g10/g10.c:2097
msgid "--store [filename]"
msgstr "--store [�ɦW]"
-#: g10/g10.c:2069
+#: g10/g10.c:2104
msgid "--symmetric [filename]"
msgstr "--symmetric [�ɦW]"
-#: g10/g10.c:2077
+#: g10/g10.c:2112
msgid "--encrypt [filename]"
msgstr "--encrypt [�ɦW]"
-#: g10/g10.c:2094
+#: g10/g10.c:2129
msgid "--sign [filename]"
msgstr "--sign [�ɦW]"
-#: g10/g10.c:2107
+#: g10/g10.c:2142
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [�ɦW]"
-#: g10/g10.c:2121
+#: g10/g10.c:2156
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [�ɦW]"
-#: g10/g10.c:2130
+#: g10/g10.c:2165
msgid "--clearsign [filename]"
msgstr "--clearsign [�ɦW]"
-#: g10/g10.c:2148
+#: g10/g10.c:2183
msgid "--decrypt [filename]"
msgstr "--decrypt [�ɦW]"
-#: g10/g10.c:2159
+#: g10/g10.c:2194
msgid "--sign-key user-id"
msgstr "--sign-key �ϥΪ�ID"
-#: g10/g10.c:2167
+#: g10/g10.c:2202
msgid "--lsign-key user-id"
msgstr "--lsign-key �ϥΪ�ID"
-#: g10/g10.c:2175
+#: g10/g10.c:2210
msgid "--nrsign-key user-id"
msgstr "--nrsign-key �ϥΪ�ID"
-#: g10/g10.c:2183
+#: g10/g10.c:2218
msgid "--nrlsign-key user-id"
msgstr "--nrlsign-key �ϥΪ�ID"
-#: g10/g10.c:2191
+#: g10/g10.c:2226
msgid "--edit-key user-id [commands]"
msgstr "--edit-key �ϥΪ�ID [���O]"
-#: g10/g10.c:2247 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2282 g10/encode.c:426 g10/sign.c:802
#, c-format
msgid "can't open %s: %s\n"
msgstr "�L�k�}�� %s: %s\n"
-#: g10/g10.c:2262
+#: g10/g10.c:2297
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
-#: g10/g10.c:2354
+#: g10/g10.c:2335
+#, fuzzy, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2337
+#, fuzzy, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2339
+#, fuzzy, c-format
+msgid "key export failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2351
+#, fuzzy, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/g10.c:2361
+#, fuzzy, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "��s�p�_���ѡG %s\n"
+
+#: g10/g10.c:2402
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
-#: g10/g10.c:2362
+#: g10/g10.c:2410
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�i��ʸ˥��ѡG %s\n"
-#: g10/g10.c:2449
+#: g10/g10.c:2497
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�L�� `%s' ����t��k\n"
-#: g10/g10.c:2535
+#: g10/g10.c:2583
msgid "[filename]"
msgstr "[�ɦW]"
-#: g10/g10.c:2539
+#: g10/g10.c:2587
msgid "Go ahead and type your message ...\n"
-msgstr "�}�l��J�p���T�� ...\n"
+msgstr "�ж}�l��J�p���T�� ...\n"
-#: g10/g10.c:2542 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2590 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
#: g10/verify.c:142
#, c-format
msgid "can't open `%s'\n"
msgstr "�L�k�}�� `%s'\n"
-#: g10/g10.c:2815
+#: g10/g10.c:2863
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
-msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v����\n"
+msgstr "�аO�W�٤@�w�n�ĥΥi�L�X���r�ũΪťաA�åH�@�ӡu=�v�ӵ���\n"
-#: g10/g10.c:2824
+#: g10/g10.c:2872
msgid "a user notation name must contain the '@' character\n"
msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
-#: g10/g10.c:2832
+#: g10/g10.c:2882
msgid "a notation value must not use any control characters\n"
msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
-#: g10/g10.c:2869
+#: g10/g10.c:2917
msgid "the given certification policy URL is invalid\n"
msgstr "���w�������ҭ�h URL �L��\n"
-#: g10/g10.c:2871
+#: g10/g10.c:2919
msgid "the given signature policy URL is invalid\n"
msgstr "���w����h URL �L��\n"
@@ -1249,7 +1289,7 @@ msgstr ""
"�U�C���بS���������H���ȡG\n"
"%4u%c/%08lX %s \""
-#: g10/pkclist.c:290 g10/mainproc.c:1428
+#: g10/pkclist.c:290 g10/mainproc.c:1452
msgid " aka \""
msgstr " ��Y \""
@@ -1306,7 +1346,7 @@ msgstr " s = ���L�o����_���B�z\n"
msgid " q = quit\n"
msgstr " q = �h�X\n"
-#: g10/pkclist.c:326 g10/revoke.c:631
+#: g10/pkclist.c:326 g10/revoke.c:632
msgid "Your decision? "
msgstr "�p���M�w�O�ƻ�H "
@@ -1558,7 +1598,7 @@ msgstr " (%d) RSA (�ȯ�[�K��)\n"
msgid " (%d) RSA (sign and encrypt)\n"
msgstr " (%d) RSA (��ñ�p�Υ[�K)\n"
-#: g10/keygen.c:965 g10/keyedit.c:616
+#: g10/keygen.c:965 g10/keyedit.c:652
msgid "Your selection? "
msgstr "�p�n����@�ӡH "
@@ -1576,7 +1616,7 @@ msgstr ""
msgid "Create anyway? "
msgstr "�L�צp���٬O�n�إ߶ܡH "
-#: g10/keygen.c:1011 g10/keyedit.c:629 g10/revoke.c:664
+#: g10/keygen.c:1011 g10/keyedit.c:665 g10/revoke.c:665
msgid "Invalid selection.\n"
msgstr "�L�Ī���ܡC\n"
@@ -1780,27 +1820,27 @@ msgstr ""
" \"%s\"\n"
"\n"
-#: g10/keygen.c:1324
+#: g10/keygen.c:1326
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "�Ф��n��q�l�l��a�}��i�p���u��m�W�ε�����\n"
-#: g10/keygen.c:1329
+#: g10/keygen.c:1331
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1339
+#: g10/keygen.c:1341
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�ΰh�X(Q)�H "
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "�ܧ�m�W(N) �B����(C) �B�q�l�l��a�}(E)�νT�w(O)/�h�X(Q)�H "
-#: g10/keygen.c:1359
+#: g10/keygen.c:1361
msgid "Please correct the error first\n"
msgstr "���q�����~\n"
-#: g10/keygen.c:1398
+#: g10/keygen.c:1400
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -1808,16 +1848,16 @@ msgstr ""
"�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
"\n"
-#: g10/keygen.c:1407 g10/keyedit.c:827
+#: g10/keygen.c:1409 g10/keyedit.c:863
msgid "passphrase not correctly repeated; try again"
msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
-#: g10/keygen.c:1408
+#: g10/keygen.c:1410
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1414
+#: g10/keygen.c:1416
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -1829,7 +1869,7 @@ msgstr ""
"�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
"\n"
-#: g10/keygen.c:1435
+#: g10/keygen.c:1437
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1840,53 +1880,53 @@ msgstr ""
"�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
"�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
-#: g10/keygen.c:2000
+#: g10/keygen.c:2002
msgid "DSA keypair will have 1024 bits.\n"
msgstr "DSA ���_��|�� 1024 �줸�C\n"
-#: g10/keygen.c:2054
+#: g10/keygen.c:2056
msgid "Key generation canceled.\n"
msgstr "�w�������_���͡C\n"
-#: g10/keygen.c:2161 g10/keygen.c:2249
+#: g10/keygen.c:2163 g10/keygen.c:2251
#, c-format
msgid "writing public key to `%s'\n"
msgstr "���b�N���_�g�� `%s'\n"
-#: g10/keygen.c:2162 g10/keygen.c:2251
+#: g10/keygen.c:2164 g10/keygen.c:2253
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "���b�N�p�_�g�� `%s'\n"
-#: g10/keygen.c:2238
+#: g10/keygen.c:2240
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
-#: g10/keygen.c:2244
+#: g10/keygen.c:2246
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
-#: g10/keygen.c:2258
+#: g10/keygen.c:2260
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keygen.c:2265
+#: g10/keygen.c:2267
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keygen.c:2285
+#: g10/keygen.c:2287
msgid "public and secret key created and signed.\n"
msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
-#: g10/keygen.c:2286
+#: g10/keygen.c:2288
msgid "key marked as ultimately trusted.\n"
msgstr "���_�w�Q�аO�������H���F�C\n"
-#: g10/keygen.c:2297
+#: g10/keygen.c:2299
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1894,32 +1934,32 @@ msgstr ""
"�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
"�Ӳ��ͦ��_�צ�C\n"
-#: g10/keygen.c:2309 g10/keygen.c:2428
+#: g10/keygen.c:2311 g10/keygen.c:2430
#, c-format
msgid "Key generation failed: %s\n"
msgstr "���ͪ��_���ѡG %s\n"
-#: g10/keygen.c:2355 g10/sign.c:261
+#: g10/keygen.c:2357 g10/sign.c:262
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
-#: g10/keygen.c:2357 g10/sign.c:263
+#: g10/keygen.c:2359 g10/sign.c:264
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "���_�w�g�b %lu ���᪺���ӻs�y�X�ӤF (�i��O�]���ɥ��Ȧ�ή��������D)\n"
-#: g10/keygen.c:2366
+#: g10/keygen.c:2368
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
-#: g10/keygen.c:2395
+#: g10/keygen.c:2397
msgid "Really create? "
msgstr "�u���n�إ߶ܡH "
-#: g10/decrypt.c:96 g10/encode.c:780
+#: g10/decrypt.c:96 g10/encode.c:775
msgid "--output doesn't work for this command\n"
msgstr "--output �b�o�өR�O���S���@��\n"
@@ -1938,17 +1978,17 @@ msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "�]���B�� S2K �Ҧ��U�ӵL�k�ϥι�٦� ESK �ʥ]\n"
-#: g10/encode.c:233 g10/encode.c:498
+#: g10/encode.c:233 g10/encode.c:497
#, c-format
msgid "`%s' already compressed\n"
msgstr "`%s' �w�g�Q���Y�F\n"
-#: g10/encode.c:301 g10/encode.c:534
+#: g10/encode.c:302 g10/encode.c:534
#, c-format
msgid "%s: WARNING: empty file\n"
msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
-#: g10/encode.c:416
+#: g10/encode.c:417
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "�b --pgp2 �Ҧ����A�p���H 2048 �줸�H�U�� RSA ���_�[�K\n"
@@ -1962,12 +2002,12 @@ msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "�p���n�Ψӥ[�K���Ҧ����_������ϥ� IDEA �s�K�k�C\n"
-#: g10/encode.c:479 g10/encode.c:662
+#: g10/encode.c:478 g10/encode.c:662
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
-#: g10/encode.c:576 g10/sign.c:770
+#: g10/encode.c:576 g10/sign.c:771
#, c-format
msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
@@ -1977,332 +2017,332 @@ msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
msgid "you may not use %s while in %s mode\n"
msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
-#: g10/encode.c:753
+#: g10/encode.c:748
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s �w�g�[�K���G \"%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:2480 g10/delkey.c:73 g10/revoke.c:224
#, c-format
msgid "key `%s' not found: %s\n"
msgstr "�䤣�� `%s' ���_�G %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:81 g10/revoke.c:230 g10/revoke.c:454
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
-#: g10/export.c:222
+#: g10/export.c:189
#, c-format
msgid "key %08lX: not a rfc2440 key - skipped\n"
msgstr "���_ %08lX: ���O�@�� rfc2440 ���_ �w �w���L\n"
-#: g10/export.c:238
+#: g10/export.c:205
#, c-format
msgid "key %08lX: not protected - skipped\n"
msgstr "���_ %08lX: ���Q�O�@ �w �w���L\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 �˦������_ �w �w���L\n"
#. 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 ""
+msgstr "�Чi�G�p�_ %08lX �èS���������@ SK �[�`�ˬd\n"
-#: g10/export.c:347
+#: g10/export.c:310
msgid "WARNING: nothing exported\n"
msgstr "ĵ�i�G�S���ץX����F��\n"
-#: g10/getkey.c:150
+#: g10/getkey.c:151
msgid "too many entries in pk cache - disabled\n"
msgstr "pk �֨��̦��Ӧh���� �w �w�T��\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:187 g10/getkey.c:2586
msgid "[User id not found]"
msgstr "[�䤣��ϥΪ� ID]"
-#: g10/getkey.c:1557
+#: g10/getkey.c:1578
#, c-format
msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
-#: g10/getkey.c:2009
-#, fuzzy, c-format
+#: g10/getkey.c:2074
+#, c-format
msgid "no secret subkey for public subkey %08lX - ignoring\n"
-msgstr "���_ \"%s\" ���۹������p�_�I\n"
+msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
-#: g10/getkey.c:2237
+#: g10/getkey.c:2302
#, c-format
msgid "using secondary key %08lX instead of primary key %08lX\n"
msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
-#: g10/getkey.c:2284
+#: g10/getkey.c:2349
#, c-format
msgid "key %08lX: secret key without public key - skipped\n"
msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
-#: g10/import.c:259
+#: g10/import.c:226
#, c-format
msgid "skipping block of type %d\n"
msgstr "���b���L %d ���A���϶�\n"
-#: g10/import.c:268
+#: g10/import.c:235
#, c-format
msgid "%lu keys so far processed\n"
msgstr "�w�� %lu ����_�Q�B�z�F\n"
-#: g10/import.c:273
+#: g10/import.c:240
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/import.c:285
+#: g10/import.c:252
#, c-format
msgid "Total number processed: %lu\n"
msgstr "�`�@�Q�B�z���ƶq�G %lu\n"
-#: g10/import.c:287
+#: g10/import.c:254
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �w���L���s���_�G %lu\n"
-#: g10/import.c:290
+#: g10/import.c:257
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " �S���ϥΪ̪� ID�G %lu\n"
-#: g10/import.c:292
+#: g10/import.c:259
#, c-format
msgid " imported: %lu"
msgstr " �w�פJ�G %lu"
-#: g10/import.c:298
+#: g10/import.c:265
#, c-format
msgid " unchanged: %lu\n"
msgstr " �����ܪ��G %lu\n"
-#: g10/import.c:300
+#: g10/import.c:267
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �s���ϥΪ� ID�G %lu\n"
-#: g10/import.c:302
+#: g10/import.c:269
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �s���l�_�G %lu\n"
-#: g10/import.c:304
+#: g10/import.c:271
#, c-format
msgid " new signatures: %lu\n"
msgstr " �s���G %lu\n"
-#: g10/import.c:306
+#: g10/import.c:273
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �s�����_�M�P�G %lu\n"
-#: g10/import.c:308
+#: g10/import.c:275
#, c-format
msgid " secret keys read: %lu\n"
msgstr " �Q�����p�_�G %lu\n"
-#: g10/import.c:310
+#: g10/import.c:277
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " �w�פJ���p�_�G %lu\n"
-#: g10/import.c:312
+#: g10/import.c:279
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " �����ܪ��p�_�G %lu\n"
-#: g10/import.c:314
+#: g10/import.c:281
#, c-format
msgid " not imported: %lu\n"
msgstr " ���Q�פJ�G %lu\n"
-#: g10/import.c:599
+#: g10/import.c:550
msgid ""
"NOTE: Elgamal primary key detected - this may take some time to import\n"
msgstr "�`�N�G������ Elgamal �D�_ �w �פJ�o��D�_�i��|�ӤW�@�Ǯɶ�\n"
-#: g10/import.c:613 g10/import.c:875
+#: g10/import.c:564 g10/import.c:826
#, c-format
msgid "key %08lX: no user ID\n"
msgstr "���_ %08lX: �S���ϥΪ� ID\n"
-#: g10/import.c:634
+#: g10/import.c:585
#, c-format
msgid "key %08lX: HKP subkey corruption repaired\n"
msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
-#: g10/import.c:649
+#: g10/import.c:600
#, c-format
msgid "key %08lX: accepted non self-signed user ID '%s'\n"
msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
-#: g10/import.c:656
+#: g10/import.c:607
#, c-format
msgid "key %08lX: no valid user IDs\n"
msgstr "���_ %08lX: �S�����Ī��ϥΪ� ID\n"
-#: g10/import.c:658
+#: g10/import.c:609
msgid "this may be caused by a missing self-signature\n"
msgstr "�o�i��O�ѩ�򥢦ۧ�ñ���ҾɭP����G\n"
-#: g10/import.c:668 g10/import.c:955
+#: g10/import.c:619 g10/import.c:906
#, c-format
msgid "key %08lX: public key not found: %s\n"
msgstr "���_ %08lX: �䤣�줽�_�G %s\n"
-#: g10/import.c:673
+#: g10/import.c:624
#, c-format
msgid "key %08lX: new key - skipped\n"
msgstr "���_ %08lX: �s���_ �w �w���L\n"
-#: g10/import.c:683
+#: g10/import.c:634
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "�䤣��i�g���_�Ͱ�G %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:678 g10/sign.c:917 g10/openfile.c:254
#, c-format
msgid "writing to `%s'\n"
msgstr "���b�g�� `%s'\n"
-#: g10/import.c:691 g10/import.c:776 g10/import.c:902 g10/import.c:1015
+#: g10/import.c:642 g10/import.c:727 g10/import.c:853 g10/import.c:966
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "�g���_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/import.c:708
+#: g10/import.c:659
#, c-format
msgid "key %08lX: public key \"%s\" imported\n"
msgstr "���_ %08lX: ���_ \"%s\" �w�Q�פJ\n"
-#: g10/import.c:730
+#: g10/import.c:681
#, c-format
msgid "key %08lX: doesn't match our copy\n"
msgstr "���_ %08lX: ��ڭ̪��ƥ����k�X\n"
-#: g10/import.c:747 g10/import.c:972
+#: g10/import.c:698 g10/import.c:923
#, c-format
msgid "key %08lX: can't locate original keyblock: %s\n"
msgstr "���_ %08lX: �L�k�w���l�����_�϶��G %s\n"
-#: g10/import.c:754 g10/import.c:978
+#: g10/import.c:705 g10/import.c:929
#, c-format
msgid "key %08lX: can't read original keyblock: %s\n"
msgstr "���_ %08lX: �L�kŪ����l�����_�϶��G %s\n"
-#: g10/import.c:785
+#: g10/import.c:736
#, c-format
msgid "key %08lX: \"%s\" 1 new user ID\n"
msgstr "���_ %08lX: \"%s\" 1 �ӷs���ϥΪ� ID\n"
-#: g10/import.c:788
+#: g10/import.c:739
#, c-format
msgid "key %08lX: \"%s\" %d new user IDs\n"
msgstr "���_ %08lX: \"%s\" %d �ӷs���ϥΪ� ID\n"
-#: g10/import.c:791
+#: g10/import.c:742
#, c-format
msgid "key %08lX: \"%s\" 1 new signature\n"
msgstr "���_ %08lX: \"%s\" 1 �ӷs��ñ��\n"
-#: g10/import.c:794
+#: g10/import.c:745
#, c-format
msgid "key %08lX: \"%s\" %d new signatures\n"
msgstr "���_ %08lX: \"%s\" %d �ӷs��ñ��\n"
-#: g10/import.c:797
+#: g10/import.c:748
#, c-format
msgid "key %08lX: \"%s\" 1 new subkey\n"
msgstr "���_ %08lX: \"%s\" 1 �ӷs���l�_\n"
-#: g10/import.c:800
+#: g10/import.c:751
#, c-format
msgid "key %08lX: \"%s\" %d new subkeys\n"
msgstr "���_ %08lX: \"%s\" %d �ӷs���l�_\n"
-#: g10/import.c:819
+#: g10/import.c:770
#, c-format
msgid "key %08lX: \"%s\" not changed\n"
msgstr "���_ %08lX: \"%s\" �S���Q����\n"
-#: g10/import.c:881
+#: g10/import.c:832
#, c-format
msgid "key %08lX: secret key with invalid cipher %d - skipped\n"
msgstr "���_ %08lX: �p�_�ϥΤF�L�Ī��s�K�k %d �w �w���L\n"
-#: g10/import.c:896
+#: g10/import.c:847
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
-#: g10/import.c:907
+#: g10/import.c:858
#, c-format
msgid "key %08lX: secret key imported\n"
msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
#. we can't merge secret keys
-#: g10/import.c:913
+#: g10/import.c:864
#, c-format
msgid "key %08lX: already in secret keyring\n"
msgstr "���_ %08lX: �w�g�b�p�_�_�Ͱ餤�F\n"
-#: g10/import.c:920
+#: g10/import.c:871
#, c-format
msgid "key %08lX: secret key not found: %s\n"
msgstr "���_ %08lX: �䤣��p�_�G %s\n"
-#: g10/import.c:949
+#: g10/import.c:900
#, c-format
msgid "key %08lX: no public key - can't apply revocation certificate\n"
msgstr "���_ %08lX: �S�����_ �w �L�k�M�κM�P����\n"
-#: g10/import.c:989
+#: g10/import.c:940
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w��^\n"
-#: g10/import.c:1021
+#: g10/import.c:972
#, c-format
msgid "key %08lX: \"%s\" revocation certificate imported\n"
msgstr "���_ %08lX: \"%s\" �M�P���Ҥw�Q�פJ\n"
-#: g10/import.c:1084
+#: g10/import.c:1035
#, c-format
msgid "key %08lX: no user ID for signature\n"
msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
-#: g10/import.c:1097
+#: g10/import.c:1048
#, c-format
msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n"
msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
-#: g10/import.c:1099
+#: g10/import.c:1050
#, c-format
msgid "key %08lX: invalid self-signature on user id \"%s\"\n"
msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
-#: g10/import.c:1114
+#: g10/import.c:1065
#, c-format
msgid "key %08lX: no subkey for key binding\n"
msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
-#: g10/import.c:1122 g10/import.c:1163
+#: g10/import.c:1073 g10/import.c:1114
#, c-format
msgid "key %08lX: unsupported public key algorithm\n"
msgstr "���_ %08lX: ���Q�䴩�����}���_�t��k\n"
-#: g10/import.c:1123
+#: g10/import.c:1074
#, c-format
msgid "key %08lX: invalid subkey binding\n"
msgstr "���_ %08lX: �L�����a�l�_\n"
@@ -2310,17 +2350,17 @@ msgstr "���_ %08lX: �L�����a�l�_\n"
#. Delete the last binding
#. sig since this one is
#. newer
-#: g10/import.c:1135
+#: g10/import.c:1086
#, c-format
msgid "key %08lX: removed multiple subkey binding\n"
msgstr "���_ %08lX: �h�����a�l�_�w�Q����\n"
-#: g10/import.c:1155
+#: g10/import.c:1106
#, c-format
msgid "key %08lX: no subkey for key revocation\n"
msgstr "���_ %08lX: �S���l�_�i�Ѫ��_�M�P\n"
-#: g10/import.c:1164
+#: g10/import.c:1115
#, c-format
msgid "key %08lX: invalid subkey revocation\n"
msgstr "���_ %08lX: �L���l�_�M�P\n"
@@ -2328,17 +2368,17 @@ msgstr "���_ %08lX: �L���l�_�M�P\n"
#. Delete the last revocation
#. sig since this one is
#. newer
-#: g10/import.c:1175
+#: g10/import.c:1126
#, c-format
msgid "key %08lX: removed multiple subkey revocation\n"
msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
-#: g10/import.c:1212
+#: g10/import.c:1163
#, c-format
msgid "key %08lX: skipped user ID '"
msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
-#: g10/import.c:1235
+#: g10/import.c:1186
#, c-format
msgid "key %08lX: skipped subkey\n"
msgstr "���_ %08lX: �l�_�w���L\n"
@@ -2347,52 +2387,52 @@ msgstr "���_ %08lX: �l�_�w���L\n"
#. * to import non-exportable signature when we have the
#. * the secret key used to create this signature - it
#. * seems that this makes sense
-#: g10/import.c:1261
+#: g10/import.c:1212
#, c-format
msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
-#: g10/import.c:1270
+#: g10/import.c:1221
#, c-format
msgid "key %08lX: revocation certificate at wrong place - skipped\n"
msgstr "���_ %08lX: �M�P���Ҧb���~���a�� �w �w���L\n"
-#: g10/import.c:1287
+#: g10/import.c:1238
#, c-format
msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w���L\n"
-#: g10/import.c:1299
+#: g10/import.c:1250
#, c-format
msgid "key %08lX: subkey signature in wrong place - skipped\n"
msgstr "���_ %08lX: �l�_�b���~���a�� �w �w���L\n"
-#: g10/import.c:1307
+#: g10/import.c:1258
#, c-format
msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n"
-msgstr "���_ %08lX: �D�w�������� (%02x) �w �w���L\n"
+msgstr "���_ %08lX: �D�w�������� (0x%02X) �w �w���L\n"
-#: g10/import.c:1405
+#: g10/import.c:1356
#, c-format
msgid "key %08lX: duplicated user ID detected - merged\n"
msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
-#: g10/import.c:1464
+#: g10/import.c:1415
#, c-format
msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n"
msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G���b���^�M�P���_ %08lX\n"
-#: g10/import.c:1478
+#: g10/import.c:1429
#, c-format
msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n"
msgstr "ĵ�i�G���_ %08lX �i��Q�M�P�F�G�M�P���_ %08lX ���X�{�C\n"
-#: g10/import.c:1535
+#: g10/import.c:1486
#, c-format
msgid "key %08lX: \"%s\" revocation certificate added\n"
msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
-#: g10/import.c:1566
+#: g10/import.c:1517
#, c-format
msgid "key %08lX: direct key signature added\n"
msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
@@ -2446,20 +2486,27 @@ msgstr "������ %d �ӨS�����Ħۧ�ñ�����ϥΪ� ID\n"
msgid "User ID \"%s\" is revoked."
msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
-#: 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:1218
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�p���M�Q�nñ�p���ܡH (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:1224
msgid " Unable to sign.\n"
msgstr " �L�kñ�p�C\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 "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
+
+#: g10/keyedit.c:402
+#, fuzzy, c-format
+msgid "User ID \"%s\" is not self-signed."
msgstr "ĵ�i�G�ϥΪ� ID \"%s\" ���g�ۧ�ñ�p�C\n"
-#: g10/keyedit.c:401
+#: g10/keyedit.c:437
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2468,11 +2515,11 @@ msgstr ""
"\"%s\" �̪��ۧ�ñ��\n"
"�O PGP 2.x ���A���C\n"
-#: g10/keyedit.c:410
+#: g10/keyedit.c:446
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "�p�O�_�Q�n�N���ɯŦ� OpenPGP �ۧ�ñ���H (y/N) "
-#: g10/keyedit.c:424
+#: g10/keyedit.c:460
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@ -2481,13 +2528,13 @@ msgstr ""
"�p�ثe�b \"%s\" ��ñ��\n"
"�w�g�L���F�C\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 "�p�Q�n�o�G�@���s��ñ���Ө��N�w�L�������@�ӶܡH (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"
@@ -2496,53 +2543,53 @@ msgstr ""
"�p�ثe�b \"%s\" ��ñ��\n"
"�O�@�����a�C\n"
-#: g10/keyedit.c:453
+#: g10/keyedit.c:489
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "�p�O�_�Q�n��L�ɯŦ��i�H�����ץX��ñ���H (y/N) "
-#: g10/keyedit.c:474
+#: g10/keyedit.c:510
#, c-format
msgid "\"%s\" was already locally signed by key %08lX\n"
msgstr "\"%s\" �w�g�Q���_ %08lX �b���añ�p�F\n"
-#: g10/keyedit.c:478
+#: g10/keyedit.c:514
#, c-format
msgid "\"%s\" was already signed by key %08lX\n"
msgstr "\"%s\" �w�g�Q���_ %08lX ñ�p�F\n"
-#: g10/keyedit.c:483
+#: g10/keyedit.c:519
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�p���M�Q�n�A��ñ�p���ܡH (y/N) "
-#: g10/keyedit.c:503
+#: g10/keyedit.c:539
#, c-format
msgid "Nothing to sign with key %08lX\n"
msgstr "�S���F��i�H�����_ %08lX ñ�p\n"
-#: g10/keyedit.c:518
+#: g10/keyedit.c:554
msgid "This key has expired!"
msgstr "�o����_�w�g�L���F�I"
-#: g10/keyedit.c:538
+#: g10/keyedit.c:574
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�o����_�N�b %s �L���C\n"
-#: g10/keyedit.c:542
+#: g10/keyedit.c:578
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "�p�Q�n���p��ñ���]�b�P�@�ӮɭԹL���ܡH (Y/n) "
-#: g10/keyedit.c:575
+#: g10/keyedit.c:611
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "�p����b --pgp2 �Ҧ��U�A�� PGP 2.x ���_���X OpenPGP ñ���C\n"
-#: g10/keyedit.c:577
+#: g10/keyedit.c:613
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "�o�|���o����_�b PGP 2.x �Ҧ��U���i�ϥΡC\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"
@@ -2551,31 +2598,31 @@ msgstr ""
"�p���h�ԷV�ˬd���nñ�p�����_�T���ݩ�W�����ӤH���W�r�O�H\n"
"�p�G�p�����D�o�Ӱ��D�����סA�п�J�u0�v�C\n"
-#: g10/keyedit.c:604
+#: g10/keyedit.c:640
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) �ڤ��@���C %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 " (�w�])"
-#: g10/keyedit.c:606
+#: g10/keyedit.c:642
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) �ڮڥ��S���ˬd�L�C %s\n"
-#: g10/keyedit.c:608
+#: g10/keyedit.c:644
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ���H�N�ˬd�L�F�C %s\n"
-#: g10/keyedit.c:610
+#: g10/keyedit.c:646
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
-#: g10/keyedit.c:635
+#: g10/keyedit.c:671
msgid ""
"Are you really sure that you want to sign this key\n"
"with your key: \""
@@ -2583,7 +2630,7 @@ msgstr ""
"�p�u���T�w�nñ�p�o����_\n"
"�Ωp�����_�G \""
-#: g10/keyedit.c:644
+#: g10/keyedit.c:680
msgid ""
"\n"
"This will be a self-signature.\n"
@@ -2591,7 +2638,7 @@ msgstr ""
"\n"
"�o�N�|�O�ۧ�ñ���C\n"
-#: g10/keyedit.c:648
+#: g10/keyedit.c:684
msgid ""
"\n"
"WARNING: the signature will not be marked as non-exportable.\n"
@@ -2599,7 +2646,7 @@ msgstr ""
"\n"
"ĵ�i�G�o��ñ�����|�Q�аO�����i�ץX�C\n"
-#: g10/keyedit.c:653
+#: g10/keyedit.c:689
msgid ""
"\n"
"WARNING: the signature will not be marked as non-revocable.\n"
@@ -2607,7 +2654,7 @@ msgstr ""
"\n"
"ĵ�i�G�o��ñ�����|�Q�аO�����i�M�P�C\n"
-#: g10/keyedit.c:660
+#: g10/keyedit.c:696
msgid ""
"\n"
"The signature will be marked as non-exportable.\n"
@@ -2615,7 +2662,7 @@ msgstr ""
"\n"
"�o��ñ���|�Q�аO�����i�ץX�C\n"
-#: g10/keyedit.c:664
+#: g10/keyedit.c:700
msgid ""
"\n"
"The signature will be marked as non-revocable.\n"
@@ -2623,7 +2670,7 @@ msgstr ""
"\n"
"�o��ñ���|�Q�аO�����i�M�P�C\n"
-#: g10/keyedit.c:669
+#: g10/keyedit.c:705
msgid ""
"\n"
"I have not checked this key at all.\n"
@@ -2631,7 +2678,7 @@ msgstr ""
"\n"
"�ڮڥ��S���ˬd�L�o����_�C\n"
-#: g10/keyedit.c:673
+#: g10/keyedit.c:709
msgid ""
"\n"
"I have checked this key casually.\n"
@@ -2639,7 +2686,7 @@ msgstr ""
"\n"
"���H�N�ˬd�L�o����_�F�C\n"
-#: g10/keyedit.c:677
+#: g10/keyedit.c:713
msgid ""
"\n"
"I have checked this key very carefully.\n"
@@ -2647,34 +2694,34 @@ msgstr ""
"\n"
"�ګD�`�p�ߦa�ˬd�L�o����_�F�C\n"
-#: g10/keyedit.c:686
+#: g10/keyedit.c:722
msgid "Really sign? "
msgstr "�u���nñ�p�ܡH "
-#: g10/keyedit.c:728 g10/keyedit.c:3185 g10/keyedit.c:3276 g10/keyedit.c:3349
-#: g10/sign.c:312
+#: g10/keyedit.c:764 g10/keyedit.c:3259 g10/keyedit.c:3350 g10/keyedit.c:3423
+#: g10/sign.c:313
#, c-format
msgid "signing failed: %s\n"
msgstr "ñ�p�ɥ��ѤF�G %s\n"
-#: g10/keyedit.c:784
+#: g10/keyedit.c:820
msgid "This key is not protected.\n"
msgstr "�o����_�S���Q�O�@�C\n"
-#: g10/keyedit.c:788
+#: g10/keyedit.c:824
msgid "Secret parts of primary key are not available.\n"
msgstr "�D�_���p�_�����S��k���ΡC\n"
-#: g10/keyedit.c:792
+#: g10/keyedit.c:828
msgid "Key is protected.\n"
msgstr "���_�Q�O�@�F�C\n"
-#: g10/keyedit.c:812
+#: g10/keyedit.c:848
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "�L�k�s��o����_�G %s\n"
-#: g10/keyedit.c:818
+#: g10/keyedit.c:854
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2682,7 +2729,7 @@ msgstr ""
"��J�n���o��p�_���s�K�X��C\n"
"\n"
-#: g10/keyedit.c:832
+#: g10/keyedit.c:868
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2690,493 +2737,491 @@ msgstr ""
"�p���Q�n�αK�X�� �w �o�j���O�� *�V* �I�l�I\n"
"\n"
-#: g10/keyedit.c:835
+#: g10/keyedit.c:871
msgid "Do you really want to do this? "
msgstr "�p�u���Q�n�o�򰵶ܡH "
-#: g10/keyedit.c:899
+#: g10/keyedit.c:935
msgid "moving a key signature to the correct place\n"
msgstr "���b����_��ñ���h���쥿�T����m�h\n"
-#: g10/keyedit.c:941
+#: g10/keyedit.c:977
msgid "quit this menu"
msgstr "���}�o�ӿ��"
-#: g10/keyedit.c:942
+#: g10/keyedit.c:978
msgid "q"
msgstr "q"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
msgid "save"
msgstr "save"
-#: g10/keyedit.c:943
+#: g10/keyedit.c:979
msgid "save and quit"
msgstr "�x�s�����}"
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
msgid "help"
msgstr "help"
-#: g10/keyedit.c:944
+#: g10/keyedit.c:980
msgid "show this help"
msgstr "��ܳo���u�W����"
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
msgid "fpr"
msgstr "fpr"
-#: g10/keyedit.c:946
+#: g10/keyedit.c:982
msgid "show fingerprint"
msgstr "��ܫ���"
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
msgid "list"
msgstr "list"
-#: g10/keyedit.c:947
+#: g10/keyedit.c:983
msgid "list key and user IDs"
msgstr "�C�X���_�M�ϥΪ� ID"
-#: g10/keyedit.c:948
+#: g10/keyedit.c:984
msgid "l"
msgstr "l"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
msgid "uid"
msgstr "uid"
-#: g10/keyedit.c:949
+#: g10/keyedit.c:985
msgid "select user ID N"
msgstr "�ϥΪ� ID ��F N"
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
msgid "key"
msgstr "key"
-#: g10/keyedit.c:950
+#: g10/keyedit.c:986
msgid "select secondary key N"
msgstr "��ܦ��_ N"
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
msgid "check"
msgstr "check"
-#: g10/keyedit.c:951
+#: g10/keyedit.c:987
msgid "list signatures"
msgstr "�C�Xñ��"
-#: g10/keyedit.c:952
+#: g10/keyedit.c:988
msgid "c"
msgstr "c"
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
msgid "sign"
msgstr "sign"
-#: g10/keyedit.c:953
+#: g10/keyedit.c:989
msgid "sign the key"
msgstr "ñ�p���_"
-#: g10/keyedit.c:954
+#: g10/keyedit.c:990
msgid "s"
msgstr "s"
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
msgid "lsign"
msgstr "lsign"
-#: g10/keyedit.c:955
+#: g10/keyedit.c:991
msgid "sign the key locally"
msgstr "�Ȧb���añ�p���_"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
msgid "nrsign"
msgstr "nrsign"
-#: g10/keyedit.c:956
+#: g10/keyedit.c:992
msgid "sign the key non-revocably"
msgstr "�H���i�M�P�Ҧ�ñ�p���_"
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
msgid "nrlsign"
msgstr "nrlsign"
-#: g10/keyedit.c:957
+#: g10/keyedit.c:993
msgid "sign the key locally and non-revocably"
msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
-#: g10/keyedit.c:958
+#: g10/keyedit.c:994
msgid "debug"
msgstr "debug"
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
msgid "adduid"
msgstr "adduid"
-#: g10/keyedit.c:959
+#: g10/keyedit.c:995
msgid "add a user ID"
msgstr "�W�[�@�ӨϥΪ� ID"
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
msgid "addphoto"
msgstr "addphoto"
-#: g10/keyedit.c:960
+#: g10/keyedit.c:996
msgid "add a photo ID"
msgstr "�W�[�@�ӷӤ� ID"
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
msgid "deluid"
msgstr "deluid"
-#: g10/keyedit.c:961
+#: g10/keyedit.c:997
msgid "delete user ID"
msgstr "�R���@�ӨϥΪ� ID"
#. delphoto is really deluid in disguise
-#: g10/keyedit.c:963
+#: g10/keyedit.c:999
msgid "delphoto"
msgstr "delphoto"
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
msgid "addkey"
msgstr "addkey"
-#: g10/keyedit.c:964
+#: g10/keyedit.c:1000
msgid "add a secondary key"
msgstr "�W�[�@�⦸�_"
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
msgid "delkey"
msgstr "delkey"
-#: g10/keyedit.c:965
+#: g10/keyedit.c:1001
msgid "delete a secondary key"
msgstr "�R���@�⦸�_"
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
msgid "addrevoker"
msgstr "addrevoker"
-#: g10/keyedit.c:966
+#: g10/keyedit.c:1002
msgid "add a revocation key"
msgstr "�W�[�@��M�P���_"
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
msgid "delsig"
msgstr "delsig"
-#: g10/keyedit.c:967
+#: g10/keyedit.c:1003
msgid "delete signatures"
msgstr "�R��ñ��"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
msgid "expire"
msgstr "expire"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:1004
msgid "change the expire date"
msgstr "���ϥδ���"
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
msgid "primary"
msgstr "primary"
-#: g10/keyedit.c:969
+#: g10/keyedit.c:1005
msgid "flag user ID as primary"
msgstr "��ϥΪ� ID �аO���D�n"
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
msgid "toggle"
msgstr "toggle"
-#: g10/keyedit.c:970
+#: g10/keyedit.c:1006
msgid "toggle between secret and public key listing"
msgstr "��p�_�M���_�M��ô�b�@�_"
-#: g10/keyedit.c:972
+#: g10/keyedit.c:1008
msgid "t"
msgstr "t"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
msgid "pref"
msgstr "pref"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:1009
msgid "list preferences (expert)"
msgstr "�C�X���n (�M�a�Ҧ�)"
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
msgid "showpref"
msgstr "showpref"
-#: g10/keyedit.c:974
+#: g10/keyedit.c:1010
msgid "list preferences (verbose)"
msgstr "�C�X���n (�o���Ҧ�)"
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
msgid "setpref"
msgstr "setpref"
-#: g10/keyedit.c:975
+#: g10/keyedit.c:1011
msgid "set preference list"
msgstr "�]�w���n�M��"
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
msgid "updpref"
msgstr "updpref"
-#: g10/keyedit.c:976
+#: g10/keyedit.c:1012
msgid "updated preferences"
msgstr "��s�L�����n"
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
msgid "passwd"
msgstr "passwd"
-#: g10/keyedit.c:977
+#: g10/keyedit.c:1013
msgid "change the passphrase"
msgstr "���K�X��"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
msgid "trust"
msgstr "trust"
-#: g10/keyedit.c:978
+#: g10/keyedit.c:1014
msgid "change the ownertrust"
msgstr "���D�[�H��"
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
msgid "revsig"
msgstr "revsig"
-#: g10/keyedit.c:979
+#: g10/keyedit.c:1015
msgid "revoke signatures"
msgstr "�M�Pñ��"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
msgid "revuid"
msgstr "revuid"
-#: g10/keyedit.c:980
+#: g10/keyedit.c:1016
msgid "revoke a user ID"
msgstr "�M�P�@�ӨϥΪ� ID"
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
msgid "revkey"
msgstr "revkey"
-#: g10/keyedit.c:981
+#: g10/keyedit.c:1017
msgid "revoke a secondary key"
msgstr "�M�P�@�⦸�_"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
msgid "disable"
msgstr "disable"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:1018
msgid "disable a key"
msgstr "�T�Τ@����_"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
msgid "enable"
msgstr "enable"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:1019
msgid "enable a key"
msgstr "�ҥΤ@����_"
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
msgid "showphoto"
msgstr "showphoto"
-#: g10/keyedit.c:984
+#: g10/keyedit.c:1020
msgid "show photo ID"
msgstr "��ܷӤ� ID"
-#: g10/keyedit.c:1004 g10/delkey.c:119
+#: g10/keyedit.c:1040 g10/delkey.c:119
msgid "can't do that in batchmode\n"
msgstr "�L�k�b�妸�Ҧ������˰�\n"
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1078
#, c-format
msgid "error reading secret keyblock `%s': %s\n"
msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
-#: g10/keyedit.c:1060
+#: g10/keyedit.c:1096
msgid "Secret key is available.\n"
msgstr "�p�_�i�ΡC\n"
-#: g10/keyedit.c:1091
+#: g10/keyedit.c:1127
msgid "Command> "
msgstr "���O> "
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1159
msgid "Need the secret key to do this.\n"
msgstr "�n���p�_�ׯ�o�򰵡C\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1163
msgid "Please use the command \"toggle\" first.\n"
msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
-#: g10/keyedit.c:1176
+#: g10/keyedit.c:1212
msgid "Key is revoked."
msgstr "���_�w�g�Q�M�P�F�C"
-#: g10/keyedit.c:1195
+#: g10/keyedit.c:1231
msgid "Really sign all user IDs? "
msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1232
msgid "Hint: Select the user IDs to sign\n"
msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
-#: g10/keyedit.c:1221
+#: g10/keyedit.c:1257
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
-#: g10/keyedit.c:1241 g10/keyedit.c:1262 g10/keyedit.c:1322
+#: g10/keyedit.c:1277 g10/keyedit.c:1298 g10/keyedit.c:1358
msgid "You must select at least one user ID.\n"
msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
-#: g10/keyedit.c:1243
+#: g10/keyedit.c:1279
msgid "You can't delete the last user ID!\n"
msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
-#: g10/keyedit.c:1246
+#: g10/keyedit.c:1282
msgid "Really remove all selected user IDs? "
msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1247
+#: g10/keyedit.c:1283
msgid "Really remove this user ID? "
msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
-#: g10/keyedit.c:1285 g10/keyedit.c:1341
+#: g10/keyedit.c:1321 g10/keyedit.c:1377
msgid "You must select at least one key.\n"
msgstr "�p�ܤ֥�����ܤ@����_�C\n"
-#: g10/keyedit.c:1289
+#: g10/keyedit.c:1325
msgid "Do you really want to delete the selected keys? "
msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1326
msgid "Do you really want to delete this key? "
msgstr "�p�u���n�R���o����_�ܡH "
-#: g10/keyedit.c:1325
+#: g10/keyedit.c:1361
msgid "Really revoke all selected user IDs? "
msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1362
msgid "Really revoke this user ID? "
msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
-#: g10/keyedit.c:1345
+#: g10/keyedit.c:1381
msgid "Do you really want to revoke the selected keys? "
msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1382
msgid "Do you really want to revoke this key? "
msgstr "�p�u���Q�n�M�P�o����_�ܡH "
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1451
msgid "Really update the preferences for the selected user IDs? "
msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1453
msgid "Really update the preferences? "
msgstr "�u���n��s���n�ܡH "
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1491
msgid "Save changes? "
msgstr "�n�x�s�ܧ�ܡH "
-#: g10/keyedit.c:1458
+#: g10/keyedit.c:1494
msgid "Quit without saving? "
msgstr "�n���x�s�����}�ܡH "
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1505
#, c-format
msgid "update failed: %s\n"
msgstr "��s���ѡG %s\n"
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1512
#, c-format
msgid "update secret failed: %s\n"
msgstr "��s�p�_���ѡG %s\n"
-#: g10/keyedit.c:1483
+#: g10/keyedit.c:1519
msgid "Key not changed so no update needed.\n"
msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1531
msgid "Invalid command (try \"help\")\n"
msgstr "�L�Ī����O (�ոլ� \"help\")\n"
-#: g10/keyedit.c:1554
+#: g10/keyedit.c:1590
msgid "Digest: "
msgstr "�K�n�G "
-#: g10/keyedit.c:1606
+#: g10/keyedit.c:1642
msgid "Features: "
msgstr "�S�I�G "
-#: g10/keyedit.c:1843
+#: g10/keyedit.c:1879
#, c-format
msgid "This key may be revoked by %s key "
msgstr "�o����_�i��Q %s ���_�M�P�F "
-#: g10/keyedit.c:1847
+#: g10/keyedit.c:1883
msgid " (sensitive)"
msgstr " �]���K���^"
#. 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:1889 g10/keyedit.c:1915 g10/keyedit.c:2000 g10/keyedit.c:2015
#, c-format
msgid "%s%c %4u%c/%08lX created: %s expires: %s"
msgstr "%s%c %4u%c/%08lX �s�y��G %s �ϥδ����G %s"
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1898
#, c-format
msgid " trust: %c/%c"
msgstr " �H���G %c/%c"
-#: g10/keyedit.c:1866
+#: g10/keyedit.c:1902
msgid "This key has been disabled"
msgstr "�o����_�w�g�Q�T�ΤF"
-#: g10/keyedit.c:1895
+#: g10/keyedit.c:1931
#, c-format
msgid "rev! subkey has been revoked: %s\n"
msgstr "rev! �l�_�w�g�Q�M�P�F�G %s\n"
-#: g10/keyedit.c:1898
+#: g10/keyedit.c:1934
msgid "rev- faked revocation found\n"
msgstr "rev- �o�{�Q���y���M�P\n"
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1936
#, c-format
msgid "rev? problem checking revocation: %s\n"
msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
-#: g10/keyedit.c:1920
-#, fuzzy
+#: g10/keyedit.c:1956
msgid "[revoked] "
-msgstr "revkey"
+msgstr "[�w�M�P]"
-#: g10/keyedit.c:1922
-#, fuzzy
+#: g10/keyedit.c:1958
msgid "[expired] "
-msgstr "expire"
+msgstr "[�w�L��]"
-#: g10/keyedit.c:1930
+#: g10/keyedit.c:1966
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
-#: g10/keyedit.c:1938
+#: g10/keyedit.c:1974
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@ -3184,7 +3229,13 @@ msgstr ""
"�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
"���D�p���s����{���C\n"
-#: g10/keyedit.c:2095
+#: g10/keyedit.c:2106
+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"
@@ -3193,45 +3244,45 @@ msgstr ""
"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
" �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\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 "�p�T�w���M�Q�n�W�[�ܡH (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 "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
-#: g10/keyedit.c:2241
+#: g10/keyedit.c:2311
msgid "Delete this good signature? (y/N/q)"
msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2321
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2255
+#: g10/keyedit.c:2325
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
-#: g10/keyedit.c:2261
+#: g10/keyedit.c:2331
msgid "Really delete this self-signature? (y/N)"
msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
-#: g10/keyedit.c:2275
+#: g10/keyedit.c:2345
#, c-format
msgid "Deleted %d signature.\n"
msgstr "�w�g�R���F %d ���C\n"
-#: g10/keyedit.c:2276
+#: g10/keyedit.c:2346
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "�w�g�R���F %d ���C\n"
-#: g10/keyedit.c:2279
+#: g10/keyedit.c:2349
msgid "Nothing deleted.\n"
msgstr "�S���F��Q�R���C\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"
@@ -3240,84 +3291,82 @@ msgstr ""
"ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
" �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\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 "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
-#: g10/keyedit.c:2402
+#: g10/keyedit.c:2472
msgid "Enter the user ID of the designated revoker: "
msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
-#: g10/keyedit.c:2417
+#: g10/keyedit.c:2487
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\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:2497
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
-#: g10/keyedit.c:2446
-#, fuzzy
+#: g10/keyedit.c:2516
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
-#: g10/keyedit.c:2452
-#, fuzzy
+#: g10/keyedit.c:2522
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N): "
-msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
+msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2587
msgid "Please remove selections from the secret keys.\n"
msgstr "�бq�p�_��������ܡC\n"
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2593
msgid "Please select at most one secondary key.\n"
msgstr "�Цܦh��ܤ@�⦸�_�C\n"
-#: g10/keyedit.c:2527
+#: g10/keyedit.c:2597
msgid "Changing expiration time for a secondary key.\n"
msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
-#: g10/keyedit.c:2529
+#: g10/keyedit.c:2599
msgid "Changing expiration time for the primary key.\n"
msgstr "���b�ܧ�D�_���ϥδ����C\n"
-#: g10/keyedit.c:2571
+#: g10/keyedit.c:2643
msgid "You can't change the expiration date of a v3 key\n"
msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
-#: g10/keyedit.c:2587
+#: g10/keyedit.c:2659
msgid "No corresponding signature in secret ring\n"
msgstr "�b�p�_��̨S���@�P��ñ��\n"
-#: g10/keyedit.c:2667
+#: g10/keyedit.c:2739
msgid "Please select exactly one user ID.\n"
msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
-#: g10/keyedit.c:2704 g10/keyedit.c:2811
+#: g10/keyedit.c:2776 g10/keyedit.c:2885
#, c-format
msgid "skipping v3 self-signature on user id \"%s\"\n"
msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
-#: g10/keyedit.c:2871
+#: g10/keyedit.c:2945
#, c-format
msgid "No user ID with index %d\n"
msgstr "���� %d �S���ϥΪ� ID\n"
-#: g10/keyedit.c:2917
+#: g10/keyedit.c:2991
#, c-format
msgid "No secondary key with index %d\n"
msgstr "���� %d �S�����_\n"
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3105
msgid "user ID: \""
msgstr "�ϥΪ� ID�G \""
-#: g10/keyedit.c:3036
+#: g10/keyedit.c:3110
#, c-format
msgid ""
"\"\n"
@@ -3326,7 +3375,7 @@ msgstr ""
"\"\n"
"�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
-#: g10/keyedit.c:3039
+#: g10/keyedit.c:3113
#, c-format
msgid ""
"\"\n"
@@ -3335,56 +3384,56 @@ msgstr ""
"\"\n"
"�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
-#: g10/keyedit.c:3044
+#: g10/keyedit.c:3118
#, c-format
msgid "This signature expired on %s.\n"
msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
-#: g10/keyedit.c:3048
+#: g10/keyedit.c:3122
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
-#: g10/keyedit.c:3052
+#: g10/keyedit.c:3126
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
#. FIXME: detect duplicates here
-#: g10/keyedit.c:3077
+#: g10/keyedit.c:3151
msgid "You have signed these user IDs:\n"
msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
-#: g10/keyedit.c:3096
+#: g10/keyedit.c:3170
#, c-format
msgid " signed by %08lX at %s%s%s\n"
msgstr " �� %08lX ñ�p�� %s%s%s\n"
-#: g10/keyedit.c:3104
+#: g10/keyedit.c:3178
#, c-format
msgid " revoked by %08lX at %s\n"
msgstr " �� %08lX �M�P�� %s\n"
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3198
msgid "You are about to revoke these signatures:\n"
msgstr "�p���b�M�P�o���G\n"
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3208
#, c-format
msgid " signed by %08lX at %s%s\n"
msgstr " �� %08lX ñ�p�� %s%s\n"
-#: g10/keyedit.c:3136
+#: g10/keyedit.c:3210
msgid " (non-exportable)"
msgstr " (���i�ץX)"
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3217
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
-#: g10/keyedit.c:3173
+#: g10/keyedit.c:3247
msgid "no secret key\n"
msgstr "�S���p�_\n"
-#: g10/keyedit.c:3243
+#: g10/keyedit.c:3317
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
@@ -3393,12 +3442,12 @@ msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\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:3334
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
-#: g10/keyedit.c:3433
+#: g10/keyedit.c:3507
#, c-format
msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n"
msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
@@ -3427,34 +3476,34 @@ msgstr "ñ���аO�G "
msgid "not human readable"
msgstr "���O�H�����o����"
-#: g10/keylist.c:225
+#: g10/keylist.c:229
msgid "Keyring"
msgstr "�_�Ͱ�"
#. of subkey
-#: g10/keylist.c:507 g10/mainproc.c:905
+#: g10/keylist.c:506 g10/mainproc.c:905
#, c-format
msgid " [expires: %s]"
msgstr " [���Ĵ����G %s]"
-#: g10/keylist.c:1025
+#: g10/keylist.c:1028
msgid "Primary key fingerprint:"
msgstr "�D�_�����G"
-#: g10/keylist.c:1027
+#: g10/keylist.c:1030
msgid " Subkey fingerprint:"
msgstr " �l�_�����G"
-#: g10/keylist.c:1034
+#: g10/keylist.c:1037
msgid " Primary key fingerprint:"
msgstr " �D�_�����G"
-#: g10/keylist.c:1036
+#: g10/keylist.c:1039
msgid " Subkey fingerprint:"
msgstr " �l�_�����G"
#. use tty
-#: g10/keylist.c:1040 g10/keylist.c:1044
+#: g10/keylist.c:1043 g10/keylist.c:1047
msgid " Key fingerprint ="
msgstr " ���_���� ="
@@ -3559,80 +3608,87 @@ msgstr "ñ�����Ҥw�Q����\n"
msgid "can't handle these multiple signatures\n"
msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
-#: g10/mainproc.c:1311
+#: g10/mainproc.c:1309
#, c-format
msgid "Signature made %.*s using %s key ID %08lX\n"
msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %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:1332
+#, fuzzy
+msgid "Key available at: "
+msgstr "�S���i������"
+
+#: g10/mainproc.c:1379 g10/mainproc.c:1412
msgid "BAD signature from \""
msgstr "*�l�a* ��ñ���Ӧ۩� \""
-#: g10/mainproc.c:1361 g10/mainproc.c:1394
+#: g10/mainproc.c:1380 g10/mainproc.c:1413
msgid "Expired signature from \""
msgstr "�L����ñ���Ӧ۩� \""
-#: g10/mainproc.c:1362 g10/mainproc.c:1395
+#: g10/mainproc.c:1381 g10/mainproc.c:1414
msgid "Good signature from \""
msgstr "���n��ñ���Ӧ۩� \""
-#: g10/mainproc.c:1397
+#: g10/mainproc.c:1416
msgid "[uncertain]"
msgstr "[���T�w]"
-#: g10/mainproc.c:1491
-#, fuzzy, c-format
+#: g10/mainproc.c:1515
+#, c-format
msgid "Signature expired %s\n"
msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
-#: g10/mainproc.c:1496
-#, fuzzy, c-format
+#: g10/mainproc.c:1520
+#, c-format
msgid "Signature expires %s\n"
-msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
+msgstr "�o��ñ�p�b %s �L���C\n"
-#: g10/mainproc.c:1499
-#, fuzzy, c-format
+#: g10/mainproc.c:1523
+#, c-format
msgid "%s signature, digest algorithm %s\n"
-msgstr "%s ñ���ӦۡG \"%s\"\n"
+msgstr "%s �A�K�n�t��k %s\n"
-#: g10/mainproc.c:1500
-#, fuzzy
+#: g10/mainproc.c:1524
msgid "binary"
-msgstr "primary"
+msgstr "�G�i��"
-#: g10/mainproc.c:1501
+#: g10/mainproc.c:1525
msgid "textmode"
-msgstr ""
+msgstr "��r�Ҧ�"
-#: g10/mainproc.c:1501
-#, fuzzy
+#: g10/mainproc.c:1525
msgid "unknown"
-msgstr "����������"
+msgstr "����"
-#: g10/mainproc.c:1521
+#: g10/mainproc.c:1545
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�L�k�ˬdñ���G %s\n"
-#: g10/mainproc.c:1590 g10/mainproc.c:1606 g10/mainproc.c:1672
+#: g10/mainproc.c:1614 g10/mainproc.c:1630 g10/mainproc.c:1716
msgid "not a detached signature\n"
msgstr "���O�@��������ñ��\n"
-#: g10/mainproc.c:1617
+#: g10/mainproc.c:1657
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "ĵ�i�G������h��ñ���C�馳�Ĥ@��ñ���׷|�Q�ֿ�C\n"
-#: g10/mainproc.c:1621
+#: g10/mainproc.c:1665
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���� 0x%02x ���W��ñ��\n"
-#: g10/mainproc.c:1678
+#: g10/mainproc.c:1722
msgid "old style (PGP 2.x) signature\n"
msgstr "�«� (PGP 2.x) ñ��\n"
-#: g10/mainproc.c:1684
+#: g10/mainproc.c:1732
msgid "invalid root packet detected in proc_tree()\n"
msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
@@ -3651,7 +3707,7 @@ msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
#: g10/misc.c:300
msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �K�X�k�~���Ҳդ��s�b\n"
+msgstr "IDEA �s�K�k�~���Ҳդ��s�b\n"
#: g10/misc.c:301
msgid ""
@@ -3673,12 +3729,17 @@ msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
msgid "please use \"%s%s\" instead\n"
msgstr "��H \"%s%s\" �N��\n"
-#: g10/parse-packet.c:120
+#: g10/misc.c:593
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
+
+#: g10/parse-packet.c:121
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "�L�k�ާ@���}���_�t��k %d\n"
-#: g10/parse-packet.c:1069
+#: g10/parse-packet.c:1083
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
@@ -3877,8 +3938,8 @@ msgid "failed sending to `%s': status=%u\n"
msgstr "�ǰe�� `%s' ���ɭԥ��ѤF�G���A=%u\n"
#: g10/hkp.c:369
-msgid "this keyserver is not fully HKP compatible\n"
-msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+msgid "this keyserver does not support --search-keys\n"
+msgstr ""
#: g10/hkp.c:519
#, c-format
@@ -3968,52 +4029,54 @@ msgstr "���]���_ %08lX ���l�añ���ɦ]��Y�ӥ���������줸\n"
msgid "key %08lX: no subkey for subkey revocation packet\n"
msgstr "���_ %08lX: �S���l�_�M�P�ʥ]�һݪ��l�_\n"
-#: g10/sign.c:78
-#, fuzzy
+#: g10/sig-check.c:578
+#, fuzzy, c-format
+msgid "key %08lX: no subkey for subkey binding signature\n"
+msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
+
+#: g10/sign.c:79
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^��ñ������J�аO���\n"
-#: g10/sign.c:86
-#, fuzzy
+#: g10/sign.c:87
msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_ñ������J�аO���\n"
-#: g10/sign.c:105
+#: g10/sign.c:106
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "ĵ�i�G�аO %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
-#: g10/sign.c:134
-#, fuzzy
+#: g10/sign.c:135
msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^������J��h URL\n"
-#: g10/sign.c:142
+#: g10/sign.c:143
msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
-msgstr ""
+msgstr "�L�k�b v3 �] PGP 2.x ���A�^�����_����J��h URL\n"
-#: g10/sign.c:155
+#: g10/sign.c:156
#, c-format
msgid ""
"WARNING: unable to %%-expand policy url (too large). Using unexpanded.\n"
-msgstr "ĵ�i�G��h url �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
+msgstr "ĵ�i�G��h URL �� %% �L�k�X�i (�Ӥj�F)�C �{�b�ϥΥ��X�i���C\n"
-#: g10/sign.c:307
+#: g10/sign.c:308
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "�ˬd�w�إߪ�ñ���ɵo�Ϳ��~�G %s\n"
-#: g10/sign.c:316
+#: g10/sign.c:317
#, c-format
msgid "%s signature from: \"%s\"\n"
msgstr "%s ñ���ӦۡG \"%s\"\n"
-#: g10/sign.c:465
+#: g10/sign.c:466
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
-#: g10/sign.c:648
+#: g10/sign.c:649
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
@@ -4027,11 +4090,11 @@ msgstr "�L�k�إ� %s: %s\n"
msgid "forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
-#: g10/sign.c:796
+#: g10/sign.c:797
msgid "signing:"
msgstr "ñ�p�G"
-#: g10/sign.c:895
+#: g10/sign.c:896
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
@@ -4109,9 +4172,9 @@ msgid "NOTE: trustdb not writable\n"
msgstr "�Ъ`�N�G�H����Ʈw���i�g�J\n"
#: g10/tdbio.c:579
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%S: �L�Ī��H����Ʈw\n"
+msgstr "%s: �L�Ī��H����Ʈw\n"
#: g10/tdbio.c:611
#, c-format
@@ -4232,35 +4295,34 @@ msgstr "�H����Ʈw�G�P�B�ƥ��ѡG %s\n"
msgid "no need for a trustdb check\n"
msgstr "�H����Ʈw�ˬd���ݭn\n"
-#: g10/trustdb.c:466 g10/trustdb.c:1771
+#: g10/trustdb.c:466 g10/trustdb.c:1779
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "�]�� %s �i��U�@�Ӹ�Ʈw�ˬd\n"
#: g10/trustdb.c:819
msgid "please do a --check-trustdb\n"
-msgstr ""
+msgstr "��@�� --check-trustdb\n"
#: g10/trustdb.c:823
msgid "checking the trustdb\n"
msgstr "���b�ˬd�H����Ʈw\n"
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1029
#, c-format
msgid "public key %08lX not found: %s\n"
msgstr "���_ %08lX �S���Q���G %s\n"
-#: g10/trustdb.c:1565
+#: g10/trustdb.c:1573
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr ""
+msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
-#: g10/trustdb.c:1619
-#, fuzzy
+#: g10/trustdb.c:1627
msgid "no ultimately trusted keys found\n"
-msgstr "�����H�����_ %08lX �����_�S���Q���\n"
+msgstr "�S������������H�������_\n"
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1645
#, c-format
msgid "public key of ultimately trusted key %08lX not found\n"
msgstr "�����H�����_ %08lX �����_�S���Q���\n"
@@ -4268,7 +4330,7 @@ msgstr "�����H�����_ %08lX �����_�S���Q���\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:1720
#, c-format
msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
msgstr "���b�ˬd�`�� %d ñ�p=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
@@ -4832,9 +4894,9 @@ msgid "Enter JPEG filename for photo ID: "
msgstr "��J�n���@�ۤ� ID �� JPEG �ɦW�G "
#: g10/photoid.c:87
-#, fuzzy, c-format
+#, c-format
msgid "Unable to open photo \"%s\": %s\n"
-msgstr "�L�k������ɸ��|�]�� %s\n"
+msgstr "�L�k�}�ҷӤ� \"%s\": %s\n"
#: g10/photoid.c:97
msgid "Are you sure you want to use it (y/N)? "
@@ -4850,9 +4912,8 @@ msgid "Is this photo correct (y/N/q)? "
msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
#: g10/photoid.c:331
-#, fuzzy
msgid "unable to display photo ID!\n"
-msgstr "�L�k������ɸ��|�]�� %s\n"
+msgstr "�L�k��ܷӤ� ID �I\n"
#: g10/exec.c:48
msgid "no remote program execution supported\n"
@@ -4943,7 +5004,7 @@ msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
#: g10/revoke.c:310 g10/revoke.c:534
msgid "ASCII armored output forced.\n"
-msgstr "�w�j���ϥ� ASCII �ʸ˹L����X\n"
+msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
#: g10/revoke.c:324 g10/revoke.c:548
#, c-format
@@ -5002,34 +5063,33 @@ msgstr ""
"���O�d�U�p�ߡG�p�������W���C�L�t�Υi��|�b�C�L�L\n"
"�{����o�Ǹ�ƼȦs�b�Y�Ө�L�H�]����ݱo�쪺�a��I\n"
-#: g10/revoke.c:614
-#, fuzzy
+#: g10/revoke.c:615
msgid "Please select the reason for the revocation:\n"
msgstr "�п�ܺM�P����]�G\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 "�]�]�\�p�|�Q�n�b�o�̿�� %d �^\n"
-#: g10/revoke.c:667
+#: g10/revoke.c:668
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "�п�J��Ϊ��y�z�F�H�ťզC�����G\n"
-#: g10/revoke.c:695
+#: g10/revoke.c:696
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "�M�P��]�G %s\n"
-#: g10/revoke.c:697
+#: g10/revoke.c:698
msgid "(No description given)\n"
-msgstr "�]�S�����q�y�z�^\n"
+msgstr "�]�S�����w�y�z�^\n"
-#: g10/revoke.c:702
+#: g10/revoke.c:703
msgid "Is this okay? "
msgstr "�o�˥i�H�ܡH "
@@ -5039,7 +5099,7 @@ msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
-"# �۹������H���ȲM��A�إߩ� %s\n"
+"# �۹������H���ȲM��Q�إߩ� %s\n"
"# �]�Х� \"gpg --import-ownertrust\" �Ө��^���̡^\n"
#: g10/tdbdump.c:140
@@ -5074,5 +5134,8 @@ msgstr "�M��H���O���ɿ��~�G %s\n"
msgid "read error: %s\n"
msgstr "�����~�G %s\n"
+#~ msgid "this keyserver is not fully HKP compatible\n"
+#~ msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"
+
#~ msgid "The use of this algorithm is deprecated - create anyway? "
#~ msgstr "�o�Ӻt��k�ä��Q��ij�ϥ� �w �L�צp���٬O�~��ܡH "