1 files changed, 602 insertions, 543 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 42cbee5c4..e43ea5b98 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
-"POT-Creation-Date: 2003-08-21 18:22+0200\n"
+"POT-Creation-Date: 2003-12-03 16:04+0100\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -24,35 +24,39 @@ msgstr "ĵ�i�G���b�ϥΤ��w�����O����I\n"
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "�аѦ� http://www.gnupg.org/faq.html �W�i�@�B����T\n"
 
-#: util/secmem.c:326
+#: util/secmem.c:337
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
 
-#: util/secmem.c:327
+#: util/secmem.c:338
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
 
-#: util/miscutil.c:296 util/miscutil.c:331
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: util/miscutil.c:297 util/miscutil.c:334
+#, fuzzy
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:297 util/miscutil.c:334
+#: util/miscutil.c:298 util/miscutil.c:339
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:298 util/miscutil.c:332
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: util/miscutil.c:300 util/miscutil.c:336
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:299 util/miscutil.c:335
+#: util/miscutil.c:301 util/miscutil.c:340
 msgid "nN"
 msgstr "nN"
 
-#: util/miscutil.c:333 g10/keyedit.c:978
+#. NOTE TO TRANSLATOR: See doc/TRANSLATE about this string.
+#: util/miscutil.c:338 g10/keyedit.c:980
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:336
+#: util/miscutil.c:341
 msgid "qQ"
 msgstr "qQ"
 
@@ -279,7 +283,7 @@ msgstr "�p���@�ӷ岫�F ... (%s:%d)\n"
 msgid "no entropy gathering module detected\n"
 msgstr "��������üƻ`���Ҳ�\n"
 
-#: cipher/random.c:387 g10/keygen.c:1834 g10/import.c:163
+#: cipher/random.c:387 g10/keygen.c:1817 g10/import.c:163
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�L�k�}�� `%s' �G %s\n"
@@ -374,7 +378,12 @@ msgstr ""
 "�еy�ݤ���A�t�Φ��ɥ��b�`���üơC�p�G�p�|ı�o�L�᪺�ܡA\n"
 "�������ǧO���ơA�o�ˤl�Ʀܯ�����üƪ��~���n�C\n"
 
-#: g10/g10.c:305
+#: cipher/primegen.c:310
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr ""
+
+#: g10/g10.c:313
 msgid ""
 "@Commands:\n"
 " "
@@ -382,163 +391,163 @@ msgstr ""
 "@���O�G\n"
 " "
 
-#: g10/g10.c:307
+#: g10/g10.c:315
 msgid "|[file]|make a signature"
 msgstr "|[�ɮ�]|�إߤ@��ñ��"
 
-#: g10/g10.c:308
+#: g10/g10.c:316
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ɮ�]|�إߤ@������ñ��"
 
-#: g10/g10.c:309
+#: g10/g10.c:317
 msgid "make a detached signature"
 msgstr "�إߤ@��������ñ��"
 
-#: g10/g10.c:310
+#: g10/g10.c:318
 msgid "encrypt data"
 msgstr "�[�K���"
 
-#: g10/g10.c:311
+#: g10/g10.c:320
 msgid "|[files]|encrypt files"
 msgstr "|[�ɮ�]|�[�K�ɮ�"
 
-#: g10/g10.c:312
+#: g10/g10.c:321
 msgid "encryption only with symmetric cipher"
 msgstr "�Ȩϥι�٦��s�K�k�ӥ[�K"
 
-#: g10/g10.c:313
+#: g10/g10.c:322
 msgid "store only"
 msgstr "���x�s"
 
-#: g10/g10.c:314
+#: g10/g10.c:323
 msgid "decrypt data (default)"
 msgstr "��ƸѱK(�w�])"
 
-#: g10/g10.c:315
+#: g10/g10.c:324
 msgid "|[files]|decrypt files"
 msgstr "|[�ɮ�]|�ɮ׸ѱK"
 
-#: g10/g10.c:316
+#: g10/g10.c:325
 msgid "verify a signature"
 msgstr "���ҬY��ñ��"
 
-#: g10/g10.c:318
+#: g10/g10.c:327
 msgid "list keys"
 msgstr "�C�X���_"
 
-#: g10/g10.c:320
+#: g10/g10.c:329
 msgid "list keys and signatures"
 msgstr "�C�X���_�Mñ��"
 
-#: g10/g10.c:321
+#: g10/g10.c:330
 msgid "check key signatures"
 msgstr "�ˬd���_ñ��"
 
-#: g10/g10.c:322
+#: g10/g10.c:331
 msgid "list keys and fingerprints"
 msgstr "�C�X���_�M����"
 
-#: g10/g10.c:323
+#: g10/g10.c:332
 msgid "list secret keys"
 msgstr "�C�X�p�_"
 
-#: g10/g10.c:324
+#: g10/g10.c:333
 msgid "generate a new key pair"
 msgstr "���ͤ@���s�����_��"
 
-#: g10/g10.c:325
+#: g10/g10.c:334
 msgid "remove keys from the public keyring"
 msgstr "�q���_�_�Ͱ�̲��h���_"
 
-#: g10/g10.c:327
+#: g10/g10.c:336
 msgid "remove keys from the secret keyring"
 msgstr "�q�p�_�_�Ͱ�̲��h���_"
 
-#: g10/g10.c:328
+#: g10/g10.c:337
 msgid "sign a key"
 msgstr "ñ�p�Y����_"
 
-#: g10/g10.c:329
+#: g10/g10.c:338
 msgid "sign a key locally"
 msgstr "�Ȧb���añ�p�Y����_"
 
-#: g10/g10.c:330
+#: g10/g10.c:339
 msgid "sign a key non-revocably"
 msgstr "�H���i�M�P�Ҧ���ñ�p�Y����_"
 
-#: g10/g10.c:331
+#: g10/g10.c:340
 msgid "sign a key locally and non-revocably"
 msgstr "�Ȧb���a�H���i�M�P�Ҧ���ñ�p�Y����_"
 
-#: g10/g10.c:332
+#: g10/g10.c:341
 msgid "sign or edit a key"
 msgstr "ñ�p�νs��Y����_"
 
-#: g10/g10.c:333
+#: g10/g10.c:342
 msgid "generate a revocation certificate"
 msgstr "���ͤ@���M�P����"
 
-#: g10/g10.c:335
+#: g10/g10.c:344
 msgid "export keys"
 msgstr "�ץX���_"
 
-#: g10/g10.c:336
+#: g10/g10.c:345
 msgid "export keys to a key server"
 msgstr "����_�ץX�ܬY�Ӫ��_���A���W"
 
-#: g10/g10.c:337
+#: g10/g10.c:346
 msgid "import keys from a key server"
 msgstr "�q�Y�Ӫ��_���A���W�פJ���_"
 
-#: g10/g10.c:339
+#: g10/g10.c:348
 msgid "search for keys on a key server"
 msgstr "�b�Y�Ӫ��_���A���W�j�M���_"
 
-#: g10/g10.c:341
+#: g10/g10.c:350
 msgid "update all keys from a keyserver"
 msgstr "�q�Y�Ӫ��_���A���W��s�Ҧ������_"
 
-#: g10/g10.c:345
+#: g10/g10.c:354
 msgid "import/merge keys"
 msgstr "�פJ/�X�֪��_"
 
-#: g10/g10.c:347
+#: g10/g10.c:356
 msgid "list only the sequence of packets"
 msgstr "�ȦC�X�ʥ]�ǦC"
 
-#: g10/g10.c:349
+#: g10/g10.c:358
 msgid "export the ownertrust values"
 msgstr "�ץX�D�[�H����"
 
-#: g10/g10.c:351
+#: g10/g10.c:360
 msgid "import ownertrust values"
 msgstr "�פJ�D�[�H����"
 
-#: g10/g10.c:353
+#: g10/g10.c:362
 msgid "update the trust database"
 msgstr "��s�H����Ʈw"
 
-#: g10/g10.c:355
+#: g10/g10.c:364
 msgid "unattended trust database update"
 msgstr "��s�����[���H����Ʈw"
 
-#: g10/g10.c:356
+#: g10/g10.c:365
 msgid "fix a corrupted trust database"
 msgstr "�״_�Y�Ӥw�l�����H����Ʈw"
 
-#: g10/g10.c:357
+#: g10/g10.c:366
 msgid "De-Armor a file or stdin"
 msgstr "�q�ɮשμзǿ�J�Ѷ}�ʸ�"
 
-#: g10/g10.c:359
+#: g10/g10.c:368
 msgid "En-Armor a file or stdin"
 msgstr "�q�ɮשμзǿ�J�i��ʸ�"
 
-#: g10/g10.c:361
+#: g10/g10.c:370
 msgid "|algo [files]|print message digests"
 msgstr "|�t��k [�ɮ�]|�L�X�T���K�n"
 
-#: g10/g10.c:365 g10/gpgv.c:64
+#: g10/g10.c:374 g10/gpgv.c:64
 msgid ""
 "@\n"
 "Options:\n"
@@ -548,195 +557,195 @@ msgstr ""
 "�ﶵ�G\n"
 " "
 
-#: g10/g10.c:367
+#: g10/g10.c:376
 msgid "create ascii armored output"
 msgstr "�إߥH ASCII �ʸ˹L����X"
 
-#: g10/g10.c:369
+#: g10/g10.c:378
 msgid "|NAME|encrypt for NAME"
 msgstr "|�W�r|�H�u�W�r�v�@���[�K��H"
 
-#: g10/g10.c:372
+#: g10/g10.c:381
 msgid "|NAME|use NAME as default recipient"
 msgstr "|�W�r|�H�u�W�r�v�אּ�w�]�������"
 
-#: g10/g10.c:374
+#: g10/g10.c:383
 msgid "use the default key as default recipient"
 msgstr "��w�]�����_���@�w�]�������"
 
-#: g10/g10.c:380
+#: g10/g10.c:389
 msgid "use this user-id to sign or decrypt"
 msgstr "�ϥγo�ӨϥΪ� ID ��ñ�p�θѱK"
 
-#: g10/g10.c:381
+#: g10/g10.c:390
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|�]�w���Y���Ŭ� N (0 ���ܤ����Y)"
 
-#: g10/g10.c:383
+#: g10/g10.c:392
 msgid "use canonical text mode"
 msgstr "�ϥμзǪ���r�Ҧ�"
 
-#: g10/g10.c:391
+#: g10/g10.c:400
 msgid "use as output file"
 msgstr "���@��X�ɮרӨϥ�"
 
-#: g10/g10.c:392 g10/gpgv.c:66
+#: g10/g10.c:401 g10/gpgv.c:66
 msgid "verbose"
 msgstr "�o���Ҧ�"
 
-#: g10/g10.c:393 g10/gpgv.c:67
+#: g10/g10.c:402 g10/gpgv.c:67
 msgid "be somewhat more quiet"
 msgstr "�ɶq�w�R��"
 
-#: g10/g10.c:394
+#: g10/g10.c:403
 msgid "don't use the terminal at all"
 msgstr "�������n�ϥβ׺�"
 
-#: g10/g10.c:395
+#: g10/g10.c:404
 msgid "force v3 signatures"
 msgstr "�j���ϥβĤT��ñ��"
 
-#: g10/g10.c:396
+#: g10/g10.c:405
 msgid "do not force v3 signatures"
 msgstr "���n�j���ϥβĤT��ñ��"
 
-#: g10/g10.c:397
+#: g10/g10.c:406
 msgid "force v4 key signatures"
 msgstr "�j���ϥβĥ|�����_ñ��"
 
-#: g10/g10.c:398
+#: g10/g10.c:407
 msgid "do not force v4 key signatures"
 msgstr "���n�j���ϥβĥ|�����_ñ��"
 
-#: g10/g10.c:399
+#: g10/g10.c:408
 msgid "always use a MDC for encryption"
 msgstr "�`�O�� MDC �ӥ[�K"
 
-#: g10/g10.c:401
+#: g10/g10.c:410
 msgid "never use a MDC for encryption"
 msgstr "�û����n�� MDC �ӥ[�K"
 
-#: g10/g10.c:403
+#: g10/g10.c:412
 msgid "do not make any changes"
 msgstr "���n���������"
 
-#: g10/g10.c:404
+#: g10/g10.c:413
 msgid "prompt before overwriting"
 msgstr "�мg�e���߰�"
 
-#: g10/g10.c:405
+#: g10/g10.c:414
 msgid "use the gpg-agent"
 msgstr "�ϥ� gpg-agent �N�z�{��"
 
-#: g10/g10.c:408
+#: g10/g10.c:417
 msgid "batch mode: never ask"
 msgstr "�妸�Ҧ��G�û����߰�"
 
-#: g10/g10.c:409
+#: g10/g10.c:418
 msgid "assume yes on most questions"
 msgstr "���]�j�h�ư��D���^�����u�O�v"
 
-#: g10/g10.c:410
+#: g10/g10.c:419
 msgid "assume no on most questions"
 msgstr "���]�j�h�ư��D���^�����u�_�v"
 
-#: g10/g10.c:411
+#: g10/g10.c:420
 msgid "add this keyring to the list of keyrings"
 msgstr "��o���_�Ͱ�[�i�_�Ͱ�M�椤"
 
-#: g10/g10.c:412
+#: g10/g10.c:421
 msgid "add this secret keyring to the list"
 msgstr "��o�Өp�_�_�Ͱ�[�i�M�椤"
 
-#: g10/g10.c:413
+#: g10/g10.c:422
 msgid "show which keyring a listed key is on"
 msgstr "��ܳQ�C�X�����_�b���@���_�Ͱ�W"
 
-#: g10/g10.c:414
+#: g10/g10.c:423
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�W�r|�ϥΡu�W�r�v���@�w�]�p�_"
 
-#: g10/g10.c:415
+#: g10/g10.c:424
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�D��|�ϥγo�Ӫ��_���A���ӴM����_"
 
-#: g10/g10.c:419
+#: g10/g10.c:428
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|�W��|�]�w�׺ݦr�������u�W�١v"
 
-#: g10/g10.c:420
+#: g10/g10.c:429
 msgid "read options from file"
 msgstr "�q�ɮ�Ū���ﶵ"
 
-#: g10/g10.c:424 g10/gpgv.c:71
+#: g10/g10.c:433 g10/gpgv.c:71
 msgid "|FD|write status info to this FD"
 msgstr "|�ɮ״y�z|�⪬�A��T�g�J���ɮ״y�z"
 
-#: g10/g10.c:426
+#: g10/g10.c:435
 msgid "|[file]|write status info to file"
 msgstr "|[�ɮ�]|�⪬�A��T�g�J�ɮ�"
 
-#: g10/g10.c:438
+#: g10/g10.c:447
 msgid "|KEYID|ultimately trust this key"
 msgstr "|���_ID|�����H�������_"
 
-#: g10/g10.c:439
+#: g10/g10.c:448
 msgid "|FILE|load extension module FILE"
 msgstr "|�ɮ�|���J�����Ҳ��ɮ�"
 
-#: g10/g10.c:445
+#: g10/g10.c:454
 msgid "emulate the mode described in RFC1991"
 msgstr "�ɶq�ҥ� RFC1991 �̩Ҵy�z���Ҧ�"
 
-#: g10/g10.c:447
+#: g10/g10.c:456
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "��Ҧ����ʥ]�B�s�K�k�M�K�n�ﶵ�վ㦨 OpenPGP ���A"
 
-#: g10/g10.c:448
+#: g10/g10.c:457
 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:461
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ϥμҦ� N ���K�X��"
 
-#: g10/g10.c:454
+#: g10/g10.c:463
 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:465
 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:467
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�W��|�ϥΡu�W�١v�s�K�t��k"
 
-#: g10/g10.c:459
+#: g10/g10.c:468
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�W��|�ϥΡu�W�١v�T���K�n�t��k"
 
-#: g10/g10.c:461
+#: g10/g10.c:470
 msgid "|N|use compress algorithm N"
 msgstr "|N|�ϥ� N ���Y�t��k"
 
-#: g10/g10.c:462
+#: g10/g10.c:471
 msgid "throw keyid field of encrypted packets"
 msgstr "�q�w�[�K���ʥ]�������_ ID �϶�"
 
-#: g10/g10.c:463
+#: g10/g10.c:472
 msgid "Show Photo IDs"
 msgstr "��ܷӤ� ID"
 
-#: g10/g10.c:464
+#: g10/g10.c:473
 msgid "Don't show Photo IDs"
 msgstr "����ܷӤ� ID"
 
-#: g10/g10.c:465
+#: g10/g10.c:474
 msgid "Set command line to view Photo IDs"
 msgstr "�]�w�[�ݷӤ� ID �ɭn�Ϊ��R�O�C"
 
-#: g10/g10.c:472
+#: g10/g10.c:481
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -744,7 +753,7 @@ msgstr ""
 "@\n"
 "(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
 
-#: g10/g10.c:475
+#: g10/g10.c:484
 msgid ""
 "@\n"
 "Examples:\n"
@@ -764,15 +773,15 @@ msgstr ""
 " --list-keys [�W�r]         ��ܪ��_\n"
 " --fingerprint [�W�r]       ��ܫ���\n"
 
-#: g10/g10.c:635 g10/gpgv.c:95
+#: g10/g10.c:646 g10/gpgv.c:95
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
 
-#: g10/g10.c:639
+#: g10/g10.c:663
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
 
-#: g10/g10.c:642
+#: g10/g10.c:666
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -782,7 +791,7 @@ msgstr ""
 "ñ�p�B�ˬd�B�[�K�θѱK\n"
 "�w�]���ާ@�|�̿�J��Ʀөw\n"
 
-#: g10/g10.c:653
+#: g10/g10.c:677
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -790,367 +799,377 @@ msgstr ""
 "\n"
 "�w�Q�䴩���t��k�G\n"
 
-#: g10/g10.c:656
+#: g10/g10.c:680
 msgid "Pubkey: "
 msgstr "���_�G "
 
-#: g10/g10.c:662 g10/keyedit.c:1568
+#: g10/g10.c:686 g10/keyedit.c:1570
 msgid "Cipher: "
 msgstr "�s�K�k�G "
 
-#: g10/g10.c:668
+#: g10/g10.c:692
 msgid "Hash: "
 msgstr "����G "
 
-#: g10/g10.c:674 g10/keyedit.c:1614
+#: g10/g10.c:698 g10/keyedit.c:1616
 msgid "Compression: "
 msgstr "���Y�G "
 
-#: g10/g10.c:757
+#: g10/g10.c:781
 msgid "usage: gpg [options] "
 msgstr "�Ϊk�G gpg [�ﶵ] "
 
-#: g10/g10.c:825
+#: g10/g10.c:849
 msgid "conflicting commands\n"
 msgstr "���O�����٬�\n"
 
-#: g10/g10.c:843
+#: g10/g10.c:867
 #, c-format
 msgid "no = sign found in group definition \"%s\"\n"
 msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
 
-#: g10/g10.c:1011
+#: g10/g10.c:1035
 #, c-format
 msgid "WARNING: unsafe ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1038
 #, c-format
 msgid "WARNING: unsafe permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1041
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1045
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on %s \"%s\"\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1222
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
 
-#: g10/g10.c:1233
+#: g10/g10.c:1258
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1262
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�ﶵ�� `%s' �G %s\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1269
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�q `%s' Ū���ﶵ\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1469
 #, 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:1563
+#: g10/g10.c:1600
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:1581
+#: g10/g10.c:1618
 msgid "could not parse keyserver URI\n"
 msgstr "�L�k���R���_���A�� URI\n"
 
-#: g10/g10.c:1590
+#: g10/g10.c:1627
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1593
+#: g10/g10.c:1630
 msgid "invalid import options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:1600
+#: g10/g10.c:1637
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1603
+#: g10/g10.c:1640
 msgid "invalid export options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1646
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�L�k������ɸ��|�]�� %s\n"
 
-#: g10/g10.c:1736
+#: g10/g10.c:1787
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
 
-#: g10/g10.c:1740
+#: g10/g10.c:1791
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
 
-#: g10/g10.c:1747 g10/g10.c:1758
+#: g10/g10.c:1798 g10/g10.c:1809
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "�Ъ`�N�G�@�뱡�p�U���|�Ψ� %s�I\n"
 
-#: g10/g10.c:1749
+#: g10/g10.c:1800
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ���Q���\�� %s �֥�\n"
 
-#: g10/g10.c:1752
+#: g10/g10.c:1803
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1824
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1830
 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:1785
+#: g10/g10.c:1836
 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:1798
+#: g10/g10.c:1849
 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:1869 g10/g10.c:1887
+#: g10/g10.c:1916 g10/g10.c:1934
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:1875 g10/g10.c:1893
+#: g10/g10.c:1922 g10/g10.c:1940
 msgid "selected digest algorithm is invalid\n"
 msgstr "�ҿ諸�K�n�t��k�L��\n"
 
-#: g10/g10.c:1881
+#: g10/g10.c:1928
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
 
-#: g10/g10.c:1896
+#: g10/g10.c:1944
+#, fuzzy, c-format
+msgid "compress algorithm `%s' is read-only in this release\n"
+msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
+
+#: g10/g10.c:1948
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���Y�t��k�@�w�n���� %d �� %d ����\n"
 
-#: g10/g10.c:1898
+#: g10/g10.c:1950
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �@�w�n�j�� 0\n"
 
-#: g10/g10.c:1900
+#: g10/g10.c:1952
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �@�w�n�j�� 1\n"
 
-#: g10/g10.c:1902
+#: g10/g10.c:1954
 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:1905
+#: g10/g10.c:1957
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
 
-#: g10/g10.c:1909
+#: g10/g10.c:1961
 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:1913
+#: g10/g10.c:1965
 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:1919
+#: g10/g10.c:1971
 msgid "invalid default preferences\n"
 msgstr "�L�Ī��w�]���n\n"
 
-#: g10/g10.c:1927
+#: g10/g10.c:1979
 msgid "invalid personal cipher preferences\n"
 msgstr "�L�Ī��ӤH�s�K�k���n\n"
 
-#: g10/g10.c:1931
+#: g10/g10.c:1983
 msgid "invalid personal digest preferences\n"
 msgstr "�L�Ī��ӤH�K�n���n\n"
 
-#: g10/g10.c:1935
+#: g10/g10.c:1987
 msgid "invalid personal compress preferences\n"
 msgstr "�L�Ī��ӤH���Y���n\n"
 
-#: g10/g10.c:1978
+#: g10/g10.c:2017
+#, fuzzy, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
+
+#: g10/g10.c:2061
 #, 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:1983
+#: g10/g10.c:2066
 #, 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:1988
+#: g10/g10.c:2071
 #, 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:2081
+#: g10/g10.c:2163
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/g10.c:2091
+#: g10/g10.c:2173
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
 
-#: g10/g10.c:2101
+#: g10/g10.c:2183
 msgid "--store [filename]"
 msgstr "--store [�ɦW]"
 
-#: g10/g10.c:2108
+#: g10/g10.c:2190
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ɦW]"
 
-#: g10/g10.c:2116
+#: g10/g10.c:2202
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ɦW]"
 
-#: g10/g10.c:2133
+#: g10/g10.c:2217
 msgid "--sign [filename]"
 msgstr "--sign [�ɦW]"
 
-#: g10/g10.c:2146
+#: g10/g10.c:2230
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:2160
+#: g10/g10.c:2244
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ɦW]"
 
-#: g10/g10.c:2169
+#: g10/g10.c:2253
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ɦW]"
 
-#: g10/g10.c:2187
+#: g10/g10.c:2278
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ɦW]"
 
-#: g10/g10.c:2198
+#: g10/g10.c:2286
 msgid "--sign-key user-id"
 msgstr "--sign-key �ϥΪ�ID"
 
-#: g10/g10.c:2206
+#: g10/g10.c:2294
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2214
+#: g10/g10.c:2302
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2222
+#: g10/g10.c:2310
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �ϥΪ�ID"
 
-#: g10/g10.c:2230
+#: g10/g10.c:2318
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �ϥΪ�ID [���O]"
 
-#: g10/g10.c:2286 g10/encode.c:426 g10/sign.c:801
+#: g10/g10.c:2374 g10/encode.c:419 g10/sign.c:804
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "�L�k�}�� %s: %s\n"
 
-#: g10/g10.c:2301
+#: g10/g10.c:2389
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
 
-#: g10/g10.c:2339
+#: g10/g10.c:2426
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2341
+#: g10/g10.c:2428
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2430
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2355
+#: g10/g10.c:2441
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:2365
+#: g10/g10.c:2451
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/g10.c:2406
+#: g10/g10.c:2492
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2414
+#: g10/g10.c:2500
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:2501
+#: g10/g10.c:2587
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�L�Ī� `%s' ����t��k\n"
 
-#: g10/g10.c:2587
+#: g10/g10.c:2673
 msgid "[filename]"
 msgstr "[�ɦW]"
 
-#: g10/g10.c:2591
+#: g10/g10.c:2677
 msgid "Go ahead and type your message ...\n"
 msgstr "�ж}�l��J�p���T�� ...\n"
 
-#: g10/g10.c:2594 g10/decrypt.c:61 g10/decrypt.c:110 g10/verify.c:95
+#: g10/g10.c:2680 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:2867
+#: g10/g10.c:2953
 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"
 
-#: g10/g10.c:2876
+#: g10/g10.c:2962
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
 
-#: g10/g10.c:2886
+#: g10/g10.c:2972
 msgid "a notation value must not use any control characters\n"
 msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
 
-#: g10/g10.c:2921
+#: g10/g10.c:3007
 msgid "the given certification policy URL is invalid\n"
 msgstr "���w�������ҭ�h URL �L��\n"
 
-#: g10/g10.c:2923
+#: g10/g10.c:3009
 msgid "the given signature policy URL is invalid\n"
 msgstr "���w����h URL �L��\n"
 
@@ -1197,7 +1216,7 @@ msgstr "�h�h����ñ��\n"
 
 #: g10/armor.c:544
 msgid "invalid dash escaped line: "
-msgstr "�L�Ī��}�鸹���X�C�G "
+msgstr "�L�Ī��}�鸹�h�X�C�G "
 
 #: g10/armor.c:556
 msgid "unexpected armor:"
@@ -1245,11 +1264,11 @@ msgstr "�L�Ī��ʸˡG�C���W�X %d �r��\n"
 #: g10/armor.c:1082
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "�ʸ˸̥X�{�Q�޸��������i�C�L�r�� �w �]�\���H�ΤF���岫�� MTA\n"
+msgstr "�ʸ˸̥X�{�Q�޸��A�����i�C�L�r�� �w �i��O���岫���e�H�{���y����\n"
 
 #: g10/pkclist.c:63 g10/revoke.c:603
 msgid "No reason specified"
-msgstr "�S���S�O����]"
+msgstr "�����w��]"
 
 #: g10/pkclist.c:65 g10/revoke.c:605
 msgid "Key is superseded"
@@ -1289,7 +1308,7 @@ msgstr ""
 "�U�C���بS���������H���ȡG\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:290 g10/mainproc.c:1451
+#: g10/pkclist.c:290 g10/mainproc.c:1490
 msgid "                aka \""
 msgstr "                ��Y \""
 
@@ -1412,7 +1431,7 @@ msgid ""
 "you may answer the next question with yes\n"
 "\n"
 msgstr ""
-"�o����_�� *��* �ݩ�o�ӨϥΪ� ID �̪����ӤH�C\n"
+"�o����_�� *��* �T�w�ݩ�ϥΪ� ID �̪����ӤH�C\n"
 "���D�p **�u��** ���D�ۤv�b���ƻ�A\n"
 "�_�h�p�̦n�b�U�@�Ӱ��D�^�� no\n"
 
@@ -1578,49 +1597,30 @@ msgstr "   (%d) DSA (�ȯ�ñ�p��)\n"
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�ȯ�[�K��)\n"
 
-#: g10/keygen.c:962
-#, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (��ñ�p�Υ[�K)\n"
-
-#: g10/keygen.c:963
+#: g10/keygen.c:961
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (�ȯ�ñ�p��)\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:963
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 
-#: g10/keygen.c:967
+#: g10/keygen.c:965
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (��ñ�p�Υ[�K)\n"
 
-#: g10/keygen.c:970
+#: g10/keygen.c:968
 msgid "Your selection? "
 msgstr "�p�n����@�ӡH "
 
-#: g10/keygen.c:996
-msgid ""
-"The use of this algorithm is only supported by GnuPG.  You will not be\n"
-"able to use this key to communicate with PGP users.  This algorithm is also\n"
-"very slow, and may not be as secure as the other choices.\n"
-msgstr ""
-"�Ъ`�N�A�馳 GnuPG �פ䴩�o�Ӻt��k�C�γo�Ӻt��k�إߪ����_\n"
-"�|�S����k�� PGP �ϥΪ̤��q�C�P�ɳo�Ӻt��k�D�`�a�w�C�A\n"
-"�ӥB�i��]���p��L�t��k�ӱo�w���C\n"
-
-#: g10/keygen.c:1001
-msgid "Create anyway? "
-msgstr "�L�צp���٬O�n�إ߶ܡH "
-
-#: g10/keygen.c:1019 g10/keyedit.c:666 g10/revoke.c:665
+#: g10/keygen.c:1002 g10/keyedit.c:666 g10/revoke.c:665
 msgid "Invalid selection.\n"
 msgstr "�L�Ī���ܡC\n"
 
-#: g10/keygen.c:1032
+#: g10/keygen.c:1015
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1633,19 +1633,19 @@ msgstr ""
 "        �w�]�����_�ؤo�O 1024 �줸\n"
 "    ��ij���̤j���_�ؤo�O 2048 �줸\n"
 
-#: g10/keygen.c:1041
+#: g10/keygen.c:1024
 msgid "What keysize do you want? (1024) "
 msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
 
-#: g10/keygen.c:1046
+#: g10/keygen.c:1029
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA �����_�ؤo��श�� 512 �M 1024 ����\n"
 
-#: g10/keygen.c:1048
+#: g10/keygen.c:1031
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1034
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
 
@@ -1657,12 +1657,12 @@ msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\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:1062
+#: g10/keygen.c:1045
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "���_�ؤo�Ӥj�F�̤j�����Ψ� %d �C\n"
 
-#: g10/keygen.c:1067
+#: g10/keygen.c:1050
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1670,27 +1670,27 @@ msgstr ""
 "����ij�ϥΤj�� 2048 �����_�ؤo�A\n"
 "�]���p�� *�u��* �|��h�ܦh�ɶ��I\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1053
 msgid "Are you sure that you want this keysize? "
 msgstr "�p�T�w�n�γo�Ӫ��_�ؤo�ܡH "
 
-#: g10/keygen.c:1071
+#: g10/keygen.c:1054
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr "�n�A���O�аO���p���ù��M��L�]�O�۷��e���Q�s�����z�I�I\n"
 
-#: g10/keygen.c:1080
+#: g10/keygen.c:1063
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�p�ҭn�D�����_�ؤo�O %u �줸\n"
 
-#: g10/keygen.c:1083 g10/keygen.c:1087
+#: g10/keygen.c:1066 g10/keygen.c:1070
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�[�j�� %u �줸\n"
 
-#: g10/keygen.c:1138
+#: g10/keygen.c:1121
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1706,7 +1706,7 @@ msgstr ""
 "      <n>m = ���_�b n ���|�L��\n"
 "      <n>y = ���_�b n �~��|�L��\n"
 
-#: g10/keygen.c:1147
+#: g10/keygen.c:1130
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1722,30 +1722,30 @@ msgstr ""
 "      <n>m = �b n ���|�L��\n"
 "      <n>y = �b n �~��|�L��\n"
 
-#: g10/keygen.c:1169
+#: g10/keygen.c:1152
 msgid "Key is valid for? (0) "
 msgstr "���_�����Ĵ����O�h�[�H (0) "
 
-#: g10/keygen.c:1171
+#: g10/keygen.c:1154
 msgid "Signature is valid for? (0) "
 msgstr "ñ�������Ĵ����O�h�[�H (0) "
 
-#: g10/keygen.c:1176
+#: g10/keygen.c:1159
 msgid "invalid value\n"
 msgstr "�L�Ī��ƭ�\n"
 
-#: g10/keygen.c:1181
+#: g10/keygen.c:1164
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s �������|�L��\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:1188
+#: g10/keygen.c:1171
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s �N�|�b %s �L��\n"
 
-#: g10/keygen.c:1194
+#: g10/keygen.c:1177
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1753,11 +1753,11 @@ msgstr ""
 "�p���t�εL�k��� 2038 �~�H�᪺����C\n"
 "���L�A���i�H���T�B�z���� 2106 �~���e���~���C\n"
 
-#: g10/keygen.c:1199
+#: g10/keygen.c:1182
 msgid "Is this correct (y/n)? "
 msgstr "�H�W���T�ܡH (y/n) "
 
-#: g10/keygen.c:1242
+#: g10/keygen.c:1225
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1772,44 +1772,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1254
+#: g10/keygen.c:1237
 msgid "Real name: "
 msgstr "�u��m�W�G "
 
-#: g10/keygen.c:1262
+#: g10/keygen.c:1245
 msgid "Invalid character in name\n"
 msgstr "�m�W�t���L�Ī��r��\n"
 
-#: g10/keygen.c:1264
+#: g10/keygen.c:1247
 msgid "Name may not start with a digit\n"
 msgstr "�m�W���i�H�μƦr�}�Y\n"
 
-#: g10/keygen.c:1266
+#: g10/keygen.c:1249
 msgid "Name must be at least 5 characters long\n"
 msgstr "�m�W�ܤ֭n�����Ӧr�Ū�\n"
 
-#: g10/keygen.c:1274
+#: g10/keygen.c:1257
 msgid "Email address: "
 msgstr "�q�l�l��a�}�G "
 
-#: g10/keygen.c:1285
+#: g10/keygen.c:1268
 msgid "Not a valid email address\n"
 msgstr "���O���Ī��q�l�l��a�}\n"
 
-#: g10/keygen.c:1293
+#: g10/keygen.c:1276
 msgid "Comment: "
 msgstr "�����G "
 
-#: g10/keygen.c:1299
+#: g10/keygen.c:1282
 msgid "Invalid character in comment\n"
 msgstr "�����t���L�Ī��r��\n"
 
-#: g10/keygen.c:1322
+#: g10/keygen.c:1305
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�p���b�ϥ� `%s' �r�����C\n"
 
-#: g10/keygen.c:1328
+#: g10/keygen.c:1311
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1820,27 +1820,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1334
+#: g10/keygen.c:1317
 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:1339
+#: g10/keygen.c:1322
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1349
+#: g10/keygen.c:1332
 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:1350
+#: g10/keygen.c:1333
 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:1369
+#: g10/keygen.c:1352
 msgid "Please correct the error first\n"
 msgstr "���q�����~\n"
 
-#: g10/keygen.c:1408
+#: g10/keygen.c:1391
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1848,16 +1848,16 @@ msgstr ""
 "�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
 "\n"
 
-#: g10/keygen.c:1417 g10/keyedit.c:864
+#: g10/keygen.c:1400 g10/keyedit.c:864
 msgid "passphrase not correctly repeated; try again"
 msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
 
-#: g10/keygen.c:1418
+#: g10/keygen.c:1401
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1407
 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"
@@ -1869,7 +1869,7 @@ msgstr ""
 "�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
 "\n"
 
-#: g10/keygen.c:1445
+#: g10/keygen.c:1428
 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"
@@ -1880,53 +1880,53 @@ msgstr ""
 "�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
 "�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
 
-#: g10/keygen.c:2010
+#: g10/keygen.c:1993
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ���_��|�� 1024 �줸�C\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2057
 msgid "Key generation canceled.\n"
 msgstr "�w�������_���͡C\n"
 
-#: g10/keygen.c:2181 g10/keygen.c:2269
+#: g10/keygen.c:2164 g10/keygen.c:2252
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "���b�N���_�g�� `%s'\n"
 
-#: g10/keygen.c:2182 g10/keygen.c:2271
+#: g10/keygen.c:2165 g10/keygen.c:2254
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/keygen.c:2258
+#: g10/keygen.c:2241
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2264
+#: g10/keygen.c:2247
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2278
+#: g10/keygen.c:2261
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2285
+#: g10/keygen.c:2268
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2305
+#: g10/keygen.c:2288
 msgid "public and secret key created and signed.\n"
 msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
 
-#: g10/keygen.c:2306
+#: g10/keygen.c:2289
 msgid "key marked as ultimately trusted.\n"
 msgstr "���_�w�Q�аO�������H���F�C\n"
 
-#: g10/keygen.c:2317
+#: g10/keygen.c:2300
 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"
@@ -1934,95 +1934,95 @@ msgstr ""
 "�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
 "�Ӳ��ͦ��_�צ�C\n"
 
-#: g10/keygen.c:2329 g10/keygen.c:2448
+#: g10/keygen.c:2312 g10/keygen.c:2431
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/keygen.c:2375 g10/sign.c:261
+#: g10/keygen.c:2358 g10/sign.c:261
 #, 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:2377 g10/sign.c:263
+#: g10/keygen.c:2360 g10/sign.c:263
 #, 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:2386
+#: g10/keygen.c:2369
 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:2415
+#: g10/keygen.c:2398
 msgid "Really create? "
 msgstr "�u���n�إ߶ܡH "
 
-#: g10/decrypt.c:96 g10/encode.c:775
+#: g10/decrypt.c:96 g10/encode.c:767
 msgid "--output doesn't work for this command\n"
 msgstr "--output �b�o�өR�O���S���@��\n"
 
-#: g10/encode.c:178 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180
+#: g10/encode.c:176 g10/tdbio.c:508 g10/tdbio.c:569 g10/openfile.c:180
 #: g10/openfile.c:316
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: �L�k�}�ҡG %s\n"
 
-#: g10/encode.c:209 g10/sign.c:1055
+#: g10/encode.c:207 g10/sign.c:1058
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
 
-#: g10/encode.c:214
+#: g10/encode.c:212
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "�]���B�� S2K �Ҧ��U�ӵL�k�ϥι�٦� ESK �ʥ]\n"
 
-#: g10/encode.c:233 g10/encode.c:497
+#: g10/encode.c:229 g10/encode.c:490
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' �w�g�Q���Y�F\n"
 
-#: g10/encode.c:302 g10/encode.c:534
+#: g10/encode.c:298 g10/encode.c:527
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ĵ�i�G�o�O���ɮ�\n"
 
-#: g10/encode.c:417
+#: g10/encode.c:410
 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"
 
-#: g10/encode.c:432
+#: g10/encode.c:425
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "���b�q `%s' Ū����\n"
 
-#: g10/encode.c:468
+#: g10/encode.c:461
 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:478 g10/encode.c:662
+#: g10/encode.c:471 g10/encode.c:654
 #, 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:569 g10/sign.c:776
 #, c-format
 msgid "forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) ���Y�t��k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/encode.c:721
+#: g10/encode.c:713
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/encode.c:748
+#: g10/encode.c:740
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s �w�g�[�K���G \"%s\"\n"
 
-#: g10/export.c:157 g10/keyedit.c:2481 g10/delkey.c:73 g10/revoke.c:224
+#: g10/export.c:157 g10/keyedit.c:2486 g10/delkey.c:73 g10/revoke.c:224
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�䤣�� `%s' ���_�G %s\n"
@@ -2063,26 +2063,26 @@ 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:187 g10/getkey.c:2584
+#: g10/getkey.c:187 g10/getkey.c:2600
 msgid "[User id not found]"
 msgstr "[�䤣��ϥΪ� ID]"
 
-#: g10/getkey.c:1578
+#: g10/getkey.c:1582
 #, 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:2072
+#: g10/getkey.c:2088
 #, c-format
 msgid "no secret subkey for public subkey %08lX - ignoring\n"
 msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
 
-#: g10/getkey.c:2300
+#: g10/getkey.c:2316
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
 
-#: g10/getkey.c:2347
+#: g10/getkey.c:2363
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
@@ -2211,7 +2211,7 @@ msgstr "���_ %08lX: �s���_ �w �w���L\n"
 msgid "no writable keyring found: %s\n"
 msgstr "�䤣��i�g���_�Ͱ�G %s\n"
 
-#: g10/import.c:639 g10/sign.c:677 g10/sign.c:916 g10/openfile.c:254
+#: g10/import.c:639 g10/sign.c:683 g10/sign.c:919 g10/openfile.c:254
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "���b�g�� `%s'\n"
@@ -2435,29 +2435,29 @@ msgstr "[�M�P]"
 msgid "[self-signature]"
 msgstr "[�ۧ�ñ��]"
 
-#: g10/keyedit.c:221 g10/keylist.c:169
+#: g10/keyedit.c:221 g10/keylist.c:168
 msgid "1 bad signature\n"
 msgstr "1 �ӷl�a��ñ��\n"
 
-#: g10/keyedit.c:223 g10/keylist.c:171
+#: g10/keyedit.c:223 g10/keylist.c:170
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �ӷl�a��ñ��\n"
 
-#: g10/keyedit.c:225 g10/keylist.c:173
+#: g10/keyedit.c:225 g10/keylist.c:172
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�� 1 ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:227 g10/keylist.c:175
+#: g10/keyedit.c:227 g10/keylist.c:174
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�� %d ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:229 g10/keylist.c:177
+#: g10/keyedit.c:229 g10/keylist.c:176
 msgid "1 signature not checked due to an error\n"
 msgstr "�� 1 ��ñ���]���Y�ӿ��~�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:231 g10/keylist.c:179
+#: g10/keyedit.c:231 g10/keylist.c:178
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "�� %d ��ñ���]���Y�ǿ��~�ӥ��Q�ˬd\n"
@@ -2477,12 +2477,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
 
 #: g10/keyedit.c:369 g10/keyedit.c:389 g10/keyedit.c:410 g10/keyedit.c:560
-#: g10/keyedit.c:618 g10/keyedit.c:1219
+#: g10/keyedit.c:618 g10/keyedit.c:1221
 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:397 g10/keyedit.c:418 g10/keyedit.c:566
-#: g10/keyedit.c:1225
+#: g10/keyedit.c:1227
 msgid "  Unable to sign.\n"
 msgstr "  �L�kñ�p�C\n"
 
@@ -2692,8 +2692,8 @@ msgstr ""
 msgid "Really sign? "
 msgstr "�u���nñ�p�ܡH "
 
-#: g10/keyedit.c:765 g10/keyedit.c:3261 g10/keyedit.c:3352 g10/keyedit.c:3425
-#: g10/sign.c:312
+#: g10/keyedit.c:765 g10/keyedit.c:3269 g10/keyedit.c:3360 g10/keyedit.c:3433
+#: g10/sign.c:318
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ñ�p�ɥ��ѤF�G %s\n"
@@ -2735,487 +2735,487 @@ msgstr ""
 msgid "Do you really want to do this? "
 msgstr "�p�u���Q�n�o�򰵶ܡH "
 
-#: g10/keyedit.c:936
+#: g10/keyedit.c:938
 msgid "moving a key signature to the correct place\n"
 msgstr "���b����_��ñ���h���쥿�T����m�h\n"
 
-#: g10/keyedit.c:978
+#: g10/keyedit.c:980
 msgid "quit this menu"
 msgstr "���}�o�ӿ��"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:981
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:982
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:982
 msgid "save and quit"
 msgstr "�x�s�����}"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:983
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:981
+#: g10/keyedit.c:983
 msgid "show this help"
 msgstr "��ܳo���u�W����"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:985
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:983
+#: g10/keyedit.c:985
 msgid "show fingerprint"
 msgstr "��ܫ���"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:986
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:984
+#: g10/keyedit.c:986
 msgid "list key and user IDs"
 msgstr "�C�X���_�M�ϥΪ� ID"
 
-#: g10/keyedit.c:985
+#: g10/keyedit.c:987
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
 msgid "select user ID N"
 msgstr "�ϥΪ� ID ��F N"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:989
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:989
 msgid "select secondary key N"
 msgstr "��ܦ��_ N"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:990
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:988
+#: g10/keyedit.c:990
 msgid "list signatures"
 msgstr "�C�Xñ��"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:991
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:992
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:990
+#: g10/keyedit.c:992
 msgid "sign the key"
 msgstr "ñ�p���_"
 
-#: g10/keyedit.c:991
+#: g10/keyedit.c:993
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:994
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:992
+#: g10/keyedit.c:994
 msgid "sign the key locally"
 msgstr "�Ȧb���añ�p���_"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
 msgid "sign the key non-revocably"
 msgstr "�H���i�M�P�Ҧ�ñ�p���_"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:996
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:996
 msgid "sign the key locally and non-revocably"
 msgstr "�H���i�M�P�Ҧ��b���añ�p���_"
 
-#: g10/keyedit.c:995
+#: g10/keyedit.c:997
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:998
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:998
 msgid "add a user ID"
 msgstr "�W�[�@�ӨϥΪ� ID"
 
-#: g10/keyedit.c:997
+#: g10/keyedit.c:999
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:997
+#: g10/keyedit.c:999
 msgid "add a photo ID"
 msgstr "�W�[�@�ӷӤ� ID"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1000
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:998
+#: g10/keyedit.c:1000
 msgid "delete user ID"
 msgstr "�R���@�ӨϥΪ� ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1003
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1003
 msgid "add a secondary key"
 msgstr "�W�[�@�⦸�_"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1004
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1004
 msgid "delete a secondary key"
 msgstr "�R���@�⦸�_"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1005
 msgid "addrevoker"
 msgstr "addrevoker"
 
-#: g10/keyedit.c:1003
+#: g10/keyedit.c:1005
 msgid "add a revocation key"
 msgstr "�W�[�@��M�P���_"
 
-#: g10/keyedit.c:1004
+#: g10/keyedit.c:1006
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:1004
+#: g10/keyedit.c:1006
 msgid "delete signatures"
 msgstr "�R��ñ��"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
 msgid "change the expire date"
 msgstr "���ϥδ���"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1008
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1008
 msgid "flag user ID as primary"
 msgstr "��ϥΪ� ID �аO���D�n"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1009
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1009
 msgid "toggle between secret and public key listing"
 msgstr "��p�_�M���_�M��ô�b�@�_"
 
-#: g10/keyedit.c:1009
+#: g10/keyedit.c:1011
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
 msgid "list preferences (expert)"
 msgstr "�C�X���n (�M�a�Ҧ�)"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1013
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1013
 msgid "list preferences (verbose)"
 msgstr "�C�X���n (�o���Ҧ�)"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1014
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:1012
+#: g10/keyedit.c:1014
 msgid "set preference list"
 msgstr "�]�w���n�M��"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1015
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:1013
+#: g10/keyedit.c:1015
 msgid "updated preferences"
 msgstr "��s�L�����n"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1016
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:1014
+#: g10/keyedit.c:1016
 msgid "change the passphrase"
 msgstr "���K�X��"
 
-#: g10/keyedit.c:1015
+#: g10/keyedit.c:1017
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:1015
+#: g10/keyedit.c:1017
 msgid "change the ownertrust"
 msgstr "���D�[�H��"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1018
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1018
 msgid "revoke signatures"
 msgstr "�M�Pñ��"
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1019
 msgid "revuid"
 msgstr "revuid"
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1019
 msgid "revoke a user ID"
 msgstr "�M�P�@�ӨϥΪ� ID"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1020
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:1018
+#: g10/keyedit.c:1020
 msgid "revoke a secondary key"
 msgstr "�M�P�@�⦸�_"
 
-#: g10/keyedit.c:1019
+#: g10/keyedit.c:1021
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:1019
+#: g10/keyedit.c:1021
 msgid "disable a key"
 msgstr "�T�Τ@����_"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
 msgid "enable a key"
 msgstr "�ҥΤ@����_"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1023
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1023
 msgid "show photo ID"
 msgstr "��ܷӤ� ID"
 
-#: g10/keyedit.c:1041 g10/delkey.c:119
+#: g10/keyedit.c:1043 g10/delkey.c:119
 msgid "can't do that in batchmode\n"
 msgstr "�L�k�b�妸�Ҧ������˰�\n"
 
-#: g10/keyedit.c:1079
+#: g10/keyedit.c:1081
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keyedit.c:1097
+#: g10/keyedit.c:1099
 msgid "Secret key is available.\n"
 msgstr "�p�_�i�ΡC\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1130
 msgid "Command> "
 msgstr "���O> "
 
-#: g10/keyedit.c:1160
+#: g10/keyedit.c:1162
 msgid "Need the secret key to do this.\n"
 msgstr "�n���p�_�ׯ�o�򰵡C\n"
 
-#: g10/keyedit.c:1164
+#: g10/keyedit.c:1166
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
 
-#: g10/keyedit.c:1213
+#: g10/keyedit.c:1215
 msgid "Key is revoked."
 msgstr "���_�w�g�Q�M�P�F�C"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1234
 msgid "Really sign all user IDs? "
 msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1233
+#: g10/keyedit.c:1235
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1260
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
 
-#: g10/keyedit.c:1278 g10/keyedit.c:1299 g10/keyedit.c:1359
+#: g10/keyedit.c:1280 g10/keyedit.c:1301 g10/keyedit.c:1361
 msgid "You must select at least one user ID.\n"
 msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1282
 msgid "You can't delete the last user ID!\n"
 msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
 
-#: g10/keyedit.c:1283
+#: g10/keyedit.c:1285
 msgid "Really remove all selected user IDs? "
 msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1284
+#: g10/keyedit.c:1286
 msgid "Really remove this user ID? "
 msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1322 g10/keyedit.c:1378
+#: g10/keyedit.c:1324 g10/keyedit.c:1380
 msgid "You must select at least one key.\n"
 msgstr "�p�ܤ֥�����ܤ@����_�C\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1328
 msgid "Do you really want to delete the selected keys? "
 msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1327
+#: g10/keyedit.c:1329
 msgid "Do you really want to delete this key? "
 msgstr "�p�u���n�R���o����_�ܡH "
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1364
 msgid "Really revoke all selected user IDs? "
 msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1365
 msgid "Really revoke this user ID? "
 msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1385
 msgid "Do you really want to revoke this key? "
 msgstr "�p�u���Q�n�M�P�o����_�ܡH "
 
-#: g10/keyedit.c:1452
+#: g10/keyedit.c:1454
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
 
-#: g10/keyedit.c:1454
+#: g10/keyedit.c:1456
 msgid "Really update the preferences? "
 msgstr "�u���n��s���n�ܡH "
 
-#: g10/keyedit.c:1492
+#: g10/keyedit.c:1494
 msgid "Save changes? "
 msgstr "�n�x�s�ܧ�ܡH "
 
-#: g10/keyedit.c:1495
+#: g10/keyedit.c:1497
 msgid "Quit without saving? "
 msgstr "�n���x�s�����}�ܡH "
 
-#: g10/keyedit.c:1506
+#: g10/keyedit.c:1508
 #, c-format
 msgid "update failed: %s\n"
 msgstr "��s���ѡG %s\n"
 
-#: g10/keyedit.c:1513
+#: g10/keyedit.c:1515
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1522
 msgid "Key not changed so no update needed.\n"
 msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
 
-#: g10/keyedit.c:1532
+#: g10/keyedit.c:1534
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
 
-#: g10/keyedit.c:1591
+#: g10/keyedit.c:1593
 msgid "Digest: "
 msgstr "�K�n�G "
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1645
 msgid "Features: "
 msgstr "�S�I�G "
 
-#: g10/keyedit.c:1880
+#: g10/keyedit.c:1882
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�o����_�i��Q %s ���_�M�P�F "
 
-#: g10/keyedit.c:1884
+#: g10/keyedit.c:1886
 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:1890 g10/keyedit.c:1916 g10/keyedit.c:2001 g10/keyedit.c:2016
+#: g10/keyedit.c:1892 g10/keyedit.c:1918 g10/keyedit.c:2003 g10/keyedit.c:2018
 #, 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:1899
+#: g10/keyedit.c:1901
 #, c-format
 msgid " trust: %c/%c"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1905
 msgid "This key has been disabled"
 msgstr "�o����_�w�g�Q�T�ΤF"
 
-#: g10/keyedit.c:1932
+#: g10/keyedit.c:1934
 #, 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:1935
+#: g10/keyedit.c:1937
 msgid "rev- faked revocation found\n"
 msgstr "rev- �o�{�Q���y���M�P\n"
 
-#: g10/keyedit.c:1937
+#: g10/keyedit.c:1939
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
 
-#: g10/keyedit.c:1957
+#: g10/keyedit.c:1959
 msgid "[revoked] "
 msgstr "[�w�M�P]"
 
-#: g10/keyedit.c:1959
+#: g10/keyedit.c:1961
 msgid "[expired] "
 msgstr "[�w�L��]"
 
-#: g10/keyedit.c:1967
+#: g10/keyedit.c:1969
 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:1975
+#: g10/keyedit.c:1977
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3223,13 +3223,13 @@ msgstr ""
 "�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
 "���D�p���s����{���C\n"
 
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2109
 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:2166
+#: g10/keyedit.c:2168
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3238,45 +3238,45 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2171 g10/keyedit.c:2444
+#: g10/keyedit.c:2173 g10/keyedit.c:2446
 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:2177
+#: g10/keyedit.c:2179
 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:2312
+#: g10/keyedit.c:2314
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2322
+#: g10/keyedit.c:2324
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2326
+#: g10/keyedit.c:2328
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2332
+#: g10/keyedit.c:2334
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
 
-#: g10/keyedit.c:2346
+#: g10/keyedit.c:2348
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2347
+#: g10/keyedit.c:2349
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2350
+#: g10/keyedit.c:2352
 msgid "Nothing deleted.\n"
 msgstr "�S���F��Q�R���C\n"
 
-#: g10/keyedit.c:2439
+#: g10/keyedit.c:2441
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3285,82 +3285,82 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2450
+#: g10/keyedit.c:2452
 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:2473
+#: g10/keyedit.c:2475
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
 
-#: g10/keyedit.c:2488
+#: g10/keyedit.c:2496
 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:2498
+#: g10/keyedit.c:2506
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
 
-#: g10/keyedit.c:2517
+#: g10/keyedit.c:2525
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2531
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N): "
 msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
 
-#: g10/keyedit.c:2588
+#: g10/keyedit.c:2596
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�бq�p�_��������ܡC\n"
 
-#: g10/keyedit.c:2594
+#: g10/keyedit.c:2602
 msgid "Please select at most one secondary key.\n"
 msgstr "�Цܦh��ܤ@�⦸�_�C\n"
 
-#: g10/keyedit.c:2598
+#: g10/keyedit.c:2606
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
 
-#: g10/keyedit.c:2600
+#: g10/keyedit.c:2608
 msgid "Changing expiration time for the primary key.\n"
 msgstr "���b�ܧ�D�_���ϥδ����C\n"
 
-#: g10/keyedit.c:2645
+#: g10/keyedit.c:2653
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
 
-#: g10/keyedit.c:2661
+#: g10/keyedit.c:2669
 msgid "No corresponding signature in secret ring\n"
 msgstr "�b�p�_��̨S���@�P��ñ��\n"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2749
 msgid "Please select exactly one user ID.\n"
 msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:2778 g10/keyedit.c:2887
+#: g10/keyedit.c:2786 g10/keyedit.c:2895
 #, c-format
 msgid "skipping v3 self-signature on user id \"%s\"\n"
 msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
 
-#: g10/keyedit.c:2947
+#: g10/keyedit.c:2955
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "���� %d �S���ϥΪ� ID\n"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:3001
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "���� %d �S�����_\n"
 
-#: g10/keyedit.c:3107
+#: g10/keyedit.c:3115
 msgid "user ID: \""
 msgstr "�ϥΪ� ID�G \""
 
-#: g10/keyedit.c:3112
+#: g10/keyedit.c:3120
 #, c-format
 msgid ""
 "\"\n"
@@ -3369,7 +3369,7 @@ msgstr ""
 "\"\n"
 "�w�g�Q�p�����_ %08lX ñ�p�� %s\n"
 
-#: g10/keyedit.c:3115
+#: g10/keyedit.c:3123
 #, c-format
 msgid ""
 "\"\n"
@@ -3378,56 +3378,56 @@ msgstr ""
 "\"\n"
 "�w�g�Q�p�����_ %08lX �b���añ�p�� %s\n"
 
-#: g10/keyedit.c:3120
+#: g10/keyedit.c:3128
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3132
 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:3128
+#: g10/keyedit.c:3136
 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:3153
+#: g10/keyedit.c:3161
 msgid "You have signed these user IDs:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
 
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3180
 #, c-format
 msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s%s\n"
 
-#: g10/keyedit.c:3180
+#: g10/keyedit.c:3188
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �� %08lX �M�P�� %s\n"
 
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3208
 msgid "You are about to revoke these signatures:\n"
 msgstr "�p���b�M�P�o���G\n"
 
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3218
 #, c-format
 msgid "   signed by %08lX at %s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s\n"
 
-#: g10/keyedit.c:3212
+#: g10/keyedit.c:3220
 msgid " (non-exportable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3219
+#: g10/keyedit.c:3227
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3249
+#: g10/keyedit.c:3257
 msgid "no secret key\n"
 msgstr "�S���p�_\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3327
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
@@ -3436,173 +3436,190 @@ 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:3336
+#: g10/keyedit.c:3344
 #, 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:3509
+#: g10/keyedit.c:3517
 #, 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"
 
-#: g10/keylist.c:112
+#: g10/keylist.c:111
 msgid "Critical signature policy: "
 msgstr "������h�G "
 
-#: g10/keylist.c:114
+#: g10/keylist.c:113
 msgid "Signature policy: "
 msgstr "��h�G "
 
-#: g10/keylist.c:139 g10/keylist.c:162 g10/mainproc.c:766 g10/mainproc.c:775
+#: g10/keylist.c:138 g10/keylist.c:161 g10/mainproc.c:805 g10/mainproc.c:814
 msgid "WARNING: invalid notation data found\n"
 msgstr "ĵ�i�G���L�Ī��аO���\n"
 
-#: g10/keylist.c:148
+#: g10/keylist.c:147
 msgid "Critical signature notation: "
 msgstr "����ñ���аO�G "
 
-#: g10/keylist.c:150
+#: g10/keylist.c:149
 msgid "Signature notation: "
 msgstr "ñ���аO�G "
 
-#: g10/keylist.c:157
+#: g10/keylist.c:156
 msgid "not human readable"
 msgstr "���O�H����Ū�o����"
 
-#: g10/keylist.c:250
+#: g10/keylist.c:249
 msgid "Keyring"
 msgstr "�_�Ͱ�"
 
 #. of subkey
-#: g10/keylist.c:527 g10/mainproc.c:902
+#: g10/keylist.c:526 g10/mainproc.c:941
 #, c-format
 msgid " [expires: %s]"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keylist.c:1049
+#: g10/keylist.c:1048
 msgid "Primary key fingerprint:"
 msgstr "�D�_�����G"
 
-#: g10/keylist.c:1051
+#: g10/keylist.c:1050
 msgid "     Subkey fingerprint:"
 msgstr "              �l�_�����G"
 
-#: g10/keylist.c:1058
+#: g10/keylist.c:1057
 msgid " Primary key fingerprint:"
 msgstr " �D�_�����G"
 
-#: g10/keylist.c:1060
+#: g10/keylist.c:1059
 msgid "      Subkey fingerprint:"
 msgstr "               �l�_�����G"
 
 #. use tty
-#: g10/keylist.c:1064 g10/keylist.c:1068
+#: g10/keylist.c:1063 g10/keylist.c:1067
 msgid "     Key fingerprint ="
 msgstr "            ���_���� ="
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:249
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
 
-#: g10/mainproc.c:259
-#, c-format
-msgid "invalid symkey algorithm detected (%d)\n"
-msgstr "������L�Ī��D��٩ʪ��_�t��k (%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:263
+#, fuzzy, c-format
+msgid "bad passphrase or unknown cipher algorithm (%d)\n"
+msgstr "�������s�K�t��k"
 
-#: g10/mainproc.c:288 g10/encr-data.c:66
+#: g10/mainproc.c:300
+#, fuzzy, c-format
+msgid "%s encrypted session key\n"
+msgstr "�[�K�L�����q���_ (%d) �ؤo�޲�\n"
+
+#: g10/mainproc.c:302 g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s �[�K�L�����\n"
 
-#: g10/mainproc.c:290 g10/encr-data.c:68
+#: g10/mainproc.c:306 g10/encr-data.c:68
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�H�������t��k %d �[�K�L\n"
 
-#: g10/mainproc.c:318
+#: g10/mainproc.c:352
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "���_�O %08lX\n"
 
-#: g10/mainproc.c:364
+#: g10/mainproc.c:398
 msgid "public key encrypted data: good DEK\n"
 msgstr "���_�[�K�L����ơG���n�� DEK\n"
 
-#: g10/mainproc.c:416
+#: g10/mainproc.c:450
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "�H %u �줸 %s ID %08lX �إߩ� %s �����_�[�K�L\n"
 
-#: g10/mainproc.c:426
+#: g10/mainproc.c:460
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "�H %s ID %08lX �����_�[�K�L\n"
 
-#: g10/mainproc.c:440
+#: g10/mainproc.c:474
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "���_�ѱK���ѡG %s\n"
 
-#: g10/mainproc.c:467 g10/mainproc.c:486
+#: g10/mainproc.c:488
+#, fuzzy, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "�ЦA��J�@���K�X��\n"
+
+#: g10/mainproc.c:490
+#, fuzzy
+msgid "encrypted with 1 passphrase\n"
+msgstr "�ЦA��J�@���K�X��\n"
+
+#: g10/mainproc.c:506 g10/mainproc.c:525
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "���w %s ���[�K�L�����\n"
 
-#: g10/mainproc.c:474
+#: g10/mainproc.c:513
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �s�K�k���i�ΡA�ڭ̼��[�a�յۧ�H %s �N��\n"
 
-#: g10/mainproc.c:504
+#: g10/mainproc.c:543
 msgid "decryption okay\n"
 msgstr "�ѱK���\\n"
 
-#: g10/mainproc.c:508
+#: g10/mainproc.c:547
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ĵ�i�G�T�������짹�㪺�O�@\n"
 
-#: g10/mainproc.c:511
+#: g10/mainproc.c:550
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ĵ�i�G�[�K�L���T���w�g�Q�ܳy�F�I\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:556
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "�ѱK���ѡG %s\n"
 
-#: g10/mainproc.c:536
+#: g10/mainproc.c:575
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "�Ъ`�N�G�H��̭n�D�F�u�p���Ӭ�β����ݡv\n"
 
-#: g10/mainproc.c:538
+#: g10/mainproc.c:577
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "��l���ɦW ='%.*s'\n"
 
-#: g10/mainproc.c:710
+#: g10/mainproc.c:749
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "�W�ߺM�P �w �Х� \"gpg --import\" �ӮM��\n"
 
-#: g10/mainproc.c:778
+#: g10/mainproc.c:817
 msgid "Notation: "
 msgstr "�аO�G "
 
-#: g10/mainproc.c:790
+#: g10/mainproc.c:829
 msgid "Policy: "
 msgstr "��h�G "
 
-#: g10/mainproc.c:1245
+#: g10/mainproc.c:1284
 msgid "signature verification suppressed\n"
 msgstr "ñ�����Ҥw�Q����\n"
 
 #. plaintext before signatures but no one-pass packets
-#: g10/mainproc.c:1287 g10/mainproc.c:1297
+#: g10/mainproc.c:1326 g10/mainproc.c:1336
 msgid "can't handle these multiple signatures\n"
 msgstr "�L�k�B�z�o�Ǧh��ñ��\n"
 
-#: g10/mainproc.c:1306
+#: g10/mainproc.c:1345
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %08lX\n"
@@ -3611,78 +3628,78 @@ msgstr "�� %.*s �إߪ�ñ���A�ϥ� %s ���_ ID %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:1329
+#: g10/mainproc.c:1368
 #, fuzzy
 msgid "Key available at: "
 msgstr "�S���i������"
 
-#: g10/mainproc.c:1378 g10/mainproc.c:1411
+#: g10/mainproc.c:1417 g10/mainproc.c:1450
 msgid "BAD signature from \""
 msgstr "*�l�a* ��ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1379 g10/mainproc.c:1412
+#: g10/mainproc.c:1418 g10/mainproc.c:1451
 msgid "Expired signature from \""
 msgstr "�L����ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1380 g10/mainproc.c:1413
+#: g10/mainproc.c:1419 g10/mainproc.c:1452
 msgid "Good signature from \""
 msgstr "���n��ñ���Ӧ۩� \""
 
-#: g10/mainproc.c:1415
+#: g10/mainproc.c:1454
 msgid "[uncertain]"
 msgstr "[���T�w]"
 
-#: g10/mainproc.c:1514
+#: g10/mainproc.c:1553
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1558
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�o��ñ�p�b %s �L���C\n"
 
-#: g10/mainproc.c:1522
+#: g10/mainproc.c:1561
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s �A�K�n�t��k %s\n"
 
-#: g10/mainproc.c:1523
+#: g10/mainproc.c:1562
 msgid "binary"
 msgstr "�G�i��"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1563
 msgid "textmode"
 msgstr "��r�Ҧ�"
 
-#: g10/mainproc.c:1524
+#: g10/mainproc.c:1563
 msgid "unknown"
 msgstr "����"
 
-#: g10/mainproc.c:1544
+#: g10/mainproc.c:1583
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�L�k�ˬdñ���G %s\n"
 
-#: g10/mainproc.c:1613 g10/mainproc.c:1629 g10/mainproc.c:1715
+#: g10/mainproc.c:1652 g10/mainproc.c:1668 g10/mainproc.c:1754
 msgid "not a detached signature\n"
 msgstr "���O�@��������ñ��\n"
 
-#: g10/mainproc.c:1656
+#: g10/mainproc.c:1695
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ĵ�i�G������h��ñ���C�馳�Ĥ@��ñ���׷|�Q�ֿ�C\n"
 
-#: g10/mainproc.c:1664
+#: g10/mainproc.c:1703
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���� 0x%02x ���W��ñ��\n"
 
-#: g10/mainproc.c:1721
+#: g10/mainproc.c:1760
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�«� (PGP 2.x) ñ��\n"
 
-#: g10/mainproc.c:1731
+#: g10/mainproc.c:1770
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
 
@@ -3723,7 +3740,12 @@ msgstr "ĵ�i�G \"%s\" �ﶵ�w����ij�ϥ�\n"
 msgid "please use \"%s%s\" instead\n"
 msgstr "��H \"%s%s\" �N��\n"
 
-#: g10/misc.c:617
+#: g10/misc.c:550
+#, fuzzy
+msgid "Uncompressed"
+msgstr "���Q�B�z"
+
+#: g10/misc.c:628
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
@@ -3733,7 +3755,11 @@ msgstr "�o�ӰT���]�\���O %s �ү�Ϊ�\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "�L�k�ާ@���}���_�t��k %d\n"
 
-#: g10/parse-packet.c:1083
+#: g10/parse-packet.c:690
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr ""
+
+#: g10/parse-packet.c:1096
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
@@ -3892,17 +3918,17 @@ msgstr "���䴩�¦��� DEK �s�X\n"
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�s�K�t��k %d%s �����Τw���ΤF\n"
 
-#: g10/pubkey-enc.c:221
+#: g10/pubkey-enc.c:216
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "�Ъ`�N�G���n�]�w���䤣��s�K�t��k %d\n"
 
-#: g10/pubkey-enc.c:243
+#: g10/pubkey-enc.c:237
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
 
-#: g10/pubkey-enc.c:249
+#: g10/pubkey-enc.c:243
 msgid "NOTE: key has been revoked"
 msgstr "�Ъ`�N�G���_�w�g�Q�M�P�F"
 
@@ -4055,44 +4081,44 @@ 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"
 
-#: g10/sign.c:307
+#: g10/sign.c:313
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�ˬd�w�إߪ�ñ���ɵo�Ϳ��~�G %s\n"
 
-#: g10/sign.c:316
+#: g10/sign.c:322
 #, c-format
 msgid "%s signature from: \"%s\"\n"
 msgstr "%s ñ���ӦۡG \"%s\"\n"
 
-#: g10/sign.c:465
+#: g10/sign.c:471
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ĵ�i�G `%s' �O�@�Ӫ��ɮ�\n"
 
-#: g10/sign.c:648
+#: g10/sign.c:654
 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"
 
-#: g10/sign.c:672 g10/sign.c:911
+#: g10/sign.c:678 g10/sign.c:914
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "�L�k�إ� %s: %s\n"
 
-#: g10/sign.c:701
+#: g10/sign.c:707
 #, c-format
 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:799
 msgid "signing:"
 msgstr "ñ�p�G"
 
-#: g10/sign.c:895
+#: g10/sign.c:898
 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"
 
-#: g10/sign.c:1049
+#: g10/sign.c:1052
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �[�K�N�Q�ĥ�\n"
@@ -4287,12 +4313,12 @@ msgstr "�H����Ʈw�G�P�B�ƥ��ѡG %s\n"
 
 #: g10/trustdb.c:459
 msgid "no need for a trustdb check\n"
-msgstr "�H����Ʈw�ˬd���ݭn\n"
+msgstr "���ݭn�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:465 g10/trustdb.c:1795
+#: g10/trustdb.c:465 g10/trustdb.c:1811
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "�]�� %s �i��U�@�Ӹ�Ʈw�ˬd\n"
+msgstr "�U���H����Ʈw�ˬd�N�� %s �i��\n"
 
 #: g10/trustdb.c:835
 msgid "please do a --check-trustdb\n"
@@ -4307,16 +4333,26 @@ msgstr "���b�ˬd�H����Ʈw\n"
 msgid "public key %08lX not found: %s\n"
 msgstr "���_ %08lX �S���Q���G %s\n"
 
-#: g10/trustdb.c:1589
+#: g10/trustdb.c:1200
+#, c-format
+msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:1208
+#, c-format
+msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:1605
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
 
-#: g10/trustdb.c:1643
+#: g10/trustdb.c:1663
 msgid "no ultimately trusted keys found\n"
 msgstr "�S������������H�������_\n"
 
-#: g10/trustdb.c:1661
+#: g10/trustdb.c:1677
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr "�����H�����_ %08lX �����_�S���Q���\n"
@@ -4324,7 +4360,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:1736
+#: g10/trustdb.c:1752
 #, 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"
@@ -4435,7 +4471,7 @@ msgstr "�إߤF�z���_ �w ���b����\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�L�k�קK��٦��s�K�k���z���_�F�w�g�դF %d ���F�I\n"
 
-#: g10/seskey.c:200
+#: g10/seskey.c:210
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
 msgstr "DSA �n�D�ϥ� 160 �줸������t��k\n"
 
@@ -5128,6 +5164,29 @@ msgstr "�M��H���O���ɿ��~�G %s\n"
 msgid "read error: %s\n"
 msgstr "Ū�����~�G %s\n"
 
+#, fuzzy
+#~ msgid "quit|quit"
+#~ msgstr "quit"
+
+#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
+#~ msgstr "   (%d) ElGamal (��ñ�p�Υ[�K)\n"
+
+#~ msgid ""
+#~ "The use of this algorithm is only supported by GnuPG.  You will not be\n"
+#~ "able to use this key to communicate with PGP users.  This algorithm is "
+#~ "also\n"
+#~ "very slow, and may not be as secure as the other choices.\n"
+#~ msgstr ""
+#~ "�Ъ`�N�A�馳 GnuPG �פ䴩�o�Ӻt��k�C�γo�Ӻt��k�إߪ����_\n"
+#~ "�|�S����k�� PGP �ϥΪ̤��q�C�P�ɳo�Ӻt��k�D�`�a�w�C�A\n"
+#~ "�ӥB�i��]���p��L�t��k�ӱo�w���C\n"
+
+#~ msgid "Create anyway? "
+#~ msgstr "�L�צp���٬O�n�إ߶ܡH "
+
+#~ msgid "invalid symkey algorithm detected (%d)\n"
+#~ msgstr "������L�Ī��D��٩ʪ��_�t��k (%d)\n"
+
 #~ msgid "this keyserver is not fully HKP compatible\n"
 #~ msgstr "�o�Ӫ��_���A���ëD�����P HKP �ۮe\n"