[balsa] Update Simplified Chinese translation.



commit 45818dac1b7427820d6cb51e0482973d0b7c9cea
Author: Aron Xu <aronxu gnome org>
Date:   Fri Jul 30 18:53:51 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 8822 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 5011 insertions(+), 3811 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f131cbf..9365384 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,195 +1,236 @@
+# Simplified Chinese translation of balsa
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the balsa package.
 # Original by Dillion Chen <dillon chen turbolinux com cn>
 #   Rewritten by Wang Jian <lark linux net cn>
+# Rewritten by Yinghua Wang <wantinghard gmail com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: balsa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 15:21+0100\n"
-"PO-Revision-Date: 2002-01-29 23:04+0800\n"
-"Last-Translator: Dillion Chen <dillon chen turbolinux com cn>\n"
-"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
+"Project-Id-Version: balsa master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=balsa&component=general\n"
+"POT-Creation-Date: 2010-07-29 03:00+0000\n"
+"PO-Revision-Date: 2010-07-30 18:53+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Translator: Wang Jian <lark linux net cn>\n"
+"Plural-Forms: nplurals=1;plural=0;\n"
 
 # src/filter-edit-dialog.c:749
 #: ../balsa.desktop.in.h:1
-#, fuzzy
 msgid "Balsa"
-msgstr "Balsaï¼?%s"
+msgstr "Balsa"
 
 #: ../balsa.desktop.in.h:2
 msgid "E-Mail utility"
-msgstr ""
+msgstr "���件工�"
 
 #. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:210 ../libbalsa/address-book-ldap.c:421
-#: ../libbalsa/address-book-ldif.c:329
+#: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldap.c:496
+#: ../libbalsa/address-book-ldif.c:332
 msgid "No-Id"
-msgstr "没æ?? Id"
+msgstr "���"
 
 # src/filter-edit-dialog.c:101
-#: ../libbalsa/address-book-extern.c:215 ../libbalsa/address-book-extern.c:370
-#: ../libbalsa/address-book-ldap.c:427 ../libbalsa/address-book-ldif.c:309
-#: ../libbalsa/address-book-ldif.c:332 ../libbalsa/address-book-ldif.c:351
-#: ../libbalsa/address-book-ldif.c:355 ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:312
+#: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:371
+#: ../libbalsa/address-book-ldap.c:502 ../libbalsa/address-book-ldif.c:311
+#: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
+#: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
+#: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:403
 msgid "No-Name"
 msgstr "没æ??å??å­?"
 
-#: ../libbalsa/address-book-ldap.c:275
+#: ../libbalsa/address-book-ldap.c:284
+msgid "SASL Interaction\n"
+msgstr "SASL 交�\n"
+
+#: ../libbalsa/address-book-ldap.c:331
 msgid "TLS requested but not compiled in"
-msgstr ""
+msgstr "é??è¦? TLSï¼?ä½?ç¨?åº?ç¼?è¯?æ?¶æ?ªå? å?¥"
+
+#: ../libbalsa/address-book-ldap.c:611
+msgid "Undefined location of user address book"
+msgstr "ç?¨æ?·å?°å??ç°¿ä½?置没æ??å®?ä¹?"
 
-#: ../libbalsa/address-book.c:301 ../libbalsa/filter-error.c:45
+#: ../libbalsa/address-book.c:316 ../libbalsa/filter-error.c:47
 msgid "No error"
 msgstr "没æ??é??误"
 
-#: ../libbalsa/address-book.c:302
-#, fuzzy
+#: ../libbalsa/address-book.c:317
 msgid "Cannot read from address book"
-msgstr "æ? æ³?è½½å?¥å?°å??ç°¿ %s"
+msgstr "æ? æ³?读å??å?°å??ç°¿"
 
-#: ../libbalsa/address-book.c:303
-#, fuzzy
+#: ../libbalsa/address-book.c:318
 msgid "Cannot write to address book"
-msgstr "æ? æ³?è½½å?¥å?°å??ç°¿ %s"
+msgstr "æ? æ³?å??å?¥å?°å??ç°¿"
 
-#: ../libbalsa/address-book.c:304
-#, fuzzy
-msgid "Cannot connect to server"
-msgstr "æ­£å?¨å?³é?­å?° IMAP æ??å?¡å?¨ç??è¿?æ?¥..."
+#: ../libbalsa/address-book.c:319
+msgid "Cannot connect to the server"
+msgstr "æ? æ³?è¿?æ?¥å?°æ??å?¡å?¨"
 
-#: ../libbalsa/address-book.c:305
-#, fuzzy
+#: ../libbalsa/address-book.c:320
 msgid "Cannot search in the address book"
-msgstr "æ??å¼?å?°å??ç°¿"
+msgstr "æ? æ³?æ??ç´¢å?°å??ç°¿"
 
-#: ../libbalsa/address-book.c:307
+#: ../libbalsa/address-book.c:322
 msgid "Cannot add duplicate entry"
-msgstr ""
+msgstr "æ? æ³?æ·»å? é??å¤?ç??æ?¡ç?®"
 
-#: ../libbalsa/address-book.c:309
-#, fuzzy
+#: ../libbalsa/address-book.c:324
 msgid "Cannot find address in address book"
-msgstr "æ??å¼?å?°å??ç°¿"
+msgstr "å?¨å?°å??簿中æ?¾ä¸?å?°å?°å??"
 
-#: ../libbalsa/address-book.c:310 ../src/main-window.c:2228
-#: ../src/main-window.c:4250 ../src/sendmsg-window.c:4809
-#, fuzzy
+#: ../libbalsa/address-book.c:325 ../src/main-window.c:2334
+#: ../src/main-window.c:4779 ../src/sendmsg-window.c:4147
 msgid "Unknown error"
 msgstr "æ?ªç?¥é??误"
 
+# src/balsa-message.c:526 src/filter-edit-dialog.c:291
+# src/sendmsg-window.c:315
+#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:738
+#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1106
+#: ../src/sendmsg-window.c:3810 ../src/store-address.c:332
+msgid "To:"
+msgstr "�件人�"
+
+# src/balsa-message.c:534
+#: ../libbalsa/address-view.c:130 ../src/balsa-mime-widget-message.c:739
+#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1106
+#: ../src/sendmsg-window.c:3818 ../src/store-address.c:333
+msgid "Cc:"
+msgstr "æ??é??ï¼?"
+
+# src/sendmsg-window.c:368
+#: ../libbalsa/address-view.c:131 ../src/balsa-mime-widget-message.c:740
+#: ../src/balsa-print-object-header.c:174 ../src/sendmsg-window.c:1106
+#: ../src/store-address.c:334
+msgid "Bcc:"
+msgstr "å¯?é??ï¼?"
+
+# src/sendmsg-window.c:513
+#: ../libbalsa/address-view.c:133
+msgid "Reply To:"
+msgstr "å??å¤?ç»?ï¼?"
+
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/address.c:436
-#, fuzzy
-msgid "_Displayed Name:"
-msgstr "中é?´å??ï¼?"
+#: ../libbalsa/address.c:949
+msgid "D_isplayed Name:"
+msgstr "æ?¾ç¤ºå??(_I)ï¼?"
 
 # src/filter-edit-dialog.c:456
-#: ../libbalsa/address.c:437
-#, fuzzy
+#: ../libbalsa/address.c:950
 msgid "_First Name:"
-msgstr "å??ï¼?"
+msgstr "å??(_F)ï¼?"
 
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/address.c:438
-#, fuzzy
+#: ../libbalsa/address.c:951
 msgid "_Last Name:"
-msgstr "��"
+msgstr "�(_L)�"
 
 # src/filter-edit-dialog.c:101
-#: ../libbalsa/address.c:439
-#, fuzzy
+#: ../libbalsa/address.c:952
 msgid "_Nickname:"
-msgstr "å??å­?ï¼?"
+msgstr "�称(_N)�"
 
-#: ../libbalsa/address.c:440
-#, fuzzy
+#: ../libbalsa/address.c:953
 msgid "O_rganization:"
-msgstr "ç»?ç»?ï¼?"
+msgstr "ç»?ç»?(_R)ï¼?"
 
 # src/balsa-init.c:261 src/pref-manager.c:377
-#: ../libbalsa/address.c:441
-#, fuzzy
+#: ../libbalsa/address.c:954
 msgid "_Email Address:"
-msgstr "é?®ä»¶å?°å??ï¼?"
+msgstr "ç?µå­?é?®ä»¶å?°å??(_E)ï¼?"
+
+# src/filter-edit-dialog.c:380 src/mailbox-conf.c:281 src/mailbox-conf.c:904
+# src/pref-manager.c:461
+#. Right/Add button
+#: ../libbalsa/address.c:973 ../src/filter-edit-callbacks.c:1067
+#: ../src/filter-run-dialog.c:329
+msgid "A_dd"
+msgstr "添�(_D)"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../libbalsa/body.c:116 ../libbalsa/mailbox_local.c:1165
-#: ../libbalsa/message.c:808
-#, fuzzy
+#: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1765
+#: ../libbalsa/message.c:845
 msgid "(No subject)"
-msgstr "主�"
+msgstr "(�主�)"
 
-#: ../libbalsa/files.c:231
+#: ../libbalsa/body.c:352 ../libbalsa/body.c:399
 #, c-format
-msgid "Open with %s"
-msgstr "ç?¨ %s æ??å¼?"
+msgid "Failed to create output stream"
+msgstr "å??建è¾?å?ºæµ?失败"
+
+# src/main-window.c:139
+#: ../libbalsa/body.c:543
+#, c-format
+msgid "Could not read embedded message"
+msgstr "æ? æ³?读å??åµ?å?¥é?®ä»¶"
 
-#: ../libbalsa/filter-error.c:46
+#: ../libbalsa/filter-error.c:48
 msgid "Syntax error in the filter configuration file"
-msgstr "å?¨è¿?滤é??ç½®æ??件中æ??语æ³?é??误"
+msgstr "å?¨è¿?滤è§?å??é??ç½®æ??件中æ??语æ³?é??误"
 
 # src/index-child.c:176
-#: ../libbalsa/filter-error.c:47
+#: ../libbalsa/filter-error.c:49
 msgid "Unable to allocate memory"
 msgstr "æ? æ³?å??é??å??å­?"
 
-#: ../libbalsa/filter-error.c:48
+#: ../libbalsa/filter-error.c:50
 msgid "Error in regular expression syntax"
 msgstr "æ­£å??表达å¼?中æ??语æ³?é??误"
 
-#: ../libbalsa/filter-error.c:49
+#: ../libbalsa/filter-error.c:51
 msgid "Attempt to apply an invalid filter"
 msgstr "è¯?å?¾åº?ç?¨ä¸?个æ? æ??ç??è¿?滤è§?å??"
 
 #: ../libbalsa/filter-file.c:141
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
-msgstr ""
+msgstr "é?®ç®± %s ç??è¿?滤è§?å?? %s æ? æ??"
 
-#: ../libbalsa/filter.c:132 ../libbalsa/mailbox_local.c:407
+#: ../libbalsa/filter.c:129 ../libbalsa/mailbox_local.c:845
 msgid "Unable to load message body to match filter"
-msgstr ""
+msgstr "æ? æ³?è½½å?¥é?®ä»¶æ­£æ??æ?¥å?¹é??è¿?滤è§?å??"
 
 # src/main-window.c:182
-#: ../libbalsa/filter.c:240
-#, fuzzy, c-format
+#: ../libbalsa/filter.c:236
+#, c-format
 msgid "Invalid filter: %s"
 msgstr "æ? æ??ç??è¿?滤è§?å??ï¼?%s"
 
-#: ../libbalsa/filter.c:279 ../libbalsa/filter.c:302
+#: ../libbalsa/filter.c:284 ../libbalsa/filter.c:307
 #, c-format
 msgid "Bad mailbox name for filter: %s"
-msgstr ""
+msgstr "è¿?滤è§?å??ç??é?®ç®±å??é??误ï¼?%s"
 
 # src/main-window.c:200
-#: ../libbalsa/filter.c:283
-#, fuzzy, c-format
+#: ../libbalsa/filter.c:288
+#, c-format
 msgid "Error when copying messages: %s"
-msgstr "å¤?å?¶é?®ä»¶æ?¶å??ç??é??误"
+msgstr "å¤?å?¶é?®ä»¶æ?¶å??ç??é??误ï¼?%s"
 
 # src/sendmsg-window.c:71
-#: ../libbalsa/filter.c:293
-#, fuzzy, c-format
+#: ../libbalsa/filter.c:298
+#, c-format
 msgid "Error when trashing messages: %s"
-msgstr "å? é?¤é?®ä»¶æ?¶å??ç??é??误"
+msgstr "å? é?¤é?®ä»¶æ?¶å??ç??é??误ï¼?%s"
 
 # src/main-window.c:200
-#: ../libbalsa/filter.c:306
-#, fuzzy, c-format
+#: ../libbalsa/filter.c:311
+#, c-format
 msgid "Error when moving messages: %s"
-msgstr "移å?¨é?®ä»¶æ?¶å??ç??é??误"
+msgstr "移å?¨é?®ä»¶æ?¶å??ç??é??误ï¼?%s"
 
 #: ../libbalsa/gmime-application-pkcs7.c:237
 #: ../libbalsa/gmime-application-pkcs7.c:380
+#, c-format
 msgid "Failed to decrypt MIME part: parse error"
-msgstr ""
+msgstr "解å¯? MIME å?ºæ®µå¤±è´¥ï¼?解æ??é??误"
 
-#: ../libbalsa/gmime-gpgme-context.c:279 ../libbalsa/rfc3156.c:1603
+#: ../libbalsa/gmime-gpgme-context.c:300 ../libbalsa/rfc3156.c:1730
 #, c-format
 msgid ""
 "The passphrase for this key was bad, please try again!\n"
@@ -197,7 +238,7 @@ msgid ""
 "Key: %s"
 msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:284 ../libbalsa/rfc3156.c:1608
+#: ../libbalsa/gmime-gpgme-context.c:305 ../libbalsa/rfc3156.c:1735
 #, c-format
 msgid ""
 "Please enter the passphrase for the secret key!\n"
@@ -205,347 +246,471 @@ msgid ""
 "Key: %s"
 msgstr ""
 
-#: ../libbalsa/gmime-gpgme-context.c:404 ../libbalsa/gmime-gpgme-context.c:486
-#: ../libbalsa/gmime-gpgme-context.c:497 ../libbalsa/gmime-gpgme-context.c:612
-#: ../libbalsa/gmime-gpgme-context.c:703
-#, c-format
-msgid "%s: could not get data from stream: %s"
-msgstr ""
+# src/main-window.c:139
+#: ../libbalsa/gmime-gpgme-context.c:424 ../libbalsa/gmime-gpgme-context.c:497
+#: ../libbalsa/gmime-gpgme-context.c:505 ../libbalsa/gmime-gpgme-context.c:614
+#: ../libbalsa/gmime-gpgme-context.c:694
+msgid "could not get data from stream"
+msgstr "æ? æ³?ä»?æµ?è?·å??æ?°æ?®"
+
+#: ../libbalsa/gmime-gpgme-context.c:429 ../libbalsa/gmime-gpgme-context.c:620
+#: ../libbalsa/gmime-gpgme-context.c:699
+msgid "could not create new data object"
+msgstr "æ? æ³?å??建æ?°æ?°æ?®å¯¹è±¡"
+
+#: ../libbalsa/gmime-gpgme-context.c:436
+msgid "signing failed"
+msgstr "ç­¾å??失败"
 
-#: ../libbalsa/gmime-gpgme-context.c:412 ../libbalsa/gmime-gpgme-context.c:621
-#: ../libbalsa/gmime-gpgme-context.c:711
-#, fuzzy, c-format
-msgid "%s: could not create new data object: %s"
-msgstr "æ? æ³?å??建临æ?¶æ??件 %s"
+#: ../libbalsa/gmime-gpgme-context.c:516 ../libbalsa/rfc3156.c:638
+#: ../libbalsa/rfc3156.c:643 ../libbalsa/rfc3156.c:958
+#: ../libbalsa/rfc3156.c:964
+msgid "signature verification failed"
+msgstr "ç­¾å??éª?è¯?失败"
 
-#: ../libbalsa/gmime-gpgme-context.c:422
+#: ../libbalsa/gmime-gpgme-context.c:580
 #, c-format
-msgid "%s: signing failed: %s"
-msgstr ""
+msgid "combined signing and encryption is defined only for RFC 2440"
+msgstr "å?ªæ?? RFC 2440 å®?ä¹?äº?è??å??ç??ç­¾å??å??å? å¯?"
 
-#: ../libbalsa/gmime-gpgme-context.c:511
-#, c-format
-msgid "%s: signature verification failed: %s"
-msgstr ""
+#: ../libbalsa/gmime-gpgme-context.c:643
+msgid "signing and encryption failed"
+msgstr "ç­¾å??å??å? å¯?失败"
 
-#: ../libbalsa/gmime-gpgme-context.c:576
-msgid "combined signing and encryption is only defined for RFC 2440"
-msgstr ""
+#: ../libbalsa/gmime-gpgme-context.c:645
+msgid "encryption failed"
+msgstr "��失败"
 
-#: ../libbalsa/gmime-gpgme-context.c:647
-#, c-format
-msgid "%s: signing and encryption failed: %s"
-msgstr ""
+#: ../libbalsa/gmime-gpgme-context.c:708 ../libbalsa/rfc3156.c:777
+#: ../libbalsa/rfc3156.c:782
+msgid "decryption failed"
+msgstr "解�失败"
 
-#: ../libbalsa/gmime-gpgme-context.c:651
-#, fuzzy, c-format
-msgid "%s: encryption failed: %s"
-msgstr "身份��失败"
+#: ../libbalsa/gmime-gpgme-context.c:765
+msgid "could not create context"
+msgstr "æ? æ³?å??建正æ??"
 
-#: ../libbalsa/gmime-gpgme-context.c:723
+#: ../libbalsa/gmime-gpgme-context.c:824
 #, c-format
-msgid "%s: decryption failed: %s"
-msgstr ""
-
-#: ../libbalsa/gmime-gpgme-context.c:758
-#, fuzzy, c-format
-msgid "%s: could not create context: %s"
-msgstr "æ? æ³?å??建临æ?¶æ??件 %s"
-
-#: ../libbalsa/gmime-gpgme-context.c:814
 msgid "the crypto engine for protocol OpenPGP is not available"
-msgstr ""
+msgstr "OpenPGP å??è®®ç??å? å¯?å¼?æ??ä¸?å?¯ç?¨"
 
-#: ../libbalsa/gmime-gpgme-context.c:824
+#: ../libbalsa/gmime-gpgme-context.c:834
+#, c-format
 msgid "the crypto engine for protocol CMS is not available"
-msgstr ""
+msgstr "CMS å??è®®ç??å? å¯?å¼?æ??ä¸?å?¯ç?¨"
 
-#: ../libbalsa/gmime-gpgme-context.c:831
+#: ../libbalsa/gmime-gpgme-context.c:841
 #, c-format
 msgid "invalid crypto engine %d"
-msgstr ""
+msgstr "æ? æ??ç??å? å¯?å¼?æ?? %d"
 
-#: ../libbalsa/gmime-gpgme-context.c:862 ../libbalsa/gmime-gpgme-context.c:884
-#, fuzzy, c-format
-msgid "%s: could not list keys for %s: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
+#: ../libbalsa/gmime-gpgme-context.c:872 ../libbalsa/gmime-gpgme-context.c:899
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "æ? æ³?å??å?ºâ??%sâ??ç??å¯?é?¥"
 
-#: ../libbalsa/gmime-gpgme-context.c:896
-#, fuzzy, c-format
+#: ../libbalsa/gmime-gpgme-context.c:915
+#, c-format
+msgid ""
+"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr "%sï¼?%s ç??å¯?é?¥å­?å?¨ï¼?ä½?å®?å·²ç»?è¿?æ??ã??ç¦?ç?¨ã??æ?¤é??æ??æ? æ??"
+
+#: ../libbalsa/gmime-gpgme-context.c:919
+#, c-format
 msgid "%s: could not find a key for %s"
-msgstr "é??误ï¼?æ? æ³?æ?¾å?°ä¸»æ?ºâ??%sâ??"
+msgstr "%sï¼?æ? æ³?æ?¾å?° %s ç??å¯?é?¥"
 
-#: ../libbalsa/gmime-gpgme-context.c:908
+#: ../libbalsa/gmime-gpgme-context.c:924
+#, c-format
+msgid ""
+"%s: a key with id %s is present, but it is expired, disabled, revoked or "
+"invalid"
+msgstr "%sï¼?æ ?è¯?为 %s ç??å¯?é?¥å­?å?¨ï¼?ä½?å®?å·²ç»?è¿?æ??ã??ç¦?ç?¨ã??åº?é?¤æ??æ? æ??"
+
+#: ../libbalsa/gmime-gpgme-context.c:928
+#, c-format
+msgid "%s: could not find a key with id %s"
+msgstr "%sï¼?æ? æ³?æ?¾å?°æ ?è¯?为 %s ç??å¯?é?¥"
+
+#: ../libbalsa/gmime-gpgme-context.c:942
 #, c-format
 msgid "%s: multiple keys for %s"
-msgstr ""
+msgstr "%sï¼?对åº? %s æ??å¤?个å¯?é?¥"
 
-#: ../libbalsa/gmime-gpgme-context.c:953
+#: ../libbalsa/gmime-gpgme-context.c:987
 #, c-format
 msgid "%s: insufficient validity for uid %s"
 msgstr ""
 
+#: ../libbalsa/html.c:68
+#, c-format
+msgid "Could not get an HTML part: %s"
+msgstr " æ? æ³?è?·å?? HTML å?ºæ®µï¼?%s "
+
+#: ../libbalsa/html.c:340
+msgid ""
+"This message part contains images from a remote server. To protect your "
+"privacy, Balsa has not downloaded them. You may choose to download them if "
+"you trust the server."
+msgstr ""
+"è¿?个é?®ä»¶å??å?ºæ®µæ??æ?¥è?ªå¤?é?¨æ??å?¡å?¨ç??å?¾å??ã??为äº?ä¿?æ?¤æ?¨ç??é??ç§?ï¼?Balsa 没æ??ä¸?è½½å®?们ã??"
+"å¦?æ??æ?¨ä¿¡ä»»è¯¥æ??å?¡å?¨ï¼?å?¯ä»¥é??æ?©ä¸?è½½å®?们ã??"
+
+#: ../libbalsa/html.c:348
+msgid "_Download images"
+msgstr "ä¸?è½½å?¾å??(_D)"
+
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:101 ../libbalsa/mailbox_local.c:1284
-#: ../libbalsa/mailbox_local.c:1286 ../src/sendmsg-window.c:3350
-#: ../src/sendmsg-window.c:3351
+#: ../libbalsa/identity.c:103 ../libbalsa/mailbox_local.c:1884
+#: ../libbalsa/mailbox_local.c:1886 ../src/sendmsg-window.c:4044
+#: ../src/sendmsg-window.c:4046
 msgid "Re:"
 msgstr "å??å¤?ï¼?"
 
-#: ../libbalsa/identity.c:102 ../src/sendmsg-window.c:3381
-#: ../src/sendmsg-window.c:3382
+#: ../libbalsa/identity.c:104 ../src/sendmsg-window.c:3984
+#: ../src/sendmsg-window.c:3985 ../src/sendmsg-window.c:3986
 msgid "Fwd:"
 msgstr "转å??ï¼?"
 
 # src/pref-manager.c:137
-#: ../libbalsa/identity.c:153
-#, fuzzy
+#: ../libbalsa/identity.c:165
 msgid "New Identity"
-msgstr "é??æ?©èº«ä»½"
+msgstr "�建身份"
 
-#: ../libbalsa/identity.c:406
-#, fuzzy
+#: ../libbalsa/identity.c:345
+#, c-format
+msgid "Error executing signature generator %s"
+msgstr "æ?§è¡?ç­¾å??ç??æ??å?¨ %s æ?¶å?ºé??"
+
+#: ../libbalsa/identity.c:355
+#, c-format
+msgid "Cannot open signature file '%s' for reading"
+msgstr "æ? æ³?æ??å¼?ç­¾å??æ??件 '%s' 以读å??"
+
+#: ../libbalsa/identity.c:361
+#, c-format
+msgid "Error reading signature from %s"
+msgstr "ä»? %s 读å??ç­¾å??æ?¶å?ºé??"
+
+#: ../libbalsa/identity.c:366
+#, c-format
+msgid "Signature in %s is not a UTF-8 text."
+msgstr "%s 中ç??ç­¾å??ä¸?æ?¯ UTF-8 æ??æ?¬ã??"
+
+#: ../libbalsa/identity.c:497
 msgid "Current"
-msgstr "å½?å??å·¥å?·æ ?"
+msgstr "å½?å??"
 
-#: ../libbalsa/identity.c:646 ../libbalsa/smtp-server.c:267
+#: ../libbalsa/identity.c:751 ../libbalsa/smtp-server.c:270
 msgid "Default"
 msgstr "�认"
 
+# src/mailbox-conf.c:861
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:950
+msgid "_Face Path"
+msgstr "_Face 路�"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:956
+msgid "_X-Face Path"
+msgstr "_X-Face 路�"
+
 # src/sendmsg-window.c:88
 #. create the "General" tab
-#: ../libbalsa/identity.c:852
-#, fuzzy
+#: ../libbalsa/identity.c:984
 msgid "General"
-msgstr "å??é??(_S)"
+msgstr "常�"
 
 # src/pref-manager.c:137
-#: ../libbalsa/identity.c:854
-#, fuzzy
-msgid "_Identity Name:"
-msgstr "身份å??ï¼?"
+#: ../libbalsa/identity.c:986
+msgid "_Identity name:"
+msgstr "身份å??(_I)ï¼?"
 
 # src/filter-edit-dialog.c:101
-#: ../libbalsa/identity.c:856
-#, fuzzy
-msgid "_Full Name:"
-msgstr "å?¨å??ï¼?"
+#: ../libbalsa/identity.c:988
+msgid "_Full name:"
+msgstr "å?¨å??(_F)ï¼?"
 
 # src/balsa-init.c:261 src/pref-manager.c:377
-#: ../libbalsa/identity.c:858
-#, fuzzy
-msgid "_Mailing Address:"
-msgstr "é?®ä»¶å?°å??ï¼?"
+#: ../libbalsa/identity.c:990
+msgid "_Mailing address:"
+msgstr "é?®ä»¶å?°å??(_M)ï¼?"
 
 # src/sendmsg-window.c:513
-#: ../libbalsa/identity.c:860
-#, fuzzy
-msgid "Reply _To:"
-msgstr "å??å¤?å?°ï¼?"
+#: ../libbalsa/identity.c:992
+msgid "Reply _to:"
+msgstr "å??å¤?å?°(_T)ï¼?"
 
 # src/filter-edit-dialog.c:420
-#: ../libbalsa/identity.c:862
-#, fuzzy
+#: ../libbalsa/identity.c:994
 msgid "_Domain:"
-msgstr "å??ï¼?"
+msgstr "å??(_D)ï¼?"
 
-#: ../libbalsa/identity.c:864
-#, fuzzy
+# src/main-window.c:200
+#. create the "Messages" tab
+#: ../libbalsa/identity.c:998
+msgid "Messages"
+msgstr "�件"
+
+#: ../libbalsa/identity.c:1000
 msgid "_Bcc:"
-msgstr "æ??é??(_B)"
+msgstr "å¯?é??(_B)ï¼?"
 
-#: ../libbalsa/identity.c:866
-#, fuzzy
-msgid "Reply _String:"
-msgstr "å??å¤?å­?符串ï¼?"
+#: ../libbalsa/identity.c:1002
+msgid "Reply _string:"
+msgstr "å??å¤?å­?符串(_S)ï¼?"
 
-#: ../libbalsa/identity.c:868
-#, fuzzy
-msgid "F_orward String:"
-msgstr "转å??å­?符串ï¼?"
+#: ../libbalsa/identity.c:1004
+msgid "F_orward string:"
+msgstr "转å??å­?符串(_O)ï¼?"
+
+#: ../libbalsa/identity.c:1007
+msgid "send messages in both plain text and _HTML format"
+msgstr "å??æ?¶ä»¥çº¯æ??æ?¬å?? _HTML æ ¼å¼?å??é??é?®ä»¶"
+
+#: ../libbalsa/identity.c:1010
+msgid "request _Message Disposition Notification by default"
+msgstr "é»?认è¦?æ±?é?®ä»¶å¤?ç??é??ç?¥(_M)"
 
 # src/balsa-init.c:276
-#: ../libbalsa/identity.c:871
-#, fuzzy
-msgid "SMT_P Server"
-msgstr "SMTPæ??å?¡å?¨ï¼?"
+#: ../libbalsa/identity.c:1020
+msgid "SMT_P server:"
+msgstr "SMTPæ??å?¡å?¨(_P)ï¼?"
 
 # src/pref-manager.c:397
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:876
-#, fuzzy
+#: ../libbalsa/identity.c:1025
 msgid "Signature"
-msgstr "é??å? ç­¾å??"
+msgstr "ç­¾å??"
 
 # src/pref-manager.c:397
-#: ../libbalsa/identity.c:878
-#, fuzzy
-msgid "Signature _Path:"
-msgstr "ç­¾å??è·¯å¾?ï¼?"
+#: ../libbalsa/identity.c:1028
+msgid "Signature _path"
+msgstr "ç­¾å??è·¯å¾?(_P)"
 
 # src/pref-manager.c:397
-#: ../libbalsa/identity.c:881
-#, fuzzy
-msgid "_Execute Signature"
-msgstr "æ?§è¡?ç­¾å??"
+#: ../libbalsa/identity.c:1031
+msgid "_Execute signature"
+msgstr "æ?§è¡?ç­¾å??(_E)"
 
-#: ../libbalsa/identity.c:884
-#, fuzzy
-msgid "Incl_ude Signature"
-msgstr "å??å?«ç­¾å??å??é??符"
+#: ../libbalsa/identity.c:1034
+msgid "Incl_ude signature"
+msgstr "å??å?«ç­¾å??(_U)"
 
-#: ../libbalsa/identity.c:887
-#, fuzzy
-msgid "Include Signature When For_warding"
-msgstr "转å??æ?¶é??å? ç­¾å??"
+#: ../libbalsa/identity.c:1037
+msgid "Include signature when for_warding"
+msgstr "转å??æ?¶å??å?«ç­¾å??(_W)"
 
-#: ../libbalsa/identity.c:890
-#, fuzzy
-msgid "Include Signature When Rep_lying"
-msgstr "å??å¤?æ?¶é??å? ç­¾å??"
+#: ../libbalsa/identity.c:1040
+msgid "Include signature when rep_lying"
+msgstr "å??å¤?æ?¶å??å?«ç­¾å??(_L)"
 
-#: ../libbalsa/identity.c:893
-#, fuzzy
-msgid "_Add Signature Separator"
-msgstr "å??å?«ç­¾å??å??é??符"
+#: ../libbalsa/identity.c:1043
+msgid "_Add signature separator"
+msgstr "æ·»å? ç­¾å??å??é??符(_A)"
 
 # src/pref-manager.c:397
-#: ../libbalsa/identity.c:896
-#, fuzzy
-msgid "Prepend Si_gnature"
-msgstr "é¢?å? ç­¾å??"
+#: ../libbalsa/identity.c:1046
+msgid "Prepend si_gnature"
+msgstr "é¢?é??ç­¾å??(_G)"
 
-#. create the "Security" tab
-#: ../libbalsa/identity.c:901
-msgid "Security"
+#: ../libbalsa/identity.c:1052
+msgid ""
+"Signing and encrypting messages are possible\n"
+"only if Balsa is built with cryptographic support."
 msgstr ""
+"ç­¾å??å??å? å¯?é?®ä»¶ä¸?è?½è¿?è¡?\n"
+"å?ªæ?? Balsa ç¼?è¯?æ?¶å¸¦å? å¯?æ?¯æ??æ??è¡?ã?? "
 
-#: ../libbalsa/identity.c:904
-#, fuzzy
+#: ../libbalsa/identity.c:1057
+msgid "Security"
+msgstr "å®?å?¨"
+
+#: ../libbalsa/identity.c:1060
 msgid "sign messages by default"
-msgstr "æ??æ?¾æ??ä½?é»?认为移å?¨é?®ä»¶"
+msgstr "é»?认对é?®ä»¶ç­¾å??"
 
-#: ../libbalsa/identity.c:907
-#, fuzzy
+#: ../libbalsa/identity.c:1063
 msgid "encrypt messages by default"
-msgstr "æ??æ?¾æ??ä½?é»?认为移å?¨é?®ä»¶"
+msgstr "�认对�件��"
 
-#: ../libbalsa/identity.c:910
-#, fuzzy
+#: ../libbalsa/identity.c:1066
 msgid "default protocol"
-msgstr "�认"
+msgstr "é»?认å??è®®"
 
-#: ../libbalsa/identity.c:913
+#: ../libbalsa/identity.c:1069
 msgid "always trust GnuPG keys when encrypting"
+msgstr "�����信任 GnuPG ��"
+
+#: ../libbalsa/identity.c:1072
+msgid "remind me if messages can be encrypted"
+msgstr "å¦?æ??é?®ä»¶å?¯ä»¥å? å¯?å??æ??é??æ??"
+
+#: ../libbalsa/identity.c:1075
+msgid ""
+"use secret key with this id for signing\n"
+"(leave empty for automatic selection)"
 msgstr ""
 
-#: ../libbalsa/identity.c:1059
+#: ../libbalsa/identity.c:1209
+#, c-format
+msgid "Error reading file %s: %s"
+msgstr "读å?? %s æ??件å?ºé??ï¼?%s"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1219
+#, c-format
+msgid "Face header file %s is too long (%lu bytes)."
+msgstr "Face 信头æ??件 %s 太é?¿(%lu å­?è??)ã??"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1229
+#, c-format
+msgid "Face header file %s contains binary data."
+msgstr "Face 信头æ??件 %s å??å?«äº?è¿?å?¶æ?°æ?®ã??"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/identity.c:1249 ../src/balsa-message.c:1576
+#, c-format
+msgid "Error loading Face: %s"
+msgstr "è½½å?¥ Face å?ºé??ï¼?%s"
+
+#: ../libbalsa/identity.c:1428
 msgid "Error: The identity does not have a name"
 msgstr "é??误ï¼?该身份没æ??å??å­?"
 
-#: ../libbalsa/identity.c:1069
+#: ../libbalsa/identity.c:1438
 msgid "Error: An identity with that name already exists"
 msgstr "é??误ï¼?å?·æ??å??å??ç??身份已å­?å?¨"
 
-#: ../libbalsa/identity.c:1240
+#: ../libbalsa/identity.c:1637
 msgid "Do you really want to delete the selected identity?"
 msgstr "æ?¨ç¡®è®¤è¦?å? é?¤é??中ç??身份ï¼?"
 
-#: ../libbalsa/identity.c:1275
+#: ../libbalsa/identity.c:1674
 #, c-format
 msgid "Error displaying help for identities: %s\n"
-msgstr ""
+msgstr "æ?¾ç¤ºèº«ä»½å¸®å?©å?ºé??ï¼?%s\n"
 
 # src/main-window.c:182
-#: ../libbalsa/identity.c:1321
+#: ../libbalsa/identity.c:1720
 msgid "Manage Identities"
 msgstr "管ç??身份"
 
-#: ../libbalsa/identity.c:1639
+#: ../libbalsa/identity.c:2113
 msgid "GnuPG MIME mode"
-msgstr ""
+msgstr "GnuPG MIME 模�"
 
-#: ../libbalsa/identity.c:1641
+#: ../libbalsa/identity.c:2115
 msgid "GnuPG OpenPGP mode"
-msgstr ""
+msgstr "GnuPG OpenPGP 模�"
 
-#: ../libbalsa/identity.c:1644
+#: ../libbalsa/identity.c:2118
 msgid "GpgSM S/MIME mode"
-msgstr ""
+msgstr "GpgSM S/MIME 模�"
 
 # src/balsa-init.c:276
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:256
-#, fuzzy, c-format
+#: ../libbalsa/imap-server.c:321
+#, c-format
 msgid ""
 "IMAP server %s alert:\n"
 "%s"
-msgstr "SMTP æ??å?¡å?¨é?®é¢?ï¼?%s"
+msgstr ""
+"IMAP æ??å?¡å?¨ %s è­¦å??ï¼?\n"
+"%s"
 
 # src/balsa-init.c:276
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:260
-#, fuzzy, c-format
+#: ../libbalsa/imap-server.c:325
+#, c-format
 msgid "IMAP server %s error: %s"
-msgstr "SMTP æ??å?¡å?¨é?®é¢?ï¼?%s"
+msgstr "SMTP æ??å?¡å?¨ %s é??误ï¼?%s"
 
 # src/mailbox-conf.c:531
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:266
-#, fuzzy, c-format
+#: ../libbalsa/imap-server.c:331
+#, c-format
 msgid "%s: %s"
-msgstr "%d %s"
+msgstr "%sï¼?%s"
 
-#: ../libbalsa/imap-server.c:507
-#, fuzzy, c-format
-msgid "Cannot connect to the server: %s"
-msgstr "æ? æ³?è¿?æ?¥å?° %s (%s)ã??"
+# src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
+#: ../libbalsa/imap-server.c:577 ../libbalsa/server.c:348
+#: ../libbalsa/server.c:392
+msgid "Balsa passwords"
+msgstr "Balsa ��"
 
-#: ../libbalsa/imap-server.c:511
-#, fuzzy
-msgid "Cannot connect to the server"
-msgstr "æ? æ³?è¿?æ?¥å?° %s (%s)ã??"
+#: ../libbalsa/imap-server.c:628
+#, c-format
+msgid "Cannot connect to %s"
+msgstr "����� %s"
+
+#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#, c-format
+msgid "Cannot connect to the server: %s"
+msgstr "æ? æ³?è¿?æ?¥å?°æ??å?¡å?¨ï¼?%s"
 
-#: ../libbalsa/imap-server.c:659
+#: ../libbalsa/imap-server.c:786
 #, c-format
 msgid "Exceeded the number of connections per server %s"
-msgstr ""
+msgstr "è¶?è¿?æ¯?个æ??å?¡å?¨ç??è¿?æ?¥æ?° %s"
 
-#: ../libbalsa/libbalsa-conf.c:204
+#: ../libbalsa/libbalsa-conf.c:143
 msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
-msgstr ""
+msgstr "æ?¨ç?? Balsa é??ç½®ç?°å?¨ä¿?å­?å?¨â??~/.balsa/configâ??ã??"
 
-#: ../libbalsa/libbalsa.c:285
+# src/sendmsg-window.c:188
+#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5168
 #, c-format
-msgid "LDAP Directory for %s"
-msgstr "%s ç??LDAP ç?®å½?"
+msgid "not a regular file"
+msgstr "ä¸?æ?¯å¸¸è§?æ??件"
 
-#: ../libbalsa/libbalsa.c:391
-#, fuzzy
+#: ../libbalsa/libbalsa-vfs.c:610
+#, c-format
+msgid "Cannot launch, missing application"
+msgstr "�����缺�����"
+
+#: ../libbalsa/libbalsa-vfs.c:676
+#, c-format
+msgid "Open with %s"
+msgstr "ç?¨ %s æ??å¼?"
+
+#: ../libbalsa/libbalsa-vfs.c:729
+#, c-format
+msgid "Open _part with %s"
+msgstr "ç?¨ %s æ??å¼?å?ºæ®µ(_P)"
+
+#: ../libbalsa/libbalsa.c:382
 msgid "Invalid date"
-msgstr "[æ? æ??ç??æ?¥æ??]"
+msgstr "æ? æ??ç??æ?¥æ??"
 
-#: ../libbalsa/libbalsa.c:407 ../src/pref-manager.c:1206
-#: ../src/pref-manager.c:1301
+#: ../libbalsa/libbalsa.c:398 ../src/pref-manager.c:1408
+#: ../src/pref-manager.c:1504
 msgid "Unknown"
 msgstr "��"
 
-#: ../libbalsa/libbalsa.c:546
+#: ../libbalsa/libbalsa.c:544
 #, c-format
 msgid ""
 "Authenticity of this certificate could not be verified.\n"
 "<b>Reason:</b> %s\n"
 "<b>This certificate belongs to:</b>\n"
 msgstr ""
+"该è¯?书ç??æ??æ??æ?§æ? æ³?éª?è¯?ã??\n"
+"<b>å??å? </b> %s\n"
+"<b>此�书���</b>\n"
 
-#: ../libbalsa/libbalsa.c:558
-#, fuzzy
+#: ../libbalsa/libbalsa.c:556
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
-msgstr "该è¯?书ç??ç­¾å??è??æ?¯ï¼?"
+msgstr ""
+"\n"
+"<b>è¯?书é¢?å??è??ï¼?</b>\n"
 
-#: ../libbalsa/libbalsa.c:569
+#: ../libbalsa/libbalsa.c:567
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -553,138 +718,270 @@ msgid ""
 "to %s\n"
 "<b>Fingerprint:</b> %s"
 msgstr ""
+"<b>该è¯?书æ?¯æ??æ??ç??</b>\n"
+"�� %s\n"
+"å??ç»? %s\n"
+"<b>æ??纹ï¼?</b> %s"
 
-#: ../libbalsa/libbalsa.c:578
-#, fuzzy
+#: ../libbalsa/libbalsa.c:576
 msgid "SSL/TLS certificate"
-msgstr "SSL �书��"
+msgstr "SSL/TLS �书"
 
-#: ../libbalsa/libbalsa.c:580
+#: ../libbalsa/libbalsa.c:578
 msgid "_Accept Once"
-msgstr ""
+msgstr "æ?¥å??ä¸?次(_A)"
 
-#: ../libbalsa/libbalsa.c:581
+#: ../libbalsa/libbalsa.c:579
 msgid "Accept&_Save"
-msgstr ""
+msgstr "æ?¥å??并ä¿?å­?"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../libbalsa/libbalsa.c:582
-#, fuzzy
+#: ../libbalsa/libbalsa.c:580
 msgid "_Reject"
-msgstr "主�(_S)"
+msgstr "æ??ç»?(_R)"
+
+#: ../libbalsa/libbalsa.c:626
+#, c-format
+msgid "Connection to %s timed out. Abort?"
+msgstr "è¿?æ?¥ %s è¶?æ?¶ã??中止å??ï¼?"
+
+#: ../libbalsa/libbalsa.c:872
+#, c-format
+msgid "No image data"
+msgstr "没æ??å?¾å??æ?°æ?®"
+
+#: ../libbalsa/libbalsa.c:916
+#, c-format
+msgid "Invalid input format"
+msgstr "æ? æ??ç??è¾?å?¥æ ¼å¼?"
+
+#: ../libbalsa/libbalsa.c:920
+#, c-format
+msgid "Internal buffer overrun"
+msgstr "è¶?å?ºå??é?¨ç¼?å­?"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/libbalsa.c:937
+#, c-format
+msgid "Bad X-Face data"
+msgstr "X-Face æ?°æ?®æ??误"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox.c:390
+#: ../libbalsa/mailbox.c:522
 #, c-format
 msgid "Cannot load mailbox %s"
-msgstr "��载��件箱 %s"
+msgstr "��载��箱 %s"
 
 # src/mailbox-conf.c:634
-#: ../libbalsa/mailbox.c:397
+#: ../libbalsa/mailbox.c:529
 #, c-format
 msgid "No such mailbox type: %s"
-msgstr "没æ??è¿?ç§?é?®ä»¶ç®±ç±»å??ï¼?%s"
+msgstr "没æ??è¿?ç§?é?®ç®±ç±»å??ï¼?%s"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox.c:414
-#, fuzzy, c-format
+#: ../libbalsa/mailbox.c:546
+#, c-format
 msgid "Bad local mailbox path \"%s\""
-msgstr "��载��件箱 %s"
+msgstr "é??误ç??æ?¬å?°é?®ç®±è·¯å¾?â??%sâ??"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox.c:419
+#: ../libbalsa/mailbox.c:551
 #, c-format
 msgid "Could not create a mailbox of type %s"
-msgstr "æ? æ³?å??建类å??为 %s ç??é?®ä»¶ç®±"
+msgstr "æ? æ³?å??建类å??为 %s ç??é?®ç®±"
+
+#: ../libbalsa/mailbox.c:874
+#, c-format
+msgid "Applying filter rules to %s"
+msgstr "æ­£å?¨å?? %s åº?ç?¨è¿?滤è§?å??"
+
+#: ../libbalsa/mailbox.c:1029
+#, c-format
+msgid "Copying from %s to %s"
+msgstr "æ­£å?¨ä»? %s å?? %s å¤?å?¶é?®ä»¶"
+
+#: ../libbalsa/mailbox.c:1936
+#, c-format
+msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
+msgstr "libbalsa_mailbox_get_message��箱 %s 已��"
+
+# src/main-window.c:168
+#: ../libbalsa/mailbox.c:2146
+#, c-format
+msgid "Removing messages from source mailbox failed"
+msgstr "���箱中移��件失败"
+
+#: ../libbalsa/mailbox.c:3019
+msgid "from unknown"
+msgstr "å??é??æ?¹æ?ªç?¥"
+
+#: ../libbalsa/mailbox.c:3021
+msgid "Loading..."
+msgstr "正���..."
+
+# src/sendmsg-window.c:523
+#: ../libbalsa/mailbox.c:3991
+#, c-format
+msgid "Searching %s for partial messages"
+msgstr "æ­£å?¨æ??ç´¢ %s æ?¥æ?¾é?¨å??é?®ä»¶"
+
+# src/sendmsg-window.c:523
+#: ../libbalsa/mailbox.c:4081
+msgid "Reconstructing message"
+msgstr "é??ç»?é?®ä»¶"
+
+#: ../libbalsa/mailbox.c:4350
+#, c-format
+msgid "Finding duplicate messages in source mailbox failed"
+msgstr "å?¨æº?é?®ç®±ä¸­æ?¥æ?¾é??å¤?é?®ä»¶å¤±è´¥"
 
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:538
+#: ../libbalsa/mailbox_imap.c:609
 msgid "IMAP connection has been severed. Reconnecting..."
+msgstr "IMAP è¿?æ?¥å·²æ?­å¼?ã??é??æ?°è¿?æ?¥..."
+
+#: ../libbalsa/mailbox_imap.c:612
+msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr ""
 
-#: ../libbalsa/mailbox_imap.c:541
+#: ../libbalsa/mailbox_imap.c:615
 #, c-format
 msgid "IMAP server has shut the connection: %s Reconnecting..."
-msgstr ""
+msgstr "IMAP æ??å?¡å?¨å?³é?­äº?è¿?æ?¥ï¼?%s é??æ?°è¿?æ?¥..."
+
+#: ../libbalsa/mailbox_imap.c:627
+#, c-format
+msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+msgstr "æ? æ³?æ?§è¡?å¼?æ­¥ IMAP å?½ä»¤ %sã??é??æ?°è¿?æ?¥..."
 
 # libbalsa/mailbox.c:476
-#: ../libbalsa/mailbox_imap.c:1007 ../libbalsa/mailbox_maildir.c:493
-#: ../libbalsa/mailbox_mbox.c:516 ../libbalsa/mailbox_mh.c:518
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_imap.c:1111 ../libbalsa/mailbox_maildir.c:511
+#: ../libbalsa/mailbox_mbox.c:750 ../libbalsa/mailbox_mh.c:547
+#, c-format
 msgid "%s: Opening %s Refcount: %d\n"
-msgstr "LibBalsaMailboxPop3ï¼?æ??å¼? %s ç??å¼?ç?¨è®¡æ?°ï¼?%d\n"
+msgstr "%sï¼? æ??å¼? %s å¼?ç?¨è®¡æ?°ï¼?%d\n"
 
-#: ../libbalsa/mailbox_imap.c:1081 ../libbalsa/mailbox_imap.c:2221
+#: ../libbalsa/mailbox_imap.c:1198
 #, c-format
 msgid "Downloading %ld kB"
-msgstr ""
+msgstr "�载 %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1461
+#: ../libbalsa/mailbox_imap.c:1595
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
 "falling back to default searching method"
 msgstr ""
+"对é?®ç®± %s ç?? IMAP SEARCH å?½ä»¤å¤±è´¥\n"
+"é??å??å?°é»?认ç??æ??ç´¢æ?¹æ³?"
 
-#: ../libbalsa/mailbox_imap.c:1521
+#: ../libbalsa/mailbox_imap.c:1655
 #, c-format
 msgid "No path found for mailbox \"%s\", using \"%s\""
-msgstr ""
+msgstr "没æ??æ?¾å?°é?®ç®±â??%sâ??ç??è·¯å¾?ï¼?使ç?¨â??%sâ??"
 
-#: ../libbalsa/mailbox_imap.c:1610 ../libbalsa/mailbox_imap.c:1651
+#: ../libbalsa/mailbox_imap.c:1783 ../libbalsa/mailbox_imap.c:1824
+#, c-format
 msgid "Cannot get IMAP handle"
-msgstr ""
+msgstr "æ? æ³?è?·å¾? IMAP å?¥æ??"
 
-#: ../libbalsa/mailbox_imap.c:2254
-#, fuzzy
+#: ../libbalsa/mailbox_imap.c:2424 ../libbalsa/mailbox_imap.c:2490
+#, c-format
+msgid "Error fetching message from IMAP server: %s"
+msgstr "ä»? IMAP æ??å?¡å?¨å??å??é?®ä»¶å?ºé??ï¼?%s"
+
+#: ../libbalsa/mailbox_imap.c:2458
+#, c-format
+msgid "Downloading %u kB"
+msgstr "�载 %u kB"
+
+#: ../libbalsa/mailbox_imap.c:2502
+#, c-format
 msgid "Cannot create temporary file"
-msgstr "æ? æ³?å??建临æ?¶æ??件ï¼?"
+msgstr "æ? æ³?å??建临æ?¶æ??件"
 
-#: ../libbalsa/mailbox_imap.c:2273
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_imap.c:2522
+#, c-format
 msgid "Cannot write to temporary file %s"
-msgstr "æ? æ³?æ??å¼?临æ?¶æ??件 %sã??"
+msgstr "æ? æ³?å??å?¥ä¸´æ?¶æ??件 %s"
 
-#: ../libbalsa/mailbox_imap.c:2506
+#: ../libbalsa/mailbox_imap.c:2751
 #, c-format
 msgid "Uploading %ld kB"
-msgstr ""
+msgstr "�传 %ld kB"
+
+#: ../libbalsa/mailbox_imap.c:2870
+msgid "Uploading %"
+msgstr "正��传 %"
 
-#: ../libbalsa/mailbox_imap.c:2693
+#: ../libbalsa/mailbox_imap.c:3170
 msgid "Server-side threading not supported."
 msgstr ""
 
-#: ../libbalsa/mailbox_local.c:1450
+# src/main-window.c:168
+#: ../libbalsa/mailbox_local.c:543
+#, c-format
+msgid "Failed to save cache file \"%s\": %s."
+msgstr "ä¿?å­?ç¼?å­?æ??件â??%sâ??失败ï¼?%sã??"
+
+#: ../libbalsa/mailbox_local.c:575
+#, c-format
+msgid "Cache file for mailbox %s will be created"
+msgstr "å°?å??建é?®ç®± %s ç??ç¼?å­?æ??件"
+
+#: ../libbalsa/mailbox_local.c:584
+#, c-format
+msgid "Failed to read cache file %s: %s"
+msgstr "读å??ç¼?å­?æ??件 %s 失败ï¼?%s"
+
+#: ../libbalsa/mailbox_local.c:602 ../libbalsa/mailbox_local.c:619
+#: ../libbalsa/mailbox_local.c:643
+#, c-format
+msgid "Cache file for mailbox %s will be repaired"
+msgstr "å°?ä¿®å¤?é?®ç®± %s ç??ç¼?å­?æ??件"
+
+# src/main-window.c:182
+#: ../libbalsa/mailbox_local.c:1169
+#, c-format
+msgid "Filtering %s"
+msgstr "正��滤 %s"
+
+#: ../libbalsa/mailbox_local.c:1257
+#, c-format
+msgid "Preparing %s"
+msgstr "æ­£å?¨å??å¤? %s"
+
+#: ../libbalsa/mailbox_local.c:2053
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "æ??å¼? %s 失败ã??Errno = %dï¼?"
 
-#: ../libbalsa/mailbox_local.c:1472
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_local.c:2075
+#, c-format
 msgid "Failed to sync mailbox \"%s\""
-msgstr "æ? æ³?å??æ­¥é?®ä»¶ç®± %sï¼?"
+msgstr "å??æ­¥é?®ä»¶ç®± %s 失败"
 
-#: ../libbalsa/mailbox_maildir.c:205
+#: ../libbalsa/mailbox_maildir.c:197
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
-msgstr "é?®ä»¶ç®±â??%sâ??ä¸?æ?¯æ??æ??ç?? Maildir é?®ç®±ã??"
+msgstr "é?®ç®±â??%sâ??ä¸?æ?¯æ??æ??ç?? Maildir é?®ç®±ã??"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_maildir.c:214
+#: ../libbalsa/mailbox_maildir.c:206
 #, c-format
 msgid "Could not create a MailDir directory at %s (%s)"
 msgstr "æ? æ³?å?¨ %s å??建 MailDir ç?®å½? (%s)"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_maildir.c:221 ../libbalsa/mailbox_maildir.c:229
-#: ../libbalsa/mailbox_maildir.c:239
+#: ../libbalsa/mailbox_maildir.c:214 ../libbalsa/mailbox_maildir.c:223
+#: ../libbalsa/mailbox_maildir.c:234
 #, c-format
 msgid "Could not create a MailDir at %s (%s)"
 msgstr "æ? æ³?å?¨ %s å??建 MailDir (%s)"
 
-#: ../libbalsa/mailbox_maildir.c:340 ../libbalsa/mailbox_mh.c:277
+#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mh.c:294
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -693,8 +990,8 @@ msgstr ""
 "æ? æ³?å? é?¤ %s ç??å??容ï¼?\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:346 ../libbalsa/mailbox_mbox.c:300
-#: ../libbalsa/mailbox_mh.c:283
+#: ../libbalsa/mailbox_maildir.c:347 ../libbalsa/mailbox_mbox.c:326
+#: ../libbalsa/mailbox_mh.c:300
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -704,704 +1001,764 @@ msgstr ""
 "%s"
 
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/mailbox_maildir.c:472 ../libbalsa/mailbox_mbox.c:467
-#: ../libbalsa/mailbox_mh.c:499
-#, fuzzy
+#: ../libbalsa/mailbox_maildir.c:490 ../libbalsa/mailbox_mbox.c:694
+#: ../libbalsa/mailbox_mh.c:528
+#, c-format
 msgid "Mailbox does not exist."
-msgstr "å·²å??建é?®ä»¶ç®±ã??"
-
-# src/main-window.c:139
-#: ../libbalsa/mailbox_maildir.c:901
-#, fuzzy
-msgid "Cannot read message"
-msgstr "æ? æ³?å??é?®ä»¶"
+msgstr "é?®ç®±ä¸?å­?å?¨ã??"
 
-#: ../libbalsa/mailbox_maildir.c:923 ../libbalsa/mailbox_mbox.c:1606
-#: ../libbalsa/mailbox_mh.c:1114
-#, fuzzy
+#: ../libbalsa/mailbox_maildir.c:932 ../libbalsa/mailbox_mbox.c:2031
+#: ../libbalsa/mailbox_mh.c:1110
+#, c-format
 msgid "Data copy error"
-msgstr "没æ??é??误"
+msgstr "æ?°æ?®å¤?å?¶é??误"
 
-#: ../libbalsa/mailbox_mbox.c:204
+#: ../libbalsa/mailbox_mbox.c:211
 #, c-format
 msgid "Mailbox %s does not appear to be an Mbox mailbox."
-msgstr "é?®ä»¶ç®± %s ä¸?æ?¯ä¸?个 Mbox é?®ç®±ã??"
+msgstr "é?®ç®± %s ä¸?æ?¯ä¸?个 Mbox é?®ç®±ã??"
+
+#: ../libbalsa/mailbox_mbox.c:429
+#, c-format
+msgid "Could not write file %s: %s"
+msgstr "æ? æ³?å??æ??件 %sï¼?%s"
+
+#: ../libbalsa/mailbox_mbox.c:441
+#, c-format
+msgid "Failed to create temporary file \"%s\": %s"
+msgstr "å??建临æ?¶æ??件â??%sâ?? 失败ï¼?%s"
+
+#: ../libbalsa/mailbox_mbox.c:453
+#, c-format
+msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
+msgstr "ä¿?å­?ç¼?å­?æ??件â??%sâ??失败ï¼?%sã??æ?°ç??æ?¬ä¿?å­?为â??%sâ??"
+
+#: ../libbalsa/mailbox_mbox.c:461
+#, c-format
+msgid "Could not unlink file %s: %s"
+msgstr " æ? æ³?å??æ¶?é?¾æ?¥æ??件 %s ï¼?%s "
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_mbox.c:475
-#, fuzzy
+#: ../libbalsa/mailbox_mbox.c:702
+#, c-format
 msgid "Cannot open mailbox."
-msgstr "��载��件箱 %s"
+msgstr "æ? æ³?æ??å¼?é?®ç®±ã??"
 
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../libbalsa/mailbox_mbox.c:487
-#, fuzzy
+#: ../libbalsa/mailbox_mbox.c:714
+#, c-format
 msgid "Mailbox is not in mbox format."
-msgstr "å·²å??建é?®ä»¶ç®±ã??"
+msgstr "é?®ç®±ä¸?æ?¯ mbox æ ¼å¼?ã??"
 
 # src/mailbox-conf.c:488
-#: ../libbalsa/mailbox_mbox.c:495
-#, fuzzy
+#: ../libbalsa/mailbox_mbox.c:722
+#, c-format
 msgid "Cannot lock mailbox."
-msgstr "��载��件箱 %s"
+msgstr "æ? æ³?é??å®?é?®ç®±ã??"
 
-#: ../libbalsa/mailbox_mbox.c:1554
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_mbox.c:1988
+#, c-format
 msgid "%s: could not open %s."
-msgstr "æ? æ³?æ??å¼?æ??件 %sã??\n"
+msgstr "%sï¼?æ? æ³?æ??å¼? %sã??"
 
-#: ../libbalsa/mailbox_mbox.c:1564
+#: ../libbalsa/mailbox_mbox.c:1999
 #, c-format
 msgid "%s: could not get new mime stream."
-msgstr ""
+msgstr "%sï¼?æ? æ³?è?·å¾?æ?°ç?? mime æµ?ã??"
 
 # src/mailbox-conf.c:640
-#: ../libbalsa/mailbox_mbox.c:1572
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_mbox.c:2007
+#, c-format
 msgid "%s: %s is not in mbox format."
-msgstr "%s ä¸?æ?¯é?®ä»¶ç®±ã??"
-
-# src/main-window.c:139
-#: ../libbalsa/mailbox_mbox.c:1584
-#, fuzzy, c-format
-msgid "%s: could not get message stream."
-msgstr "æ? æ³?å??é?®ä»¶"
+msgstr "%sï¼?%s ä¸?æ?¯ mbox æ ¼å¼?ã??"
 
-#: ../libbalsa/mailbox_mh.c:184
+#: ../libbalsa/mailbox_mh.c:175
 #, c-format
 msgid "Mailbox %s does not appear to be a Mh mailbox."
-msgstr "é?®ä»¶ç®± %s ä¸?æ?¯ä¸?个 Mh é?®ç®±ã??"
+msgstr "é?®ç®± %s ä¸?æ?¯ä¸?个 Mh é?®ç®±ã??"
 
-#: ../libbalsa/mailbox_mh.c:194
+#: ../libbalsa/mailbox_mh.c:185
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "æ? æ³?å?¨ %s å??建 MH ç?®å½? (%s)"
 
-#: ../libbalsa/mailbox_mh.c:201
+#: ../libbalsa/mailbox_mh.c:197
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "æ? æ³?å?¨ %s å??建 MH ç»?æ?? (%s)"
 
 # src/main-window.c:139
-#: ../libbalsa/mailbox_mh.c:1090
-#, fuzzy
+#: ../libbalsa/mailbox_mh.c:1091
+#, c-format
 msgid "Cannot create message"
-msgstr "æ? æ³?å??é?®ä»¶"
+msgstr "æ? æ³?å??建é?®ä»¶"
 
 # src/main-window.c:200
-#: ../libbalsa/mailbox_mh.c:1140
-#, fuzzy
+#: ../libbalsa/mailbox_mh.c:1135
+#, c-format
 msgid "Message rename error"
-msgstr "�件��"
-
-# src/main-window.c:168
-#: ../libbalsa/mailbox_pop3.c:204
-#, fuzzy, c-format
-msgid "Error setting flags on messages in mailbox %s"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+msgstr "é??å?½å??é?®ä»¶å?ºé??"
 
-#: ../libbalsa/mailbox_pop3.c:218
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_pop3.c:192
+#, c-format
 msgid "Error appending message %d from %s to %s: %s"
-msgstr ""
-"ä»? %s æ?¾ç½®é?®ä»¶å?° %s æ?¶å??ç??é??误\n"
-"é?®ä»¶ä¿?ç??å?¨ %s\n"
+msgstr "å°?é?®ä»¶ %d ä»? %s 追å? å?° %s å?ºé??ï¼?%s"
+
+#: ../libbalsa/mailbox_pop3.c:341
+#, c-format
+msgid "Saving POP message to %s failed"
+msgstr "�� POP �件� %s 失败"
 
 # src/main-window.c:211
-#: ../libbalsa/mailbox_pop3.c:380
+#: ../libbalsa/mailbox_pop3.c:348
 #, c-format
 msgid "Retrieving Message %d of %d"
 msgstr "正��载�件�第 %d �� %d"
 
-#: ../libbalsa/mailbox_pop3.c:403
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_pop3.c:371
+#, c-format
 msgid "Received %ld kB of %ld"
-msgstr "å·²æ?¥æ?¶ %d å­?è??å?± %d"
+msgstr "已�� %ld kB�� %ld"
 
-#: ../libbalsa/mailbox_pop3.c:417
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_pop3.c:385
+#, c-format
 msgid "Saving POP message to %s failed."
-msgstr "æ­£å?¨æ??已读é?®ä»¶ç§»å?° %s..."
+msgstr "ä¿?å­? POP é?®ä»¶å?° %s 失败ã??"
 
-#: ../libbalsa/mailbox_pop3.c:427
+#: ../libbalsa/mailbox_pop3.c:395
 #, c-format
-msgid "Transfering POP message to %s failed."
-msgstr ""
+msgid "Transferring POP message to %s failed."
+msgstr "å°? POP é?®ä»¶ä¼ é??å?° %s 失败ã??"
 
-#: ../libbalsa/mailbox_pop3.c:508 ../libbalsa/mailbox_pop3.c:519
+#: ../libbalsa/mailbox_pop3.c:477
 #, c-format
 msgid ""
 "POP3 mailbox %s temp file error:\n"
 "%s"
 msgstr ""
-"POP3 é?®ä»¶ç®± %s 临æ?¶æ??件é??误ï¼?\n"
+"POP3 é?®ç®± %s 临æ?¶æ??件é??误ï¼?\n"
 "%s"
 
-#: ../libbalsa/mailbox_pop3.c:533
+#: ../libbalsa/mailbox_pop3.c:502
 #, c-format
-msgid "POP3 mailbox %s temp mailbox error:\n"
-msgstr "POP3 é?®ä»¶ç®± %s 临æ?¶é?®ä»¶ç®±é??误ï¼?\n"
-
-#: ../libbalsa/mailbox_pop3.c:557
-#, fuzzy, c-format
 msgid "POP3 mailbox %s error: %s\n"
-msgstr ""
-"POP3 é?®ä»¶ç®± %s å­?å??é??误ï¼?\n"
-"%s"
+msgstr "POP3 é?®ç®± %s é??误ï¼?%s\n"
 
-#: ../libbalsa/mailbox_pop3.c:591
+#: ../libbalsa/mailbox_pop3.c:540
 #, c-format
 msgid "POP3 message %d oversized: %d kB - skipped."
-msgstr ""
+msgstr "POP3 é?®ä»¶ %d 尺寸è¿?大ï¼?%d kB - 已跳è¿?ã??"
 
-#: ../libbalsa/mailbox_pop3.c:602
+#: ../libbalsa/mailbox_pop3.c:552
 #, c-format
 msgid "POP3 error: cannot open %s for writing."
-msgstr ""
+msgstr "POP3 é??误ï¼?æ? æ³?æ??å¼? %s 以å??å?¥ã??"
 
-#: ../libbalsa/mailbox_pop3.c:610
+#: ../libbalsa/mailbox_pop3.c:560
 #, c-format
 msgid "POP3 error: cannot close %s."
-msgstr ""
+msgstr "POP3 é??误ï¼?æ? æ³?å?³é?­ %sã??"
 
-#: ../libbalsa/mailbox_pop3.c:639
-#, fuzzy, c-format
+#: ../libbalsa/mailbox_pop3.c:595
+#, c-format
 msgid "POP3 error: %s."
-msgstr "å??é??é??误ï¼?%s"
+msgstr "POP3 é??误ï¼?%sã??"
 
-#: ../libbalsa/message.c:529 ../libbalsa/message.c:569
-#, fuzzy, c-format
+#: ../libbalsa/message.c:617
+#, c-format
 msgid "Mailbox (%s) is readonly: cannot change flags."
-msgstr "æº?é?®ä»¶ç®±(%s)å?ªè¯»ã??æ? æ³?移å?¨é?®ä»¶"
+msgstr "é?®ç®±(%s) 为å?ªè¯»ã??æ? æ³?ä¿®æ?¹æ ?è®°ã??"
 
-#: ../libbalsa/misc.c:1237
-#, fuzzy
+#: ../libbalsa/misc.c:598
 msgid "west european"
-msgstr "ç¹?ä½?中æ??"
+msgstr "西欧"
 
-#: ../libbalsa/misc.c:1239 ../libbalsa/misc.c:1273
+#: ../libbalsa/misc.c:600 ../libbalsa/misc.c:634
 msgid "east european"
-msgstr ""
+msgstr "�欧"
 
-#: ../libbalsa/misc.c:1241
+#: ../libbalsa/misc.c:602
 msgid "south european"
-msgstr ""
+msgstr "å??欧"
 
-#: ../libbalsa/misc.c:1243
+#: ../libbalsa/misc.c:604
 msgid "north european"
-msgstr ""
+msgstr "å??欧"
 
-#: ../libbalsa/misc.c:1245 ../libbalsa/misc.c:1275
+#: ../libbalsa/misc.c:606 ../libbalsa/misc.c:636
 msgid "cyrillic"
-msgstr ""
+msgstr "西é??å°?"
 
-#: ../libbalsa/misc.c:1247 ../libbalsa/misc.c:1281
+#: ../libbalsa/misc.c:608 ../libbalsa/misc.c:642
 msgid "arabic"
-msgstr ""
+msgstr "é?¿æ??伯"
 
-#: ../libbalsa/misc.c:1249 ../libbalsa/misc.c:1277
-#, fuzzy
+#: ../libbalsa/misc.c:610 ../libbalsa/misc.c:638
 msgid "greek"
 msgstr "å¸?è??语"
 
-#: ../libbalsa/misc.c:1251 ../libbalsa/misc.c:1279
+#: ../libbalsa/misc.c:612 ../libbalsa/misc.c:640
 msgid "hebrew"
-msgstr ""
+msgstr "�伯�"
 
 # src/balsa-init.c:606
-#: ../libbalsa/misc.c:1253
-#, fuzzy
+#: ../libbalsa/misc.c:614
 msgid "turkish"
 msgstr "å??è?³å?¶è¯­"
 
-#: ../libbalsa/misc.c:1255
+#: ../libbalsa/misc.c:616
 msgid "nordic"
 msgstr ""
 
-#: ../libbalsa/misc.c:1257
+#: ../libbalsa/misc.c:618
 msgid "thai"
-msgstr ""
+msgstr "æ³°å?½"
 
-#: ../libbalsa/misc.c:1259 ../libbalsa/misc.c:1283
+#: ../libbalsa/misc.c:620 ../libbalsa/misc.c:644
 msgid "baltic"
-msgstr ""
+msgstr "æ³¢ç½?ç??æµ·"
 
-#: ../libbalsa/misc.c:1261
+#: ../libbalsa/misc.c:622
 msgid "celtic"
-msgstr ""
+msgstr "���"
 
-#: ../libbalsa/misc.c:1263
+#: ../libbalsa/misc.c:624
 #, fuzzy
 msgid "west europe (euro)"
-msgstr "ç¹?ä½?中æ??"
+msgstr "西欧(欧å??)"
 
-#: ../libbalsa/misc.c:1265
-#, fuzzy
+#: ../libbalsa/misc.c:626
 msgid "russian"
-msgstr "�语 (KOI)"
+msgstr "�语"
 
-#: ../libbalsa/misc.c:1267
-#, fuzzy
-msgid "ukranian"
+#: ../libbalsa/misc.c:628
+msgid "ukrainian"
 msgstr "ä¹?å??å?°è¯­"
 
-#: ../libbalsa/misc.c:1269
-#, fuzzy
+#: ../libbalsa/misc.c:630
 msgid "japanese"
 msgstr "�语"
 
-#: ../libbalsa/misc.c:1271
-#, fuzzy
+#: ../libbalsa/misc.c:632
 msgid "korean"
 msgstr "�语"
 
-#: ../libbalsa/misc.c:1889
+# src/main-window.c:171
+#: ../libbalsa/misc.c:806
+#, c-format
+msgid "Cannot open %s: %s"
+msgstr "æ? æ³?æ??å¼? %sï¼?%s"
+
+#: ../libbalsa/misc.c:815
+#, c-format
+msgid "Cannot open %s: is a symbolic link"
+msgstr "æ? æ³?æ??å¼? %sï¼?æ?¯ä¸?个符å?·é?¾æ?¥"
+
+#: ../libbalsa/misc.c:942
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "å?¨è¯?å?¾è¿?è¡? fcntl é??ç??æ?¶å??è¶?æ?¶ï¼?"
 
-#: ../libbalsa/misc.c:1896
+#: ../libbalsa/misc.c:949
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "ç­?å¾? fcntl é??... %d"
 
-#: ../libbalsa/misc.c:1924
+#: ../libbalsa/misc.c:977
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "å?¨è¯?å?¾è¿?è¡? flock é??ç??æ?¶å??è¶?æ?¶ï¼?"
 
-#: ../libbalsa/misc.c:1931
+#: ../libbalsa/misc.c:984
 #, c-format
 msgid "Waiting for flock attempt... %d"
-msgstr "ç­?å¾? flock é??... %d"
+msgstr "�� flock ��... %d"
 
-#: ../libbalsa/rfc3156.c:89
-#, fuzzy, c-format
-msgid "Gpgme has been compiled without support for protocol %s."
+#: ../libbalsa/misc.c:1265
+#, c-format
+msgid "LDAP Directory for %s"
+msgstr "%s ç?? LDAP ç?®å½?"
+
+#: ../libbalsa/rfc2445.c:90 ../libbalsa/rfc2445.c:685
+#: ../libbalsa/rfc2445.c:704 ../libbalsa/rfc3156.c:1394
+msgid "unknown"
+msgstr "��"
+
+#: ../libbalsa/rfc2445.c:91
+msgid "needs action"
+msgstr "é??è¦?æ??ä½?"
+
+#: ../libbalsa/rfc2445.c:92
+msgid "accepted"
+msgstr "å·²æ?¥å??"
+
+#: ../libbalsa/rfc2445.c:93
+msgid "declined"
+msgstr "å·²æ??ç»?"
+
+#: ../libbalsa/rfc2445.c:94
+msgid "tentatively accepted"
+msgstr "æ??æ?¶æ?¥å??"
+
+# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
+# src/pref-manager.c:471
+#: ../libbalsa/rfc2445.c:95
+#| msgid "Deleted"
+msgid "delegated"
+msgstr "å·²æ??æ??"
+
+# src/main-window.c:107
+#: ../libbalsa/rfc2445.c:96
+msgid "completed"
+msgstr "å·²å®?æ??"
+
+#: ../libbalsa/rfc2445.c:97
+msgid "in process"
+msgstr "��中"
+
+# src/filter-edit-dialog.c:592
+#: ../libbalsa/rfc2445.c:686
+msgid "Event Notification"
+msgstr "äº?件é??ç?¥"
+
+#: ../libbalsa/rfc2445.c:687
+msgid "Event Request"
+msgstr "�件请�"
+
+# src/main-window.c:215
+#: ../libbalsa/rfc2445.c:688
+msgid "Reply to Event Request"
+msgstr "å??å¤?äº?件请æ±?"
+
+#: ../libbalsa/rfc2445.c:689
+msgid "Event Cancellation"
+msgstr "äº?件å??æ¶?"
+
+#: ../libbalsa/rfc2445.c:705
+msgid "chair"
 msgstr ""
-"Balsa 没æ??ç¼?è¯?è¿? gnome-print æ?¯æ??ã??\n"
-"ä¸?è?½æ??å?°ã??"
 
-#: ../libbalsa/rfc3156.c:94
+#: ../libbalsa/rfc2445.c:706
+msgid "required participant"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:707
+msgid "optional participant"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:708
+msgid "non-participant, information only"
+msgstr ""
+
+#: ../libbalsa/rfc3156.c:95
+#, c-format
+msgid "Gpgme has been compiled without support for protocol %s."
+msgstr "Gpgme 没æ??ç¼?è¯?è¿? %s å??è®®æ?¯æ??ã??"
+
+#: ../libbalsa/rfc3156.c:100
 #, c-format
 msgid "Crypto engine %s is not installed properly."
-msgstr ""
+msgstr "å? å¯?å¼?æ?? %s 没æ??正确å®?è£?ã??"
 
-#: ../libbalsa/rfc3156.c:99
+#: ../libbalsa/rfc3156.c:104
+#, c-format
+msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+msgstr "æ??示ï¼?æ£?æ?¥ `gnupg2'(ä¼?å??) æ?? `gnupg' 软件å??ã??"
+
+#: ../libbalsa/rfc3156.c:107
+#, c-format
+msgid " Hint: check the `gpgsm' package."
+msgstr "æ??示ï¼?æ£?æ?¥ `gpgsm' 软件å??ã??"
+
+#: ../libbalsa/rfc3156.c:111
 #, c-format
 msgid ""
 "Crypto engine %s version %s is installed, but at least version %s is "
 "required."
-msgstr ""
+msgstr "å? å¯?å¼?æ?? %s ç??æ?¬ %s å·²å®?è£?ï¼?ä½?è?³å°?é??è¦?å®?è£? %s ç??æ?¬ã??"
 
-#: ../libbalsa/rfc3156.c:106
+#: ../libbalsa/rfc3156.c:118
 #, c-format
 msgid "Unknown problem with engine for protocol %s."
-msgstr ""
+msgstr "%s å??è®®å¼?æ??æ??æ?ªç?¥é?®é¢?ã??"
 
-#: ../libbalsa/rfc3156.c:111
+#: ../libbalsa/rfc3156.c:123
 #, c-format
-msgid "%s: could not retreive crypto engine information: %s."
-msgstr ""
+msgid "%s: could not retrieve crypto engine information: %s."
+msgstr "%sï¼?æ? æ³?å??å??å? å¯?å¼?æ??ä¿¡æ?¯ï¼?%sã??"
 
-#: ../libbalsa/rfc3156.c:115
+#: ../libbalsa/rfc3156.c:127
 #, c-format
 msgid ""
 "\n"
 "Disable support for protocol %s."
 msgstr ""
+"\n"
+"ç¦?ç?¨ %s å??è®®æ?¯æ??ã??"
 
-#: ../libbalsa/rfc3156.c:257 ../libbalsa/rfc3156.c:262
-#: ../libbalsa/rfc3156.c:349 ../libbalsa/rfc3156.c:354
-#: ../libbalsa/rfc3156.c:517 ../libbalsa/rfc3156.c:522
-#: ../libbalsa/rfc3156.c:630 ../libbalsa/rfc3156.c:635
-#: ../libbalsa/rfc3156.c:746 ../libbalsa/rfc3156.c:751
-#: ../libbalsa/rfc3156.c:859 ../libbalsa/rfc3156.c:864
-#: ../libbalsa/rfc3156.c:939 ../libbalsa/rfc3156.c:944
-msgid "creating a gpgme context failed"
-msgstr ""
-
-#: ../libbalsa/rfc3156.c:275 ../libbalsa/rfc3156.c:764
+#: ../libbalsa/rfc3156.c:355 ../libbalsa/rfc3156.c:864
 msgid "Enter passphrase to unlock the secret key for signing"
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:296 ../libbalsa/rfc3156.c:300
-#: ../libbalsa/rfc3156.c:796
-#, fuzzy
-msgid "signing failed"
-msgstr "ç?»å½?失败ã??"
-
-#: ../libbalsa/rfc3156.c:403 ../libbalsa/rfc3156.c:408
-#: ../libbalsa/rfc3156.c:799
-#, fuzzy
-msgid "encryption failed"
-msgstr "身份��失败"
-
-#: ../libbalsa/rfc3156.c:552 ../libbalsa/rfc3156.c:557
-#: ../libbalsa/rfc3156.c:875 ../libbalsa/rfc3156.c:881
-#, fuzzy
-msgid "signature verification failed"
-msgstr "身份��失败"
+#: ../libbalsa/rfc3156.c:603 ../libbalsa/rfc3156.c:608
+#: ../libbalsa/rfc3156.c:725 ../libbalsa/rfc3156.c:730
+#: ../libbalsa/rfc3156.c:940 ../libbalsa/rfc3156.c:945
+#: ../libbalsa/rfc3156.c:1034 ../libbalsa/rfc3156.c:1039
+msgid "creating a gpgme context failed"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:647 ../libbalsa/rfc3156.c:955
+#: ../libbalsa/rfc3156.c:744 ../libbalsa/rfc3156.c:1052
 msgid "Enter passphrase to decrypt message"
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:682 ../libbalsa/rfc3156.c:687
-#, fuzzy
-msgid "decryption failed"
-msgstr "身份��失败"
-
-#: ../libbalsa/rfc3156.c:792 ../libbalsa/rfc3156.c:806
-#, fuzzy
-msgid "signing and encryption failed"
-msgstr "POP �令��失败"
-
-#: ../libbalsa/rfc3156.c:809
-#, fuzzy, c-format
-msgid "signing failed: %s"
-msgstr "ç?»å½?失败ã??"
-
-#: ../libbalsa/rfc3156.c:812
-#, fuzzy, c-format
-msgid "encryption failed: %s"
-msgstr "身份��失败"
-
-#: ../libbalsa/rfc3156.c:964 ../libbalsa/rfc3156.c:971
+#: ../libbalsa/rfc3156.c:1061 ../libbalsa/rfc3156.c:1068
 msgid "decryption and signature verification failed"
-msgstr ""
+msgstr "解å¯?å??ç­¾å??éª?è¯?失败"
 
-#: ../libbalsa/rfc3156.c:1002
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1103
 msgid "The signature is valid."
-msgstr "该è¯?书æ??æ??"
+msgstr "该签å??æ??æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1004
+#: ../libbalsa/rfc3156.c:1105
 msgid "The signature is valid but expired."
-msgstr ""
+msgstr "ç­¾å??æ??æ??ï¼?ä½?å·²è¿?æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1007
+#: ../libbalsa/rfc3156.c:1108
 msgid ""
 "The signature is valid but the key used to verify the signature has expired."
-msgstr ""
+msgstr "ç­¾å??æ??æ??ï¼?è?¤ç?¨äº?éª?è¯?ç­¾å??ç??å¯?é?¥å·²è¿?æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1010
+#: ../libbalsa/rfc3156.c:1111
 msgid ""
 "The signature is valid but the key used to verify the signature has been "
 "revoked."
-msgstr ""
+msgstr "ç­¾å??æ??æ??ï¼?ä½?ç?¨äº?éª?è¯?ç­¾å??ç??å¯?é?¥å·²æ?¤é??ã??"
 
-#: ../libbalsa/rfc3156.c:1013
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1114
 msgid "The signature is invalid."
-msgstr "该è¯?书æ??æ??"
+msgstr "该签å??æ?¯æ??æ??ç??ã??"
 
-#: ../libbalsa/rfc3156.c:1016
+#: ../libbalsa/rfc3156.c:1117
 msgid "The signature could not be verified due to a missing key."
-msgstr ""
+msgstr "æ? æ³?éª?è¯?ç­¾å??ï¼?å? ä¸ºç¼ºå°?å¯?é?¥ã??"
 
-#: ../libbalsa/rfc3156.c:1018
+#: ../libbalsa/rfc3156.c:1119
 msgid "This part is not a real PGP signature."
-msgstr ""
+msgstr "该å?ºæ®µä¸?æ?¯ç??æ­£ç?? PGP ç­¾å??ã??"
 
-#: ../libbalsa/rfc3156.c:1021
+#: ../libbalsa/rfc3156.c:1122
 msgid "The signature could not be verified due to an invalid crypto engine."
-msgstr ""
+msgstr "æ? æ³?éª?è¯?ç­¾å??ï¼?å? ä¸ºå? å¯?å¼?æ??æ? æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1024 ../libbalsa/rfc3156.c:1764
+#: ../libbalsa/rfc3156.c:1125 ../libbalsa/rfc3156.c:1891
 msgid "GnuPG is rebuilding the trust database and is currently unavailable."
-msgstr ""
+msgstr "GnuPG æ­£å?¨é??建信任æ?°æ?®åº?ï¼?ç?°å?¨ä¸?è?½ç?¨ã??"
 
-#: ../libbalsa/rfc3156.c:1027
+#: ../libbalsa/rfc3156.c:1128
 msgid "An error prevented the signature verification."
-msgstr ""
+msgstr "ä¸?个é??误é?»æ­¢äº?ç­¾å??éª?è¯?è¿?ç¨?ã??"
 
-#: ../libbalsa/rfc3156.c:1035
+#: ../libbalsa/rfc3156.c:1136
 msgid "The user ID is of unknown validity."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?ç??æ??æ??æ?§æ?ªç?¥ã??"
 
-#: ../libbalsa/rfc3156.c:1037
+#: ../libbalsa/rfc3156.c:1138
 msgid "The validity of the user ID is undefined."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?ç??æ??æ??æ?§æ²¡æ??å®?ä¹?ã??"
 
-#: ../libbalsa/rfc3156.c:1039
+#: ../libbalsa/rfc3156.c:1140
 msgid "The user ID is never valid."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?ä»?æ?ªæ??æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1041
+#: ../libbalsa/rfc3156.c:1142
 msgid "The user ID is marginally valid."
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:1043
+#: ../libbalsa/rfc3156.c:1144
 msgid "The user ID is fully valid."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?å®?å?¨æ??æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1045
+#: ../libbalsa/rfc3156.c:1146
 msgid "The user ID is ultimately valid."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?å½»åº?æ??æ??ã??"
 
-#: ../libbalsa/rfc3156.c:1047 ../libbalsa/rfc3156.c:1292
+#: ../libbalsa/rfc3156.c:1148 ../libbalsa/rfc3156.c:1406
 msgid "bad validity"
-msgstr ""
+msgstr "æ??æ??æ?§æ??é?®é¢?"
 
 # src/pref-manager.c:397
-#: ../libbalsa/rfc3156.c:1055
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1156
 msgid "PGP signature: "
-msgstr "æ£?æ?¥ç­¾å??"
+msgstr "PGP ç­¾å??ï¼?"
 
 # src/pref-manager.c:397
-#: ../libbalsa/rfc3156.c:1057
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1158
 msgid "S/MIME signature: "
-msgstr "ç­¾å??è·¯å¾?ï¼?"
+msgstr "S/MIME ç­¾å??ï¼?"
 
-#: ../libbalsa/rfc3156.c:1059
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1160
 msgid "(unknown protocol) "
-msgstr "æ?ªç?¥é??误"
+msgstr "(æ?ªç?¥å??è®®) "
 
-#: ../libbalsa/rfc3156.c:1078
+#: ../libbalsa/rfc3156.c:1187
 #, c-format
 msgid ""
 "\n"
 "User ID: %s"
 msgstr ""
+"\n"
+"�����%s"
 
-#: ../libbalsa/rfc3156.c:1081
+#: ../libbalsa/rfc3156.c:1190
 #, c-format
 msgid ""
 "\n"
 "Signed by: %s"
 msgstr ""
+"\n"
+"ç­¾å??è??ï¼?%s"
 
 # src/balsa-init.c:261 src/pref-manager.c:377
-#: ../libbalsa/rfc3156.c:1085
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1194
+#, c-format
 msgid ""
 "\n"
 "Mail address: %s"
-msgstr "ç?µå­?é?®ä»¶å?°å??ï¼?"
+msgstr ""
+"\n"
+"é?®ä»¶å?°å??ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1090
+#: ../libbalsa/rfc3156.c:1196
 #, c-format
 msgid ""
 "\n"
 "Signed on: %s"
 msgstr ""
+"\n"
+"ç­¾å??äº?ï¼?%s"
 
 # src/main-window.c:182
-#: ../libbalsa/rfc3156.c:1092
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1197
+#, c-format
 msgid ""
 "\n"
 "User ID validity: %s"
-msgstr "æ? æ??ç??è¿?滤è§?å??ï¼?%s"
+msgstr ""
+"\n"
+"ç?¨æ?·æ ?è¯?æ??æ??æ?§ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1096
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1201
+#, c-format
 msgid ""
 "\n"
 "Key owner trust: %s"
-msgstr "æ??纹ï¼?%s"
+msgstr ""
+"\n"
+"å¯?é?¥æ?¥æ??è??ä¿¡ä»»ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1100
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1205
+#, c-format
 msgid ""
 "\n"
 "Key fingerprint: %s"
-msgstr "æ??纹ï¼?%s"
+msgstr ""
+"\n"
+"å¯?é?¥æ??纹ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1105
-#, fuzzy, c-format
+#. Subkey creation date
+#: ../libbalsa/rfc3156.c:1208
+#, c-format
 msgid ""
 "\n"
 "Subkey created on: %s"
-msgstr "æ??纹ï¼?%s"
+msgstr ""
+"\n"
+"å­?å¯?é?¥å??建äº?ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1110
-#, fuzzy, c-format
+#. Subkey expiration date
+#: ../libbalsa/rfc3156.c:1210
+#, c-format
 msgid ""
 "\n"
 "Subkey expires on: %s"
-msgstr "æ??纹ï¼?%s"
+msgstr ""
+"\n"
+"å­?å¯?é?¥è¿?æ??æ?¥æ??ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1119
+#: ../libbalsa/rfc3156.c:1218
 msgid " revoked"
-msgstr ""
+msgstr "å·²æ?¤é??"
 
-#: ../libbalsa/rfc3156.c:1124
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1223
 msgid " expired"
-msgstr "å·²å??å¤?"
+msgstr "å·²è¿?æ??"
 
-#: ../libbalsa/rfc3156.c:1129
+#: ../libbalsa/rfc3156.c:1228
 msgid " disabled"
-msgstr ""
+msgstr "已��"
 
-#: ../libbalsa/rfc3156.c:1134
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1233
 msgid " invalid"
-msgstr "[æ? æ??ç??æ?¥æ??]"
+msgstr "æ? æ??"
 
-#: ../libbalsa/rfc3156.c:1137
+#. ngettext: string begins with a single space, so no space after
+#. * the colon is correct punctuation (in English).
+#: ../libbalsa/rfc3156.c:1237
 #, c-format
 msgid ""
 "\n"
+"Subkey attribute:%s"
+msgid_plural ""
+"\n"
 "Subkey attributes:%s"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libbalsa/rfc3156.c:1139
+# src/filter-edit-dialog.c:456
+#: ../libbalsa/rfc3156.c:1246
 #, c-format
 msgid ""
 "\n"
-"Subkey attribute:%s"
+"Issuer name: %s"
 msgstr ""
-
-# src/filter-edit-dialog.c:456
-#: ../libbalsa/rfc3156.c:1145
-#, fuzzy, c-format
-msgid ""
 "\n"
-"Issuer name: %s"
-msgstr "æ??件å??ï¼?%s"
+"é¢?å??è??å??称ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1149
+#: ../libbalsa/rfc3156.c:1250
 #, c-format
 msgid ""
 "\n"
 "Issuer serial number: %s"
 msgstr ""
+"\n"
+"é¢?å??è??åº?å??å?·ï¼?%s"
 
-#: ../libbalsa/rfc3156.c:1152
+#: ../libbalsa/rfc3156.c:1253
 #, c-format
 msgid ""
 "\n"
 "Chain ID: %s"
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:1199
-#, fuzzy, c-format
-msgid "Could not launch %s to get the public key %s."
-msgstr "æ? æ³?æ??å¼?æ??件 %sã??\n"
+#: ../libbalsa/rfc3156.c:1310
+#, c-format
+msgid "Could not launch %s to query the public key %s."
+msgstr "æ? æ³?å?¯å?¨ %s 以æ?¥è¯¢å?¬é?¥ %sã??"
 
-#: ../libbalsa/rfc3156.c:1249
+#: ../libbalsa/rfc3156.c:1360
 #, c-format
 msgid ""
-"Running gpg failed with return value %d:\n"
+"Running %s failed with return value %d:\n"
 "%s"
 msgstr ""
+"è¿?è¡? %s 失败ï¼?è¿?å??å?¼ %dï¼?\n"
+"%s"
 
-#: ../libbalsa/rfc3156.c:1256
+#: ../libbalsa/rfc3156.c:1367
 #, c-format
 msgid ""
-"Running gpg successful:\n"
+"Running %s successful:\n"
 "%s"
 msgstr ""
+"è¿?è¡? %s æ??å??ï¼?\n"
+"%s"
 
-#: ../libbalsa/rfc3156.c:1280
-#, fuzzy
-msgid "unknown"
-msgstr "��"
-
-#: ../libbalsa/rfc3156.c:1282
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1396
 msgid "undefined"
-msgstr "��失败"
+msgstr "���"
 
 # src/filter-edit-dialog.c:721
-#: ../libbalsa/rfc3156.c:1284
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1398 ../src/address-book-config.c:200
 msgid "never"
 msgstr "��"
 
-#: ../libbalsa/rfc3156.c:1286
+#: ../libbalsa/rfc3156.c:1400
 msgid "marginal"
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:1288
+#: ../libbalsa/rfc3156.c:1402
 msgid "full"
-msgstr ""
+msgstr "å®?å?¨"
 
-#: ../libbalsa/rfc3156.c:1290
+#: ../libbalsa/rfc3156.c:1404
 msgid "ultimate"
-msgstr ""
+msgstr "彻�"
 
-#: ../libbalsa/rfc3156.c:1353
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1467
 msgid "User ID"
-msgstr "��"
+msgstr "����"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1467
 msgid "Key ID"
-msgstr ""
+msgstr "����"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1467
 msgid "Length"
-msgstr ""
+msgstr "�度"
 
-#: ../libbalsa/rfc3156.c:1353
+#: ../libbalsa/rfc3156.c:1467
 msgid "Validity"
-msgstr ""
+msgstr "æ??æ??æ?§"
 
 # src/main-window.c:215
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/rfc3156.c:1397
-#, fuzzy
+#: ../libbalsa/rfc3156.c:1511
 msgid "Select key"
-msgstr "é??中æ??å­?(_S)"
+msgstr "é??中å¯?é?¥"
 
-#: ../libbalsa/rfc3156.c:1408
-#, fuzzy, c-format
+#: ../libbalsa/rfc3156.c:1527
+#, c-format
 msgid "Select the private key for the signer %s"
-msgstr "é??æ?©å??é??该é?®ä»¶æ??使ç?¨ç??身份"
+msgstr "é??æ?©ç­¾å??è?? %s 对åº?ç??ç??ç§?é?¥"
 
-#: ../libbalsa/rfc3156.c:1412
+#: ../libbalsa/rfc3156.c:1531
 #, c-format
 msgid "Select the public key for the recipient %s"
-msgstr ""
+msgstr "é??æ?©å¯¹åº?æ?¶ä»¶äºº %s ç??å?¬é?¥"
 
-#: ../libbalsa/rfc3156.c:1543
+#: ../libbalsa/rfc3156.c:1662
 #, c-format
 msgid "Insufficient trust for recipient %s"
 msgstr ""
 
-#: ../libbalsa/rfc3156.c:1545
+#: ../libbalsa/rfc3156.c:1664
 #, c-format
 msgid "The validity of the key with user ID \"%s\" is \"%s\"."
-msgstr ""
+msgstr "ç?¨æ?·æ ?è¯?为â??%sâ??ç??å¯?é?¥ç??æ??æ??æ?§ä¸ºâ??%sâ??ã??"
 
-#: ../libbalsa/rfc3156.c:1556
+#: ../libbalsa/rfc3156.c:1675
 msgid "Use this key anyway?"
-msgstr ""
+msgstr "���使�该���"
 
-#: ../libbalsa/rfc3156.c:1765
+#: ../libbalsa/rfc3156.c:1892
 msgid "Try again later."
-msgstr ""
+msgstr "ç¨?å??é??è¯?ã??"
 
 # src/sendmsg-window.c:71
-#: ../libbalsa/send.c:244 ../libbalsa/send.c:251
+#: ../libbalsa/send.c:253 ../libbalsa/send.c:260
 msgid "Sending Mail..."
 msgstr "æ­£å?¨å??é??é?®ä»¶..."
 
 # src/filter-edit-dialog.c:267
-#: ../libbalsa/send.c:247 ../src/main-window.c:2685
-#, fuzzy
+#: ../libbalsa/send.c:256 ../src/main-window.c:2823
 msgid "_Hide"
-msgstr "é??è??"
+msgstr "é??è??(_H)"
 
-#: ../libbalsa/send.c:838
+#: ../libbalsa/send.c:951
 #, c-format
 msgid ""
 "Could not send the message to %s:\n"
 "%d: %s\n"
 "Message left in your outbox.\n"
 msgstr ""
+"æ? æ³?å??é??é?®ä»¶ç»? %sï¼?\n"
+"%d: %s\n"
+"é?®ä»¶ç??å?¨äº?æ?¨ç??å??件箱ã??\n"
 
-#: ../libbalsa/send.c:884
-#, fuzzy, c-format
+#: ../libbalsa/send.c:997
+#, c-format
 msgid "Saving sent message to %s failed: %s"
-msgstr "æ­£å?¨æ??已读é?®ä»¶ç§»å?° %s..."
+msgstr "å°?å·²å??é??é?®ä»¶ä¿?å­?å?° %s 失败ï¼?%s"
 
-#: ../libbalsa/send.c:903
+#: ../libbalsa/send.c:1027 ../libbalsa/send.c:1039
 #, c-format
 msgid ""
 "Relaying refused:\n"
@@ -1409,7 +1766,7 @@ msgid ""
 "Message left in your outbox.\n"
 msgstr ""
 
-#: ../libbalsa/send.c:913
+#: ../libbalsa/send.c:1046
 msgid ""
 "Message submission problem, placing it into your outbox.\n"
 "System will attempt to resubmit the message until you delete it."
@@ -1417,387 +1774,471 @@ msgstr ""
 "é?®ä»¶æ??交é??误ï¼?å·²å°?å®?æ?¾å?¥å??件箱ã??\n"
 "ç³»ç»?å°?è¯?å?¾é??æ?°æ??交ï¼?ç?´å?°æ?¨å? é?¤å®?为止ã??"
 
-#: ../libbalsa/send.c:943
+#: ../libbalsa/send.c:1076
 msgid "Connected to MTA"
 msgstr "已��� MTA"
 
-# src/balsa-message.c:544 src/filter-edit-dialog.c:303
-# src/sendmsg-window.c:338
-#: ../libbalsa/send.c:950 ../src/balsa-mime-widget-message.c:611
-#: ../src/print.c:361 ../src/sendmsg-window.c:3172 ../src/store-address.c:305
-msgid "From:"
-msgstr "å??件人ï¼?"
+#. status code, mailbox
+#: ../libbalsa/send.c:1085
+#, c-format
+msgid "From: %d <%s>"
+msgstr "ä»?ï¼?%d <%s>"
 
-# src/balsa-index.c:231
-#: ../libbalsa/send.c:953 ../src/balsa-index.c:357
-msgid "From"
-msgstr "å??件人"
+# src/mailbox-conf.c:531
+#. mailbox, status code, status text
+#: ../libbalsa/send.c:1089
+#, c-format
+msgid "From %s: %d %s"
+msgstr "ä»? %sï¼?%d %s"
 
-# src/balsa-message.c:526 src/filter-edit-dialog.c:291
-# src/sendmsg-window.c:315
-#: ../libbalsa/send.c:962 ../src/balsa-mime-widget-message.c:621
-#: ../src/print.c:365 ../src/sendmsg-window.c:997 ../src/sendmsg-window.c:3180
-#: ../src/store-address.c:306
-msgid "To:"
-msgstr "�件人�"
+#. status code, mailbox
+#: ../libbalsa/send.c:1100
+#, c-format
+msgid "To: %d <%s>"
+msgstr "��%d <%s>"
 
-# src/balsa-message.c:526 src/filter-edit-dialog.c:291
-# src/sendmsg-window.c:315
-#: ../libbalsa/send.c:965 ../src/balsa-index.c:1021
-msgid "To"
-msgstr "�件人"
+# src/mailbox-conf.c:531
+#. mailbox, status code, status text
+#: ../libbalsa/send.c:1104
+#, c-format
+msgid "To %s: %d %s"
+msgstr "è?³ %sï¼?%d %s"
 
-#: ../libbalsa/send.c:1003
+#: ../libbalsa/send.c:1142
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libbalsa/send.c:1277
+#: ../libbalsa/send.c:1424
 msgid ""
 "SMTP server refused connection.\n"
 "Check your internet connection."
 msgstr ""
+"SMTP æ??å?¡å?¨æ??ç»?è¿?æ?¥ã??\n"
+"æ£?æ?¥æ?¨ç??äº?è??ç½?è¿?æ?¥ã??"
 
-#: ../libbalsa/send.c:1282
+#: ../libbalsa/send.c:1429
 msgid ""
 "SMTP server cannot be reached.\n"
 "Check your internet connection."
 msgstr ""
+"SMTP æ??å?¡å?¨æ? æ³?å?°è¾¾ã??\n"
+"æ£?æ?¥æ?¨ç??äº?è??ç½?è¿?æ?¥"
 
-#: ../libbalsa/send.c:1291
+#: ../libbalsa/send.c:1438
 msgid "Message left in Outbox (try again later)"
-msgstr ""
+msgstr "é?®ä»¶ç??å?¨äº?å??件箱(ç¨?å??é??è¯?)"
 
-#: ../libbalsa/send.c:1295
+#: ../libbalsa/send.c:1442
 #, c-format
 msgid ""
 "SMTP server problem (%d): %s\n"
 "Message is left in outbox."
 msgstr ""
+"SMTP æ??å?¡å?¨æ??é??(%d)ï¼?%s\n"
+"é?®ä»¶ç??å?¨äº?å??件箱ã??"
+
+# src/main-window.c:139
+#: ../libbalsa/send.c:1756 ../libbalsa/send.c:1825
+#, c-format
+msgid "Cannot read %s: %s"
+msgstr "æ? æ³?读å?? %sï¼?%s"
+
+# src/main-window.c:139
+#: ../libbalsa/send.c:1759 ../libbalsa/send.c:1828
+#, c-format
+msgid "Cannot read %s"
+msgstr "æ? æ³?读å?? %s"
 
-#: ../libbalsa/send.c:1572
+#: ../libbalsa/send.c:1789
 #, c-format
 msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
-msgstr ""
+msgstr "æ? æ³?ç¡®å®?æ??æ?¬æ??件 `%s' ç??å­?符é??ï¼?以 mime ç±»å?? `%s' å??é??"
+
+#: ../libbalsa/send.c:2141
+msgid "This message will not be encrypted for the BCC: recipient."
+msgid_plural "This message will not be encrypted for the BCC: recipients."
+msgstr[0] "å¯?é??ç»?æ?¶ä»¶äººç??æ¶?æ?¯å°?ä¸?å? å¯?ã??"
 
-#: ../libbalsa/send.c:1909 ../libbalsa/send.c:1991
+#: ../libbalsa/send.c:2229
 msgid "This message will not be encrypted for the BCC: recipient(s)."
-msgstr ""
+msgstr "è¿?å°?é?®ä»¶å¯?é??ç»?æ?¶ä»¶äººæ?¶å°?ä¸?å? å¯?ã??"
 
 #. host, authentication method
-#: ../libbalsa/server.c:374
+#: ../libbalsa/server.c:431
 #, c-format
 msgid "Logging in to %s using %s"
-msgstr ""
+msgstr "使� %s ��� %s"
 
 # src/filter-edit-dialog.c:721
-#: ../libbalsa/smtp-server.c:348 ../src/mailbox-conf.c:198
-#: ../src/mailbox-conf.c:1360 ../src/pref-manager.c:356
-#: ../src/pref-manager.c:3090
+#: ../libbalsa/smtp-server.c:388 ../src/mailbox-conf.c:205
+#: ../src/mailbox-conf.c:1486 ../src/pref-manager.c:404
+#: ../src/pref-manager.c:3426
 msgid "Never"
 msgstr "��"
 
-#: ../libbalsa/smtp-server.c:349 ../src/mailbox-conf.c:199
-#: ../src/mailbox-conf.c:1361
+#: ../libbalsa/smtp-server.c:389 ../src/mailbox-conf.c:206
+#: ../src/mailbox-conf.c:1487
 msgid "If Possible"
 msgstr "å¦?æ??å?¯è?½"
 
-#: ../libbalsa/smtp-server.c:350 ../src/mailbox-conf.c:200
+#: ../libbalsa/smtp-server.c:390 ../src/mailbox-conf.c:207
 msgid "Required"
 msgstr "é??è¦?"
 
-#: ../libbalsa/smtp-server.c:387 ../src/folder-conf.c:104
-#, fuzzy, c-format
-msgid "Error displaying %s: %s\n"
-msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
+#: ../libbalsa/smtp-server.c:423
+#, c-format
+msgid "Error displaying server help: %s\n"
+msgstr "æ?¾ç¤ºæ??å?¡å?¨å¸®å?©å?ºé??ï¼?%s\n"
 
 # src/balsa-init.c:276
-#: ../libbalsa/smtp-server.c:484
-#, fuzzy
+#: ../libbalsa/smtp-server.c:538
 msgid "SMTP Server"
-msgstr "SMTPæ??å?¡å?¨ï¼?"
+msgstr "SMTPæ??å?¡å?¨"
 
-#: ../libbalsa/smtp-server.c:508
-#, fuzzy
-msgid "_Descriptive Name"
-msgstr "æ??è¿°æ?§å??å­?(_N)ï¼?"
+#: ../libbalsa/smtp-server.c:565
+msgid "_Descriptive Name:"
+msgstr "æ??è¿°æ?§å??å­?(_D)ï¼?"
 
 # src/mailbox-conf.c:723 src/mailbox-conf.c:804
-#: ../libbalsa/smtp-server.c:515
-#, fuzzy
-msgid "_Server"
+#. pop server
+#. imap server
+#: ../libbalsa/smtp-server.c:572 ../src/folder-conf.c:377
+#: ../src/mailbox-conf.c:1218 ../src/mailbox-conf.c:1331
+msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
 
 # src/mailbox-conf.c:742 src/mailbox-conf.c:833
-#: ../libbalsa/smtp-server.c:522
-#, fuzzy
-msgid "_User Name"
+#: ../libbalsa/smtp-server.c:579
+msgid "_User Name:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../libbalsa/smtp-server.c:529
-#, fuzzy
-msgid "_Pass Phrase"
-msgstr "�令"
+#: ../libbalsa/smtp-server.c:586
+msgid "_Pass Phrase:"
+msgstr "�令(_P):"
 
-#: ../libbalsa/smtp-server.c:537 ../src/mailbox-conf.c:212
-#, fuzzy
-msgid "Use _TLS"
-msgstr "使� TLS"
+#: ../libbalsa/smtp-server.c:595 ../src/mailbox-conf.c:237
+msgid "Use _TLS:"
+msgstr "使� _TLS�"
 
-#: ../libbalsa/smtp-server.c:543
-#, fuzzy
-msgid "C_ertificate Pass Phrase"
-msgstr "�书�令串"
+#: ../libbalsa/smtp-server.c:600
+msgid "C_ertificate Pass Phrase:"
+msgstr "�书�令(_E)�"
+
+#: ../libbalsa/smtp-server.c:612
+msgid "Sp_lit message larger than"
+msgstr "å??å?²é?®ä»¶ï¼?è?¥å?¶å°ºå¯¸å¤§äº?(_L)"
+
+#: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1918
+msgid "MB"
+msgstr "MB"
+
+# src/main-window.c:182
+#. Top level
+#. Menus
+#: ../libbalsa/source-viewer.c:46 ../src/ab-main.c:553
+#: ../src/main-window.c:344 ../src/message-window.c:239
+#: ../src/sendmsg-window.c:319
+msgid "_File"
+msgstr "æ??件(_F)"
+
+# src/main-window.c:166
+#: ../libbalsa/source-viewer.c:47 ../src/filter-edit-dialog.c:321
+#: ../src/main-window.c:345 ../src/message-window.c:240
+#: ../src/sendmsg-window.c:320
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
+
+# src/main-window.c:107
+#: ../libbalsa/source-viewer.c:48 ../src/main-window.c:346
+#: ../src/message-window.c:241
+msgid "_View"
+msgstr "å¯?ç??(_V)"
 
 # src/main-window.c:161
 #. Items
-#: ../libbalsa/source-viewer.c:48 ../src/mailbox-node.c:989
-#: ../src/main-window.c:752 ../src/main-window.c:857
+#: ../libbalsa/source-viewer.c:50 ../src/mailbox-node.c:1096
+#: ../src/main-window.c:498 ../src/message-window.c:248
+#: ../src/sendmsg-window.c:349
 msgid "_Close"
 msgstr "��(_C)"
 
 # src/main-window.c:213
-#: ../libbalsa/source-viewer.c:49
-#, fuzzy
+#: ../libbalsa/source-viewer.c:51
 msgid "Close the window"
-msgstr "æ­£å?¨å?³é?­æ?°å??çª?å?£"
+msgstr "����"
 
 # src/filter-edit-dialog.c:279
-#: ../libbalsa/source-viewer.c:50
-#, fuzzy
+#. Edit menu items
+#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:418
+#: ../src/main-window.c:564 ../src/message-window.c:251
+#: ../src/sendmsg-window.c:357
 msgid "_Copy"
-msgstr "ä¿¡ä½?"
+msgstr "��(_C)"
 
 # src/filter-edit-dialog.c:618
-#: ../libbalsa/source-viewer.c:51
-#, fuzzy
+#: ../libbalsa/source-viewer.c:53
 msgid "Copy text"
-msgstr "å¼¹å?ºæ??æ?¬ï¼?"
+msgstr "å¤?å?¶æ??æ?¬"
 
 # src/main-window.c:215
-#: ../libbalsa/source-viewer.c:52 ../src/main-window.c:661
+#: ../libbalsa/source-viewer.c:54 ../src/main-window.c:566
 msgid "_Select Text"
 msgstr "é??中æ??å­?(_S)"
 
 # src/pref-manager.c:137
-#: ../libbalsa/source-viewer.c:53 ../src/main-window.c:662
+#: ../libbalsa/source-viewer.c:55 ../src/main-window.c:567
 msgid "Select entire mail"
 msgstr "é??中æ?´ä¸ªé?®ä»¶"
 
-#: ../libbalsa/source-viewer.c:58
+#: ../libbalsa/source-viewer.c:60
 msgid "_Escape Special Characters"
-msgstr ""
+msgstr "忽����符(_E)"
 
-#: ../libbalsa/source-viewer.c:59
+#: ../libbalsa/source-viewer.c:61
 msgid "Escape special and non-ASCII characters"
-msgstr ""
+msgstr "忽ç?¥ç?¹æ®?å??é?? ASCII å­?符"
 
 # src/mailbox-conf.c:238
-#: ../libbalsa/source-viewer.c:155
+#: ../libbalsa/source-viewer.c:159
 msgid "Mailbox closed"
-msgstr "�件箱被��"
+msgstr "�箱已��"
 
 # src/main-window.c:200
-#: ../libbalsa/source-viewer.c:258
+#: ../libbalsa/source-viewer.c:280
 msgid "Message Source"
 msgstr "�件��"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:58
-msgid "Use balsa as default email client?"
+#: ../libinit_balsa/assistant_helper.c:68
+#, c-format
+msgid "Error loading %s: %s\n"
+msgstr "载� %s 失败�%s\n"
+
+#: ../libinit_balsa/assistant_helper.c:209
+#, c-format
+msgid "The path %s must be relative to the filesystem root (start with /)."
+msgstr "è·¯å¾? %s å¿?é¡»ç?¸å¯¹äº?æ ¹æ??件系ç»? (å¼?å§?äº? /)ã??"
+
+#: ../libinit_balsa/assistant_helper.c:221
+#, c-format
+msgid ""
+"Couldn't create a directory: mkdir() failed on pathname \"%s\", with error "
+"\"%s\"."
+msgstr "æ? æ³?å??建æ??件夹ï¼?mkdir() å?¨è·¯å¾?å??â??%sâ??å¤?失败, é??误为â??%sâ??ã??"
+
+#: ../libinit_balsa/assistant_helper.c:233
+#: ../libinit_balsa/assistant_helper.c:256
+#, c-format
+msgid "The file with pathname \"%s\" is not a directory."
+msgstr "è·¯å¾?å??为â??%sâ??ç??æ??件ä¸?æ?¯æ??件夹ã??"
+
+#: ../libinit_balsa/assistant_helper.c:247
+#, c-format
+msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgstr "æ? æ³?å??建æ??件夹ï¼?mkdir() å??建â??%sâ??失败ã??"
+
+#: ../libinit_balsa/assistant_init.c:51
+msgid ""
+"This will exit Balsa.\n"
+"Do you really want to do this?"
 msgstr ""
+"è¿?å°?é??å?º Balsaã??\n"
+"æ?¨ç??ç??æ?³è¿?æ ·å??ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:62
-#, fuzzy
+#: ../libinit_balsa/assistant_init.c:74
+msgid "GnomeCard Address Book"
+msgstr "GnomeCard å?°å??ç°¿"
+
+#: ../libinit_balsa/assistant_init.c:81 ../libinit_balsa/assistant_init.c:89
+#: ../src/ab-window.c:231
+msgid "Address Book"
+msgstr "å?°å??ç°¿"
+
+#: ../libinit_balsa/assistant_init.c:148
+msgid "Configure Balsa"
+msgstr "é??ç½® Balsa"
+
+#: ../libinit_balsa/assistant_page_defclient.c:59
+msgid "Use balsa as default email client?"
+msgstr "使� balsa �为�认�件客�端�"
+
+#: ../libinit_balsa/assistant_page_defclient.c:63
 msgid "_Yes"
-msgstr "æ?¯"
+msgstr "æ?¯(_Y)"
 
 # src/balsa-message.c:526 src/filter-edit-dialog.c:291
 # src/sendmsg-window.c:315
-#: ../libinit_balsa/balsa-druid-page-defclient.c:64
-#, fuzzy
+#: ../libinit_balsa/assistant_page_defclient.c:65
 msgid "_No"
-msgstr "�件人(_T)"
+msgstr "å?¦(_N)"
 
-#: ../libinit_balsa/balsa-druid-page-defclient.c:100
-#, fuzzy
+#: ../libinit_balsa/assistant_page_defclient.c:102
 msgid "Default Client"
-msgstr "�认"
+msgstr "�认客�端"
 
 # src/balsa-init.c:590
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
-#, fuzzy
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Inbox:"
-msgstr "�件箱�"
+msgstr "�件箱(_I)�"
 
 # src/balsa-init.c:598
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
-#, fuzzy
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Outbox:"
-msgstr "å??件箱ï¼?"
+msgstr "å??件箱(_O)ï¼?"
 
 # src/balsa-init.c:590
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
-#, fuzzy
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Sentbox:"
-msgstr "å·²å??é??é?®ä»¶ï¼?"
+msgstr "å·²å??é??(_S)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:43
-#, fuzzy
+#: ../libinit_balsa/assistant_page_directory.c:60
 msgid "_Draftbox:"
-msgstr "稿件箱�"
+msgstr "è??稿箱(_D)ï¼?"
 
 # src/balsa-init.c:606
-#: ../libinit_balsa/balsa-druid-page-directory.c:44
-#, fuzzy
+#: ../libinit_balsa/assistant_page_directory.c:61
 msgid "_Trash:"
-msgstr "已���件�"
+msgstr "�件箱(_T)�"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:71
+#: ../libinit_balsa/assistant_page_directory.c:95
 #, c-format
 msgid ""
 "The pathname \"%s\" must be specified canonically -- it must start with a "
 "'/'."
 msgstr "è·¯å¾?å??â??%sâ??å¿?é¡»æ?¯æ­£è§?ç??å½¢å¼? -- å¿?须以â??/â??å¼?å§?ã??"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:135
+#: ../libinit_balsa/assistant_page_directory.c:161
 #, c-format
 msgid "The mailbox \"%s\" does not appear to be valid."
-msgstr "é?®ä»¶ç®±â??%sâ??æ? æ??ã??"
+msgstr "é?®ç®±â??%sâ??æ? æ??ã??"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:185
+#: ../libinit_balsa/assistant_page_directory.c:204
 msgid ""
 "Please verify the locations of your default mail files.\n"
 "These will be created if necessary."
 msgstr ""
-"请æ£?æ?¥æ?¨ç??é»?认é?®ä»¶æ??件ç??ä½?ç½®ã??\n"
-"å¦?æ??é??è¦?ï¼?ä¼?å??建è¿?äº?æ??件ã??"
+"请æ£?æ?¥æ?¨ç??é?®ä»¶æ??件ç??é»?认ä½?ç½®ã??\n"
+"å¦?æ??é??è¦?ï¼?ä¼?å??建è¿?äº?ä½?ç½®ã??"
 
 # src/filter-edit-dialog.c:749
-#: ../libinit_balsa/balsa-druid-page-directory.c:243
+#: ../libinit_balsa/assistant_page_directory.c:266
 msgid "Mail Files"
 msgstr "é?®ä»¶æ??件"
 
-#: ../libinit_balsa/balsa-druid-page-directory.c:346
-#: ../libinit_balsa/balsa-druid-page-directory.c:380
-#, fuzzy, c-format
+#: ../libinit_balsa/assistant_page_directory.c:362
+#: ../libinit_balsa/assistant_page_directory.c:396
+#, c-format
 msgid ""
 "Problem Creating Mailboxes\n"
 "%s"
-msgstr "å??建é?®ä»¶ç®±æ?¶äº§ç??é??误"
+msgstr ""
+"å??建é?®ç®±æ?¶å??ç??é?®é¢?\n"
+"%s"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:41
+#: ../libinit_balsa/assistant_page_finish.c:44
 msgid ""
 "You've successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
 msgstr ""
-"æ?¨å·²ç»?æ??å??é??置好 Balsaã??ç¥?æ?¨å¼?å¿?ï¼?\n"
+"æ?¨å·²ç»?æ??å??é??置好 Balsaã??ç¥?æ?¨ä½¿ç?¨æ??å¿«ï¼?\n"
 "   -- Balsa å¼?å??å°?ç»?"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:47
+#: ../libinit_balsa/assistant_page_finish.c:49
 msgid "All Done!"
 msgstr "å?¨é?¨å®?æ??ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-finish.c:77
-msgid "GnomeCard Address Book"
-msgstr "GnomeCard å?°å??ç°¿"
-
-#: ../libinit_balsa/balsa-druid-page-finish.c:84
-#: ../libinit_balsa/balsa-druid-page-finish.c:92 ../src/ab-window.c:226
-msgid "Address Book"
-msgstr "å?°å??ç°¿"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:71
+#: ../libinit_balsa/assistant_page_user.c:57
 msgid ""
 "The following settings are also needed (and you can find them later, if need "
 "be, in the Email application in the 'Preferences' and 'Identities' commands "
 "on the 'Tools' menu)"
 msgstr ""
 
-#: ../libinit_balsa/balsa-druid-page-user.c:76
+#: ../libinit_balsa/assistant_page_user.c:63
 msgid ""
 " Whoever provides your email account should be able to give you the "
 "following information (if you have a Network Administrator, they may already "
 "have set this up for you):"
 msgstr ""
+"æ?¨ç??ç?µå­?é?®ç®±æ??ä¾?æ?¹åº?该è?½å¤?å??æ?¨æ??ä¾?以ä¸?ä¿¡æ?¯(å¦?æ??æ?¨æ??ç½?ç»?管ç??å??ï¼?ä¹?许ä»?们已ç»?为"
+"�设置好�)�"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:82
+#: ../libinit_balsa/assistant_page_user.c:70
 msgid "Yes, remember it"
-msgstr ""
+msgstr "æ?¯ç??ï¼?è®°ä½?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:82
+#: ../libinit_balsa/assistant_page_user.c:70
 msgid "No, type it in every time"
-msgstr ""
+msgstr "���次���"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:114
+#: ../libinit_balsa/assistant_page_user.c:103
 msgid "Name of mail server for incoming _mail:"
-msgstr ""
+msgstr "æ?¥æ?¶é?®ä»¶ç??é?®ä»¶æ??å?¡å?¨å??称(_M)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:119
-#, fuzzy
+#: ../libinit_balsa/assistant_page_user.c:108
 msgid "_Type of mail server:"
-msgstr "访é?®ç±»å??ï¼?é?®ä»¶æ??å?¡å?¨\n"
+msgstr "é?®ä»¶æ??å?¡å?¨ç±»å??(_T)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:123
+#: ../libinit_balsa/assistant_page_user.c:112
 msgid "Connect using _SSL:"
-msgstr ""
+msgstr "使� _SSL����"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:126
+#: ../libinit_balsa/assistant_page_user.c:115
 msgid "Your email _login name:"
-msgstr ""
+msgstr "æ?¨ç??ç?µå­?é?®ç®±ç?»å½?å??(_L)ï¼?"
 
 # src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../libinit_balsa/balsa-druid-page-user.c:129
-#, fuzzy
+#: ../libinit_balsa/assistant_page_user.c:118
 msgid "Your _password:"
-msgstr "�令(_P)�"
+msgstr "æ?¨ç??å¯?ç ?(_P)ï¼?"
 
 # src/balsa-init.c:276
-#: ../libinit_balsa/balsa-druid-page-user.c:137
-#, fuzzy
+#: ../libinit_balsa/assistant_page_user.c:126
 msgid "_SMTP Server:"
-msgstr "SMTPæ??å?¡å?¨ï¼?"
+msgstr "SMTPæ??å?¡å?¨(_S)ï¼?"
 
 #. 2.1
-#: ../libinit_balsa/balsa-druid-page-user.c:142
+#: ../libinit_balsa/assistant_page_user.c:131
 msgid "Your real _name:"
-msgstr ""
+msgstr "æ?¨ç??ç??å®?å§?å??(_N)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:148
+#: ../libinit_balsa/assistant_page_user.c:137
 msgid "Your _Email Address, for this email account:"
-msgstr ""
+msgstr "该ç?µå­?é?®ç®±ç??ç?µå­?é?®ç®±å?°å??(_E)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:153
-#, fuzzy
+#: ../libinit_balsa/assistant_page_user.c:142
 msgid "_Remember your password:"
-msgstr "记��令(_R)"
-
-#: ../libinit_balsa/balsa-druid-page-user.c:156
-msgid "_Refer to this account as:"
-msgstr ""
+msgstr "è®°ä½?æ?¨ç??å¯?ç ?(_R)ï¼?"
 
 # src/pref-manager.c:481
-#: ../libinit_balsa/balsa-druid-page-user.c:164
-#, fuzzy
+#: ../libinit_balsa/assistant_page_user.c:148
 msgid "_Local mail directory:"
-msgstr "���件���"
+msgstr "æ?¬å?°é?®ä»¶æ??件夹(_L)ï¼?"
 
-#: ../libinit_balsa/balsa-druid-page-user.c:181
+#: ../libinit_balsa/assistant_page_user.c:168
 msgid "User Settings"
 msgstr "��设置"
 
+# src/pref-manager.c:137
+#: ../libinit_balsa/assistant_page_user.c:290
+msgid "Default Identity"
+msgstr "�认身份"
+
 # src/pref-manager.c:476
-#: ../libinit_balsa/balsa-druid-page-user.c:333
-#, fuzzy, c-format
+#: ../libinit_balsa/assistant_page_user.c:335
+#, c-format
 msgid ""
 "Local Mail Problem\n"
 "%s"
-msgstr "���件��"
+msgstr ""
+"���件��\n"
+"%s"
 
 # src/balsa-init.c:193
-#: ../libinit_balsa/balsa-druid-page-welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:29
 msgid "Welcome to Balsa!"
 msgstr "欢�使� Balsa�"
 
-#: ../libinit_balsa/balsa-druid-page-welcome.c:35
+#: ../libinit_balsa/assistant_page_welcome.c:32
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
@@ -1808,686 +2249,751 @@ msgid ""
 "-- or your Network Administrator at your place of work/study/similar may "
 "have set up your computer to connect to the network."
 msgstr ""
-
-#: ../libinit_balsa/balsa-initdruid.c:81
-#, fuzzy
-msgid ""
-"This will exit Balsa.\n"
-"Do you really want to do this?"
-msgstr "æ?¨ç??ç??è¦?é??å?ºå??ï¼?"
-
-#: ../libinit_balsa/helper.c:66
-#, fuzzy, c-format
-msgid "Error loading %s: %s\n"
-msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
-
-#: ../libinit_balsa/helper.c:202
-#, c-format
-msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr "è·¯å¾? %s å¿?é¡»ç?¸å¯¹äº?æ ¹æ??件系ç»? (å¼?å§?äº? /)."
-
-#: ../libinit_balsa/helper.c:215 ../libinit_balsa/helper.c:239
-#, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
-msgstr "æ? æ³?å??建ç?®å½?ï¼?mkdir() å??建â??%sâ??失败ã??"
-
-#: ../libinit_balsa/helper.c:225 ../libinit_balsa/helper.c:248
-#, c-format
-msgid "The file with pathname \"%s\" is not a directory."
-msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
-
-#: ../libinit_balsa/init_balsa.c:48
-msgid "Configure Balsa"
-msgstr "é??ç½® Balsa"
+"å?¨æ?¨è?½å¤?æ?¶å??é?®ä»¶ä¹?å??ï¼?\n"
+"\n"
+"-- è¦?ä¹?æ?¨å·²ç»?è?½å¤?访é?®äº?è??ç½?并æ??äº?ä¸?个äº?è??ç½?æ??å?¡æ??ä¾?å??æ??ä¾?ç??é?®ç®±å¸?æ?·ï¼?æ?¨ç??计ç®?"
+"æ?ºå·²ç»?è?½å¤?è??ç½?\n"
+"\n"
+"-- è¦?ä¹?å?¨æ?¨ç?? work/study/similar ä½?ç½®ç??ç½?ç»?管ç??å??å·²ç»?æ?¿æ?¨è®¾ç½®å¥½äº?计ç®?æ?ºç?? ç½?"
+"ç»?è¿?æ?¥ã??"
 
 # src/filter-edit-dialog.c:749
 #: ../sounds/balsa.soundlist.in.h:1
-#, fuzzy
 msgid "Balsa E-mail reader"
-msgstr "Balsa �滤�"
+msgstr "Balsa ç?µå­?é?®ä»¶é??读å?¨"
 
 # src/filter-edit-dialog.c:592
 #: ../sounds/balsa.soundlist.in.h:2
-#, fuzzy
 msgid "New mail notification"
-msgstr "é??ç?¥ï¼?"
+msgstr "æ?°é?®ä»¶é??ç?¥"
 
 #: ../sounds/balsa.soundlist.in.h:3
 msgid "Program startup"
-msgstr ""
+msgstr "����"
 
-#: ../src/ab-main.c:199 ../src/ab-window.c:673
-#, fuzzy
+#: ../src/ab-main.c:228 ../src/ab-window.c:691
 msgid " address book: "
-msgstr "ä¿?å­?å?¨å?°å??簿中"
+msgstr "å?°å??ç°¿ï¼?"
+
+#: ../src/ab-main.c:554
+msgid "_Entry"
+msgstr "æ?¡ç?®(_E)"
+
+#: ../src/ab-main.c:555 ../src/main-window.c:350
+msgid "_Help"
+msgstr "帮�(_H)"
 
-#: ../src/ab-main.c:470 ../src/address-book-config.c:903
+# src/main-window.c:107
+#. new button
+#: ../src/ab-main.c:556 ../src/filter-edit-dialog.c:226
+#: ../src/mailbox-node.c:1061 ../src/main-window.c:352
+#: ../src/main-window.c:586 ../src/main-window.c:595
+msgid "_New"
+msgstr "�建(_N)"
+
+#: ../src/ab-main.c:557 ../src/address-book-config.c:871
 msgid "VCard Address Book (GnomeCard)"
 msgstr "VCard å?°å??ç°¿ (GnomeCard)"
 
-#: ../src/ab-main.c:472 ../src/address-book-config.c:909
+#: ../src/ab-main.c:559 ../src/address-book-config.c:877
 msgid "External query (a program)"
-msgstr ""
+msgstr "��请�(�个��)"
 
-#: ../src/ab-main.c:474 ../src/address-book-config.c:914
+#: ../src/ab-main.c:561 ../src/address-book-config.c:882
 msgid "LDIF Address Book"
 msgstr "LDIF å?°å??ç°¿"
 
-#: ../src/ab-main.c:477 ../src/address-book-config.c:920
+#: ../src/ab-main.c:564 ../src/address-book-config.c:888
 msgid "LDAP Address Book"
 msgstr "LDAP å?°å??ç°¿"
 
-#: ../src/ab-main.c:481 ../src/address-book-config.c:521
-#: ../src/address-book-config.c:927
-#, fuzzy
+#: ../src/ab-main.c:568 ../src/address-book-config.c:510
+#: ../src/address-book-config.c:895
 msgid "GPE Address Book"
-msgstr "å?°å??ç°¿"
+msgstr "GPE å?°å??ç°¿"
+
+#: ../src/ab-main.c:572
+msgid "Rubrica Address Book"
+msgstr "Rubrica å?°å??ç°¿"
+
+#: ../src/ab-main.c:575
+msgid "_Properties"
+msgstr "å±?æ?§(_P)"
+
+#: ../src/ab-main.c:576
+msgid "Edit address book properties"
+msgstr "ç¼?è¾?å?°å??ç°¿å±?æ?§"
+
+# src/main-window.c:133 src/main-window.c:168
+#: ../src/ab-main.c:577 ../src/balsa-index.c:1911
+#: ../src/filter-edit-dialog.c:232 ../src/mailbox-node.c:1088
+#: ../src/mailbox-node.c:1104 ../src/pref-manager.c:1716
+#: ../src/pref-manager.c:1791 ../src/pref-manager.c:2968
+msgid "_Delete"
+msgstr "å? é?¤(_D)"
+
+#: ../src/ab-main.c:578
+msgid "Delete address book"
+msgstr "å? é?¤å?°å??ç°¿"
+
+# src/main-window.c:166
+#: ../src/ab-main.c:579 ../src/main-window.c:386
+msgid "_Quit"
+msgstr "é??å?º(_Q)"
+
+#: ../src/ab-main.c:579
+msgid "Exit the program"
+msgstr "é??å?ºç¨?åº?"
+
+# src/pref-manager.c:137
+#: ../src/ab-main.c:581
+msgid "_New Entry"
+msgstr "æ?°æ?¡ç?®(_N)"
+
+#: ../src/ab-main.c:582
+msgid "Add new entry"
+msgstr "添����"
+
+# src/main-window.c:133 src/main-window.c:168
+#: ../src/ab-main.c:583
+msgid "_Delete Entry"
+msgstr "����(_D)"
+
+# src/pref-manager.c:137
+#: ../src/ab-main.c:584
+msgid "Delete entry"
+msgstr "����"
+
+#: ../src/ab-main.c:585 ../src/main-window.c:458
+msgid "_About"
+msgstr "��(_A)"
 
 # src/filter-edit-dialog.c:101
-#: ../src/ab-main.c:639 ../src/ab-window.c:168 ../src/filter-edit-dialog.c:200
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:221
-#: ../src/filter-run-dialog.c:295
-msgid "Name"
-msgstr "å??å­?"
+#: ../src/ab-main.c:817
+msgid "_Name"
+msgstr "å??å­?(_N)"
+
+#: ../src/ab-main.c:833
+msgid "_Address"
+msgstr "å?°å??ç°¿(_A)"
 
 # src/filter-edit-dialog.c:456
-#: ../src/ab-main.c:791
-#, fuzzy
+#: ../src/ab-main.c:959
 msgid "F_ilter:"
-msgstr "è¿?滤è§?å??å??ï¼?"
+msgstr "è¿?滤è§?å??(_I)ï¼?"
+
+# src/filter-edit-dialog.c:101
+#: ../src/ab-window.c:172 ../src/filter-edit-dialog.c:209
+#: ../src/filter-export-dialog.c:92 ../src/filter-run-dialog.c:223
+#: ../src/filter-run-dialog.c:297
+msgid "Name"
+msgstr "å??称"
 
 # src/balsa-init.c:261 src/pref-manager.c:377
-#: ../src/ab-window.c:176
+#: ../src/ab-window.c:180
 msgid "E-Mail Address"
 msgstr "é?®ä»¶å?°å??"
 
 # src/filter-edit-dialog.c:536
+#. -- table column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:263
-#, fuzzy
+#: ../src/ab-window.c:281
 msgid "_Search for Name:"
-msgstr "æ??ç´¢å??å­?ï¼?"
+msgstr "æ??ç´¢å??称(_S)ï¼?"
 
-# src/sendmsg-window.c:71
-#: ../src/ab-window.c:323
-msgid "Send-To"
-msgstr "å??è?³"
-
-#: ../src/ab-window.c:343
+#: ../src/ab-window.c:316
 msgid "Run Editor"
-msgstr ""
+msgstr "è¿?è¡?ç¼?è¾?å?¨"
 
-#: ../src/ab-window.c:350
-#, fuzzy
+#: ../src/ab-window.c:323
 msgid "_Re-Import"
-msgstr "é??æ?°å¯¼å?¥"
+msgstr "é??æ?°å¯¼å?¥(_R)"
+
+# src/sendmsg-window.c:71
+#. -- table column 3 --
+#. label for selected addresses in compose mode
+#: ../src/ab-window.c:355
+msgid "Send-To"
+msgstr "å??é??è?³"
 
 #. mode switching stuff
-#: ../src/ab-window.c:360
+#: ../src/ab-window.c:370
 msgid "Treat multiple addresses as:"
-msgstr "对å¾?å¤?个å?°å??ï¼?"
+msgstr "å°?å¤?个å?°å??对å¾?为ï¼?"
 
-#: ../src/ab-window.c:364
+#: ../src/ab-window.c:374
 msgid "alternative addresses for the same person"
-msgstr "å??ä¸?个人ç??å?¶å®?å?°å??"
+msgstr "å??ä¸?个人ç??å?¶ä»?å?°å??"
 
-#: ../src/ab-window.c:369
+#: ../src/ab-window.c:379
 msgid "a distribution list"
 msgstr "å??å??å??表"
 
+#: ../src/ab-window.c:422
+#, c-format
+msgid "Could not launch %s: %s"
+msgstr " ���� %s�%s "
+
 # src/mailbox-conf.c:488
-#: ../src/ab-window.c:702
-#, fuzzy, c-format
+#: ../src/ab-window.c:719
+#, c-format
 msgid ""
 "Error opening address book '%s':\n"
 "%s"
-msgstr "æ? æ³?æ??å¼? LDIF å?°å??ç°¿ %sã??"
+msgstr ""
+"æ??å¼?å?°å??ç°¿ '%s' å?ºé??ï¼?\n"
+"%s"
 
-#: ../src/address-book-config.c:235 ../src/address-book-config.c:328
-#, fuzzy
-msgid "Modify Address Book"
-msgstr "å?°å??ç°¿"
+#: ../src/address-book-config.c:177
+msgid "Suggest complete addresses:"
+msgstr "建议å®?æ?´ç??å?°å??ï¼?"
 
-#: ../src/address-book-config.c:239 ../src/address-book-config.c:332
-#, fuzzy
-msgid "Add Address Book"
-msgstr "å?°å??ç°¿"
+#: ../src/address-book-config.c:183
+msgid "as I type"
+msgstr "å?¨æ??è¾?å?¥æ?¶"
+
+#: ../src/address-book-config.c:192
+msgid "when I hit the Escape key"
+msgstr "å?¨æ??æ??ä¸? Escape é?®æ?¶"
+
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:331
+#, c-format
+msgid "Modify %s Address Book"
+msgstr "ä¿®æ?¹ %s å?°å??ç°¿"
+
+#: ../src/address-book-config.c:233 ../src/address-book-config.c:335
+#, c-format
+msgid "Add %s Address Book"
+msgstr "æ·»å?  %s å?°å??ç°¿"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:254 ../src/address-book-config.c:363
-#: ../src/address-book-config.c:453 ../src/address-book-config.c:519
-#, fuzzy
-msgid "A_ddress Book Name"
-msgstr "å?°å??ç°¿å??"
-
-#: ../src/address-book-config.c:258 ../src/address-book-config.c:407
-#: ../src/address-book-config.c:489 ../src/address-book-config.c:524
-msgid "_Expand aliases as you type"
-msgstr "å?¨è¾?å?¥ç??æ?¶å??å±?å¼?å?«å??(_E)"
+#: ../src/address-book-config.c:253 ../src/address-book-config.c:375
+#: ../src/address-book-config.c:441 ../src/address-book-config.c:508
+msgid "A_ddress Book Name:"
+msgstr "å?°å??ç°¿å??称(_D)ï¼?"
 
-#: ../src/address-book-config.c:368
-msgid "Load program location"
-msgstr "载����置"
+#: ../src/address-book-config.c:380
+msgid "Load program location:"
+msgstr "载����置�"
 
-#: ../src/address-book-config.c:375 ../src/address-book-config.c:380
+#: ../src/address-book-config.c:386
 msgid "Select load program for address book"
 msgstr "é??æ?©å?°å??ç°¿è½½å?¥ç¨?åº?"
 
-#: ../src/address-book-config.c:387
-msgid "Save program location"
-msgstr "�����置"
+#: ../src/address-book-config.c:393
+msgid "Save program location:"
+msgstr "�����置�"
 
-#: ../src/address-book-config.c:394 ../src/address-book-config.c:399
+#: ../src/address-book-config.c:399
 msgid "Select save program for address book"
 msgstr "é??æ?©å?°å??ç°¿ä¿?å­?ç¨?åº?"
 
 # src/balsa-init.c:247 src/pref-manager.c:367
-#: ../src/address-book-config.c:458
+#: ../src/address-book-config.c:446
 msgid "_Host Name"
 msgstr "主æ?ºå??(_H)"
 
-#: ../src/address-book-config.c:463
-#, fuzzy
+#: ../src/address-book-config.c:451
 msgid "Base Domain _Name"
-msgstr "å?ºå??å??(_B)"
+msgstr "å?ºå??å??(_N)"
 
-#: ../src/address-book-config.c:468
+#: ../src/address-book-config.c:456
 msgid "_User Name (Bind DN)"
-msgstr ""
+msgstr "ç?¨æ?·å??(ç»?å®?å??å??)(_U)"
 
 # src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../src/address-book-config.c:473
-#, fuzzy
+#: ../src/address-book-config.c:461
 msgid "_Password"
-msgstr "�令(_P)�"
+msgstr "��(_P)"
 
-#: ../src/address-book-config.c:479
-#, fuzzy
+#: ../src/address-book-config.c:467
 msgid "_User Address Book DN"
-msgstr "å?°å??ç°¿å??(_A)"
+msgstr "ç?¨æ?·å?°å??ç°¿å??å??(_U)"
 
-#: ../src/address-book-config.c:485
+#: ../src/address-book-config.c:473
 msgid "Enable _TLS"
-msgstr ""
+msgstr "�� _TLS"
 
-#: ../src/address-book-config.c:542 ../src/main-window.c:3949
+#: ../src/address-book-config.c:541 ../src/main-window.c:2666
+#: ../src/main-window.c:4426
 #, c-format
 msgid "Error displaying help: %s\n"
-msgstr ""
+msgstr "æ?¾ç¤ºå¸®å?©å?ºé??ï¼?%s\n"
 
-#: ../src/address-book-config.c:643
+#: ../src/address-book-config.c:618
 msgid "No path found.  Do you want to give one?"
-msgstr ""
-
-#: ../src/address-book-config.c:649
-#, fuzzy, c-format
-msgid "The address book file path \"%s\" is not correct. %s"
-msgstr ""
-"å?°å??ç°¿æ??件路å¾?â??%sâ??ä¸?正确ã??\n"
-"æ?¨è¦?æ?´æ­£æ??件å??å??ï¼?"
+msgstr "没æ??æ?¾å?°è·¯å¾?ã??æ?¨æ?³æ??å®?ä¸?个å??ï¼?"
 
-#: ../src/address-book-config.c:652
-#, fuzzy, c-format
-msgid "The load program path \"%s\" is not correct. %s"
-msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
-
-#: ../src/address-book-config.c:655
-#, fuzzy, c-format
-msgid "The save program path \"%s\" is not correct. %s"
-msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
+#: ../src/address-book-config.c:902
+msgid "Rubrica2 Address Book"
+msgstr "Rubrica2 å?°å??ç°¿"
 
-#: ../src/address-book-config.c:658
-#, fuzzy, c-format
-msgid "The path \"%s\" is not correct. %s"
-msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
+#: ../src/balsa-app.c:79 ../src/folder-conf.c:276 ../src/mailbox-conf.c:1312
+msgid "_Remember password in keyring"
+msgstr "����中记��令(_R)"
 
-#: ../src/address-book-config.c:661
-msgid "Do you want to correct the path?"
-msgstr ""
+#: ../src/balsa-app.c:82 ../src/folder-conf.c:279 ../src/mailbox-conf.c:1315
+msgid "_Remember password"
+msgstr "记��令(_R)"
 
-#: ../src/balsa-app.c:76
-#, fuzzy, c-format
+#: ../src/balsa-app.c:88
+#, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
 "The _password for %s %s:"
 msgstr ""
-"æ­£å?¨æ??å¼?è¿?ç¨?é?®ä»¶ç®± %sã??\n"
-"%s %s ç??å?£ä»¤æ?¯ï¼?"
+"æ­£å?¨æ??å¼?è¿?ç¨?é?®ç®± %sã??\n"
+"%s %s ç??å¯?ç ?æ?¯(_P)ï¼?"
 
 # src/index-child.c:143
-#: ../src/balsa-app.c:81
-#, fuzzy, c-format
-msgid "Mailbox _password for %s %s:"
-msgstr "%s %s ç??é?®ä»¶ç®±å?£ä»¤æ?¯ï¼?"
+#: ../src/balsa-app.c:93
+#, c-format
+msgid "_Password for %s %s (%s):"
+msgstr "%s %s ç??å¯?ç ?(%s)ï¼?"
 
 # src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../src/balsa-app.c:84
-#, fuzzy
+#: ../src/balsa-app.c:96
 msgid "Password needed"
-msgstr "�令(_P)�"
-
-#: ../src/balsa-app.c:98 ../src/folder-conf.c:357
-msgid "_Remember password"
-msgstr "记��令(_R)"
+msgstr "é??è¦?å¯?ç ?"
 
 # src/main-window.c:171
-#: ../src/balsa-app.c:538
-#, fuzzy, c-format
+#: ../src/balsa-app.c:551
+#, c-format
 msgid "Couldn't open mailbox \"%s\""
-msgstr "æ? æ³?é??æ?°æ??å¼?é?®ä»¶ç®±ï¼?"
+msgstr "æ? æ³?æ??å¼?é?®ç®±â??%sâ??"
+
+# src/balsa-index.c:231
+#: ../src/balsa-index.c:359
+msgid "From"
+msgstr "å??件人"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/balsa-index.c:370 ../src/pref-manager.c:368
+#: ../src/balsa-index.c:375 ../src/pref-manager.c:418
 msgid "Subject"
 msgstr "主�"
 
 # src/balsa-index.c:233
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:369
+#: ../src/balsa-index.c:392 ../src/pref-manager.c:419
 msgid "Date"
 msgstr "��"
 
-#: ../src/balsa-index.c:396 ../src/pref-manager.c:370
-#: ../src/sendmsg-window.c:2823
+#: ../src/balsa-index.c:407 ../src/pref-manager.c:420
+#: ../src/sendmsg-window.c:2996
 msgid "Size"
 msgstr "大�"
 
-#: ../src/balsa-index.c:984
-#, c-format
-msgid "Opening mailbox %s. Please wait..."
-msgstr "æ­£å?¨æ??å¼?é?®ä»¶ç®± %sã??请ç­?å¾?..."
+# src/balsa-message.c:526 src/filter-edit-dialog.c:291
+# src/sendmsg-window.c:315
+#. FIXME: this is hack!
+#: ../src/balsa-index.c:1055
+msgid "To"
+msgstr "�件人"
 
-#: ../src/balsa-index.c:1616
-#, fuzzy, c-format
+#: ../src/balsa-index.c:1726
+#, c-format
 msgid "Move to Trash failed: %s"
-msgstr "移�已���件(_M)"
+msgstr "移���件箱失败�%s"
 
 # src/main-window.c:113 src/message-window.c:54
-#. R
-#: ../src/balsa-index.c:1770 ../src/main-window.c:584
-#: ../src/main-window.c:1047 ../src/message-window.c:148
+#. Message menu items
+#: ../src/balsa-index.c:1884 ../src/main-window.c:514
+#: ../src/message-window.c:268
 msgid "_Reply..."
 msgstr "å??å¤?(_R)..."
 
 # src/main-window.c:215
-#: ../src/balsa-index.c:1772
-#, fuzzy
+#: ../src/balsa-index.c:1886
 msgid "Reply To _All..."
-msgstr "å?¨é?¨å??å¤?..."
+msgstr "å?¨é?¨å??å¤?(_A)..."
 
 # src/main-window.c:215
-#: ../src/balsa-index.c:1774
-#, fuzzy
+#: ../src/balsa-index.c:1888
 msgid "Reply To _Group..."
-msgstr "å??å¤?å?°ç»?..."
+msgstr "å??å¤?ç»?ç»?(_G)..."
 
 # src/main-window.c:216
-#: ../src/balsa-index.c:1776
-#, fuzzy
+#: ../src/balsa-index.c:1890
 msgid "_Forward Attached..."
-msgstr "ä½?为é??件转å??..."
+msgstr "ä½?为é??件转å??(_F)..."
 
 # src/main-window.c:216
-#: ../src/balsa-index.c:1778
-#, fuzzy
+#: ../src/balsa-index.c:1892
 msgid "Forward _Inline..."
-msgstr "ç?´æ?¥è½¬å??..."
+msgstr "å??åµ?å?¨æ­£æ??中转å??(_I)..."
 
-#: ../src/balsa-index.c:1780 ../src/main-window.c:623
+#: ../src/balsa-index.c:1894 ../src/main-window.c:541
 msgid "_Pipe through..."
-msgstr ""
+msgstr "é??è¿?管é??ä¼ é??..."
 
-#: ../src/balsa-index.c:1782 ../src/main-window.c:682
-#: ../src/main-window.c:1031
+#: ../src/balsa-index.c:1896 ../src/main-window.c:521
 msgid "_Store Address..."
 msgstr "ä¿?å­?å?°å??(_S)..."
 
-# src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-index.c:1797 ../src/filter-edit-dialog.c:223
-#: ../src/mailbox-node.c:981 ../src/mailbox-node.c:997
-#: ../src/pref-manager.c:1499 ../src/pref-manager.c:1588
-#: ../src/pref-manager.c:2633
-msgid "_Delete"
-msgstr "å? é?¤(_D)"
-
 # src/main-window.c:139
-#: ../src/balsa-index.c:1802
+#: ../src/balsa-index.c:1916
 msgid "_Undelete"
 msgstr "å??æ¶?å? é?¤(_U)"
 
-#: ../src/balsa-index.c:1807
-#, fuzzy
+#: ../src/balsa-index.c:1921
 msgid "Move To _Trash"
-msgstr "移�已���件"
+msgstr "移��件箱(_T)"
 
-#: ../src/balsa-index.c:1811
-#, fuzzy
+#: ../src/balsa-index.c:1925
 msgid "T_oggle"
-msgstr "å??æ?¢"
+msgstr "å??æ?¢(_O)"
 
-#: ../src/balsa-index.c:1815 ../src/main-window.c:331 ../src/main-window.c:360
-#, fuzzy
+#. Message:toggle-flag submenu items
+#: ../src/balsa-index.c:1929 ../src/main-window.c:591 ../src/main-window.c:636
 msgid "_Flagged"
-msgstr "æ ?è®°ç??"
+msgstr "带æ ?è®°ç??(_F)"
 
 # src/index-child.c:422
-#: ../src/balsa-index.c:1818
-#, fuzzy
+#: ../src/balsa-index.c:1932
 msgid "_Unread"
-msgstr "�读"
+msgstr "�读(_U)"
 
-#: ../src/balsa-index.c:1826
-#, fuzzy
+#: ../src/balsa-index.c:1940
 msgid "_Move to"
-msgstr "移�已���件(_M)"
+msgstr "移��(_M)"
 
-#: ../src/balsa-index.c:1834
-#, fuzzy
+#: ../src/balsa-index.c:1948
 msgid "_View Source"
-msgstr "æ?¥ç??æº?"
-
-# src/main-window.c:168
-#: ../src/balsa-index.c:2116
-#, fuzzy, c-format
-msgid "Failed to copy messages to mailbox \"%s\": %s"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+msgstr "æ?¥ç??æº?代ç ?(_V)"
 
 # src/main-window.c:168
-#: ../src/balsa-index.c:2117
-#, fuzzy, c-format
-msgid "Failed to copy message to mailbox \"%s\": %s"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+#: ../src/balsa-index.c:2193
+#, c-format
+msgid "Failed to copy %d message to mailbox \"%s\": %s"
+msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+msgstr[0] "å¤?å?¶ %d å°?é?®ä»¶å?°é?®ç®± â??%sâ?? 失败ï¼?%s"
 
-#: ../src/balsa-index.c:2129
-#, fuzzy, c-format
+#: ../src/balsa-index.c:2205
+#, c-format
 msgid "Copied to \"%s\"."
-msgstr "正����件 %d � %s..."
+msgstr "å·²å¤?å?¶å?°â??%sâ??ã??"
 
-#: ../src/balsa-index.c:2130
-#, fuzzy, c-format
+#: ../src/balsa-index.c:2206
+#, c-format
 msgid "Moved to \"%s\"."
-msgstr "移�已���件(_M)"
+msgstr "已移å?¨å?°â??%sâ??ã??"
 
-#: ../src/balsa-index.c:2250
+#: ../src/balsa-index.c:2308
 #, fuzzy, c-format
 msgid "Committing mailbox %s failed."
-msgstr "æ?¹å??é?®ä»¶ç®± %s 失败ã??"
+msgstr "æ??æ´¾é?®ç®± %s 失败ã??"
 
-#: ../src/balsa-index.c:2423
-#, fuzzy
+# src/main-window.c:139
+#: ../src/balsa-index.c:2406
+#, c-format
+msgid "Cannot process the message: %s"
+msgstr "æ? æ³?å¤?ç??é?®ä»¶ï¼?%s"
+
+# src/main-window.c:139
+#: ../src/balsa-index.c:2529
+#, c-format
+#| msgid "Cannot access the message's body\n"
+msgid "Cannot access message %u to pass to %s"
+msgstr "æ? æ³?访é?®é?®ä»¶ %u 以传é??å?° %s"
+
+# src/main-window.c:139
+#: ../src/balsa-index.c:2556
+#, c-format
+msgid "Cannot read message %u to pass to %s"
+msgstr "æ? æ³?读å??é?®ä»¶ %u 以传é??å?° %s"
+
+#: ../src/balsa-index.c:2720
 msgid "Pipe message through a program"
-msgstr "� procmail �滤(_F)"
+msgstr "é??è¿?ç¨?åº?ç?¨ç®¡é??ä¼ é??é?®ä»¶"
 
-#: ../src/balsa-index.c:2426
+#: ../src/balsa-index.c:2723
 msgid "_Run"
-msgstr ""
+msgstr "è¿?è¡?(_R)"
 
-#: ../src/balsa-index.c:2435
+#: ../src/balsa-index.c:2735
 msgid "Specify the program to run:"
-msgstr ""
+msgstr "æ??å®?è¦?è¿?è¡?ç??ç¨?åº?"
 
 # src/mailbox-conf.c:939
-#: ../src/balsa-mblist.c:278
+#: ../src/balsa-mblist.c:357
 msgid "Mailbox"
 msgstr "�件箱"
 
 # src/index-child.c:176
-#: ../src/balsa-mblist.c:992 ../src/balsa-mblist.c:1030
-#, fuzzy
+#: ../src/balsa-mblist.c:1132 ../src/balsa-mblist.c:1182
 msgid "Failed to find mailbox"
-msgstr "æ? æ³?é??ä½?é?®ä»¶ç®±ï¼?"
+msgstr "���箱失败"
 
 # src/main-window.c:182
-#: ../src/balsa-mblist.c:1590
-#, fuzzy
+#: ../src/balsa-mblist.c:1768
 msgid "_Other..."
-msgstr "�滤�(_F)..."
+msgstr "��(_O)..."
 
-#: ../src/balsa-mblist.c:1658
-#, fuzzy
+#: ../src/balsa-mblist.c:1836
 msgid "Choose destination folder"
-msgstr "移å?¨å?°æ??件夹ï¼?"
+msgstr "é??æ?©ç?®æ ?æ??件夹"
 
 # src/main-window.c:182
-#: ../src/balsa-mblist.c:1881 ../src/balsa-mblist.c:1884
-#, fuzzy
+#: ../src/balsa-mblist.c:2049
 msgid "Other..."
-msgstr "�滤�(_F)..."
-
-#: ../src/balsa-mblist.c:2042
-#, fuzzy, c-format
-msgid "Shown mailbox: %s with %d message, "
-msgid_plural "Shown mailbox: %s with %d messages, "
-msgstr[0] "æ?¾ç¤ºç??é?®ä»¶ç®±ï¼?%s æ?? %ld 个é?®ä»¶ï¼?%ld 个æ?°é?®ä»¶"
-msgstr[1] "æ?¾ç¤ºç??é?®ä»¶ç®±ï¼?%s æ?? %ld 个é?®ä»¶ï¼?%ld 个æ?°é?®ä»¶"
-
-#. xgettext: this is the second part of the message
-#. * "Shown mailbox: %s with %d messages, %ld new".
-#: ../src/balsa-mblist.c:2048
-#, c-format
-msgid "%ld new"
-msgid_plural "%ld new"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "��..."
 
 # src/pref-manager.c:397
-#: ../src/balsa-message.c:285
-#, fuzzy
+#: ../src/balsa-message.c:303
 msgid "Check cryptographic signature"
-msgstr "æ£?æ?¥ç­¾å??"
+msgstr "æ£?æ?¥å? å¯?ç­¾å??"
 
-#: ../src/balsa-message.c:306
-#, fuzzy
+#: ../src/balsa-message.c:324
 msgid "Select message part to display"
-msgstr "å??é??é?®ä»¶ä»¥è?·å??该é?¨å??"
+msgstr "æ?¾ç¤ºè¦?æ?¾ç¤ºç??é?®ä»¶å?ºæ®µ"
 
-#: ../src/balsa-message.c:381
-#, fuzzy
+#: ../src/balsa-message.c:411
+#| msgid "_Wrap"
+msgid "Wrapped"
+msgstr "已��"
+
+#: ../src/balsa-message.c:415
+msgid "Not found"
+msgstr "���"
+
+#: ../src/balsa-message.c:604
+msgid "Find:"
+msgstr "���"
+
+# src/main-window.c:218
+#: ../src/balsa-message.c:617 ../src/toolbar-factory.c:142
+msgid "Previous"
+msgstr "��个"
+
+# src/pref-manager.c:66
+#: ../src/balsa-message.c:625 ../src/toolbar-factory.c:143
+msgid "Next"
+msgstr "��个"
+
+#: ../src/balsa-message.c:716
 msgid "Content"
-msgstr "继续(_C)"
+msgstr "æ­£æ??"
 
 # src/main-window.c:200
-#: ../src/balsa-message.c:460
-#, fuzzy
+#: ../src/balsa-message.c:807
 msgid "Message parts"
-msgstr "�件��"
+msgstr "�件�段"
 
 # src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-message.c:643
-#, fuzzy
+#: ../src/balsa-message.c:986
 msgid "Save selected as..."
-msgstr "é??æ?©..."
+msgstr "å°?é??æ?©é?¨å??ä¿?å­?为..."
 
 # src/main-window.c:133 src/main-window.c:168
-#: ../src/balsa-message.c:650
-#, fuzzy
+#: ../src/balsa-message.c:993
 msgid "Save selected to folder..."
-msgstr "é??æ?©..."
+msgstr "å°?é??æ?©é?¨å??ä¿?å­?å?°æ??件夹..."
 
 # src/filter-edit-dialog.c:267
-#: ../src/balsa-message.c:788
-#, fuzzy
+#: ../src/balsa-message.c:1086
 msgid "(No sender)"
-msgstr "没æ??信头(_O)"
+msgstr "(没æ??å??信人)"
 
 # src/main-window.c:168
-#: ../src/balsa-message.c:856
-#, fuzzy, c-format
-msgid "Could not access message %ld in mailbox \"%s\"."
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+#: ../src/balsa-message.c:1140 ../src/balsa-message.c:1152
+#, c-format
+msgid "Could not access message %u in mailbox \"%s\"."
+msgstr "æ? æ³?访é?®é?®ç®±â??%2$sâ??中ç??é?®ä»¶ %1$uã??"
 
 # src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-message.c:1038
-#, fuzzy
+#: ../src/balsa-message.c:1326
 msgid "mixed parts"
-msgstr "ä¿?å­?é?¨å??"
+msgstr "æ··å??å?ºæ®µ"
 
 # src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-message.c:1040
-#, fuzzy
+#: ../src/balsa-message.c:1328
 msgid "alternative parts"
-msgstr "ä¿?å­?é?¨å??"
+msgstr "å?¯é??å?ºæ®µ"
 
-#: ../src/balsa-message.c:1042
+#: ../src/balsa-message.c:1330
 msgid "signed parts"
-msgstr ""
+msgstr "ç­¾å??ç??å?ºæ®µ"
 
-#: ../src/balsa-message.c:1044
+#: ../src/balsa-message.c:1332
 msgid "encrypted parts"
-msgstr ""
+msgstr "å? å¯?ç??å?ºæ®µ"
 
 # src/main-window.c:222
-#: ../src/balsa-message.c:1046
-#, fuzzy
+#: ../src/balsa-message.c:1334
 msgid "rfc822 message"
-msgstr "æ??å?°é?®ä»¶"
+msgstr "rfc822 �件"
 
-#: ../src/balsa-message.c:1048
+#: ../src/balsa-message.c:1336
 #, c-format
 msgid "\"%s\" parts"
+msgstr "â??%sâ?? å?ºæ®µ"
+
+#: ../src/balsa-message.c:1384
+msgid "force inline for all parts"
 msgstr ""
 
-#: ../src/balsa-message.c:1101
+#: ../src/balsa-message.c:1427
 #, c-format
 msgid "rfc822 message (from %s, subject \"%s\")"
-msgstr ""
+msgstr "rfc822 é?®ä»¶ (æ?¥è?ª %sï¼?主é¢?â??%sâ??)"
 
 # src/main-window.c:107
-#: ../src/balsa-message.c:1108
-#, fuzzy
+#: ../src/balsa-message.c:1439
 msgid "complete message"
-msgstr "ç¼?å??æ?°é?®ä»¶"
+msgstr "���件"
 
-#: ../src/balsa-message.c:1125
+#: ../src/balsa-message.c:1456
 #, c-format
 msgid "part %s: %s (file %s)"
-msgstr ""
+msgstr "%s å?ºæ®µï¼?%s (%s æ??件)"
 
-#: ../src/balsa-message.c:1136
-#, fuzzy, c-format
+#: ../src/balsa-message.c:1467
+#, c-format
 msgid "part %s: %s"
-msgstr "ä»? %sï¼?%d %s"
+msgstr "%s �段�%s"
 
-#: ../src/balsa-message.c:1151
-#, fuzzy
+#: ../src/balsa-message.c:1482
 msgid "encrypted: "
-msgstr "身份��失败"
+msgstr "已���"
+
+#: ../src/balsa-message.c:1619
+#, c-format
+msgid "Reading embedded message failed: %s"
+msgstr "读å??åµ?å?¥é?®ä»¶å¤±è´¥ï¼?%s"
+
+#: ../src/balsa-message.c:1627
+#, c-format
+msgid "Appending message to %s failed: %s"
+msgstr "å°?é?®ä»¶é??å? å?° %s 失败ï¼?%s"
 
 # src/balsa-message.c:160
-#: ../src/balsa-message.c:1254 ../src/balsa-mime-widget-text.c:344
-#: ../src/balsa-mime-widget-text.c:649
-msgid "Save..."
-msgstr "ä¿?å­?..."
+#: ../src/balsa-message.c:1656
+msgid "_Save..."
+msgstr "ä¿?å­?(_S)..."
 
-#: ../src/balsa-message.c:1330
+#: ../src/balsa-message.c:1665 ../src/balsa-mime-widget-message.c:458
+msgid "_Copy to folder..."
+msgstr "å¤?å?¶å?°æ??件夹(_C)ï¼?"
+
+#: ../src/balsa-message.c:1748
 msgid "Select folder for saving selected parts"
-msgstr ""
+msgstr "é??æ?©ç?¨äº?ä¿?å­?é??æ?©å?ºæ®µç??æ??件夹"
+
+#: ../src/balsa-message.c:1772
+#, c-format
+msgid "Could not create URI for %s"
+msgstr "æ? æ³?为 %s å??建 URI"
 
 # src/main-window.c:200
-#: ../src/balsa-message.c:1368
-#, fuzzy, c-format
+#: ../src/balsa-message.c:1797
+#, c-format
 msgid "%s message part"
-msgstr "�件��"
+msgstr "%s �件�段"
 
-#: ../src/balsa-message.c:1395 ../src/balsa-mime-widget-callbacks.c:201
-#, fuzzy, c-format
+#: ../src/balsa-message.c:1830 ../src/balsa-mime-widget-callbacks.c:165
+#, c-format
 msgid "Could not save %s: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
+msgstr " æ? æ³?ä¿?å­? %sï¼?%s"
 
-#: ../src/balsa-message.c:2099
+#: ../src/balsa-message.c:2481 ../src/balsa-message.c:2625
+#, fuzzy, c-format
+msgid "Sending the disposition notification failed: %s"
+msgstr "å??é??å??æ?§å¤±è´¥ï¼?%s"
+
+#: ../src/balsa-message.c:2578
 #, fuzzy, c-format
 msgid ""
 "The sender of this mail, %s, requested \n"
 "a Message Disposition Notification(MDN) to be returned to `%s'.\n"
 "Do you want to send this notification?"
 msgstr ""
-"该é?®ä»¶ç??å??é??è?? %s è¦?æ±?è¿?å??ä¸?个é?®ä»¶å¤?ç??é??ç?¥(MDN)å?°â??%sâ??ã??\n"
+"该é?®ä»¶ç??å??é??è?? %s è¦?æ±?è¿?å??\n"
+"ä¸?个é?®ä»¶å¤?ç??é??ç?¥(MDN)å?°â??%sâ??ã??\n"
 "æ?¨è¦?å??é??è¿?个é??ç?¥å??ï¼?"
 
 # src/sendmsg-window.c:513
-#: ../src/balsa-message.c:2106
+#: ../src/balsa-message.c:2588
 #, fuzzy
 msgid "Reply to MDN?"
-msgstr "å??å¤?å?° MDNï¼?"
+msgstr "å??å¤? MDNï¼?"
 
-#: ../src/balsa-message.c:2301
+#: ../src/balsa-message.c:2799
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
 "Please close the other instances of this message and try again."
 msgstr ""
 
-#: ../src/balsa-message.c:2322 ../src/balsa-message.c:2404
-#: ../src/balsa-message.c:2519
-#, fuzzy, c-format
+#: ../src/balsa-message.c:2820 ../src/balsa-message.c:2905
+#: ../src/balsa-message.c:3027
+#, c-format
 msgid "Parsing a message part failed: %s"
-msgstr "æ­£å?¨æ??已读é?®ä»¶ç§»å?° %s..."
+msgstr "解æ??é?®ä»¶å?ºæ®µå¤±è´¥ï¼? %s"
 
-#: ../src/balsa-message.c:2323 ../src/balsa-message.c:2405
-#: ../src/balsa-message.c:2520
+#: ../src/balsa-message.c:2821 ../src/balsa-message.c:2906
+#: ../src/balsa-message.c:3028
 msgid "Possible disk space problem."
-msgstr ""
+msgstr "å?¯è?½æ?¯ç£?ç??空é?´é?®é¢?ã??"
 
-#: ../src/balsa-message.c:2335
+#: ../src/balsa-message.c:2835
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains an encrypted part, but "
 "it's structure is invalid."
 msgstr ""
 
-#: ../src/balsa-message.c:2343
+#: ../src/balsa-message.c:2843
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
 "but this crypto protocol is not available."
 msgstr ""
 
-#: ../src/balsa-message.c:2356
+#: ../src/balsa-message.c:2856
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, "
 "but this crypto protocol is not available."
 msgstr ""
 
-#: ../src/balsa-message.c:2420
+#: ../src/balsa-message.c:2923
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a signed part, but its "
 "structure is invalid. The signature, if there is any, cannot be checked."
 msgstr ""
 
-#: ../src/balsa-message.c:2433
+#: ../src/balsa-message.c:2936
 #, c-format
 msgid ""
 "The message sent by %s with subject \"%s\" contains a %s signed part, but "
 "this crypto protocol is not available."
 msgstr ""
 
-#: ../src/balsa-message.c:2436
+#: ../src/balsa-message.c:2939
 msgid "PGP"
-msgstr ""
+msgstr "PGP"
 
-#: ../src/balsa-message.c:2436 ../src/balsa-mime-widget-crypto.c:72
-#: ../src/print.c:1302
+#: ../src/balsa-message.c:2939 ../src/balsa-mime-widget-crypto.c:74
+#: ../src/print-gtk.c:194
 msgid "S/MIME"
-msgstr ""
+msgstr "S/MIME"
 
 # src/pref-manager.c:397
-#: ../src/balsa-message.c:2455 ../src/balsa-message.c:2577
-#, fuzzy
+#: ../src/balsa-message.c:2963 ../src/balsa-message.c:3090
 msgid "Detected a good signature"
-msgstr "æ?§è¡?ç­¾å??"
+msgstr "æ£?æµ?å?°ä¸?个æ??æ??ç??ç­¾å??"
 
-#: ../src/balsa-message.c:2461
+#: ../src/balsa-message.c:2969
 msgid "Detected a good signature with insufficient validity"
 msgstr ""
 
-#: ../src/balsa-message.c:2466 ../src/balsa-message.c:2581
+#: ../src/balsa-message.c:2974 ../src/balsa-message.c:3094
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr ""
 
-#: ../src/balsa-message.c:2473 ../src/balsa-message.c:2587
+#: ../src/balsa-message.c:2981 ../src/balsa-message.c:3100
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -2495,442 +3001,800 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/balsa-message.c:2485
+#: ../src/balsa-message.c:2993
 #, c-format
 msgid ""
 "Checking the signature of the message sent by %s with subject \"%s\" failed "
 "with an error!"
 msgstr ""
 
-#: ../src/balsa-message.c:2541
+#: ../src/balsa-message.c:3052
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
 
-#: ../src/balsa-message.c:2543
+#: ../src/balsa-message.c:3054
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
 msgstr ""
 
-#: ../src/balsa-message.c:2546
+#: ../src/balsa-message.c:3057
 msgid "Please close the other instances of this message and try again."
 msgstr ""
 
-#: ../src/filter-edit-callbacks.c:311
+#: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1799
+#, c-format
+msgid "Could not launch application: %s"
+msgstr "���������%s"
+
+# src/balsa-message.c:159 src/balsa-message.c:162
+#: ../src/balsa-mime-widget-callbacks.c:81
+#, c-format
+msgid "Save %s MIME Part"
+msgstr "��%s MIME �段"
+
+# src/main-window.c:171
+#: ../src/balsa-mime-widget-callbacks.c:123
+#, c-format
+msgid "Could not construct uri from %s"
+msgstr "æ? æ³?ä»? %s æ??建 URI"
+
+#: ../src/balsa-mime-widget-callbacks.c:142
+msgid "File already exists. Overwrite?"
+msgstr "æ??件已ç»?å­?å?¨ã??è¦?è¦?ç??å??ï¼?"
+
+# src/mailbox-conf.c:531
+#: ../src/balsa-mime-widget-callbacks.c:152
+#, c-format
+msgid "Unlink %s: %s"
+msgstr "å??æ¶?é?¾æ?¥ %sï¼?%s"
+
+#: ../src/balsa-mime-widget-crypto.c:72
+#, c-format
+msgid ""
+"This is an inline %s signed %s message part:\n"
+"%s"
+msgstr ""
+
+# src/main-window.c:159
+#: ../src/balsa-mime-widget-crypto.c:74 ../src/print-gtk.c:194
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: ../src/balsa-mime-widget-crypto.c:92
+msgid "_Run GnuPG to import this key"
+msgstr "�� GnuPG �导�该��(_R)"
+
+#: ../src/balsa-mime-widget-crypto.c:96
+msgid "_Run GnuPG to check for an update of this key"
+msgstr "è¿?è¡? GnuPG æ?¥æ£?æ?¥è¯¥å¯?é?¥ç??æ?´æ?°(_R)"
+
+#: ../src/balsa-mime-widget-image.c:54 ../src/balsa-mime-widget-image.c:178
+#, c-format
+msgid "Error loading attached image: %s\n"
+msgstr "è½½å?¥å?¾å??é??件å?ºé??ï¼?%s\n"
+
+#: ../src/balsa-mime-widget-message.c:161
+#: ../src/balsa-mime-widget-message.c:173
+#: ../src/balsa-mime-widget-message.c:201
+#: ../src/balsa-mime-widget-message.c:254
+msgid "Content Type: external-body\n"
+msgstr "å??容类å??ï¼?å¤?é?¨é?®ä»¶\n"
+
+#: ../src/balsa-mime-widget-message.c:162
+#, c-format
+msgid "Access type: local-file\n"
+msgstr "访é?®ç±»å??ï¼?æ?¬å?°æ??件\n"
+
+# src/filter-edit-dialog.c:456
+#: ../src/balsa-mime-widget-message.c:163
+#: ../src/balsa-mime-widget-message.c:209 ../src/balsa-mime-widget.c:233
+#, c-format
+msgid "File name: %s"
+msgstr "æ??件å??ï¼?%s"
+
+#: ../src/balsa-mime-widget-message.c:174
+#, c-format
+msgid "Access type: URL\n"
+msgstr "访é?®ç±»å??ï¼?URL\n"
+
+#: ../src/balsa-mime-widget-message.c:175
+#, c-format
+msgid "URL: %s"
+msgstr "URLï¼?%s"
+
+#: ../src/balsa-mime-widget-message.c:202
+#, c-format
+msgid "Access type: %s\n"
+msgstr "访é?®ç±»å??ï¼?%s\n"
+
+#: ../src/balsa-mime-widget-message.c:206
+#, c-format
+msgid "FTP site: %s\n"
+msgstr "FTP ���%s\n"
+
+#: ../src/balsa-mime-widget-message.c:208
+#, c-format
+msgid "Directory: %s\n"
+msgstr "���%s\n"
+
+#: ../src/balsa-mime-widget-message.c:255
+msgid "Access type: mail-server\n"
+msgstr "访é?®ç±»å??ï¼?é?®ä»¶æ??å?¡å?¨\n"
+
+# src/pref-manager.c:144
+#: ../src/balsa-mime-widget-message.c:256
+#, c-format
+msgid "Mail server: %s\n"
+msgstr "é?®ä»¶æ??å?¡å?¨ï¼?%s\n"
+
+# src/balsa-message.c:558 src/sendmsg-window.c:358
+#: ../src/balsa-mime-widget-message.c:258
+#, c-format
+msgid "Subject: %s\n"
+msgstr "主��%s\n"
+
+#: ../src/balsa-mime-widget-message.c:275
+msgid "Se_nd message to obtain this part"
+msgstr "å??é??é?®ä»¶ä»¥è?·å??该å?ºæ®µ(_N)"
+
+#: ../src/balsa-mime-widget-message.c:296 ../src/balsa-mime-widget-text.c:804
+#: ../src/main-window.c:2684 ../src/sendmsg-window.c:1820
+#, c-format
+msgid "Error showing %s: %s\n"
+msgstr "æ?¾ç¤º %s å?ºé??ï¼?%s\n"
+
+#: ../src/balsa-mime-widget-message.c:331
+#, c-format
+msgid "Could not get a part: %s"
+msgstr " æ? æ³?è?·å??å?ºæ®µï¼?%s "
+
+#: ../src/balsa-mime-widget-message.c:363
+#, fuzzy, c-format
+msgid "Sending the external body request failed: %s"
+msgstr "å??é??å¤?é?¨é?®ä»¶ä¸»ä½?请æ±?失败ï¼?%s"
+
+# src/main-window.c:214
+#: ../src/balsa-mime-widget-message.c:450
+msgid "Reply..."
+msgstr "å??å¤?..."
+
+#: ../src/balsa-mime-widget-message.c:555
+msgid "... [truncated]"
+msgstr "... [已��]"
+
+#. Gmail sometimes fails to do that.
+#: ../src/balsa-mime-widget-message.c:705
+msgid "Error:"
+msgstr ""
+
+#: ../src/balsa-mime-widget-message.c:706
+msgid "IMAP server did not report message structure"
+msgstr ""
+
+# src/balsa-message.c:558 src/sendmsg-window.c:358
+#: ../src/balsa-mime-widget-message.c:718
+#: ../src/balsa-print-object-header.c:155 ../src/sendmsg-window.c:1138
+#: ../src/sendmsg-window.c:1140 ../src/sendmsg-window.c:1231
+#: ../src/sendmsg-window.c:3795 ../src/sendmsg-window.c:5702
+msgid "Subject:"
+msgstr "主��"
+
+# src/balsa-message.c:519
+#: ../src/balsa-mime-widget-message.c:722
+#: ../src/balsa-print-object-header.c:163 ../src/sendmsg-window.c:3791
+msgid "Date:"
+msgstr "���"
+
+# src/balsa-message.c:544 src/filter-edit-dialog.c:303
+# src/sendmsg-window.c:338
+#. addresses
+#: ../src/balsa-mime-widget-message.c:728
+#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:3802
+#: ../src/store-address.c:331
+msgid "From:"
+msgstr "å??件人ï¼?"
+
+# src/sendmsg-window.c:513
+#: ../src/balsa-mime-widget-message.c:735
+msgid "Reply-To:"
+msgstr "å??å¤?ç»?ï¼?"
+
+# src/sendmsg-window.c:368
+#: ../src/balsa-mime-widget-message.c:744
+#: ../src/balsa-print-object-header.c:176
+msgid "Fcc:"
+msgstr "æ??件æ??é??ï¼?"
+
+#: ../src/balsa-mime-widget-message.c:751
+#: ../src/balsa-print-object-header.c:179
+msgid "Disposition-Notification-To:"
+msgstr "å??é??é??读é??å??è?³ï¼?"
+
+#: ../src/balsa-mime-widget-text.c:171
+#, c-format
+msgid "Could not save a text part: %s"
+msgstr " æ? æ³?ä¿?å­?æ??æ?¬å?ºæ®µï¼?%s "
+
+#: ../src/balsa-mime-widget-text.c:515
+msgid "Copy link"
+msgstr "����"
+
+# src/main-window.c:159
+#: ../src/balsa-mime-widget-text.c:520
+msgid "Open link"
+msgstr "æ??å¼?é?¾æ?¥"
+
+# src/sendmsg-window.c:71
+#: ../src/balsa-mime-widget-text.c:525
+msgid "Send link..."
+msgstr "å??é??é?¾æ?¥..."
+
+# src/balsa-message.c:160
+#: ../src/balsa-mime-widget-text.c:554 ../src/balsa-mime-widget-text.c:1046
+msgid "Save..."
+msgstr "ä¿?å­?..."
+
+#: ../src/balsa-mime-widget-text.c:564
+msgid "Highlight structured phrases"
+msgstr ""
+
+#: ../src/balsa-mime-widget-text.c:791
+#, c-format
+msgid "Calling URL %s..."
+msgstr "正�� URL %s..."
+
+#: ../src/balsa-mime-widget-text.c:1160
+msgid "Address"
+msgstr "å?°å??"
+
+# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
+#: ../src/balsa-mime-widget-text.c:1163
+msgid "S_tore"
+msgstr "ä¿?å­?(_T)"
+
+# src/filter-edit-dialog.c:101
+#: ../src/balsa-mime-widget-text.c:1171 ../src/balsa-print-object-text.c:508
+msgid "Full Name"
+msgstr "å?¨å??"
+
+# src/filter-edit-dialog.c:101
+#: ../src/balsa-mime-widget-text.c:1172 ../src/balsa-print-object-text.c:510
+msgid "Nick Name"
+msgstr "�称"
+
+# src/filter-edit-dialog.c:456
+#: ../src/balsa-mime-widget-text.c:1173 ../src/balsa-print-object-text.c:512
+msgid "First Name"
+msgstr "å??"
+
+# src/mailbox-conf.c:671 src/mailbox-conf.c:706
+#: ../src/balsa-mime-widget-text.c:1174 ../src/balsa-print-object-text.c:514
+msgid "Last Name"
+msgstr "�"
+
+#: ../src/balsa-mime-widget-text.c:1175 ../src/balsa-print-object-text.c:516
+msgid "Organization"
+msgstr "ç»?ç»?"
+
+# src/balsa-init.c:261 src/pref-manager.c:377
+#: ../src/balsa-mime-widget-text.c:1177 ../src/balsa-print-object-text.c:519
+msgid "Email Address"
+msgstr "é?®ä»¶å?°å??"
+
+#: ../src/balsa-mime-widget-text.c:1206
+#, c-format
+msgid ""
+"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
+"header describing the used codeset (converted to %s)"
+msgstr ""
+"%s å??é??ç??主é¢?为â??%sâ??ç??é?®ä»¶å??å?«8ä½?å­?符ï¼?ä½?信头没æ??æ??è¿°å?¶ä½¿ç?¨ç??ç¼?ç ?é??(已转æ?¢ä¸º %"
+"s)"
+
+#: ../src/balsa-mime-widget-vcalendar.c:67
+#, c-format
+msgid "This is an iTIP calendar \"%s\" message."
+msgstr "è¿?æ?¯ä¸?个 iTip æ?¥å?? â??%sâ?? 信件ã??"
+
+#: ../src/balsa-mime-widget-vcalendar.c:169
+#: ../src/balsa-print-object-text.c:665
+msgid "Summary"
+msgstr "��"
+
+#: ../src/balsa-mime-widget-vcalendar.c:170
+#: ../src/balsa-print-object-text.c:667
+msgid "Organizer"
+msgstr "ç»?ç»?"
+
+#: ../src/balsa-mime-widget-vcalendar.c:171
+#: ../src/balsa-print-object-text.c:669
+msgid "Start"
+msgstr "��"
+
+#: ../src/balsa-mime-widget-vcalendar.c:172
+#: ../src/balsa-print-object-text.c:671
+msgid "End"
+msgstr "ç»?æ??"
+
+# src/filter-edit-dialog.c:707
+#: ../src/balsa-mime-widget-vcalendar.c:173
+#: ../src/balsa-print-object-text.c:673
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../src/balsa-mime-widget-vcalendar.c:205
+#: ../src/balsa-print-object-text.c:682
+msgid "Attendees"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:205
+#: ../src/balsa-print-object-text.c:682
+msgid "Attendee"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:208
+#: ../src/balsa-print-object-text.c:696 ../src/sendmsg-window.c:3008
+msgid "Description"
+msgstr "æ??è¿°æ?§"
+
+#: ../src/balsa-mime-widget-vcalendar.c:229
+msgid "The sender asks you for a reply to this request:"
+msgstr ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:236
+msgid "Accept"
+msgstr "æ?¥å??"
+
+#: ../src/balsa-mime-widget-vcalendar.c:245
+msgid "Accept tentatively"
+msgstr "临æ?¶æ?¥å??"
+
+# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
+# src/pref-manager.c:471
+#: ../src/balsa-mime-widget-vcalendar.c:253
+msgid "Decline"
+msgstr "æ??ç»?"
+
+#: ../src/balsa-mime-widget-vcalendar.c:300
+msgid "iTip Calendar Request"
+msgstr "iTip æ?¥å??请æ±?"
+
+#: ../src/balsa-mime-widget-vcalendar.c:334
+#, c-format
+msgid "Sending the iTip calendar reply failed: %s"
+msgstr ""
+
+# src/sendmsg-window.c:71
+#: ../src/balsa-mime-widget.c:252
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "读å??é?®ä»¶å?ºæ®µæ?¶å??ç??é??误ï¼?%s"
+
+#: ../src/balsa-mime-widget.c:276
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "ç±»å??ï¼?%s (%s)"
+
+#: ../src/balsa-mime-widget.c:280
+#, c-format
+msgid "Content Type: %s"
+msgstr "å??容类å??ï¼?%s"
+
+#: ../src/balsa-mime-widget.c:293
+msgid "No open or view action defined for this content type"
+msgstr "没æ??å®?ä¹?é??对该å??容类å??ç??æ??å¼?æ??æ?¥ç??æ??ä½?"
+
+# src/balsa-message.c:159 src/balsa-message.c:162
+#: ../src/balsa-mime-widget.c:298
+msgid "S_ave part"
+msgstr "���段(_A)"
+
+# src/pref-manager.c:440
+#: ../src/balsa-print-object-default.c:153
+#: ../src/balsa-print-object-default.c:155
+#: ../src/balsa-print-object-default.c:158
+msgid "Type:"
+msgstr "ç±»å??ï¼?"
+
+# src/filter-edit-dialog.c:456
+#: ../src/balsa-print-object-default.c:163
+#: ../src/balsa-print-object-default.c:167
+msgid "File name:"
+msgstr "æ??件å??ï¼?"
+
+#: ../src/filter-edit-callbacks.c:337
 msgid "One of the specified fields contains:"
 msgstr "æ??å®?ç??å­?段ä¹?ä¸?å??å?«ï¼?"
 
-#: ../src/filter-edit-callbacks.c:312
+#: ../src/filter-edit-callbacks.c:338
 msgid "None of the specified fields contains:"
 msgstr "æ??æ??æ??å®?ç??å­?段é?½ä¸?å??å?«ï¼?"
 
-#: ../src/filter-edit-callbacks.c:314
+#: ../src/filter-edit-callbacks.c:340
 msgid "One of the regular expressions matches"
 msgstr "ä¸?个正å??表达å¼?å?¹é??"
 
-#: ../src/filter-edit-callbacks.c:315
+#: ../src/filter-edit-callbacks.c:341
 msgid "None of the regular expressions matches"
 msgstr "没æ??æ­£å??表达å¼?å?¹é??"
 
-#: ../src/filter-edit-callbacks.c:317
+#: ../src/filter-edit-callbacks.c:343
 msgid "Match when date is in the interval:"
 msgstr "å½?æ?¥æ??å?¨é?´é??中æ?¶å?¹é??ï¼?"
 
-#: ../src/filter-edit-callbacks.c:318
+#: ../src/filter-edit-callbacks.c:344
 msgid "Match when date is outside the interval:"
 msgstr "å½?æ?¥æ??ä¸?å?¨é?´é??中æ?¶å?¹é??ï¼?"
 
-#: ../src/filter-edit-callbacks.c:320 ../src/filter-edit-callbacks.c:1070
+#: ../src/filter-edit-callbacks.c:346 ../src/filter-edit-callbacks.c:1134
 msgid "Match when one of these flags is set:"
 msgstr "å½?设置äº?ä»»æ??ä¸?个æ ?å¿?æ?¶å?¹é??ï¼?"
 
-#: ../src/filter-edit-callbacks.c:321
+#: ../src/filter-edit-callbacks.c:347
 msgid "Match when none of these flags is set:"
 msgstr "å½?ä»»ä½?ä¸?个æ ?å¿?é?½æ²¡æ??设置æ?¶å?¹é??ï¼?"
 
-#: ../src/filter-edit-callbacks.c:512
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:540
 msgid "You must specify the name of the user header to match on"
-msgstr "æ?¨è?³å°?è¦?æ??å®?ä¸?个è¦?å?¹é??ç??å­?段"
+msgstr "æ?¨å¿?é¡»æ??å®?è¦?å?¹é??ç??ç?¨æ?·ä¿¡å¤´å??称"
 
-#: ../src/filter-edit-callbacks.c:523
+#: ../src/filter-edit-callbacks.c:551
 msgid "You must specify at least one field for matching"
 msgstr "æ?¨è?³å°?è¦?æ??å®?ä¸?个è¦?å?¹é??ç??å­?段"
 
-#: ../src/filter-edit-callbacks.c:533
+#: ../src/filter-edit-callbacks.c:561
 msgid "You must provide a string"
 msgstr "æ?¨å¿?é¡»æ??ä¾?ä¸?个å­?符串"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:569
 msgid "You must provide at least one regular expression"
-msgstr ""
+msgstr "æ?¨å¿?é¡»æ??ä¾?è?³å°?ä¸?个正å??表达å¼?"
 
-#: ../src/filter-edit-callbacks.c:552
+#: ../src/filter-edit-callbacks.c:582
 msgid "Low date is incorrect"
 msgstr ""
 
-#: ../src/filter-edit-callbacks.c:563
+#: ../src/filter-edit-callbacks.c:593
 msgid "High date is incorrect"
 msgstr ""
 
-#: ../src/filter-edit-callbacks.c:571
+#: ../src/filter-edit-callbacks.c:601
 msgid "Low date is greater than high date"
 msgstr ""
 
-#: ../src/filter-edit-callbacks.c:841
+#: ../src/filter-edit-callbacks.c:896
 #, c-format
 msgid "Error displaying condition help: %s\n"
-msgstr ""
+msgstr "æ?¾ç¤ºæ?¡ä»¶å¸®å?©å?ºé??ï¼?%s\n"
 
 # src/filter-edit-dialog.c:704
-#: ../src/filter-edit-callbacks.c:882
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:937
 msgid "Match Fields"
-msgstr "å?¹é??"
+msgstr "å?¹é??å­?段"
 
 # src/filter-edit-dialog.c:255
-#: ../src/filter-edit-callbacks.c:892
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:947
 msgid "_All"
-msgstr "��"
+msgstr "��(_A)"
 
 # src/main-window.c:161
-#: ../src/filter-edit-callbacks.c:893
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:948
 msgid "C_lear"
-msgstr "��"
+msgstr "��(_L)"
 
 # src/filter-edit-dialog.c:279
-#: ../src/filter-edit-callbacks.c:895 ../src/main-window.c:3828
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:950 ../src/main-window.c:4302
 msgid "_Body"
-msgstr "ä¿¡ä½?"
+msgstr "ä¿¡ä½?(_B)"
 
 # src/balsa-message.c:526 src/filter-edit-dialog.c:291
 # src/sendmsg-window.c:315
-#. To:
-#: ../src/filter-edit-callbacks.c:896 ../src/main-window.c:3829
-#: ../src/sendmsg-window.c:2710
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:951 ../src/main-window.c:4303
 msgid "_To:"
-msgstr "�件人(_T)"
+msgstr "�件人(_T)�"
 
 # src/balsa-message.c:544 src/filter-edit-dialog.c:303
 # src/sendmsg-window.c:338
-#: ../src/filter-edit-callbacks.c:897 ../src/main-window.c:3830
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:952 ../src/main-window.c:4304
 msgid "_From:"
-msgstr "å??件人ï¼?"
+msgstr "å??件人(_F)ï¼?"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/filter-edit-callbacks.c:898
+#: ../src/filter-edit-callbacks.c:953
 msgid "_Subject"
 msgstr "主�(_S)"
 
 # src/balsa-message.c:534
-#: ../src/filter-edit-callbacks.c:899 ../src/main-window.c:3832
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:954 ../src/main-window.c:4306
 msgid "_Cc:"
-msgstr "æ??é??(_C)"
+msgstr "æ??é??(_C)ï¼?"
 
 # src/mailbox-conf.c:742 src/mailbox-conf.c:833
-#: ../src/filter-edit-callbacks.c:901
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:956
 msgid "_User header:"
-msgstr "ç?¨æ?·å??(_U)ï¼?"
+msgstr "��信头(_U)�"
 
 # src/index-child.c:422
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:990
 msgid "Unread"
 msgstr "�读"
 
 # src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
 # src/pref-manager.c:471
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:990
 msgid "Deleted"
 msgstr "已��"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:990
 msgid "Replied"
 msgstr "å·²å??å¤?"
 
-#: ../src/filter-edit-callbacks.c:931
+#: ../src/filter-edit-callbacks.c:990
 msgid "Flagged"
 msgstr "æ ?è®°ç??"
 
-#: ../src/filter-edit-callbacks.c:946
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1005
 msgid "One of the specified f_ields contains"
-msgstr "æ??å®?ç??å­?段ä¹?ä¸?å??å?«ï¼?"
+msgstr "æ??å®?ç??ä¸?个å­?段å??å?«(_I)ï¼?"
 
-#: ../src/filter-edit-callbacks.c:961
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1020
 msgid "Contain/Does _Not Contain"
-msgstr "å??å?«/ä¸?å??å?«"
+msgstr "å??å?«/ä¸?å??å?«(_N)"
 
-#: ../src/filter-edit-callbacks.c:980
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1040
 msgid "_One of the regular expressions matches"
-msgstr "ä¸?个正å??表达å¼?å?¹é??"
-
-# src/filter-edit-dialog.c:380 src/mailbox-conf.c:281 src/mailbox-conf.c:904
-# src/pref-manager.c:461
-#. Right/Add button
-#: ../src/filter-edit-callbacks.c:1007 ../src/filter-run-dialog.c:327
-#, fuzzy
-msgid "A_dd"
-msgstr "添�"
+msgstr "ä¸?个正å??表达å¼?å?¹é??(_O)"
 
 # src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
 #. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1011 ../src/filter-edit-dialog.c:319
-#: ../src/filter-run-dialog.c:332
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1071 ../src/filter-edit-dialog.c:330
+#: ../src/filter-run-dialog.c:334
 msgid "_Remove"
-msgstr "å? é?¤"
+msgstr "移�(_R)"
 
-#: ../src/filter-edit-callbacks.c:1015
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1075
 msgid "One _Matches/None Matches"
-msgstr "ä¸?个å?¹é??/没æ??å?¹é??"
+msgstr "ä¸?个å?¹é??/没æ??å?¹é??(_M)"
 
-#: ../src/filter-edit-callbacks.c:1032
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1086
+msgid "Filtering using regular expressions is not yet implemented."
+msgstr "使ç?¨æ­£å??表达å¼?è¿?è¡?è¿?滤è¿?没æ??å®?ç?°ã??"
+
+#: ../src/filter-edit-callbacks.c:1096
 msgid "Match when message date is in the interval:"
-msgstr "å½?æ?¥æ??å?¨é?´é??中æ?¶å?¹é??ï¼?"
+msgstr "å?¹é??以ä¸?æ?¶é?´æ®µä¸­ç??é?®ä»¶ï¼?"
 
-#: ../src/filter-edit-callbacks.c:1052
+#: ../src/filter-edit-callbacks.c:1116
 msgid "Inside/outside the date interval"
-msgstr ""
+msgstr "å?¨è¯¥æ?¶é?´æ®µå??/å¤?"
 
-#: ../src/filter-edit-callbacks.c:1099
+#: ../src/filter-edit-callbacks.c:1163
 msgid "Match when one flag is set/when no flag is set"
-msgstr ""
+msgstr "å?¹é??设置äº?ä¸?个æ ?è®°/æ?ªè®¾å®?æ ?è®°ç??é?®ä»¶"
 
 # src/filter-edit-dialog.c:536
-#: ../src/filter-edit-callbacks.c:1117
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1182
 msgid "Search T_ype:"
-msgstr "æ??索类å??ï¼?"
+msgstr "æ??索类å??(_Y)ï¼?"
 
-#: ../src/filter-edit-callbacks.c:1191
+#: ../src/filter-edit-callbacks.c:1259
 msgid "Edit condition for filter: "
-msgstr ""
+msgstr "���滤�件�"
 
-#: ../src/filter-edit-callbacks.c:1431
-#, fuzzy, c-format
+#: ../src/filter-edit-callbacks.c:1477 ../src/save-restore.c:1961
+msgid "Filter with no condition was omitted"
+msgstr "没æ??æ?¡ä»¶ç??è¿?滤è§?å??被忽ç?¥"
+
+#: ../src/filter-edit-callbacks.c:1503
+#, c-format
 msgid "Error displaying filter help: %s\n"
-msgstr "åº?ç?¨è¿?滤è§?å??æ?¶å??ç??é??误"
+msgstr "æ?¾ç¤ºè¿?滤è§?å??帮å?©æ?¶å?ºé??ï¼?%s\n"
 
 # src/main-window.c:182
-#: ../src/filter-edit-callbacks.c:1621
+#: ../src/filter-edit-callbacks.c:1702
 msgid "New filter"
 msgstr "æ?°å»ºè¿?滤è§?å??"
 
-#: ../src/filter-edit-callbacks.c:1751
+#: ../src/filter-edit-callbacks.c:1831
 msgid "No filter name specified."
 msgstr "没æ??æ??å®?è¿?滤è§?å??å??ã??"
 
-#: ../src/filter-edit-callbacks.c:1756
-#, fuzzy, c-format
+#: ../src/filter-edit-callbacks.c:1836
+#, c-format
 msgid "Filter \"%s\" already exists."
-msgstr "è¿?滤è§?å?? %s å·²å­?å?¨ã??"
+msgstr "è¿?滤è§?å??â??%sâ??å·²å­?å?¨ã??"
 
-#: ../src/filter-edit-callbacks.c:1766
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1846
 msgid "Filter must have conditions."
-msgstr "è¿?滤è§?å??å¿?é¡»æ??æ?¡ä»¶\n"
+msgstr "è¿?滤è§?å??å¿?é¡»æ??æ?¡ä»¶ã??"
 
 # src/filter-edit-dialog.c:456
-#: ../src/filter-edit-callbacks.c:1823
+#: ../src/filter-edit-callbacks.c:1932
 msgid "Filter has matched"
 msgstr "è¿?滤è§?å??å?¹é??"
 
-#: ../src/filter-edit-callbacks.c:1848
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:1952
 msgid "You must provide a sound to play"
-msgstr "æ?¨å¿?é¡»æ??ä¾?ä¸?个å­?符串"
+msgstr "æ?¨å¿?é¡»æ??ä¾?è¦?æ?­æ?¾ç??声é?³"
 
-#: ../src/filter-edit-callbacks.c:2002
+#: ../src/filter-edit-callbacks.c:2130
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr ""
 
-#: ../src/filter-edit-dialog.c:89 ../src/pref-manager.c:376
+#: ../src/filter-edit-dialog.c:97 ../src/pref-manager.c:426
 msgid "Simple"
 msgstr "ç®?å??"
 
-#: ../src/filter-edit-dialog.c:90
+#: ../src/filter-edit-dialog.c:98
 msgid "Regular Expression"
 msgstr "æ­£å??表达å¼?"
 
-#: ../src/filter-edit-dialog.c:91
+#: ../src/filter-edit-dialog.c:99
 msgid "Date interval"
 msgstr "æ?¥æ??é?´é??"
 
-#: ../src/filter-edit-dialog.c:92
+#: ../src/filter-edit-dialog.c:100
 msgid "Flag condition"
-msgstr ""
+msgstr "�记�件"
 
-#: ../src/filter-edit-dialog.c:96
+#: ../src/filter-edit-dialog.c:104
 msgid "Copy to folder:"
 msgstr "å¤?å?¶å?°æ??件夹ï¼?"
 
-#: ../src/filter-edit-dialog.c:97
+#: ../src/filter-edit-dialog.c:105
 msgid "Move to folder:"
 msgstr "移å?¨å?°æ??件夹ï¼?"
 
-#: ../src/filter-edit-dialog.c:98
+# src/main-window.c:161
+#: ../src/filter-edit-dialog.c:106
+msgid "Colorize"
+msgstr "使�彩�"
+
+#: ../src/filter-edit-dialog.c:107
 msgid "Print on printer:"
 msgstr "å?¨æ??å?°æ?ºä¸?æ??å?°ï¼?"
 
 # src/filter-edit-dialog.c:506
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:108
 msgid "Run program:"
 msgstr "�����"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:109
 msgid "Send to Trash"
 msgstr "移�已���件"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:113
 msgid "OR"
 msgstr "æ??"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:114
 msgid "AND"
 msgstr "å??"
 
-# src/main-window.c:107
-#. new button
-#. #define MENU_FILE_NEW_POS 0
-#: ../src/filter-edit-dialog.c:217 ../src/mailbox-node.c:954
-#: ../src/main-window.c:371 ../src/main-window.c:430
-msgid "_New"
-msgstr "�建(_N)"
-
 # src/filter-edit-dialog.c:456
 #. The name entry
-#: ../src/filter-edit-dialog.c:249
-#, fuzzy
+#: ../src/filter-edit-dialog.c:258
 msgid "_Filter name:"
-msgstr "è¿?滤è§?å??å??ï¼?"
+msgstr "è¿?滤è§?å??å??称(_F)ï¼?"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:267
+#: ../src/filter-edit-dialog.c:276
 msgid "Operation between conditions"
-msgstr ""
-
-# src/main-window.c:166
-#: ../src/filter-edit-dialog.c:310
-#, fuzzy
-msgid "_Edit"
-msgstr "ç¼?è¾?"
+msgstr "æ?¡ä»¶ä¹?é?´ç??æ??ä½?符"
 
 # src/filter-edit-dialog.c:188
-#: ../src/filter-edit-dialog.c:315
-#, fuzzy
+#: ../src/filter-edit-dialog.c:326
 msgid "Ne_w"
-msgstr "�建"
+msgstr "�建(_W)"
+
+#: ../src/filter-edit-dialog.c:354
+msgid "Foreground"
+msgstr "å??æ?¯"
+
+#: ../src/filter-edit-dialog.c:365
+msgid "Background"
+msgstr "è??æ?¯"
 
 # src/filter-edit-dialog.c:592
 #. The notification area
-#: ../src/filter-edit-dialog.c:348
+#: ../src/filter-edit-dialog.c:390
 msgid "Notification:"
 msgstr "é??ç?¥ï¼?"
 
 # src/filter-edit-dialog.c:601
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:358
+#: ../src/filter-edit-dialog.c:400
 msgid "Play sound:"
 msgstr "��声��"
 
 # src/filter-edit-dialog.c:609
-#: ../src/filter-edit-dialog.c:365 ../src/filter-edit-dialog.c:378
+#: ../src/filter-edit-dialog.c:406
 msgid "Use Sound..."
 msgstr "使�声�..."
 
 # src/filter-edit-dialog.c:618
-#: ../src/filter-edit-dialog.c:397
+#: ../src/filter-edit-dialog.c:427
 msgid "Popup text:"
 msgstr "å¼¹å?ºæ??æ?¬ï¼?"
 
 # src/filter-edit-dialog.c:637
 #. The action area
-#: ../src/filter-edit-dialog.c:418
+#: ../src/filter-edit-dialog.c:448
 msgid "Action to perform:"
 msgstr "è¦?æ?§è¡?ç??å?¨ä½?ï¼?"
 
 # src/filter-edit-dialog.c:704
-#: ../src/filter-edit-dialog.c:469
+#: ../src/filter-edit-dialog.c:501
 msgid "Match"
 msgstr "å?¹é??"
 
 # src/filter-edit-dialog.c:707
-#: ../src/filter-edit-dialog.c:472
+#: ../src/filter-edit-dialog.c:504
 msgid "Action"
 msgstr "��"
 
 # src/filter-edit-dialog.c:721
-#: ../src/filter-edit-dialog.c:484
+#: ../src/filter-edit-dialog.c:516
 msgid "Revert"
 msgstr "è¿?å??"
 
-#: ../src/filter-edit-dialog.c:533
+#: ../src/filter-edit-dialog.c:567
 msgid "A filter run dialog is open.Close it before you can modify filters."
-msgstr ""
+msgstr "ä¸?个è¿?滤è§?å??è¿?è¡?对è¯?æ¡?å·²ç»?æ??å¼?ã??å?³é?­å®?ä¹?å??æ??è?½ä¿®æ?¹è¿?滤è§?å??ã??"
 
 # src/filter-edit-dialog.c:749
-#: ../src/filter-edit-dialog.c:546
+#: ../src/filter-edit-dialog.c:580
 msgid "Balsa Filters"
-msgstr "Balsa �滤�"
+msgstr "Balsa è¿?滤è§?å??"
 
-#: ../src/filter-edit-dialog.c:612
-#, fuzzy, c-format
+#: ../src/filter-edit-dialog.c:649
+#, c-format
 msgid "Filter \"%s\" has no condition."
-msgstr "è¿?滤è§?å??å¿?é¡»æ??æ?¡ä»¶\n"
+msgstr "è¿?滤è§?å??â??%sâ??中没æ??æ?¡ä»¶ã??"
 
-#: ../src/filter-export-callbacks.c:57
+#: ../src/filter-export-callbacks.c:59
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
-msgstr ""
+msgstr "æ? æ³?导å?ºè¿?滤è§?å?? %sï¼?å??ç??äº?é??误ã??"
 
-#: ../src/filter-export-dialog.c:63
+#: ../src/filter-export-dialog.c:65
 msgid ""
 "There are opened filter run dialogs, close them before you can modify "
 "filters."
-msgstr ""
+msgstr "æ??æ??å¼?ç??è¿?滤è§?å??è¿?è¡?对è¯?æ¡?ã??å?³é?­å®?们ä¹?å??æ??è?½ä¿®æ?¹è¿?滤è§?å??ã??"
 
 # src/filter-edit-dialog.c:749
-#: ../src/filter-export-dialog.c:75
-#, fuzzy
+#: ../src/filter-export-dialog.c:77
 msgid "Balsa Filters Export"
-msgstr "Balsa �滤�"
+msgstr "Balsa è¿?滤è§?å??导å?º"
 
-#: ../src/filter-run-callbacks.c:182
-#, fuzzy, c-format
+#: ../src/filter-run-callbacks.c:184
+#, c-format
 msgid "Error displaying run filters help: %s\n"
-msgstr "åº?ç?¨è¿?滤è§?å??æ?¶å??ç??é??误"
+msgstr "æ?¾ç¤ºè¿?è¡?è¿?滤è§?å??帮å?©æ?¶å?ºé??ï¼?%s\n"
 
-#: ../src/filter-run-callbacks.c:230 ../src/filter-run-callbacks.c:252
+#: ../src/filter-run-callbacks.c:234 ../src/filter-run-callbacks.c:256
 msgid "Error when applying filters"
 msgstr "åº?ç?¨è¿?滤è§?å??æ?¶å??ç??é??误"
 
-#: ../src/filter-run-callbacks.c:233 ../src/filter-run-callbacks.c:255
-#, fuzzy, c-format
+#: ../src/filter-run-callbacks.c:237 ../src/filter-run-callbacks.c:259
+#, c-format
 msgid "Filter applied to \"%s\"."
-msgstr "正����件 %d � %s..."
+msgstr "已对â??%sâ??åº?ç?¨äº?è¿?滤è§?å??ã??"
 
-#: ../src/filter-run-callbacks.c:292
+#: ../src/filter-run-callbacks.c:298
 #, c-format
 msgid ""
 "The destination mailbox of the filter \"%s\" is \"%s\".\n"
 "You can't associate it with the same mailbox (that causes recursion)."
 msgstr ""
+"è¿?滤è§?å??â??%sâ??ç??ç?®æ ?é?®ç®±ä¸ºâ??%sâ??ã??\n"
+"æ?¨ä¸?è?½å°?å®?ä¸?å??ä¸?个é?®ç®±å?³è??(å°?导è?´å¾ªç?¯)ã??"
 
-#: ../src/filter-run-callbacks.c:300
+#: ../src/filter-run-callbacks.c:306
 #, c-format
 msgid ""
 "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -2940,138 +3804,132 @@ msgid ""
 msgstr ""
 
 # src/filter-edit-dialog.c:749
-#: ../src/filter-run-dialog.c:189
-#, fuzzy
+#: ../src/filter-run-dialog.c:191
 msgid "Balsa Filters of Mailbox: "
-msgstr "Balsa �滤�"
+msgstr "Balsa é?®ç®±è¿?滤è§?å??ï¼?"
 
 # src/filter-edit-dialog.c:707
-#: ../src/filter-run-dialog.c:230
+#: ../src/filter-run-dialog.c:232
 msgid "On reception"
 msgstr "���"
 
-#: ../src/filter-run-dialog.c:242
+#: ../src/filter-run-dialog.c:244
 msgid "On exit"
 msgstr "é??å?ºæ?¶"
 
-#: ../src/filter-run-dialog.c:316
+#: ../src/filter-run-dialog.c:318
 msgid "Apply Selected"
-msgstr ""
+msgstr "åº?ç?¨é??æ?©"
 
 # src/filter-edit-dialog.c:165
 #. up button
-#: ../src/filter-run-dialog.c:364
-#, fuzzy
+#: ../src/filter-run-dialog.c:366
 msgid "_Up"
-msgstr "å??ä¸?"
+msgstr "å??ä¸?(_U)"
 
 # src/filter-edit-dialog.c:171
 #. down button
-#: ../src/filter-run-dialog.c:369
-#, fuzzy
+#: ../src/filter-run-dialog.c:371
 msgid "Do_wn"
-msgstr "å??ä¸?"
+msgstr "å??ä¸?(_W)"
 
 # src/main-window.c:113 src/message-window.c:54
-#: ../src/filter-run-dialog.c:375
-#, fuzzy
+#: ../src/filter-run-dialog.c:377
 msgid "A_pply Now!"
-msgstr "å??å¤?å?°(_R)"
+msgstr "����(_P)�"
 
-#: ../src/filter-run-dialog.c:419
+#: ../src/filter-run-dialog.c:421
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
-msgstr ""
+msgstr "è¿?滤è§?å??对è¯?æ¡?å·²æ??å¼?ï¼?å?³é?­å®?ä¹?å??æ?¨æ??è?½å¯¹é?®ç®±æ?§è¡?è¿?滤è§?å??"
+
+#: ../src/folder-conf.c:110
+#, c-format
+msgid "Error displaying config help: %s\n"
+msgstr "æ?¾ç¤ºé??置帮å?©æ?¶å?ºé??ï¼?%s\n"
 
-#: ../src/folder-conf.c:275
+#: ../src/folder-conf.c:298
 msgid "Remote IMAP folder"
 msgstr "è¿?ç¨? IMAP æ??件夹"
 
 # src/mailbox-conf.c:290 src/mailbox-conf.c:898
 #. must NOT be modal
-#: ../src/folder-conf.c:278 ../src/folder-conf.c:736 ../src/mailbox-conf.c:522
-#, fuzzy
+#: ../src/folder-conf.c:301 ../src/folder-conf.c:789 ../src/mailbox-conf.c:564
 msgid "_Update"
-msgstr "æ?´æ?°"
+msgstr "æ?´æ?°(_U)"
 
-#: ../src/folder-conf.c:278
-#, fuzzy
+#: ../src/folder-conf.c:301
 msgid "C_reate"
-msgstr "å??建"
+msgstr "å??建(_R)"
 
-#: ../src/folder-conf.c:300 ../src/mailbox-conf.c:1102
-#: ../src/mailbox-conf.c:1197
-#, fuzzy
+#: ../src/folder-conf.c:327 ../src/mailbox-conf.c:1210
+#: ../src/mailbox-conf.c:1322
 msgid "_Basic"
-msgstr "æ??é??(_B)"
+msgstr "��(_B)"
 
-#: ../src/folder-conf.c:305
-msgid "_Max number of connections"
-msgstr ""
+#: ../src/folder-conf.c:332
+msgid "_Max number of connections:"
+msgstr "æ??大è¿?æ?¥æ?°(_M)ï¼?"
 
-#: ../src/folder-conf.c:312 ../src/mailbox-conf.c:1254
+#: ../src/folder-conf.c:339 ../src/mailbox-conf.c:1385
 msgid "Enable _persistent cache"
 msgstr ""
 
-#: ../src/folder-conf.c:320 ../src/mailbox-conf.c:1258
+#: ../src/folder-conf.c:347
+msgid "Use IDLE command"
+msgstr "使� IDLE �令"
+
+#: ../src/folder-conf.c:354 ../src/mailbox-conf.c:1389
 msgid "Enable _bug workarounds"
 msgstr ""
 
-#: ../src/folder-conf.c:327
+#: ../src/folder-conf.c:361
 msgid "Use STATUS for mailbox checking"
-msgstr ""
+msgstr "�箱���使� STATUS"
 
-#: ../src/folder-conf.c:333 ../src/mailbox-conf.c:1156
-#: ../src/mailbox-conf.c:1260
+#: ../src/folder-conf.c:367 ../src/mailbox-conf.c:1264
+#: ../src/mailbox-conf.c:1391
 msgid "_Advanced"
-msgstr ""
+msgstr "�级(_A)"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:336
-msgid "Descriptive _Name:"
+#: ../src/folder-conf.c:370
+msgid "Descriptive _name:"
 msgstr "æ??è¿°æ?§å??å­?(_N)ï¼?"
 
-# src/mailbox-conf.c:723 src/mailbox-conf.c:804
-#. pop server
-#. imap server
-#: ../src/folder-conf.c:343 ../src/mailbox-conf.c:1110
-#: ../src/mailbox-conf.c:1206
-msgid "_Server:"
-msgstr "æ??å?¡å?¨(_S)ï¼?"
-
 # src/mailbox-conf.c:742 src/mailbox-conf.c:833
 #. username
-#: ../src/folder-conf.c:351 ../src/mailbox-conf.c:1118
-#, fuzzy
+#: ../src/folder-conf.c:385 ../src/mailbox-conf.c:1226
 msgid "Use_r name:"
-msgstr "ç?¨æ?·å??(_U)ï¼?"
+msgstr "ç?¨æ?·å??(_R)ï¼?"
 
 # src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../src/folder-conf.c:362
+#: ../src/folder-conf.c:391
 msgid "_Password:"
 msgstr "�令(_P)�"
 
-#: ../src/folder-conf.c:367
-#, fuzzy
+#: ../src/folder-conf.c:396 ../src/mailbox-conf.c:1347
+msgid "_Anonymous access"
+msgstr "å?¿å??访é?®(_A)"
+
+#: ../src/folder-conf.c:405
 msgid "Subscribed _folders only"
-msgstr "å?ªæ??订é??ç??æ??件夹(_S)"
+msgstr "ä»?订é??ç??æ??件夹(_F)"
 
-#: ../src/folder-conf.c:369
-#, fuzzy
+#: ../src/folder-conf.c:407
 msgid "Always show _INBOX"
-msgstr "��示�件箱(_A)"
+msgstr "��示�件箱(_I)"
 
-#: ../src/folder-conf.c:372
-#, fuzzy
-msgid "Pr_efix"
-msgstr "å??ç¼?(_P)"
+#: ../src/folder-conf.c:410
+msgid "Pr_efix:"
+msgstr "å??ç¼?(_E):"
 
-#: ../src/folder-conf.c:518
+#: ../src/folder-conf.c:556
 msgid "Select parent folder"
-msgstr "é??æ?©ç?¶å­?ä½?"
+msgstr "é??æ?©ç?¶æ??件夹"
 
-#: ../src/folder-conf.c:592
+#: ../src/folder-conf.c:634
 #, c-format
 msgid ""
 "Renaming INBOX is special!\n"
@@ -3086,75 +3944,144 @@ msgstr ""
 "æ?¶ä»¶ç®±å??å®?ç??å­?æ??件夹å°?ä¿?ç??ã??\n"
 "æ?¨è¦?æ??æ ·å??ï¼?"
 
-#: ../src/folder-conf.c:598
+#: ../src/folder-conf.c:640
 msgid "Question"
-msgstr ""
+msgstr "��"
 
-#: ../src/folder-conf.c:603
+#: ../src/folder-conf.c:645
 msgid "Rename INBOX"
 msgstr "é??å?½å??æ?¶ä»¶ç®±"
 
 # src/balsa-message.c:160 src/mailbox-conf.c:489 src/sendmsg-window.c:81
 # src/sendmsg-window.c:192
-#: ../src/folder-conf.c:605
+#: ../src/folder-conf.c:647
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: ../src/folder-conf.c:626
+#: ../src/folder-conf.c:672
 #, c-format
 msgid "Folder rename failed. Reason: %s"
-msgstr ""
+msgstr "æ??件夹é??å?½å??失败ã??å??å? ï¼?%s"
 
-#: ../src/folder-conf.c:678
-#, fuzzy, c-format
+#: ../src/folder-conf.c:724
+#, c-format
 msgid "Folder creation failed. Reason: %s"
-msgstr "身份��失败"
+msgstr "å??建æ??件夹失败ã??å??å? ï¼?%s"
 
-#: ../src/folder-conf.c:718
+#: ../src/folder-conf.c:771
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
 msgstr ""
-"ä¸?æ?¯é?®ä»¶ç®±ç?? IMAP æ??件夹没æ??å?¯ä»¥\n"
+"ä¸?æ?¯é?®ç®±ç?? IMAP æ??件夹没æ??å?¯ä»¥\n"
 "æ?´æ?¹ç??å±?æ?§ã??"
 
-#: ../src/folder-conf.c:733
+#: ../src/folder-conf.c:786
 msgid "Remote IMAP subfolder"
 msgstr "è¿?ç¨? IMAP å­?æ??件夹"
 
-#: ../src/folder-conf.c:736
-#, fuzzy
+#: ../src/folder-conf.c:789
 msgid "_Create"
-msgstr "å??建"
+msgstr "å??建(_C)"
 
-#: ../src/folder-conf.c:757
-msgid "Rename or move subfolder"
-msgstr "é??å?½å??æ??移å?¨å­?æ??件夹"
-
-#: ../src/folder-conf.c:758
+#: ../src/folder-conf.c:820
 msgid "Create subfolder"
 msgstr "å??建å­?æ??件夹"
 
 # src/filter-edit-dialog.c:456
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:765
+#: ../src/folder-conf.c:828
 msgid "_Folder name:"
 msgstr "æ??件夹å??(_F)ï¼?"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:834
 msgid "Host:"
-msgstr ""
+msgstr "主��"
 
-#: ../src/folder-conf.c:777
-#, fuzzy
+#: ../src/folder-conf.c:843
+msgid "Subfolder of:"
+msgstr "å­?æ??件夹ï¼?"
+
+#: ../src/folder-conf.c:848
 msgid "_Browse..."
-msgstr "��..."
+msgstr "��(_B)..."
+
+#: ../src/folder-conf.c:862
+msgid "read-only"
+msgstr "�读"
+
+#: ../src/folder-conf.c:863
+msgid "read-write"
+msgstr "读å??"
+
+#: ../src/folder-conf.c:864
+msgid "admin"
+msgstr "管ç??å??"
+
+#: ../src/folder-conf.c:865
+msgid "post"
+msgstr "å??é??"
+
+# src/sendmsg-window.c:88
+#: ../src/folder-conf.c:866
+msgid "append"
+msgstr "é??å? "
+
+# src/index-child.c:457
+#: ../src/folder-conf.c:867
+msgid "delete"
+msgstr "å? é?¤"
+
+#: ../src/folder-conf.c:868
+msgid "special"
+msgstr "��"
+
+#: ../src/folder-conf.c:874
+msgid "Permissions:"
+msgstr "æ??é??ï¼?"
+
+#: ../src/folder-conf.c:881
+msgid ""
+"\n"
+"detailed permissions are available only for open folders"
+msgstr ""
+"\n"
+"å?ªè?½æ?¾ç¤ºå·²æ??å¼?æ??件夹ç??详ç»?æ??é??"
+
+#: ../src/folder-conf.c:888
+msgid ""
+"\n"
+"the server does not support ACL's"
+msgstr ""
+"\n"
+"æ??å?¡å?¨ä¸?æ?¯æ?? ACL"
+
+#: ../src/folder-conf.c:897
+msgid "mine: "
+msgstr "æ??ç??ï¼?"
+
+#: ../src/folder-conf.c:936
+msgid "Quota:"
+msgstr "é??é¢?ï¼?"
+
+#: ../src/folder-conf.c:940
+msgid "quota information available only for open folders"
+msgstr ""
+
+#: ../src/folder-conf.c:945
+msgid "the server does not support quotas"
+msgstr ""
+
+#: ../src/folder-conf.c:947
+msgid "no limits"
+msgstr "æ? é??å?¶"
 
-#: ../src/folder-conf.c:785
-msgid "_Subfolder of:"
-msgstr "å­?æ??件夹(_S)ï¼?"
+#: ../src/folder-conf.c:952
+#, c-format
+msgid "%s of %s (%.1f%%) used"
+msgstr "%s / %s (%.1f%%) 已使�"
 
-#: ../src/folder-conf.c:814
+#: ../src/folder-conf.c:989
 #, fuzzy
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
@@ -3162,7 +4089,7 @@ msgid ""
 msgstr "å?¨é??置中没æ??ä¿?å­?è¿?个æ??件夹ã??ä¸?ç?¥é??å¦?ä½?ä»?è¿?ç¨?æ??å?¡å?¨ä¸?å? é?¤å®?ã??"
 
 # src/mailbox-conf.c:166
-#: ../src/folder-conf.c:823
+#: ../src/folder-conf.c:998
 #, fuzzy, c-format
 msgid ""
 "This will remove the folder \"%s\" from the list.\n"
@@ -3172,53 +4099,58 @@ msgstr ""
 "æ?¨ä»?ç?¶å?¯ä»¥ç?¨â??æ?°å»º IMAPæ??件夹â??æ?¥å??次添å? æ­¤æ??件夹ã??\n"
 "æ?¨å??å¤?å¦?ä½?å??ï¼?"
 
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:1006
 msgid "Confirm"
-msgstr ""
+msgstr "确认"
 
 # src/main-window.c:213
-#: ../src/information-dialog.c:222
-#, fuzzy
+#: ../src/information-dialog.c:232
 msgid "Information - Balsa"
-msgstr "ä¿¡æ?¯"
+msgstr "ä¿¡æ?¯ - Balsa"
 
-#: ../src/information-dialog.c:330
+#: ../src/information-dialog.c:359
 #, c-format
 msgid "WARNING: "
 msgstr "è­¦å??ï¼?"
 
-#: ../src/information-dialog.c:333
+#: ../src/information-dialog.c:362
 #, c-format
 msgid "ERROR: "
 msgstr "é??误ï¼?"
 
-#: ../src/information-dialog.c:336
+#: ../src/information-dialog.c:365
 #, c-format
 msgid "FATAL: "
 msgstr "严é??é??误ï¼?"
 
-#: ../src/mailbox-conf.c:208
-#, fuzzy
+#: ../src/mailbox-conf.c:218
+msgid ""
+"Balsa was built without SSL support.\n"
+"Neither SSL nor TLS can be used."
+msgstr ""
+
+#: ../src/mailbox-conf.c:230
 msgid "Use _SSL"
-msgstr "使� TLS"
+msgstr "使� _SSL"
 
 # src/mailbox-conf.c:634
-#: ../src/mailbox-conf.c:352
+#: ../src/mailbox-conf.c:365
 msgid "No mailbox selected."
-msgstr "没æ??é??æ?©é?®ä»¶ç®±ã??"
+msgstr "没æ??é??æ?©é?®ç®±ã??"
 
-#: ../src/mailbox-conf.c:379
+#: ../src/mailbox-conf.c:395
 #, fuzzy, c-format
 msgid ""
 "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
 "If you really want to remove it, assign its function\n"
 "to some other mailbox."
 msgstr ""
-"Balsa 使ç?¨äº?é?®ä»¶ç®±â??%sâ??ï¼?æ? æ³?å°?å®?å? é?¤ã??\n"
-"å¦?æ??æ?¨ç??ç??è¦?å? é?¤å®?ï¼?请å??å°?å®?ç??å??è?½èµ?äº?å?¶å®?é?®ä»¶ç®±ã??"
+"Balsa æ­£å?¨ä½¿ç?¨é?®ç®±â??%sâ??ï¼?æ? æ³?å°?å®?å? é?¤ã??\n"
+"å¦?æ??æ?¨ç??ç??è¦?å? é?¤å®?ï¼?请å??å°?å®?å??æ?¢å?°å?¶ä»?\n"
+"é?®ä»¶ç®±ä¸?å·¥ä½?ã??"
 
 # src/mailbox-conf.c:166
-#: ../src/mailbox-conf.c:389
+#: ../src/mailbox-conf.c:405
 #, fuzzy, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -3227,23 +4159,21 @@ msgid ""
 "mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"è¿?å°?ä¼?ä»?é?®ä»¶ç®±å??表中å? å?»é?®ä»¶ç®± %sã??\n"
-"æ?¨ä¹?å?¯ä»¥å? é?¤å??该é?®ä»¶ç®±å?³è??ç??ç£?ç??æ??件ã??\n"
-"å¦?æ??æ?¨ä¸?å? é?¤ç£?ç??æ??件ï¼?æ?¨ä»¥å??å?¯ä»¥ç?¨â??æ·»å? é?®ä»¶ç®±â??æ?¥å??次å­?å??è¿?个é?®ä»¶ç®±ã??\n"
+"è¿?å°?ä¼?ä»?é?®ç®±å??表中å? å?»é?®ç®± %sã??\n"
+"æ?¨ä¹?å?¯ä»¥å? é?¤å??该é?®ç®±å?³è??ç??ç£?ç??æ??件ã??\n"
+"å¦?æ??æ?¨ä¸?å? é?¤ç£?ç??æ??件ï¼?æ?¨ä»¥å??å?¯ä»¥ç?¨â??æ·»å? é?®ç®±â??æ?¥å??次å­?å??è¿?个é?®ç®±ã??\n"
 "æ?¨è¦?æ??æ ·å??ï¼?"
 
-#: ../src/mailbox-conf.c:401
-#, fuzzy
+#: ../src/mailbox-conf.c:417
 msgid "Remove from _list"
-msgstr "ä»?å??表中å? é?¤"
+msgstr "ä»?å??表中移é?¤(_L)"
 
-#: ../src/mailbox-conf.c:402
-#, fuzzy
+#: ../src/mailbox-conf.c:418
 msgid "Remove from list and _disk"
-msgstr "ä»?å??表å??ç£?ç??中å? é?¤"
+msgstr "ä»?å??表å??ç£?ç??中å? é?¤(_D)"
 
 # src/mailbox-conf.c:166
-#: ../src/mailbox-conf.c:410
+#: ../src/mailbox-conf.c:426
 #, fuzzy, c-format
 msgid ""
 "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -3252,54 +4182,51 @@ msgid ""
 "You may use \"New IMAP subfolder\" later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
-"è¿?å°?ä¼?ä»?æ?¨ç?? IMAP æ??å?¡å?¨ä¸?å? é?¤é?®ä»¶ç®± %s å??é??é?¢ç??é?®ä»¶ã??\n"
+"è¿?å°?ä¼?ä»?æ?¨ç?? IMAP æ??å?¡å?¨ä¸?å? é?¤é?®ç®± %s å??é??é?¢ç??é?®ä»¶ã??\n"
 "å¦?æ?? %s æ??å­?æ??件夹ï¼?å®?ä»?ç?¶ä½?为æ??件夹æ ?ç??ä¸?个è??ç?¹å?ºç?°ã??\n"
 "æ?¨ä»¥å??å?¯ä»¥ç?¨â??æ?°å»º IMAP å­?æ??件夹â??æ?¥æ·»å? ä¸?个å??å??ç??é?®ä»¶ç®±ã??\n"
 "æ?¨è¦?æ??æ ·å??ï¼?"
 
-#: ../src/mailbox-conf.c:423
-#, fuzzy
+#: ../src/mailbox-conf.c:439
 msgid "_Remove from server"
-msgstr "ä»?æ??å?¡å?¨ä¸?å? é?¤"
+msgstr "ä»?æ??å?¡å?¨ä¸?å? é?¤(_R)"
 
 # src/mailbox-conf.c:166
-#: ../src/mailbox-conf.c:430
+#: ../src/mailbox-conf.c:446
 #, fuzzy, c-format
 msgid ""
 "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
 "You may use \"Add Mailbox\" later to access this mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"è¿?å°?ä¼?ä»?é?®ä»¶ç®±å??表中å? é?¤é?®ä»¶ç®± %s\n"
-"æ?¨ä»¥å??å?¯ä»¥ç?¨â??æ·»å? é?®ä»¶ç®±â??æ?¥å??次å­?å??è¿?个é?®ä»¶ç®±ã??\n"
-"æ?¨ç¡®è®¤è¦?å? é?¤è¿?个é?®ä»¶ç®±å??ï¼?"
+"è¿?å°?ä¼?ä»?é?®ç®±å??表中å? é?¤é?®ç®± %s\n"
+"æ?¨ä»¥å??å?¯ä»¥ç?¨â??æ·»å? é?®ç®±â??æ?¥å??次å­?å??è¿?个é?®ç®±ã??\n"
+"æ?¨ç¡®è®¤è¦?å? é?¤è¿?个é?®ç®±å??ï¼?"
 
-#: ../src/mailbox-conf.c:439
-#, fuzzy
+#: ../src/mailbox-conf.c:455
 msgid "_Remove from list"
-msgstr "ä»?å??表中å? é?¤"
+msgstr "ä»?å??表中移é?¤(_R)"
 
-#: ../src/mailbox-conf.c:477
-#, fuzzy, c-format
+#: ../src/mailbox-conf.c:499
+#, c-format
 msgid "Folder deletion failed. Reason: %s"
-msgstr "身份��失败"
+msgstr "å? é?¤æ??件夹失败ã??å??å? ï¼?%s"
 
 # src/filter-edit-dialog.c:380 src/mailbox-conf.c:281 src/mailbox-conf.c:904
 # src/pref-manager.c:461
-#: ../src/mailbox-conf.c:526 ../src/pref-manager.c:1497
-#: ../src/pref-manager.c:1582 ../src/pref-manager.c:2629
-#, fuzzy
+#: ../src/mailbox-conf.c:568 ../src/pref-manager.c:1712
+#: ../src/pref-manager.c:1784 ../src/pref-manager.c:2962
 msgid "_Add"
-msgstr "添�"
+msgstr "添�(_A)"
 
 # src/mailbox-conf.c:531
-#: ../src/mailbox-conf.c:729
+#: ../src/mailbox-conf.c:791
 #, c-format
 msgid "%s on %s"
 msgstr "%s å?¨ %s"
 
 # src/balsa-message.c:231 src/balsa-message.c:246
-#: ../src/mailbox-conf.c:867
+#: ../src/mailbox-conf.c:933
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -3309,2767 +4236,2709 @@ msgstr ""
 "%s"
 
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#. mailbox name
-#: ../src/mailbox-conf.c:1046 ../src/mailbox-conf.c:1105
-#: ../src/mailbox-conf.c:1200
-msgid "Mailbox _Name:"
-msgstr "é?®ä»¶ç®±å??(_N)ï¼?"
+#: ../src/mailbox-conf.c:1142
+msgid "_Mailbox Name:"
+msgstr "é?®ç®±å??(_M)ï¼?"
 
 # src/mailbox-conf.c:238
-#: ../src/mailbox-conf.c:1057
-#, fuzzy
+#: ../src/mailbox-conf.c:1153
 msgid "Local Mailbox Configurator"
-msgstr "é?®ä»¶ç®±é??置工å?·"
+msgstr "æ?¬å?°é?®ç®±é??置工å?·"
 
 # src/mailbox-conf.c:238
-#: ../src/mailbox-conf.c:1084
-#, fuzzy
+#: ../src/mailbox-conf.c:1188
 msgid "Remote Mailbox Configurator"
-msgstr "é?®ä»¶ç®±é??置工å?·"
+msgstr "è¿?ç¨?é?®ç®±é??置工å?·"
+
+# src/mailbox-conf.c:671 src/mailbox-conf.c:706
+#. mailbox name
+#: ../src/mailbox-conf.c:1213 ../src/mailbox-conf.c:1325
+msgid "Mailbox _name:"
+msgstr "é?®ç®±å??(_N)ï¼?"
 
 # src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
 #. password field
-#: ../src/mailbox-conf.c:1124 ../src/mailbox-conf.c:1228
+#: ../src/mailbox-conf.c:1232 ../src/mailbox-conf.c:1359
 msgid "Pass_word:"
 msgstr "�令(_W)�"
 
 # src/main-window.c:168
-#: ../src/mailbox-conf.c:1132
+#: ../src/mailbox-conf.c:1240
 msgid "_Delete messages from server after download"
 msgstr "å?¨ä¸?è½½å??ä»?æ??å?¡å?¨å? é?¤é?®ä»¶(_D)"
 
-#: ../src/mailbox-conf.c:1137
+#: ../src/mailbox-conf.c:1245
+msgid "_Enable check for new mail"
+msgstr "����件��(_E)"
+
+#: ../src/mailbox-conf.c:1250
 msgid "_Filter messages through procmail"
 msgstr "� procmail �滤(_F)"
 
 # src/filter-edit-dialog.c:420
-#: ../src/mailbox-conf.c:1141
-#, fuzzy
+#: ../src/mailbox-conf.c:1254
 msgid "Fi_lter Command:"
-msgstr "�令�"
-
-#: ../src/mailbox-conf.c:1149
-msgid "_Enable check for new mail"
-msgstr "����件��(_E)"
+msgstr "è¿?滤è§?å??å?½ä»¤(_L)ï¼?"
 
-#: ../src/mailbox-conf.c:1160
+#: ../src/mailbox-conf.c:1268
 msgid "Disable _APOP"
-msgstr ""
+msgstr "�� _APOP"
 
 # src/mailbox-conf.c:742 src/mailbox-conf.c:833
 #. username
-#: ../src/mailbox-conf.c:1214
+#: ../src/mailbox-conf.c:1339
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-# src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
-#: ../src/mailbox-conf.c:1222
-#, fuzzy
-msgid "_Remember Password"
-msgstr "�令(_P)�"
-
 # src/mailbox-conf.c:861
-#: ../src/mailbox-conf.c:1233
-msgid "F_older Path:"
+#: ../src/mailbox-conf.c:1364
+msgid "F_older path:"
 msgstr "æ??件夹路å¾?(_O)ï¼?"
 
 # src/pref-manager.c:137
-#: ../src/mailbox-conf.c:1317
-#, fuzzy
-msgid "Identity:"
-msgstr "身份å??ï¼?"
+#: ../src/mailbox-conf.c:1454
+msgid "_Identity:"
+msgstr "身份å??(_I)ï¼?"
 
-# src/pref-manager.c:387
-#: ../src/mailbox-conf.c:1338
-#, fuzzy
-msgid "Show address:"
-msgstr "ä¿?å­?å?°å??"
-
-# src/balsa-index.c:231
-#: ../src/mailbox-conf.c:1341
-#, fuzzy
-msgid "_From"
-msgstr "å??件人"
-
-# src/balsa-message.c:526 src/filter-edit-dialog.c:291
-# src/sendmsg-window.c:315
-#: ../src/mailbox-conf.c:1347
-msgid "_To"
-msgstr "�件人(_T)"
-
-#: ../src/mailbox-conf.c:1362 ../src/pref-manager.c:3092
+#: ../src/mailbox-conf.c:1488 ../src/pref-manager.c:3428
 msgid "Always"
 msgstr "��"
 
-#: ../src/mailbox-conf.c:1365
+#: ../src/mailbox-conf.c:1492
 msgid ""
-"Decrypt and check\n"
+"_Decrypt and check\n"
 "signatures automatically:"
 msgstr ""
+"��解�并\n"
+"æ£?æ?¥ç­¾å??(_D)ï¼?"
+
+#: ../src/mailbox-conf.c:1519
+msgid "Show _Recipient column instead of Sender"
+msgstr "æ?¾ç¤ºæ?¶ä»¶äººå??è??é??å??信人(_R)"
 
-#: ../src/mailbox-node.c:265
+#: ../src/mailbox-conf.c:1532
+msgid "_Subscribe for new mail check"
+msgstr "æ?°é?®ä»¶æ£?æ?¥è®¢é??(_S)"
+
+#: ../src/mailbox-node.c:316
 #, fuzzy
 msgid "The folder edition to be written."
-msgstr "è¦?被å??å?¥ç??æ??件夹ã??"
+msgstr "è¦?å??å?¥ç??æ??件夹ç??æ?¬ã??"
+
+#: ../src/mailbox-node.c:491
+#, c-format
+msgid "Scanning %s. Please wait..."
+msgstr "æ­£å?¨æ?«æ?? %sã??请ç­?å¾?..."
 
-#: ../src/mailbox-node.c:431
+#: ../src/mailbox-node.c:507
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
 "Check network connectivity."
 msgstr ""
+"æ?«æ?? %s 失败ï¼?%s\n"
+"请æ£?æ?¥ç½?ç»?è¿?æ?¥ã??"
 
 # src/balsa-message.c:231 src/balsa-message.c:246
-#: ../src/mailbox-node.c:433
-#, fuzzy, c-format
+#: ../src/mailbox-node.c:509
+#, c-format
 msgid "Scanning of %s failed: %s"
-msgstr ""
-"é??å?½å?? %s å?° %s 失败ï¼?\n"
-"%s"
-
-#: ../src/mailbox-node.c:482
-#, fuzzy, c-format
-msgid "Scanning %s. Please wait..."
-msgstr "æ­£å?¨æ??å¼?é?®ä»¶ç®± %sã??请ç­?å¾?..."
+msgstr "æ?«æ?? %s 失败ï¼?%s"
 
 # src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:939
-#, fuzzy
+#: ../src/mailbox-node.c:1046
 msgid "Local _mbox mailbox..."
-msgstr "�� mbox �件箱..."
+msgstr "�� _mbox �箱..."
 
 # src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:941
-#, fuzzy
+#: ../src/mailbox-node.c:1048
 msgid "Local Mail_dir mailbox..."
-msgstr "�� Maildir �件箱..."
+msgstr "�� Mail_dir �箱..."
 
 # src/mailbox-conf.c:640
-#: ../src/mailbox-node.c:943
-#, fuzzy
+#: ../src/mailbox-node.c:1050
 msgid "Local M_H mailbox..."
-msgstr "�� MH �件箱..."
+msgstr "�� M_H �箱..."
 
-#: ../src/mailbox-node.c:945
-#, fuzzy
+#: ../src/mailbox-node.c:1052
 msgid "Remote _IMAP mailbox..."
-msgstr "�� IMAP �件箱..."
+msgstr "�� _IMAP �箱..."
 
-#: ../src/mailbox-node.c:948
-#, fuzzy
+#: ../src/mailbox-node.c:1055
 msgid "Remote IMAP _folder..."
-msgstr "è¿?ç¨? IMAP æ??件夹..."
+msgstr "è¿?ç¨? IMAP æ??件夹(_F)..."
 
-#: ../src/mailbox-node.c:950
-#, fuzzy
+#: ../src/mailbox-node.c:1057
 msgid "Remote IMAP _subfolder..."
-msgstr "è¿?ç¨? IMAP å­?æ??件夹..."
+msgstr "è¿?ç¨? IMAP å­?æ??件夹(_S)..."
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:961 ../src/mailbox-node.c:977
-#, fuzzy
+#: ../src/mailbox-node.c:1068 ../src/mailbox-node.c:1084
 msgid "_Rescan"
-msgstr "é??æ?°æ?«æ??"
+msgstr "é??æ?°æ?«æ??(_R)"
 
-#: ../src/mailbox-node.c:971
-#, fuzzy
+#: ../src/mailbox-node.c:1078 ../src/main-window.c:485
 msgid "_Properties..."
-msgstr "å±?æ?§..."
+msgstr "å±?æ?§(_P)..."
 
 # src/main-window.c:159
-#: ../src/mailbox-node.c:987
-#, fuzzy
+#: ../src/mailbox-node.c:1094
 msgid "_Open"
-msgstr "æ??å¼?"
+msgstr "æ??å¼?(_O)"
 
-#: ../src/mailbox-node.c:1001
-#, fuzzy
+#: ../src/mailbox-node.c:1108
 msgid "_Subscribe"
-msgstr "订é??"
+msgstr "订é??(_S)"
 
-#: ../src/mailbox-node.c:1003
-#, fuzzy
+#: ../src/mailbox-node.c:1110
 msgid "_Unsubscribe"
-msgstr "é??订"
+msgstr "é??订(_U)"
 
-#: ../src/mailbox-node.c:1009
-#, fuzzy
+#: ../src/mailbox-node.c:1116
 msgid "Mark as _Inbox"
-msgstr "�记为�件箱"
+msgstr "�记为�件箱(_I)"
 
-#: ../src/mailbox-node.c:1011
-#, fuzzy
+#: ../src/mailbox-node.c:1118
 msgid "_Mark as Sentbox"
-msgstr "æ ?记为已å??é?®ä»¶ç®±"
+msgstr "æ ?记为已å??(_M)"
 
-#: ../src/mailbox-node.c:1013
-#, fuzzy
+#: ../src/mailbox-node.c:1120
 msgid "Mark as _Trash"
-msgstr "�记为�纸�"
+msgstr "�记为已��(_T)"
 
-#: ../src/mailbox-node.c:1015
-#, fuzzy
+#: ../src/mailbox-node.c:1122
 msgid "Mark as D_raftbox"
-msgstr "�记为稿件箱"
+msgstr "æ ?记为è??稿(_R)"
 
-#: ../src/mailbox-node.c:1018
-#, fuzzy
+#: ../src/mailbox-node.c:1125
 msgid "_Empty trash"
-msgstr "�空�纸�(_T)"
+msgstr "�空�件箱(_E)"
 
-#: ../src/mailbox-node.c:1023
+#: ../src/mailbox-node.c:1130
 msgid "_Edit/Apply filters"
-msgstr ""
+msgstr "ç¼?è¾?/åº?ç?¨è¿?滤è§?å??(_E)"
 
-#: ../src/mailbox-node.c:1103
-#, fuzzy, c-format
+#: ../src/mailbox-node.c:1218
+#, c-format
 msgid "The path \"%s\" does not lead to a mailbox."
-msgstr "é?®ä»¶ç®±â??%sâ??æ? æ??ã??"
+msgstr "â??%sâ??è·¯å¾?没æ??æ??å??ä¸?个é?®ç®±ã??"
 
 # src/local-mailbox.c:151
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1231
 #, c-format
 msgid "Local mailbox %s loaded as: %s\n"
-msgstr "���件箱 %s 载�为�%s\n"
+msgstr "���箱 %s 载�为�%s\n"
 
 # src/local-mailbox.c:151
-#: ../src/mailbox-node.c:1143
+#: ../src/mailbox-node.c:1262
 #, c-format
 msgid "Local folder %s\n"
 msgstr "æ?¬å?°æ??件夹 %s\n"
 
-#: ../src/main-window.c:280
-msgid "Balsa closes files and connections. Please wait..."
-msgstr ""
-
-# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
-# src/pref-manager.c:471
-#: ../src/main-window.c:319 ../src/main-window.c:365
-#, fuzzy
-msgid "_Deleted"
-msgstr "已��"
-
-# src/main-window.c:133 src/main-window.c:168
 #: ../src/main-window.c:322
-#, fuzzy
-msgid "Un_Deleted"
-msgstr "å? é?¤(_D)"
+msgid "Balsa closes files and connections. Please wait..."
+msgstr "Balsa æ­£å?¨å?³é?­æ??件å??è¿?æ?¥ã??请ç­?å¾?..."
 
-# src/sendmsg-window.c:88
-#: ../src/main-window.c:325
-#, fuzzy
-msgid "_Read"
-msgstr "å??é??(_S)"
+# src/mailbox-conf.c:939
+#: ../src/main-window.c:347
+msgid "Mail_box"
+msgstr "�箱(_B)"
 
-# src/index-child.c:422
-#: ../src/main-window.c:328
-#, fuzzy
-msgid "Un_read"
-msgstr "�读"
+# src/main-window.c:200
+#: ../src/main-window.c:348 ../src/message-window.c:243
+msgid "_Message"
+msgstr "�件(_M)"
 
-#: ../src/main-window.c:334
-#, fuzzy
-msgid "Un_flagged"
-msgstr "æ ?è®°ç??"
+#: ../src/main-window.c:349
+msgid "_Settings"
+msgstr "设置(_S)"
 
-#: ../src/main-window.c:337 ../src/main-window.c:377
-msgid "_Answered"
-msgstr ""
+# src/mailbox-conf.c:939
+#: ../src/main-window.c:354
+msgid "Mail_boxes"
+msgstr "�箱(_B)"
 
-#: ../src/main-window.c:340
-msgid "Un_answered"
-msgstr ""
+# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
+#. Less frequently used entries of the 'View' menu
+#. Less frequently used entries of the 'Message' menu
+#. Less frequently used entries of the 'File' menu
+#. Less frequently used entries of the 'Edit' menu
+#. Less frequently used entries of the 'Tools' menu
+#: ../src/main-window.c:356 ../src/main-window.c:361
+#: ../src/sendmsg-window.c:327 ../src/sendmsg-window.c:329
+#: ../src/sendmsg-window.c:331
+msgid "_More"
+msgstr "��(_M)"
 
 # src/filter-edit-dialog.c:267
-#: ../src/main-window.c:346
-#, fuzzy
-msgid "_No Headers"
-msgstr "没æ??信头(_O)"
+#: ../src/main-window.c:357
+msgid "_Headers"
+msgstr "信头(_H)"
 
-#: ../src/main-window.c:346
-msgid "Display no headers"
-msgstr "��示信头"
+# src/mailbox-conf.c:634
+#: ../src/main-window.c:358
+msgid "_Sort Mailbox"
+msgstr "对é?®ç®±æ??åº?(_S)"
 
-#: ../src/main-window.c:348
-msgid "S_elected Headers"
-msgstr "é??æ?©ä¿¡å¤´(_E)"
+# src/main-window.c:139
+#: ../src/main-window.c:359
+msgid "H_ide messages"
+msgstr "é??è??é?®ä»¶(_I)"
 
-#: ../src/main-window.c:349
-msgid "Display selected headers"
-msgstr "æ?¾ç¤ºé??å®?ç??信头"
+# src/pref-manager.c:538
+#: ../src/main-window.c:362 ../src/sendmsg-window.c:325
+msgid "_Tools"
+msgstr "工�(_T)"
 
-# src/filter-edit-dialog.c:267
-#: ../src/main-window.c:351 ../src/message-window.c:90
-msgid "All _Headers"
-msgstr "��信头(_H)"
+# src/main-window.c:182
+#: ../src/main-window.c:363
+msgid "_Filters"
+msgstr "è¿?滤è§?å??(_F)"
 
-#: ../src/main-window.c:351
-msgid "Display all headers"
-msgstr "æ?¾ç¤ºæ??æ??信头"
+# src/filter-edit-dialog.c:456
+#: ../src/main-window.c:364
+msgid "F_ilters"
+msgstr "è¿?滤è§?å??(_I)"
 
-#: ../src/main-window.c:360
-msgid "Toggle flagged"
-msgstr "å??转æ ?å¿?"
+# src/main-window.c:182
+#: ../src/main-window.c:365 ../src/main-window.c:421
+msgid "Manage filters"
+msgstr "管ç??è¿?滤å?¨"
 
-# src/main-window.c:107
-#: ../src/main-window.c:366
-#, fuzzy
-msgid "Toggle deleted flag"
-msgstr "ç¼?å??æ?°é?®ä»¶"
+#. File menu items
+#. Not in the touchpad menu, but still available as a toolbar
+#. * button:
+#: ../src/main-window.c:370
+msgid "_Continue"
+msgstr "继续(_C)"
 
+# src/main-window.c:222
 #: ../src/main-window.c:371
-msgid "Toggle New"
-msgstr "å??转æ?ªè¯»"
+msgid "Continue editing current message"
+msgstr "继续���件"
 
-#: ../src/main-window.c:377
-#, fuzzy
-msgid "Toggle Answered"
-msgstr "å??转æ?ªè¯»"
+# src/main-window.c:90
+#: ../src/main-window.c:373
+msgid "_Get New Mail"
+msgstr "è?·å??æ?°é?®ä»¶(_G)"
+
+# src/main-window.c:90
+#: ../src/main-window.c:374
+msgid "Fetch new incoming mail"
+msgstr "è?·å??æ?°æ?¥ç??é?®ä»¶"
+
+# src/sendmsg-window.c:71
+#: ../src/main-window.c:375
+msgid "_Send Queued Mail"
+msgstr "å??é??é??å??中ç??é?®ä»¶(_S)"
+
+#: ../src/main-window.c:376
+msgid "Send messages from the outbox"
+msgstr "ä»?å??件箱中å??é??é?®ä»¶"
+
+# src/sendmsg-window.c:71
+#: ../src/main-window.c:379
+msgid "Send and _Receive Mail"
+msgstr "å??é??å??æ?¥æ?¶é?®ä»¶(_R)"
+
+# src/sendmsg-window.c:71
+#: ../src/main-window.c:380
+msgid "Send and Receive messages"
+msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
+
+#: ../src/main-window.c:382 ../src/message-window.c:244
+#: ../src/sendmsg-window.c:344
+msgid "Page _Setup"
+msgstr "页�设置(_S)"
+
+#: ../src/main-window.c:383 ../src/message-window.c:245
+#: ../src/sendmsg-window.c:345
+msgid "Set up page for printing"
+msgstr "æ??å?°ç??页é?¢è®¾ç½®"
+
+#: ../src/main-window.c:384
+msgid "_Address Book..."
+msgstr "å?°å??ç°¿(_A)..."
+
+#: ../src/main-window.c:385
+msgid "Open the address book"
+msgstr "æ??å¼?å?°å??ç°¿"
+
+# src/filter-edit-dialog.c:749
+#: ../src/main-window.c:386
+msgid "Quit Balsa"
+msgstr "é??å?º Balsa"
 
 # src/main-window.c:200
-#: ../src/main-window.c:392
+#. File:New submenu items
+#: ../src/main-window.c:389
 msgid "_Message..."
 msgstr "�件(_M)..."
 
 # src/main-window.c:107
-#: ../src/main-window.c:392 ../src/main-window.c:1041
+#: ../src/main-window.c:390
 msgid "Compose a new message"
-msgstr "ç¼?å??æ?°é?®ä»¶"
+msgstr "å??æ?°é?®ä»¶"
 
 # src/mailbox-conf.c:640
-#. We could use GNOMEUIINFO_INCLUDE but it appends the menu instead
-#. of including at specified position
-#: ../src/main-window.c:399
+#: ../src/main-window.c:392
 msgid "Local mbox mailbox..."
-msgstr "�� mbox �件箱..."
+msgstr "�� mbox �箱..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:400 ../src/main-window.c:813
+#: ../src/main-window.c:393 ../src/main-window.c:402
 msgid "Add a new mbox style mailbox"
-msgstr "æ·»å? æ?°ç?? mbox ç±»å??é?®ä»¶ç®±"
+msgstr "æ·»å? æ?°ç?? mbox ç±»å??é?®ç®±"
 
 # src/mailbox-conf.c:640
-#: ../src/main-window.c:403
+#: ../src/main-window.c:395
 msgid "Local Maildir mailbox..."
-msgstr "�� Maildir �件箱..."
+msgstr "�� Maildir �箱..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:404 ../src/main-window.c:818
+#: ../src/main-window.c:396 ../src/main-window.c:405
 msgid "Add a new Maildir style mailbox"
-msgstr "æ·»å? æ?°ç?? Maildir ç±»å??é?®ä»¶ç®±"
+msgstr "æ·»å? æ?°ç?? Maildir ç±»å??é?®ç®±"
 
 # src/mailbox-conf.c:640
-#: ../src/main-window.c:407
+#: ../src/main-window.c:398
 msgid "Local MH mailbox..."
-msgstr "�� MH �件箱..."
+msgstr "�� MH �箱..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:408 ../src/main-window.c:822
+#: ../src/main-window.c:399 ../src/main-window.c:408
 msgid "Add a new MH style mailbox"
-msgstr "æ·»å? æ?°ç?? MH ç±»å??é?®ä»¶ç®±"
+msgstr "æ·»å? æ?°ç?? MH ç±»å??é?®ç®±"
+
+#: ../src/main-window.c:401
+msgid "New mailbox..."
+msgstr "��箱..."
+
+# src/mailbox-conf.c:640
+#: ../src/main-window.c:404
+msgid "New \"Maildir\" mailbox..."
+msgstr "æ?°â??Maildirâ??é?®ç®±..."
 
-#: ../src/main-window.c:411 ../src/main-window.c:825
-#: ../src/pref-manager.c:2954
+# src/mailbox-conf.c:640
+#: ../src/main-window.c:407
+msgid "New \"MH\" mailbox..."
+msgstr "æ?°â??MHâ??é?®ç®±..."
+
+#: ../src/main-window.c:410 ../src/pref-manager.c:3281
 msgid "Remote IMAP mailbox..."
-msgstr "�� IMAP �件箱..."
+msgstr "�� IMAP �箱..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:412 ../src/main-window.c:826
+#: ../src/main-window.c:411
 msgid "Add a new IMAP mailbox"
-msgstr "æ·»å? æ?°ç?? IMAP é?®ä»¶ç®±"
+msgstr "æ·»å? æ?°ç?? IMAP é?®ç®±"
 
-#: ../src/main-window.c:416 ../src/main-window.c:830
-#: ../src/pref-manager.c:2959
+#: ../src/main-window.c:412 ../src/pref-manager.c:3286
 msgid "Remote IMAP folder..."
 msgstr "è¿?ç¨? IMAP æ??件夹..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:417 ../src/main-window.c:831
+#: ../src/main-window.c:413
 msgid "Add a new IMAP folder"
 msgstr "æ·»å? æ?°ç?? IMAP æ??件夹"
 
-#: ../src/main-window.c:420 ../src/main-window.c:834
+#: ../src/main-window.c:414
 msgid "Remote IMAP subfolder..."
 msgstr "è¿?ç¨? IMAP å­?æ??件夹..."
 
 # src/main-window.c:164
-#: ../src/main-window.c:421 ../src/main-window.c:835
-#, fuzzy
+#: ../src/main-window.c:415
 msgid "Add a new IMAP subfolder"
 msgstr "æ·»å? æ?°ç?? IMAP å­?æ??件夹"
 
-#: ../src/main-window.c:434
-msgid "_Continue"
-msgstr "继续(_C)"
+# src/main-window.c:182
+#: ../src/main-window.c:420
+msgid "F_ilters..."
+msgstr "è¿?滤è§?å??(_I)..."
 
-# src/main-window.c:222
-#: ../src/main-window.c:435
-msgid "Continue editing current message"
-msgstr "继续���件"
+# src/main-window.c:182
+#. Export selected filters to a text file.
+#: ../src/main-window.c:423
+msgid "_Export Filters..."
+msgstr "导å?ºè¿?滤è§?å??(_E)..."
 
-# src/main-window.c:90
-#. Ctrl-M
-#: ../src/main-window.c:442 ../src/main-window.c:877
-msgid "_Get New Mail"
-msgstr "å??æ?°é?®ä»¶(_G)"
+#: ../src/main-window.c:424
+msgid "Export filters as Sieve scripts"
+msgstr "å°?è¿?滤è§?å??导å?ºä¸º Sieve è??æ?¬"
 
-# src/main-window.c:90
-#: ../src/main-window.c:442 ../src/main-window.c:877
-msgid "Fetch new incoming mail"
-msgstr "å??æ?°æ?¥ç??é?®ä»¶"
+#: ../src/main-window.c:425
+msgid "Prefere_nces"
+msgstr "å??è??(_N)"
 
-# src/sendmsg-window.c:71
-#. Ctrl-S
-#: ../src/main-window.c:448 ../src/main-window.c:872
-msgid "_Send Queued Mail"
-msgstr "å??é??é??å??中ç??é?®ä»¶(_S)"
+#. View menu items
+#: ../src/main-window.c:428
+msgid "E_xpand All"
+msgstr "����(_X)"
 
-#: ../src/main-window.c:449 ../src/main-window.c:873
-msgid "Send messages from the outbox"
-msgstr "ä»?å??件箱中å??é??é?®ä»¶"
+#: ../src/main-window.c:429
+msgid "Expand all threads"
+msgstr "å±?å¼?æ??æ??线索"
 
-# src/sendmsg-window.c:71
-#. Ctrl-B
-#: ../src/main-window.c:455 ../src/main-window.c:867
-msgid "Send and _Receive Mail"
-msgstr "å??é??å??æ?¥æ?¶é?®ä»¶(_R)"
+#: ../src/main-window.c:430
+msgid "_Collapse All"
+msgstr "å?¨é?¨æ??å? (_C)"
 
-# src/sendmsg-window.c:71
-#: ../src/main-window.c:456 ../src/main-window.c:868
-#: ../src/toolbar-factory.c:113
-msgid "Send and Receive messages"
-msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
+#: ../src/main-window.c:431
+msgid "Collapse all expanded threads"
+msgstr "æ??å? æ??æ??å±?å¼?ç??线索"
 
-# src/main-window.c:222 src/sendmsg-window.c:78
-#: ../src/main-window.c:461 ../src/main-window.c:882
-#: ../src/sendmsg-window.c:331 ../src/sendmsg-window.c:492
-msgid "_Print..."
-msgstr "æ??å?°(_P)..."
+#: ../src/main-window.c:433 ../src/message-window.c:259
+msgid "Zoom _In"
+msgstr "�大(_I)"
 
-# src/main-window.c:222
-#: ../src/main-window.c:462 ../src/main-window.c:883
-#: ../src/toolbar-factory.c:109
-#, fuzzy
-msgid "Print current message"
-msgstr "æ??å?°å½?å??é??中ç??é?®ä»¶"
+#: ../src/main-window.c:434 ../src/message-window.c:260
+msgid "Increase magnification"
+msgstr "���大��"
 
-#: ../src/main-window.c:468 ../src/main-window.c:1100
-msgid "_Address Book..."
-msgstr "å?°å??ç°¿(_A)..."
+#: ../src/main-window.c:435 ../src/message-window.c:261
+msgid "Zoom _Out"
+msgstr "缩�(_O)"
 
-#: ../src/main-window.c:469 ../src/main-window.c:1101
-msgid "Open the address book"
-msgstr "æ??å¼?å?°å??ç°¿"
+#: ../src/main-window.c:436 ../src/message-window.c:262
+msgid "Decrease magnification"
+msgstr "å??å°?æ?¾å¤§æ¯?ä¾?"
 
-# src/main-window.c:182
-#: ../src/main-window.c:493
-#, fuzzy
-msgid "F_ilters..."
-msgstr "�滤�(_F)..."
+#. To warn msgfmt that the % sign isn't a format specifier:
+#: ../src/main-window.c:439 ../src/message-window.c:265
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "缩��_100%"
 
-# src/main-window.c:182
-#: ../src/main-window.c:493 ../src/main-window.c:1087
-msgid "Manage filters"
-msgstr "管ç??è¿?滤å?¨"
+# src/filter-edit-dialog.c:592
+#: ../src/main-window.c:440 ../src/message-window.c:266
+msgid "No magnification"
+msgstr "�缩�"
+
+# src/main-window.c:211
+#. Mailbox menu item that does not require a mailbox
+#: ../src/main-window.c:443 ../src/main-window.c:444
+#: ../src/message-window.c:300 ../src/message-window.c:301
+msgid "Next Unread Message"
+msgstr "���读�件"
+
+#: ../src/main-window.c:446
+msgid "Empty _Trash"
+msgstr "�空�件箱(_T)"
+
+# src/main-window.c:168
+#: ../src/main-window.c:447
+msgid "Delete messages from the Trash mailbox"
+msgstr "å? é?¤åº?件箱中ç??é?®ä»¶"
+
+# src/pref-manager.c:538
+#. Settings menu items
+#: ../src/main-window.c:450
+msgid "_Toolbars..."
+msgstr "工��(_T)..."
+
+#: ../src/main-window.c:451
+msgid "Customize toolbars"
+msgstr "��工��"
 
 # src/main-window.c:182
-#: ../src/main-window.c:495 ../src/main-window.c:1093
-#, fuzzy
-msgid "_Export Filters"
-msgstr "�滤�(_F)..."
+#: ../src/main-window.c:452
+msgid "_Identities..."
+msgstr "身份(_I)..."
 
-#: ../src/main-window.c:495 ../src/main-window.c:1094
-msgid "Export filters as Sieve scripts"
-msgstr ""
+#: ../src/main-window.c:453
+msgid "Create and set current identities"
+msgstr "å??建å??设置å½?å??身份"
 
-#: ../src/main-window.c:503
-msgid "_Flat index"
-msgstr "平�索�(_F)"
+#. Help menu items
+#: ../src/main-window.c:456
+msgid "_Contents"
+msgstr "å??容(_C)"
 
-#: ../src/main-window.c:504
-msgid "No threading at all"
-msgstr "�线索"
+#: ../src/main-window.c:457
+msgid "Table of Contents"
+msgstr "��"
 
-#: ../src/main-window.c:509
-#, fuzzy
-msgid "Si_mple threading"
-msgstr "ç®?å??线索(_I)"
+# src/filter-edit-dialog.c:749
+#. license ?
+#: ../src/main-window.c:458 ../src/main-window.c:2723
+msgid "About Balsa"
+msgstr "�� Balsa"
 
-#: ../src/main-window.c:510
-msgid "Simple threading algorithm"
-msgstr "ç®?å??ç??线索ç®?æ³?"
+# src/main-window.c:215
+#. Edit menu items
+#: ../src/main-window.c:465 ../src/message-window.c:253
+#: ../src/sendmsg-window.c:361
+msgid "Select _All"
+msgstr "å?¨é?¨é??中(_A)"
 
-#: ../src/main-window.c:515
-msgid "_JWZ threading"
-msgstr "_JWZ 线索"
+#: ../src/main-window.c:467
+msgid "_Find"
+msgstr "��(_F)"
 
-#: ../src/main-window.c:516
-msgid "Elaborate JWZ threading"
-msgstr "详ç»?ç?? JWZ 线索"
+#: ../src/main-window.c:469
+msgid "Find Ne_xt"
+msgstr "����个(_X)"
 
-# src/mailbox-conf.c:634
-#: ../src/main-window.c:526
-msgid "_Show Mailbox Tree"
-msgstr "�示�件箱�(_S)"
+# src/main-window.c:219
+#. Mailbox menu items
+#: ../src/main-window.c:472 ../src/main-window.c:473
+#: ../src/message-window.c:298 ../src/message-window.c:299
+msgid "Next Message"
+msgstr "���件"
 
-#: ../src/main-window.c:527
-msgid "Toggle display of mailbox and folder tree"
-msgstr "å??转é?®ä»¶ç®±å??æ??件夹æ ?ç??æ?¾ç¤º"
+# src/main-window.c:218
+#: ../src/main-window.c:474 ../src/main-window.c:475
+#: ../src/message-window.c:303 ../src/message-window.c:304
+msgid "Previous Message"
+msgstr "���件"
 
-# src/mailbox-conf.c:634
-#: ../src/main-window.c:531
-msgid "Show Mailbox _Tabs"
-msgstr "�示�件箱表(_T)"
+# src/main-window.c:211
+#: ../src/main-window.c:476 ../src/main-window.c:477
+#: ../src/message-window.c:305 ../src/message-window.c:306
+msgid "Next Flagged Message"
+msgstr "ä¸?ä¸?å??æ ?è®°é?®ä»¶"
 
-#: ../src/main-window.c:532
-msgid "Toggle display of mailbox notebook tabs"
-msgstr "å??转é?®ä»¶ç®±ç??æ?¾ç¤º"
+# src/main-window.c:139
+#: ../src/main-window.c:479
+msgid "_Hide Messages"
+msgstr "é??è??é?®ä»¶(_H)"
 
-#: ../src/main-window.c:536 ../src/main-window.c:952
-#: ../src/message-window.c:121
-msgid "_Wrap"
-msgstr "����(_W)"
+# src/filter-edit-dialog.c:749
+#: ../src/main-window.c:480
+msgid "_Reset Filter"
+msgstr "é??ç½®è¿?滤è§?å??(_R)"
 
-# src/sendmsg-window.c:518
-#: ../src/main-window.c:536 ../src/main-window.c:952
-#: ../src/sendmsg-window.c:360 ../src/sendmsg-window.c:517
-msgid "Wrap message lines"
-msgstr "�件����"
+# src/filter-edit-dialog.c:749
+#: ../src/main-window.c:481
+msgid "Reset mailbox filter"
+msgstr "é??ç½®é?®ç®±è¿?滤è§?å??"
 
-#: ../src/main-window.c:545 ../src/main-window.c:958
-#, fuzzy
-msgid "E_xpand All"
-msgstr "����(_E)"
+# src/main-window.c:215
+#: ../src/main-window.c:482
+msgid "_Select All"
+msgstr "å?¨é?¨é??中(_S)"
 
-#: ../src/main-window.c:546 ../src/main-window.c:959
-msgid "Expand all threads"
-msgstr "å±?å¼?æ??æ??线索"
+#: ../src/main-window.c:483
+msgid "Select all messages in current mailbox"
+msgstr "é??中å½?å??é?®ç®±ä¸­ç??å?¨é?¨é?®ä»¶"
 
-#: ../src/main-window.c:550 ../src/main-window.c:963
-msgid "_Collapse All"
-msgstr "å?¨é?¨æ??å? (_C)"
+# src/main-window.c:166
+#: ../src/main-window.c:486
+msgid "Edit the selected mailbox"
+msgstr "ç¼?è¾?é??å®?ç??é?®ç®±"
 
-#: ../src/main-window.c:551 ../src/main-window.c:964
-msgid "Collapse all expanded threads"
-msgstr "æ??å? æ??æ??å±?å¼?ç??线索"
+# src/main-window.c:133 src/main-window.c:168
+#: ../src/main-window.c:487
+msgid "_Delete..."
+msgstr "å? é?¤(_D)..."
 
-#: ../src/main-window.c:557 ../src/main-window.c:994
-#: ../src/message-window.c:127
-msgid "Zoom _In"
-msgstr ""
+# src/main-window.c:168
+#: ../src/main-window.c:488
+msgid "Delete the selected mailbox"
+msgstr "å? é?¤é??å®?ç??é?®ç®±"
 
-#: ../src/main-window.c:557 ../src/main-window.c:994
-#: ../src/message-window.c:127
-msgid "Increase magnification"
-msgstr ""
+# src/main-window.c:139
+#: ../src/main-window.c:491 ../src/main-window.c:494
+msgid "E_xpunge Deleted Messages"
+msgstr "æ¸?é?¤å·²å? é?¤ç??é?®ä»¶(_X)"
 
-#: ../src/main-window.c:561 ../src/main-window.c:998
-#: ../src/message-window.c:131
-msgid "Zoom _Out"
-msgstr ""
+# src/main-window.c:173
+#: ../src/main-window.c:492 ../src/main-window.c:495
+msgid "Expunge messages marked as deleted in the current mailbox"
+msgstr "æ¸?é?¤å½?å??é?®ç®±ä¸­æ ?记为å? é?¤ç??é?®ä»¶"
 
-#: ../src/main-window.c:561 ../src/main-window.c:998
-#: ../src/message-window.c:131
-msgid "Decrease magnification"
-msgstr ""
+# src/mailbox-conf.c:640
+#: ../src/main-window.c:498
+msgid "Close mailbox"
+msgstr "���箱"
 
-#. To warn msgfmt that the % sign isn't a format specifier:
-#. To warn msgfmt that the % sign isn't a
-#. * format specifier:
-#: ../src/main-window.c:567 ../src/main-window.c:1004
-#: ../src/message-window.c:138
-#, no-c-format
-msgid "Zoom _100%"
-msgstr ""
+# src/filter-edit-dialog.c:749
+#: ../src/main-window.c:500
+msgid "Select _Filters"
+msgstr "é??æ?©è¿?滤è§?å??(_F)"
 
-# src/filter-edit-dialog.c:592
-#: ../src/main-window.c:567 ../src/main-window.c:1004
-#: ../src/message-window.c:138
-#, fuzzy
-msgid "No magnification"
-msgstr "é??ç?¥ï¼?"
+#: ../src/main-window.c:501
+msgid "Select filters to be applied automatically to current mailbox"
+msgstr "é??æ?©è¦?è?ªå?¨åº?ç?¨äº?å½?å??é?®ç®±ç??è¿?滤è§?å??"
+
+#: ../src/main-window.c:504
+msgid "_Remove Duplicates"
+msgstr "移é?¤é??å¤?é?®ä»¶(_R)"
+
+# src/main-window.c:168
+#: ../src/main-window.c:505
+msgid "Remove duplicated messages from the current mailbox"
+msgstr "ä»?å½?å??é?®ç®±ä¸­ç§»é?¤é??å¤?ç??é?®ä»¶"
 
 # src/main-window.c:113
-#: ../src/main-window.c:585 ../src/main-window.c:1048
-#: ../src/toolbar-factory.c:85
+#: ../src/main-window.c:515 ../src/message-window.c:269
 msgid "Reply to the current message"
 msgstr "å??å¤?å½?å??é?®ä»¶"
 
 # src/main-window.c:119 src/message-window.c:60
-#. A
-#: ../src/main-window.c:592 ../src/main-window.c:1054
-#: ../src/message-window.c:153
+#: ../src/main-window.c:516 ../src/message-window.c:270
 msgid "Reply to _All..."
 msgstr "å?¨é?¨å??å¤?(_A)..."
 
 # src/main-window.c:120
-#: ../src/main-window.c:593 ../src/main-window.c:1055
+#: ../src/main-window.c:517 ../src/message-window.c:271
 msgid "Reply to all recipients of the current message"
 msgstr "å??å¤?ç»?å½?å??é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
 
 # src/main-window.c:119 src/message-window.c:60
-#: ../src/main-window.c:600 ../src/message-window.c:159
+#: ../src/main-window.c:519 ../src/message-window.c:273
 msgid "Reply to _Group..."
 msgstr "å??å¤?ç»?ç»?(_G)..."
 
 # src/main-window.c:215
-#: ../src/main-window.c:601 ../src/message-window.c:160
-#: ../src/toolbar-factory.c:89
+#: ../src/main-window.c:520 ../src/message-window.c:274
 msgid "Reply to mailing list"
 msgstr "å??å¤?ç»?é?®ä»¶å??表"
 
+#: ../src/main-window.c:522
+msgid "Store address of sender in addressbook"
+msgstr "å?¨å?°å??簿中ä¿?å­?å??件人å?°å??"
+
+#: ../src/main-window.c:524 ../src/message-window.c:278
+msgid "_View Source..."
+msgstr "æ?¥ç??æº?(_V)..."
+
+#: ../src/main-window.c:525 ../src/message-window.c:279
+msgid "View source form of the message"
+msgstr "æ?¥ç??é?®ä»¶ç??æº?å½¢å¼?"
+
+# src/sendmsg-window.c:518
+#. All three "Forward" actions and the "Pipe" action have the same
+#. * stock_id; the first in this list defines the action tied to the
+#. * toolbar's Forward button, so "ForwardDefault" must come before
+#. * the others.
+#: ../src/main-window.c:531
+msgid "_Forward..."
+msgstr "转å??(_F)..."
+
+# src/main-window.c:126
+#: ../src/main-window.c:532 ../src/message-window.c:285
+msgid "Forward the current message"
+msgstr "转å??å½?å??é?®ä»¶"
+
 # src/main-window.c:126 src/message-window.c:67
-#: ../src/main-window.c:608 ../src/message-window.c:165
+#: ../src/main-window.c:535 ../src/message-window.c:287
 msgid "_Forward attached..."
 msgstr "ä½?为é??件转å??(_F)..."
 
 # src/main-window.c:126
-#: ../src/main-window.c:609
+#: ../src/main-window.c:536 ../src/message-window.c:288
 msgid "Forward the current message as attachment"
 msgstr "å°?å½?å??é?®ä»¶ä½?为é??件转å??"
 
 # src/main-window.c:216
-#: ../src/main-window.c:615
-#, fuzzy
+#: ../src/main-window.c:538 ../src/message-window.c:290
 msgid "Forward _inline..."
-msgstr "ç?´æ?¥è½¬å??..."
+msgstr "å??åµ?转å??(_I)..."
 
 # src/main-window.c:126
-#: ../src/main-window.c:616
+#: ../src/main-window.c:539 ../src/message-window.c:291
 msgid "Forward the current message inline"
 msgstr "å°?å½?å??é?®ä»¶ä½?为æ?°é?®ä»¶è½¬å??"
 
-#: ../src/main-window.c:624
-#, fuzzy
+#: ../src/main-window.c:542
 msgid "Pipe the message through another program"
-msgstr "� procmail �滤(_F)"
+msgstr "ç?¨ç®¡é??å°?é?®ä»¶è½¬é??ç»?å?¦ä¸?个ç¨?åº?"
+
+#: ../src/main-window.c:544
+#| msgid "Selected headers:"
+msgid "Select _Thread"
+msgstr "é??æ?©çº¿ç´¢(_T)"
+
+#: ../src/main-window.c:545
+#| msgid "Select all messages in current mailbox"
+msgid "Select all messages in current thread"
+msgstr "é??中å½?å??线索中ç??å?¨é?¨é?®ä»¶"
+
+# src/main-window.c:222 src/sendmsg-window.c:78
+#. File menu item
+#: ../src/main-window.c:553 ../src/message-window.c:246
+#: ../src/sendmsg-window.c:347
+msgid "_Print..."
+msgstr "æ??å?°(_P)..."
+
+# src/main-window.c:222
+#: ../src/main-window.c:554 ../src/message-window.c:247
+msgid "Print current message"
+msgstr "æ??å?°å½?å??é?®ä»¶"
+
+#: ../src/main-window.c:555 ../src/message-window.c:275
+msgid "Save Current Part..."
+msgstr "ä¿?å­?å½?å??é?¨å??..."
+
+#: ../src/main-window.c:556 ../src/message-window.c:276
+msgid "Save currently displayed part of message"
+msgstr "ä¿?å­?é?®ä»¶å½?å??æ?¾ç¤ºç??å?ºæ®µ"
 
 # src/main-window.c:219
-#: ../src/main-window.c:631
-#, fuzzy
+#: ../src/main-window.c:559 ../src/message-window.c:293
 msgid "_Next Part"
-msgstr "ä¸?ä¸?é?¨å??"
+msgstr "���段(_N)"
 
 # src/main-window.c:219
-#: ../src/main-window.c:631 ../src/message-window.c:177
+#: ../src/main-window.c:560 ../src/message-window.c:294
 msgid "Next part in message"
-msgstr "é?®ä»¶ç??ä¸?ä¸?é?¨å??"
+msgstr "é?®ä»¶ç??ä¸?ä¸?å?ºæ®µ"
 
 # src/main-window.c:218
-#: ../src/main-window.c:637
-#, fuzzy
+#: ../src/main-window.c:561 ../src/message-window.c:295
 msgid "_Previous Part"
-msgstr "å??ä¸?é?¨å??"
+msgstr "���段(_P)"
 
 # src/main-window.c:218
-#: ../src/main-window.c:638 ../src/message-window.c:183
+#: ../src/main-window.c:562 ../src/message-window.c:296
 msgid "Previous part in message"
-msgstr "é?®ä»¶ç??å??ä¸?é?¨å??"
-
-#: ../src/main-window.c:644 ../src/main-window.c:1068
-#: ../src/message-window.c:187
-msgid "Save Current Part..."
-msgstr "ä¿?å­?å½?å??é?¨å??..."
+msgstr "é?®ä»¶ç??ä¸?ä¸?å?ºæ®µ"
 
-#: ../src/main-window.c:645 ../src/main-window.c:1069
-#, fuzzy
-msgid "Save currently displayed part of message"
-msgstr "ä¿?å­?é?®ä»¶å½?å??é?¨å??"
+# src/main-window.c:107
+#: ../src/main-window.c:565
+msgid "Copy message"
+msgstr "���件"
 
-#: ../src/main-window.c:651 ../src/main-window.c:1021
-#: ../src/message-window.c:192
-msgid "_View Source..."
-msgstr "æ?¥ç??æº?(_V)..."
+# src/main-window.c:200
+#: ../src/main-window.c:568
+msgid "Find in _Message"
+msgstr "��件中��(_M)"
 
-#: ../src/main-window.c:652 ../src/main-window.c:1022
-#: ../src/message-window.c:193
-msgid "View source form of the message"
-msgstr "æ?¥ç??é?®ä»¶ç??æº?å½¢å¼?"
+# src/sendmsg-window.c:71
+#: ../src/main-window.c:569 ../src/message-window.c:256
+msgid "Find a string in this message"
+msgstr "�此�件中���符串"
 
-#: ../src/main-window.c:670 ../src/message-window.c:228
+#: ../src/main-window.c:579 ../src/message-window.c:308
 msgid "_Move to Trash"
 msgstr "移�已���件(_M)"
 
 # src/main-window.c:168
-#: ../src/main-window.c:671 ../src/main-window.c:1076
+#: ../src/main-window.c:580 ../src/main-window.c:584
 msgid "Move the current message to Trash mailbox"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+msgstr "å°?å½?å??é?®ä»¶ç§»å?°åº?件箱"
+
+#: ../src/main-window.c:583
+msgid "_Delete to Trash"
+msgstr "移��件箱(_D)"
 
-#. !
-#: ../src/main-window.c:677 ../src/main-window.c:1027
+#: ../src/main-window.c:587 ../src/main-window.c:596
 #, fuzzy
-msgid "_Toggle flag"
-msgstr "å??转æ ?å¿?"
+msgid "Toggle New"
+msgstr "å??转æ?ªè¯»"
 
-#: ../src/main-window.c:683 ../src/main-window.c:1032
-msgid "Store address of sender in addressbook"
-msgstr "å?¨å?°å??簿中ä¿?å­?å??件人å?°å??"
+#: ../src/main-window.c:589
+#, fuzzy
+msgid "_Toggle Flag"
+msgstr "���记(_T)"
 
-# src/main-window.c:219
-#: ../src/main-window.c:694 ../src/main-window.c:985
-msgid "Next Message"
-msgstr "���件"
+#: ../src/main-window.c:592
+#, fuzzy
+msgid "Toggle flagged"
+msgstr "å¼?å?³æ ?è®°ç?¶æ??"
 
-# src/main-window.c:218
-#: ../src/main-window.c:700 ../src/main-window.c:989
-#: ../src/message-window.c:207
-msgid "Previous Message"
-msgstr "å??ä¸?é?®ä»¶"
+# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
+# src/pref-manager.c:471
+#. Hide messages menu items
+#: ../src/main-window.c:593 ../src/main-window.c:628
+msgid "_Deleted"
+msgstr "已��(_D)"
 
-# src/main-window.c:211
-#: ../src/main-window.c:706 ../src/main-window.c:707 ../src/main-window.c:979
-#: ../src/main-window.c:980 ../src/message-window.c:213
-#: ../src/message-window.c:214
-msgid "Next Unread Message"
-msgstr "���读�件"
+# src/main-window.c:107
+#: ../src/main-window.c:594
+msgid "Toggle deleted flag"
+msgstr "��已���记"
 
-# src/main-window.c:211
-#: ../src/main-window.c:713 ../src/main-window.c:714 ../src/main-window.c:944
-#: ../src/main-window.c:945 ../src/message-window.c:220
-#: ../src/message-window.c:221
-msgid "Next Flagged Message"
-msgstr "ä¸?ä¸?å??æ ?è®°é?®ä»¶"
+#: ../src/main-window.c:597 ../src/main-window.c:640
+msgid "_Answered"
+msgstr "å·²å??å¤?(_A)"
 
-# src/main-window.c:139
-#: ../src/main-window.c:721
-#, fuzzy
-msgid "_Hide messages"
-msgstr "æ¸?é?¤ %d 个已å? é?¤ç??é?®ä»¶ï¼?"
+#: ../src/main-window.c:598
+msgid "Toggle Answered"
+msgstr "å¼?å?³å·²å??å¤?"
 
-# src/filter-edit-dialog.c:749
-#: ../src/main-window.c:723
-#, fuzzy
-msgid "_Reset Filter"
-msgstr "Balsa �滤�"
+# src/mailbox-conf.c:634
+#: ../src/main-window.c:605
+msgid "_Show Mailbox Tree"
+msgstr "�示�箱�(_S)"
 
-# src/filter-edit-dialog.c:749
-#: ../src/main-window.c:723
-#, fuzzy
-msgid "Reset mailbox filter"
-msgstr "Balsa �滤�"
+#: ../src/main-window.c:606
+msgid "Toggle display of mailbox and folder tree"
+msgstr "å??转é?®ç®±å??æ??件夹æ ?ç??æ?¾ç¤º"
 
-# src/main-window.c:215
-#: ../src/main-window.c:728
-#, fuzzy
-msgid "_Select All"
-msgstr "å?¨é?¨é??中"
+# src/mailbox-conf.c:634
+#: ../src/main-window.c:608
+msgid "Show Mailbox _Tabs"
+msgstr "�示�箱�签页(_T)"
 
-#: ../src/main-window.c:729
-msgid "Select all messages in current mailbox"
-msgstr "é??中å½?å??é?®ä»¶ç®±ä¸­ç??å?¨é?¨é?®ä»¶"
+#: ../src/main-window.c:609
+msgid "Toggle display of mailbox notebook tabs"
+msgstr "���示�箱�签页"
 
-# src/main-window.c:166
-#: ../src/main-window.c:735 ../src/main-window.c:845
-msgid "_Edit..."
-msgstr "ç¼?è¾?(_E)..."
+#: ../src/main-window.c:611 ../src/message-window.c:315
+msgid "Show Too_lbar"
+msgstr "�示工��(_L)"
 
-# src/main-window.c:166
-#: ../src/main-window.c:735 ../src/main-window.c:845
-msgid "Edit the selected mailbox"
-msgstr "ç¼?è¾?é??å®?ç??é?®ä»¶ç®±"
+#: ../src/main-window.c:613
+msgid "Show St_atus Bar"
+msgstr "æ?¾ç¤ºç?¶æ??æ ?(_A)"
 
-# src/main-window.c:133 src/main-window.c:168
-#: ../src/main-window.c:739 ../src/main-window.c:840
-msgid "_Delete..."
-msgstr "å? é?¤(_D)..."
+#: ../src/main-window.c:615
+msgid "Show _Index Filter"
+msgstr "æ?¾ç¤ºç´¢å¼?è¿?滤è§?å??(_I)"
 
-# src/main-window.c:168
-#: ../src/main-window.c:740 ../src/main-window.c:841
-msgid "Delete the selected mailbox"
-msgstr "å? é?¤é??å®?ç??é?®ä»¶ç®±"
+#: ../src/main-window.c:618
+msgid "_Descending"
+msgstr "é??åº?(_D)"
 
-# src/main-window.c:139
-#: ../src/main-window.c:746
-#, fuzzy
-msgid "E_xpunge Deleted Messages"
-msgstr "æ¸?é?¤ %d 个已å? é?¤ç??é?®ä»¶ï¼?"
+#: ../src/main-window.c:619
+msgid "Sort in a descending order"
+msgstr "以é??åº?æ??å??"
 
-# src/main-window.c:173
-#: ../src/main-window.c:747 ../src/main-window.c:852
-#, fuzzy
-msgid "Expunge messages marked as deleted in the currently opened mailbox"
-msgstr "æ??交å½?å??æ??å¼?ç??é?®ä»¶ç®±ç??å??å??"
+# src/main-window.c:182
+#: ../src/main-window.c:621
+msgid "_View filter"
+msgstr "æ?¥ç??è¿?滤è§?å??(_V)"
 
-# src/mailbox-conf.c:640
-#: ../src/main-window.c:752 ../src/main-window.c:858
-msgid "Close mailbox"
-msgstr "���件箱"
+#: ../src/main-window.c:622
+msgid "Enable quick message index filter"
+msgstr "å?¯ç?¨å¿«é??é?®ä»¶ç´¢å¼?è¿?滤è§?å??"
 
-#: ../src/main-window.c:756 ../src/main-window.c:1105
-msgid "Empty _Trash"
-msgstr "�空�纸�(_T)"
+#: ../src/main-window.c:625 ../src/message-window.c:317
+msgid "_Wrap"
+msgstr "����(_W)"
 
-# src/main-window.c:168
-#: ../src/main-window.c:757 ../src/main-window.c:1106
-#: ../src/toolbar-factory.c:131
-msgid "Delete messages from the Trash mailbox"
-msgstr "å? é?¤åº?纸ç¯?中ç??é?®ä»¶"
+# src/sendmsg-window.c:518
+#: ../src/main-window.c:625 ../src/message-window.c:317
+#: ../src/sendmsg-window.c:364
+msgid "Wrap message lines"
+msgstr "�件����"
 
-# src/filter-edit-dialog.c:749
-#: ../src/main-window.c:761
-#, fuzzy
-msgid "Select _Filters"
-msgstr "Balsa �滤�"
+# src/main-window.c:133 src/main-window.c:168
+#: ../src/main-window.c:630
+msgid "Un_Deleted"
+msgstr "å·²å??æ¶?å? é?¤(_D)"
 
-#: ../src/main-window.c:762 ../src/main-window.c:1091
-#, fuzzy
-msgid "Select filters to be applied automatically to current mailbox"
-msgstr "é??中å½?å??é?®ä»¶ç®±ä¸­ç??å?¨é?¨é?®ä»¶"
+# src/sendmsg-window.c:88
+#: ../src/main-window.c:632
+msgid "_Read"
+msgstr "已读(_R)"
 
-#: ../src/main-window.c:767
-#, fuzzy
-msgid "_Remove Duplicates"
-msgstr "ä»?å??表中å? é?¤"
+# src/index-child.c:422
+#: ../src/main-window.c:634
+msgid "Un_read"
+msgstr "�读(_R)"
 
-# src/main-window.c:168
-#: ../src/main-window.c:768
-#, fuzzy
-msgid "Remove duplicated messages from the selected mailbox"
-msgstr "å? é?¤åº?纸ç¯?中ç??é?®ä»¶"
+#: ../src/main-window.c:638
+msgid "Un_flagged"
+msgstr "å??æ¶?æ ?è®°(_F)"
 
-# src/pref-manager.c:538
-#: ../src/main-window.c:783
-#, fuzzy
-msgid "_Toolbars..."
-msgstr "工��"
+#: ../src/main-window.c:642
+msgid "Un_answered"
+msgstr "æ?ªå??å¤?(_A)"
 
-#: ../src/main-window.c:784
-#, fuzzy
-msgid "Customize toolbars"
-msgstr "å®?å?¶å·¥å?·æ ?å??è??å??"
+# src/filter-edit-dialog.c:267
+#. Toolbar items not on any menu
+#: ../src/main-window.c:645 ../src/toolbar-factory.c:161
+msgid ""
+"All\n"
+"headers"
+msgstr ""
+"æ??æ??\n"
+"信头"
 
-# src/main-window.c:182
-#: ../src/main-window.c:787 ../src/main-window.c:1109
-msgid "_Identities..."
-msgstr "身份(_I)..."
+#: ../src/main-window.c:646 ../src/message-window.c:320
+msgid "Show all headers"
+msgstr "æ?¾ç¤ºæ??æ??信头"
 
-#: ../src/main-window.c:788 ../src/main-window.c:1110
-msgid "Create and set current identities"
-msgstr "å??建å??设置å½?å??身份"
+# src/pref-manager.c:558
+#: ../src/main-window.c:648 ../src/toolbar-factory.c:163
+msgid "Msg Preview"
+msgstr "���件"
 
-# src/mailbox-conf.c:939
-#: ../src/main-window.c:799
-msgid "Mail_box"
-msgstr "�件箱(_B)"
+# src/pref-manager.c:558
+#: ../src/main-window.c:649
+msgid "Show preview pane"
+msgstr "�示����"
 
-# src/main-window.c:200
-#: ../src/main-window.c:800 ../src/main-window.c:1123
-#: ../src/message-window.c:245
-msgid "_Message"
-msgstr "�件(_M)"
+# src/filter-edit-dialog.c:267
+#: ../src/main-window.c:655 ../src/message-window.c:326
+msgid "_No Headers"
+msgstr "没æ??信头(_N)"
 
-#: ../src/main-window.c:812
-#, fuzzy
-msgid "New mailbox..."
-msgstr "æ­£å?¨é??æ?°æ??å¼?é?®ä»¶ç®±..."
+#: ../src/main-window.c:656 ../src/message-window.c:327
+msgid "Display no headers"
+msgstr "��示信头"
 
-# src/mailbox-conf.c:640
-#: ../src/main-window.c:817
-#, fuzzy
-msgid "New \"Maildir\" mailbox..."
-msgstr "�� Maildir �件箱..."
+#: ../src/main-window.c:657
+msgid "S_elected Headers"
+msgstr "é??æ?©ç??信头(_E)"
 
-# src/mailbox-conf.c:640
-#: ../src/main-window.c:821
-#, fuzzy
-msgid "New \"MH\" mailbox..."
-msgstr "�� MH �件箱..."
+#: ../src/main-window.c:658 ../src/message-window.c:329
+msgid "Display selected headers"
+msgstr "æ?¾ç¤ºé??å®?ç??信头"
 
-# src/mailbox-conf.c:640
-#: ../src/main-window.c:851
+# src/filter-edit-dialog.c:267
+#: ../src/main-window.c:659 ../src/message-window.c:330
+msgid "All _Headers"
+msgstr "��信头(_H)"
+
+#: ../src/main-window.c:660 ../src/message-window.c:331
+msgid "Display all headers"
+msgstr "æ?¾ç¤ºæ??æ??信头"
+
+#: ../src/main-window.c:664
+msgid "_Flat index"
+msgstr "平�索�(_F)"
+
+#: ../src/main-window.c:665
 #, fuzzy
-msgid "_Compress Mailbox"
-msgstr "���件箱"
+msgid "No threading at all"
+msgstr "�线索"
 
-# src/mailbox-conf.c:939
-#: ../src/main-window.c:881
+#: ../src/main-window.c:666
 #, fuzzy
-msgid "Mail_boxes"
-msgstr "�件箱(_B)"
+msgid "Si_mple threading"
+msgstr "ç®?å??线索(_I)"
+
+#: ../src/main-window.c:667
+msgid "Simple threading algorithm"
+msgstr "ç®?å??ç??线索ç®?æ³?"
+
+#: ../src/main-window.c:668
+msgid "_JWZ threading"
+msgstr "_JWZ 线索"
+
+#: ../src/main-window.c:669
+msgid "Elaborate JWZ threading"
+msgstr "详ç»?ç?? JWZ 线索"
 
-#: ../src/main-window.c:906
+#: ../src/main-window.c:674
 msgid "By _Arrival"
-msgstr ""
+msgstr "æ??æ?¥ä¿¡æ?¥æ??(_A)"
 
-#: ../src/main-window.c:906
+#: ../src/main-window.c:675
 msgid "Arrival order"
-msgstr ""
+msgstr "�信顺�"
 
 # src/sendmsg-window.c:88
-#: ../src/main-window.c:910
-#, fuzzy
+#: ../src/main-window.c:676
 msgid "By _Sender"
-msgstr "å??é??(_S)"
+msgstr "æ??å??信人(_S)"
 
-#: ../src/main-window.c:910
+#: ../src/main-window.c:677
 msgid "Sender order"
-msgstr ""
+msgstr "å??信人顺åº?"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/main-window.c:914
-#, fuzzy
+#: ../src/main-window.c:678
 msgid "By S_ubject"
-msgstr "主�"
+msgstr "æ??主é¢?(_U)"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/main-window.c:914
-#, fuzzy
+#: ../src/main-window.c:679
 msgid "Subject order"
-msgstr "主�"
+msgstr "主�顺�"
 
-#: ../src/main-window.c:918
-#, fuzzy
+#: ../src/main-window.c:680
 msgid "By Si_ze"
-msgstr "大�"
+msgstr "æ??大å°?(_Z)"
 
 # src/sendmsg-window.c:518
-#: ../src/main-window.c:918
-#, fuzzy
+#: ../src/main-window.c:681
 msgid "By message size"
-msgstr "�件����"
+msgstr "æ??é?®ä»¶å¤§å°?"
 
-#: ../src/main-window.c:922
+#: ../src/main-window.c:682
 msgid "_Threaded"
 msgstr ""
 
-#: ../src/main-window.c:922
+#: ../src/main-window.c:683
 #, fuzzy
 msgid "Use message threading"
 msgstr "ç®?å??线索(_I)"
 
-#: ../src/main-window.c:930
-msgid "_Descending"
-msgstr ""
-
-#: ../src/main-window.c:930
-msgid "Sort in a descending order"
-msgstr ""
-
-# src/filter-edit-dialog.c:267
-#: ../src/main-window.c:951
-#, fuzzy
-msgid "_Headers"
-msgstr "信头"
-
-# src/mailbox-conf.c:634
-#: ../src/main-window.c:954
-#, fuzzy
-msgid "_Sort Mailbox"
-msgstr "�示�件箱�(_S)"
-
-# src/main-window.c:139
-#: ../src/main-window.c:955
-#, fuzzy
-msgid "H_ide messages"
-msgstr "æ¸?é?¤ %d 个已å? é?¤ç??é?®ä»¶ï¼?"
-
-# src/main-window.c:182
-#: ../src/main-window.c:969
-#, fuzzy
-msgid "_View filter"
-msgstr "æ?°å»ºè¿?滤è§?å??"
-
-#: ../src/main-window.c:970
-msgid "Enable quick message index filter"
+#: ../src/main-window.c:1032
+msgid ""
+"Balsa is sending a mail now.\n"
+"Abort sending?"
 msgstr ""
+"Balsa æ­£å?¨å??é??é?®ä»¶ã??\n"
+"中止å??é??ï¼?"
 
-# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/main-window.c:1008 ../src/main-window.c:1082
-#: ../src/sendmsg-window.c:494 ../src/sendmsg-window.c:552
-#: ../src/sendmsg-window.c:612
-#, fuzzy
-msgid "_More"
-msgstr "移�"
+#: ../src/main-window.c:1202
+msgid "Subject or Sender Contains:"
+msgstr "主é¢?æ??å??信人中å??å?«ï¼?"
 
-# src/main-window.c:107
-#: ../src/main-window.c:1041
-#, fuzzy
-msgid "_New..."
-msgstr "�建(_N)"
+#: ../src/main-window.c:1203
+msgid "Subject or Recipient Contains:"
+msgstr "主é¢?æ??æ?¶ä¿¡äººä¸­å??å?«ï¼?"
 
-# src/sendmsg-window.c:518
-#. F
-#: ../src/main-window.c:1061
-#, fuzzy
-msgid "_Forward..."
-msgstr "转å??é?®ä»¶"
+#: ../src/main-window.c:1204
+msgid "Subject Contains:"
+msgstr "主é¢?å??å?«ï¼?"
 
-# src/main-window.c:126
-#: ../src/main-window.c:1062 ../src/toolbar-factory.c:91
-#, fuzzy
-msgid "Forward the current message"
-msgstr "å°?å½?å??é?®ä»¶ä½?为æ?°é?®ä»¶è½¬å??"
-
-#. D
-#: ../src/main-window.c:1075
-#, fuzzy
-msgid "_Delete to Trash"
-msgstr "移�已���件(_M)"
-
-# src/main-window.c:200
-#: ../src/main-window.c:1087
-#, fuzzy
-msgid "_Manage..."
-msgstr "�件(_M)..."
+# src/filter-edit-dialog.c:279
+#: ../src/main-window.c:1205
+msgid "Body Contains:"
+msgstr "é?®ä»¶ä¸»ä½?å??å?«ï¼?"
 
-# src/main-window.c:215
-#: ../src/main-window.c:1090
-#, fuzzy
-msgid "_Select Filters"
-msgstr "å?¨é?¨é??中(_S)"
+#: ../src/main-window.c:1206
+msgid "Older than (days):"
+msgstr "��(天�)�"
 
-# src/main-window.c:182
-#: ../src/main-window.c:1108
-#, fuzzy
-msgid "_Filters"
-msgstr "�滤�(_F)..."
+#: ../src/main-window.c:1207
+msgid "Old at most (days):"
+msgstr "æ??æ?©(天æ?°)ï¼?"
 
-# src/pref-manager.c:538
-#: ../src/main-window.c:1124 ../src/sendmsg-window.c:628
-#, fuzzy
-msgid "_Tools"
-msgstr "工��"
-
-#: ../src/main-window.c:1228
-msgid ""
-"Balsa is sending a mail now.\n"
-"Abort sending?"
-msgstr ""
-"Balsa æ­£å?¨å??é??é?®ä»¶ã??\n"
-"中止å??é??ï¼?"
-
-#: ../src/main-window.c:1398 ../src/main-window.c:4941
-#, fuzzy
-msgid "Subject or Sender _Contains:"
-msgstr "��头��"
+#: ../src/main-window.c:2316
+#, c-format
+msgid "Opening %s"
+msgstr "æ­£å?¨æ??å¼? %s"
 
 # src/index-child.c:176
-#: ../src/main-window.c:2227
-#, fuzzy, c-format
+#: ../src/main-window.c:2333
+#, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
 "%s."
-msgstr "æ? æ³?é??ä½?é?®ä»¶ç®±ï¼?"
+msgstr ""
+"æ? æ³?æ??å¼?é?®ç®±ï¼?\n"
+"%sã??"
 
-#: ../src/main-window.c:2538
+#: ../src/main-window.c:2706
 msgid "translator-credits"
-msgstr ""
+msgstr "å¼?æº?软件å?½é??å??ç®?ä½?中æ??ç»?"
 
-# src/main-window.c:409
-#: ../src/main-window.c:2551 ../src/main-window.c:2578
-#, fuzzy
-msgid ""
-"The Balsa email client is part of the GNOME desktop environment.  "
-"Information on Balsa can be found at http://balsa.gnome.org/\n";
-"\n"
-"If you need to report bugs, please do so at: http://bugzilla.gnome.org/";
-msgstr ""
-"Balsa é?®ä»¶å®¢æ?·ç¨?åº?æ?¯ GNOME æ¡?é?¢ç?¯å¢?ç??ä¸?é?¨å??ã??å?³äº? Balsa ç??ä¿¡æ?¯å?¯ä»¥è®¿é?® "
-"http://www.balsa.net\n";
-"\n"
-"å¦?æ??æ?¨è¦?æ?¥å??软件ç??é?®é¢?ï¼?请访é?®http://bugzilla.gnome.org/";
+#: ../src/main-window.c:2718
+msgid "The Balsa email client is part of the GNOME desktop environment."
+msgstr "Balsa ç?µå­?é?®ä»¶å®¢æ?·ç«¯æ?¯ GNOME æ¡?é?¢ç?¯å¢?ç??ç»?æ??é?¨å??ã??"
 
 # src/sendmsg-window.c:71
-#: ../src/main-window.c:2682 ../src/main-window.c:2695
+#: ../src/main-window.c:2820 ../src/main-window.c:2838
 msgid "Checking Mail..."
 msgstr "正����件..."
 
 # src/mailbox-conf.c:640
-#: ../src/main-window.c:2870
-#, fuzzy, c-format
+#: ../src/main-window.c:3041
+#, c-format
 msgid "IMAP mailbox: %s"
-msgstr "�� MH �件箱..."
+msgstr "IMAP �箱�%s"
 
 # src/mailbox-conf.c:640
-#: ../src/main-window.c:2873
-#, fuzzy, c-format
+#: ../src/main-window.c:3045
+#, c-format
 msgid "Local mailbox: %s"
-msgstr "�� MH �件箱..."
+msgstr "���箱�%s"
 
-#: ../src/main-window.c:3010
+#: ../src/main-window.c:3198
 msgid "Finished Checking."
 msgstr "å®?æ??æ£?æ?¥ã??"
 
-#: ../src/main-window.c:3072
+#: ../src/main-window.c:3263
 #, c-format
 msgid "Sending error: %s"
 msgstr "å??é??é??误ï¼?%s"
 
-#: ../src/main-window.c:3157
-msgid "Balsa: New mail"
-msgstr ""
-
-#: ../src/main-window.c:3169
+#: ../src/main-window.c:3328
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "æ?¨å·²æ?¶å?° %d å°?æ?°é?®ä»¶ã??"
 
-#: ../src/main-window.c:3172
-#, fuzzy
+#: ../src/main-window.c:3331
 msgid "You have new mail."
-msgstr "æ?¨æ??æ?°é?®ä»¶"
+msgstr "æ?¨æ??æ?°é?®ä»¶ã??"
+
+#: ../src/main-window.c:3372
+#, c-format
+msgid "Balsa: you have received %d new message."
+msgid_plural "Balsa: you have received %d new messages."
+msgstr[0] "Balsaï¼?æ?¨å·²æ?¶å?° %d å°?æ?°é?®ä»¶ã??"
+
+#: ../src/main-window.c:3376
+msgid "Balsa: you have new mail."
+msgstr "Balsa:æ?¨æ??æ?°é?®ä»¶äº?ã??"
+
+#: ../src/main-window.c:3431
+msgid "Balsa: New mail"
+msgstr "Balsa���件"
+
+# src/main-window.c:211
+#: ../src/main-window.c:3720
+#, c-format
+msgid "The next unread message is in %s"
+msgstr "����读�件�� %s 中"
+
+#: ../src/main-window.c:3727
+#, c-format
+msgid "Do you want to select %s?"
+msgstr "æ?¨æ?³é??æ?© %s å??ï¼?"
 
 # src/mailbox-conf.c:640
-#: ../src/main-window.c:3790
-#, fuzzy
+#: ../src/main-window.c:4261
 msgid "Search mailbox"
-msgstr "���件箱"
+msgstr "æ??ç´¢é?®ç®±"
 
 # src/filter-edit-dialog.c:536
-#: ../src/main-window.c:3807
-#, fuzzy
+#: ../src/main-window.c:4281
 msgid "_Search for:"
-msgstr "æ??ç´¢å??å­?ï¼?"
+msgstr "æ??ç´¢å??容(_S)ï¼?"
 
 # src/balsa-init.c:590
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3820
-#, fuzzy
+#: ../src/main-window.c:4294
 msgid "In:"
-msgstr "�件箱�"
+msgstr "���"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/main-window.c:3831
-#, fuzzy
+#: ../src/main-window.c:4305
 msgid "S_ubject"
-msgstr "主�"
+msgstr "主�(_U)"
 
 # src/sendmsg-window.c:71
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3836
-#, fuzzy
+#: ../src/main-window.c:4310
 msgid "Show only matching messages"
-msgstr "å? é?¤é?®ä»¶æ?¶å??ç??é??误"
+msgstr "å?ªæ?¾ç¤ºå?¹é??ç??é?®ä»¶"
 
 # src/main-window.c:211
 #. Frame with OK button
-#: ../src/main-window.c:3857
-#, fuzzy
+#: ../src/main-window.c:4331
 msgid "Open next matching message"
-msgstr "ä¸?ä¸?å??æ ?è®°é?®ä»¶"
+msgstr "æ??å¼?ä¸?ä¸?å°?å?¹é??ç??é?®ä»¶"
 
-#: ../src/main-window.c:3868
+#: ../src/main-window.c:4342
 msgid "_Reverse search"
-msgstr ""
+msgstr "å??å??æ??ç´¢(_R)"
 
-#: ../src/main-window.c:3873
-#, fuzzy
+#: ../src/main-window.c:4347
 msgid "_Wrap around"
-msgstr "�件����(_W)"
+msgstr "����(_W)"
 
-#: ../src/main-window.c:4034
+#: ../src/main-window.c:4522
 msgid "You can apply filters only on mailbox\n"
-msgstr ""
+msgstr "æ?¨å?ªè?½å¯¹é?®ç®±åº?ç?¨è¿?滤è§?å??\n"
 
 # src/main-window.c:182
-#: ../src/main-window.c:4048
-#, fuzzy, c-format
+#: ../src/main-window.c:4537
+#, c-format
 msgid "Removing duplicates failed: %s"
-msgstr "æ? æ??ç??è¿?滤è§?å??ï¼?%s"
+msgstr "移é?¤é??å¤?é?®ä»¶å¤±è´¥ï¼?%s"
+
+#: ../src/main-window.c:4543
+#, c-format
+msgid "Removed %d duplicate"
+msgid_plural "Removed %d duplicates"
+msgstr[0] "移é?¤äº? %d å°?é??å¤?é?®ä»¶`"
+
+# src/pref-manager.c:397
+#: ../src/main-window.c:4548
+msgid "No duplicates found"
+msgstr "æ?ªæ?¾å?°é??å¤?é?®ä»¶"
 
 # src/main-window.c:171
-#: ../src/main-window.c:4249
+#: ../src/main-window.c:4777
 #, fuzzy, c-format
 msgid "Could not open trash: %s"
-msgstr "æ? æ³?é??æ?°æ??å¼?é?®ä»¶ç®±ï¼?"
+msgstr "æ? æ³?æ??å¼?åº?件箱ï¼?%s"
 
-#: ../src/main-window.c:4378
+#: ../src/main-window.c:4925
 #, c-format
 msgid "Balsa: %s (readonly)"
 msgstr "Balsa�%s (�读)"
 
 # src/filter-edit-dialog.c:749
-#: ../src/main-window.c:4380
+#: ../src/main-window.c:4927
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsaï¼?%s"
 
-#: ../src/main-window.c:4940
-#, fuzzy
-msgid "Subject or Receiver _Contains:"
-msgstr "��头��"
+# src/mailbox-conf.c:640
+#. xgettext: this is the first part of the message
+#. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
+#: ../src/main-window.c:5496
+#, c-format
+msgid "Shown mailbox: %s "
+msgstr "已�示�箱�%s"
+
+# src/main-window.c:222
+#: ../src/main-window.c:5501
+#, c-format
+msgid "with %d message"
+msgid_plural "with %d messages"
+msgstr[0] "� %d ��件"
+
+#: ../src/main-window.c:5508
+#, c-format
+msgid ", %d new"
+msgid_plural ", %d new"
+msgstr[0] "ï¼?%d å°?æ?°"
+
+#: ../src/main-window.c:5515
+#, c-format
+msgid ", %d hidden"
+msgid_plural ", %d hidden"
+msgstr[0] "ï¼?%d å°?é??è??"
+
+#: ../src/main.c:208
+#, c-format
+msgid "Could not write to %s: %s"
+msgstr "æ? æ³?å??å?¥ %sï¼?%s"
 
 # src/main-window.c:90
-#: ../src/main.c:214
+#: ../src/main.c:446 ../src/main.c:495
 msgid "Get new mail on startup"
-msgstr "å?¨å?¯å?¨æ?¶å??æ?°é?®ä»¶"
+msgstr "å?¨å?¯å?¨æ?¶æ?¶å??æ?°é?®ä»¶"
 
-#: ../src/main.c:216
+#: ../src/main.c:448 ../src/main.c:497
 msgid "Compose a new email to EMAIL ADDRESS"
 msgstr "æ?°å??ç»? EMAIL ADDRESS ç??æ?°é?®ä»¶"
 
 # src/sendmsg-window.c:239
-#: ../src/main.c:218
+#: ../src/main.c:450
 msgid "Attach file at PATH"
 msgstr "ç²?é??æ??件äº? PATH"
 
-#: ../src/main.c:220
+#: ../src/main.c:452 ../src/main.c:502
 msgid "Opens MAILBOXNAME"
 msgstr "æ??å¼? MAILBOXNAME"
 
-#: ../src/main.c:220
+#: ../src/main.c:452 ../src/main.c:502
 msgid "MAILBOXNAME"
 msgstr "MAILBOXNAME"
 
 # src/main-window.c:159
-#: ../src/main.c:223
+#: ../src/main.c:455 ../src/main.c:505
 msgid "Opens first unread mailbox"
-msgstr "æ??å¼?第ä¸?个为读ç??é?®ä»¶ç®±"
+msgstr "æ??å¼?第ä¸?个æ?ªè¯»ç??é?®ç®±"
 
 # src/main-window.c:90
-#: ../src/main.c:226
+#: ../src/main.c:458 ../src/main.c:508
 msgid "Opens default Inbox on startup"
 msgstr "å?¯å?¨æ?¶æ??å¼?é»?认ç??æ?¶ä»¶ç®±"
 
 # src/main-window.c:222
-#: ../src/main.c:229
+#: ../src/main.c:461 ../src/main.c:511
 #, fuzzy
 msgid "Prints number unread and unsent messages"
-msgstr "æ??å?°å½?å??é??中ç??é?®ä»¶"
+msgstr "æ??å?°æ?ªè¯»å??æ?ªå??é?®ä»¶ç??æ?°é??"
 
-#: ../src/main.c:231
+#: ../src/main.c:463 ../src/main.c:513
 msgid "Debug POP3 connection"
 msgstr "�� POP3 ��"
 
-#: ../src/main.c:233
-#, fuzzy
+#: ../src/main.c:465 ../src/main.c:515
 msgid "Debug IMAP connection"
-msgstr "�� POP3 ��"
+msgstr "�� IMAP ��"
 
-#: ../src/main.c:255
+#: ../src/main.c:487
 msgid "The Balsa E-Mail Client"
-msgstr ""
+msgstr "Balsa ���件客�端"
 
-#: ../src/main.c:272 ../src/main.c:277 ../src/main.c:283 ../src/main.c:289
-#: ../src/main.c:295
+# src/sendmsg-window.c:239
+#: ../src/main.c:499
+#, fuzzy
+#| msgid "Attach file at PATH"
+msgid "Attach file at URI"
+msgstr "å?¨ URI 中é??å? æ??件"
+
+#: ../src/main.c:540
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "è¿?è¡? '%s --help' æ?¥ç??å?¯ç?¨å?½ä»¤è¡?é??项ç??å®?æ?´å??表ã??\n"
+
+#: ../src/main.c:587 ../src/main.c:592 ../src/main.c:598 ../src/main.c:604
+#: ../src/main.c:610
 #, c-format
 msgid "Balsa cannot open your \"%s\" mailbox."
-msgstr "Balsa æ? æ³?æ??å¼?æ?¨ç??â??%sâ??é?®ä»¶ç®±ã??"
+msgstr "Balsa æ? æ³?æ??å¼?æ?¨ç??â??%sâ??é?®ç®±ã??"
 
 # src/balsa-init.c:590
-#: ../src/main.c:272
+#: ../src/main.c:587
 msgid "Inbox"
 msgstr "�件箱"
 
 # src/balsa-init.c:598
-#: ../src/main.c:278
+#: ../src/main.c:593
 msgid "Outbox"
 msgstr "å??件箱"
 
 # src/balsa-init.c:590
-#: ../src/main.c:284
+#: ../src/main.c:599
 msgid "Sentbox"
 msgstr "å·²å??é??é?®ä»¶"
 
-#: ../src/main.c:290
+#: ../src/main.c:605
 msgid "Draftbox"
-msgstr "稿件箱"
+msgstr "è??稿箱"
 
 # src/balsa-init.c:606
-#: ../src/main.c:295
+#: ../src/main.c:610
+#, fuzzy
 msgid "Trash"
 msgstr "已���件"
 
-#: ../src/main.c:513
-#, fuzzy
+#: ../src/main.c:832
 msgid "Compressing mail folders..."
-msgstr "æ­£å?¨é??æ?°æ??å¼?é?®ä»¶ç®±..."
-
-# src/filter-edit-dialog.c:267
-#: ../src/message-window.c:86
-msgid "N_o Headers"
-msgstr "没æ??信头(_O)"
-
-#: ../src/message-window.c:88
-msgid "_Selected Headers"
-msgstr "é??æ?©ç??信头(_S)"
-
-# src/message-window.c:54
-#: ../src/message-window.c:148
-msgid "Reply to this message"
-msgstr "å??å¤?æ­¤é?®ä»¶"
-
-# src/message-window.c:61
-#: ../src/message-window.c:154
-msgid "Reply to all recipients of this message"
-msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
-
-# src/message-window.c:67
-#: ../src/message-window.c:166
-msgid "Forward this message as attachment"
-msgstr "å°?æ­¤é?®ä»¶ä½?为é??件转å??"
-
-# src/main-window.c:216
-#: ../src/message-window.c:170
-msgid "Forward inline..."
-msgstr "ç?´æ?¥è½¬å??..."
-
-# src/message-window.c:67
-#: ../src/message-window.c:171
-msgid "Forward this message inline"
-msgstr "ç?´æ?¥è½¬å??æ­¤é?®ä»¶"
-
-# src/main-window.c:219
-#: ../src/message-window.c:177
-msgid "Next Part"
-msgstr "ä¸?ä¸?é?¨å??"
-
-# src/main-window.c:218
-#: ../src/message-window.c:182
-msgid "Previous Part"
-msgstr "å??ä¸?é?¨å??"
-
-#: ../src/message-window.c:188
-msgid "Save current part in message"
-msgstr "ä¿?å­?é?®ä»¶å½?å??é?¨å??"
-
-# src/main-window.c:219
-#: ../src/message-window.c:200
-#, fuzzy
-msgid "_Next Message"
-msgstr "���件"
-
-# src/main-window.c:219
-#: ../src/message-window.c:200
-#, fuzzy
-msgid "Next message"
-msgstr "���件"
-
-# src/main-window.c:218
-#: ../src/message-window.c:206
-#, fuzzy
-msgid "_Previous Message"
-msgstr "å??ä¸?é?®ä»¶"
-
-# src/main-window.c:168
-#: ../src/message-window.c:229
-#, fuzzy
-msgid "Move the message to Trash mailbox"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+msgstr "æ­£å?¨å??缩é?®ä»¶æ??件夹..."
 
 # src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/message-window.c:244
-#, fuzzy
+#: ../src/message-window.c:242
 msgid "M_ove"
-msgstr "移�"
-
-# src/main-window.c:200
-#: ../src/message-window.c:366
-#, fuzzy, c-format
-msgid "Message from %s: %s"
-msgstr "�件���%s\n"
-
-#: ../src/balsa-mime-widget-callbacks.c:50
-#, fuzzy, c-format
-msgid "Could not create temporary file %s: "
-msgstr "æ? æ³?å??建临æ?¶æ??件 %s"
-
-#: ../src/balsa-mime-widget-callbacks.c:114
-#, fuzzy, c-format
-msgid "could not create temporary file %s: %s"
-msgstr "æ? æ³?å??建临æ?¶æ??件 %s"
-
-# src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-mime-widget-callbacks.c:140
-#, fuzzy, c-format
-msgid "Save %s MIME Part"
-msgstr "ä¿?å­? MIME é?¨å??"
-
-#: ../src/balsa-mime-widget-callbacks.c:187
-msgid "File already exists. Overwrite?"
-msgstr "æ??件已ç»?å­?å?¨ã??è¦?è¦?ç??å??ï¼?"
-
-#: ../src/balsa-mime-widget-crypto.c:70
-#, c-format
-msgid ""
-"This is an inline %s signed %s message part:\n"
-"%s"
-msgstr ""
-
-# src/main-window.c:159
-#: ../src/balsa-mime-widget-crypto.c:72 ../src/print.c:1302
-#, fuzzy
-msgid "OpenPGP"
-msgstr "æ??å¼?"
-
-#: ../src/balsa-mime-widget-crypto.c:89
-msgid "_Run gpg to import this key"
-msgstr ""
-
-#: ../src/balsa-mime-widget-image.c:51 ../src/balsa-mime-widget-image.c:156
-#, c-format
-msgid "Error loading attached image: %s\n"
-msgstr ""
-
-#: ../src/balsa-mime-widget-message.c:164
-#: ../src/balsa-mime-widget-message.c:177
-#: ../src/balsa-mime-widget-message.c:205
-#: ../src/balsa-mime-widget-message.c:258
-msgid "Content Type: external-body\n"
-msgstr "å??容类å??ï¼?å¤?é?¨é?®ä»¶\n"
-
-#: ../src/balsa-mime-widget-message.c:165
-msgid "Access type: local-file\n"
-msgstr "访é?®ç±»å??ï¼?æ?¬å?°æ??件\n"
-
-# src/filter-edit-dialog.c:456
-#: ../src/balsa-mime-widget-message.c:166
-#: ../src/balsa-mime-widget-message.c:213 ../src/balsa-mime-widget.c:235
-#, c-format
-msgid "File name: %s"
-msgstr "æ??件å??ï¼?%s"
-
-#: ../src/balsa-mime-widget-message.c:178
-msgid "Access type: URL\n"
-msgstr "访é?®ç±»å??ï¼?URL\n"
+msgstr "移�(_O)"
 
-#: ../src/balsa-mime-widget-message.c:179
-#, c-format
-msgid "URL: %s"
-msgstr "URLï¼?%s"
-
-#: ../src/balsa-mime-widget-message.c:206
-#, c-format
-msgid "Access type: %s\n"
-msgstr "访é?®ç±»å??ï¼?%s\n"
-
-#: ../src/balsa-mime-widget-message.c:210
-#, c-format
-msgid "FTP site: %s\n"
-msgstr "FTP ���%s\n"
-
-#: ../src/balsa-mime-widget-message.c:212
-#, c-format
-msgid "Directory: %s\n"
-msgstr "���%s\n"
-
-#: ../src/balsa-mime-widget-message.c:259
-msgid "Access type: mail-server\n"
-msgstr "访é?®ç±»å??ï¼?é?®ä»¶æ??å?¡å?¨\n"
-
-# src/pref-manager.c:144
-#: ../src/balsa-mime-widget-message.c:260
-#, c-format
-msgid "Mail server: %s\n"
-msgstr "é?®ä»¶æ??å?¡å?¨ï¼?%s\n"
-
-# src/balsa-message.c:558 src/sendmsg-window.c:358
-#: ../src/balsa-mime-widget-message.c:262
-#, c-format
-msgid "Subject: %s\n"
-msgstr "主��%s\n"
-
-#: ../src/balsa-mime-widget-message.c:279
-#, fuzzy
-msgid "Se_nd message to obtain this part"
-msgstr "å??é??é?®ä»¶ä»¥è?·å??该é?¨å??"
-
-#: ../src/balsa-mime-widget-message.c:300 ../src/balsa-mime-widget-text.c:568
-#: ../src/balsa-mime-widget-text.c:693 ../src/sendmsg-window.c:1653
-#, fuzzy, c-format
-msgid "Error showing %s: %s\n"
-msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
-
-#: ../src/balsa-mime-widget-message.c:332
-#, fuzzy, c-format
-msgid "Could not get a part: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
-
-# src/balsa-message.c:558 src/sendmsg-window.c:358
-#: ../src/balsa-mime-widget-message.c:601 ../src/print.c:350
-#: ../src/sendmsg-window.c:1003 ../src/sendmsg-window.c:3165
-msgid "Subject:"
-msgstr "主��"
-
-# src/balsa-message.c:519
-#: ../src/balsa-mime-widget-message.c:605 ../src/print.c:356
-#: ../src/sendmsg-window.c:3159
-msgid "Date:"
-msgstr "���"
-
-# src/sendmsg-window.c:513
-#. Cannot edit the new "From:" header.
-#. { N_("From:"),     G_STRUCT_OFFSET(BalsaSendmsg, from[1])},
-#: ../src/balsa-mime-widget-message.c:618 ../src/sendmsg-window.c:1000
-#, fuzzy
-msgid "Reply-To:"
-msgstr "å??å¤?å?°ï¼?"
-
-# src/balsa-message.c:534
-#. cc:
-#: ../src/balsa-mime-widget-message.c:622 ../src/print.c:366
-#: ../src/sendmsg-window.c:1002 ../src/sendmsg-window.c:2721
-#: ../src/sendmsg-window.c:3188 ../src/store-address.c:307
-msgid "Cc:"
-msgstr "æ??é??ï¼?"
-
-# src/sendmsg-window.c:368
-#. bcc:
-#: ../src/balsa-mime-widget-message.c:623 ../src/print.c:367
-#: ../src/sendmsg-window.c:1001 ../src/sendmsg-window.c:2726
-#: ../src/store-address.c:308
-msgid "Bcc:"
-msgstr "æ??é??ï¼?"
-
-# src/sendmsg-window.c:368
-#: ../src/balsa-mime-widget-message.c:627 ../src/print.c:368
-msgid "Fcc:"
-msgstr "æ??件æ??é??ï¼?"
-
-#: ../src/balsa-mime-widget-message.c:634 ../src/print.c:374
-msgid "Disposition-Notification-To:"
-msgstr "å??é??é??读é??å??è?³ï¼?"
-
-#: ../src/balsa-mime-widget-text.c:100
-#, fuzzy, c-format
-msgid "Could not save a text part: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
+# src/main-window.c:213
+#: ../src/message-window.c:249
+msgid "Close the message window"
+msgstr "���件��"
 
-#: ../src/balsa-mime-widget-text.c:135
-#, c-format
-msgid ""
-"The message sent by %s with subject \"%s\" contains 8-bit characters, but no "
-"header describing the used codeset (converted to %s)"
-msgstr ""
+# src/main-window.c:139
+#: ../src/message-window.c:255
+msgid "_Find in message"
+msgstr "��件中��(_F)"
 
-#: ../src/balsa-mime-widget-text.c:558
-#, c-format
-msgid "Calling URL %s..."
-msgstr "正�� URL %s..."
+# src/main-window.c:168
+#: ../src/message-window.c:309
+msgid "Move the message to Trash mailbox"
+msgstr "å°?å½?å??é?®ä»¶ç§»å?°åº?件箱"
 
-# src/sendmsg-window.c:71
-#: ../src/balsa-mime-widget.c:254
-#, fuzzy, c-format
-msgid "Error reading message part: %s"
-msgstr "å? é?¤é?®ä»¶æ?¶å??ç??é??误"
+#: ../src/message-window.c:316
+msgid "Show toolbar"
+msgstr "�示工��"
 
-#: ../src/balsa-mime-widget.c:276
-#, c-format
-msgid "Type: %s (%s)"
-msgstr ""
+#: ../src/message-window.c:328
+msgid "_Selected Headers"
+msgstr "é??æ?©ç??信头(_S)"
 
-#: ../src/balsa-mime-widget.c:279
+# src/main-window.c:200
+#: ../src/message-window.c:1050
 #, c-format
-msgid "Content Type: %s"
-msgstr "å??容类å??ï¼?%s"
-
-#: ../src/balsa-mime-widget.c:293
-msgid "No open or view action defined in GNOME MIME for this content type"
-msgstr "å?¨ GNOME MIME 中没æ??å®?ä¹?è¿?ç§?å??容类å??ç??æ??å¼?æ??æ?¥ç??å?¨ä½?"
-
-# src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/balsa-mime-widget.c:299
-#, fuzzy
-msgid "S_ave part"
-msgstr "ä¿?å­?é?¨å??"
-
-#: ../src/balsa-mime-widget.c:321 ../src/balsa-mime-widget.c:345
-#, fuzzy, c-format
-msgid "View _part with %s"
-msgstr "ç?¨ %s æ?¥ç??é?¨å??"
+msgid "Message from %s: %s"
+msgstr "é?®ä»¶å??è?ª %sï¼?%s"
 
 # src/main-window.c:211
-#: ../src/pref-manager.c:354
-msgid "While Retrieving Messages"
+#: ../src/pref-manager.c:402
+msgid "While retrieving messages"
 msgstr "��载�件�"
 
-#: ../src/pref-manager.c:355
-msgid "Until Closed"
+#: ../src/pref-manager.c:403
+msgid "Until closed"
 msgstr "�����"
 
-#: ../src/pref-manager.c:360
+#: ../src/pref-manager.c:409
 msgid "Fast"
 msgstr "å¿«"
 
-#: ../src/pref-manager.c:361
+#: ../src/pref-manager.c:410
 msgid "Normal"
 msgstr "æ?®é??"
 
-#: ../src/pref-manager.c:362
-msgid "Bad Spellers"
-msgstr "����"
+#: ../src/pref-manager.c:411
+msgid "Bad spellers"
+msgstr "æ??å??ç??æ?¼å??æ£?æ?¥å?¨"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:367
+#: ../src/pref-manager.c:417
 #, fuzzy
 msgid "Message number"
-msgstr "�件��"
+msgstr "é?®ä»¶æ?°é??"
 
 # src/sendmsg-window.c:88
-#: ../src/pref-manager.c:371
-#, fuzzy
+#: ../src/pref-manager.c:421
 msgid "Sender"
-msgstr "å??é??(_S)"
+msgstr "å??信人"
 
-#: ../src/pref-manager.c:375
+#: ../src/pref-manager.c:425
 #, fuzzy
 msgid "Flat"
-msgstr "å¿«"
+msgstr "å¹³"
 
-#: ../src/pref-manager.c:377
+#: ../src/pref-manager.c:427
 msgid "JWZ"
-msgstr ""
+msgstr "JWZ"
 
 # src/pref-manager.c:117
 #. must NOT be modal
-#: ../src/pref-manager.c:428
+#: ../src/pref-manager.c:523
 msgid "Balsa Preferences"
 msgstr "Balsa é¦?é??项"
 
-# src/pref-manager.c:144
-#: ../src/pref-manager.c:451
-msgid "Mail Servers"
-msgstr "é?®ä»¶æ??å?¡å?¨"
-
-#: ../src/pref-manager.c:455 ../src/pref-manager.c:2579
-msgid "Address Books"
-msgstr "å?°å??ç°¿"
-
-#: ../src/pref-manager.c:459
-msgid "Mail Options"
+#: ../src/pref-manager.c:577
+msgid "Mail options"
 msgstr "é?®ä»¶é??项"
 
-# src/pref-manager.c:151
-#: ../src/pref-manager.c:463 ../src/pref-manager.c:1941
-msgid "Display"
-msgstr "�示"
+#: ../src/pref-manager.c:579
+msgid "Display options"
+msgstr "æ?¾ç¤ºé??项"
+
+#: ../src/pref-manager.c:581 ../src/pref-manager.c:2909
+msgid "Address books"
+msgstr "å?°å??ç°¿"
 
 # src/sendmsg-window.c:76
-#: ../src/pref-manager.c:467 ../src/toolbar-factory.c:120
+#: ../src/pref-manager.c:585 ../src/toolbar-factory.c:157
 msgid "Spelling"
 msgstr "æ?¼å??"
 
-# src/pref-manager.c:158 src/pref-manager.c:587
-#: ../src/pref-manager.c:471
-msgid "Misc"
-msgstr "��"
-
-#: ../src/pref-manager.c:475
+#: ../src/pref-manager.c:589
 msgid "Startup"
 msgstr "��"
 
-#: ../src/pref-manager.c:1209
-#, fuzzy, c-format
+#: ../src/pref-manager.c:591 ../src/pref-manager.c:2697
+msgid "Miscellaneous"
+msgstr "æ??项"
+
+#: ../src/pref-manager.c:1411
+#, c-format
 msgid "%s (default)"
-msgstr "设为�认�"
+msgstr "%s(�认)"
 
 # src/pref-manager.c:431
-#: ../src/pref-manager.c:1456
-msgid "Remote Mailbox Servers"
-msgstr "è¿?ç¨?é?®ä»¶ç®±æ??å?¡å?¨"
+#: ../src/pref-manager.c:1671
+msgid "Remote mailbox servers"
+msgstr "è¿?ç¨?é?®ç®±æ??å?¡å?¨"
 
 # src/pref-manager.c:440
-#: ../src/pref-manager.c:1477 ../src/pref-manager.c:2600
-#: ../src/sendmsg-window.c:2805
+#: ../src/pref-manager.c:1692 ../src/pref-manager.c:2930
+#: ../src/sendmsg-window.c:2978
 msgid "Type"
 msgstr "ç±»å??"
 
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
-#: ../src/pref-manager.c:1485
-msgid "Mailbox Name"
-msgstr "é?®ä»¶ç®±å??"
+#: ../src/pref-manager.c:1700
+msgid "Mailbox name"
+msgstr "é?®ç®±å??"
 
 # src/pref-manager.c:466
-#: ../src/pref-manager.c:1498 ../src/pref-manager.c:1584
-#: ../src/pref-manager.c:2631
-#, fuzzy
+#: ../src/pref-manager.c:1714 ../src/pref-manager.c:1787
+#: ../src/pref-manager.c:2965
 msgid "_Modify"
-msgstr "修�"
+msgstr "修�(_M)"
 
-# src/pref-manager.c:476
-#: ../src/pref-manager.c:1510
-#, fuzzy
-msgid "Local Mail"
-msgstr "���件"
+# src/pref-manager.c:481
+#: ../src/pref-manager.c:1728
+msgid "Local mail directory"
+msgstr "æ?¬å?°é?®ä»¶æ??件夹"
 
 # src/pref-manager.c:481
-#: ../src/pref-manager.c:1513 ../src/pref-manager.c:1521
+#: ../src/pref-manager.c:1730
 msgid "Select your local mail directory"
-msgstr "é??æ?©æ?¬å?°é?®ä»¶ç?®å½?"
+msgstr "é??æ?©æ?¬å?°é?®ä»¶æ??件夹"
 
 # src/pref-manager.c:488
-#: ../src/pref-manager.c:1549
-#, fuzzy
-msgid "Outgoing Mail Servers"
-msgstr "å¤?å??é?®ä»¶"
+#: ../src/pref-manager.c:1751
+msgid "Outgoing mail servers"
+msgstr "å??é??é?®ä»¶æ??å?¡å?¨"
 
 # src/filter-edit-dialog.c:536
-#: ../src/pref-manager.c:1571
-#, fuzzy
-msgid "Server Name"
-msgstr "æ??ç´¢å??å­?ï¼?"
+#: ../src/pref-manager.c:1773
+msgid "Server name"
+msgstr "æ??å?¡å?¨å??称"
+
+# src/pref-manager.c:144
+#: ../src/pref-manager.c:1813
+msgid "Mail servers"
+msgstr "é?®ä»¶æ??å?¡å?¨"
 
 # src/pref-manager.c:67
-#: ../src/pref-manager.c:1608
+#: ../src/pref-manager.c:1815
 msgid "Incoming"
 msgstr "��"
 
 # src/pref-manager.c:488
-#: ../src/pref-manager.c:1610
+#: ../src/pref-manager.c:1817
 msgid "Outgoing"
 msgstr "å??é??"
 
 # src/mailbox-conf.c:774 src/main-window.c:209
-#: ../src/pref-manager.c:1634
+#: ../src/pref-manager.c:1844
 msgid "Checking"
 msgstr "��"
 
-#: ../src/pref-manager.c:1639
-#, fuzzy
-msgid "_Check mail automatically every:"
-msgstr "�����件�"
+#: ../src/pref-manager.c:1850
+msgid "_Check mail automatically every"
+msgstr "è?ªå?¨æ£?æ?¥é?®ä»¶é?´é??(_C)"
 
-#: ../src/pref-manager.c:1650 ../src/pref-manager.c:2396
-#: ../src/pref-manager.c:2447
+#: ../src/pref-manager.c:1861 ../src/pref-manager.c:2720
+#: ../src/pref-manager.c:2780
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../src/pref-manager.c:1656
-#, fuzzy
+#: ../src/pref-manager.c:1868
 msgid "Check _IMAP mailboxes"
-msgstr "�� IMAP �件箱"
+msgstr "�� _IMAP �箱"
 
-#: ../src/pref-manager.c:1662
-#, fuzzy
+#: ../src/pref-manager.c:1874
 msgid "Check INBOX _only"
-msgstr "����件箱"
+msgstr "����件箱(_O)"
 
-#: ../src/pref-manager.c:1667
-#, fuzzy
-msgid "Display message if new mail has arrived in an open mailbox"
-msgstr "å¦?æ??æ?°é?®ä»¶å?°è¾¾å??æ?¾ç¤º"
+#: ../src/pref-manager.c:1881
+msgid "When mail arrives:"
+msgstr "��件�达��"
+
+#: ../src/pref-manager.c:1886
+msgid "Display message"
+msgstr "�示�件"
 
-#: ../src/pref-manager.c:1672
+# src/filter-edit-dialog.c:601
+#: ../src/pref-manager.c:1891
+msgid "Play sound"
+msgstr "��声�"
+
+#: ../src/pref-manager.c:1896
+msgid "Show icon"
+msgstr "�示��"
+
+#: ../src/pref-manager.c:1905
 msgid "Do background check quietly (no messages in status bar)"
-msgstr "å??å?°æ£?æ?¥(ç?¶æ??æ ?ä¸?æ?¾ç¤ºæ¶?æ?¯)"
+msgstr "å??å?°æ£?æ?¥(ç?¶æ??æ ?ä¸?æ?¾ç¤ºé?®ä»¶)"
 
-#: ../src/pref-manager.c:1676
+#: ../src/pref-manager.c:1910
 msgid "_POP message size limit:"
-msgstr ""
-
-#: ../src/pref-manager.c:1683
-msgid "MB"
-msgstr ""
+msgstr "_POP é?®ä»¶å¤§å°?é??å?¶ï¼?"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1702
+#: ../src/pref-manager.c:1938
 #, fuzzy
-msgid "Quoted and Flowed Text"
+msgid "Quoted and flowed text"
 msgstr "å¼?ç?¨æ??æ?¬"
 
-#: ../src/pref-manager.c:1706 ../src/sendmsg-window.c:4999
-msgid "Quoted Text Regular Expression"
-msgstr "å¼?ç?¨æ??æ?¬ç??æ­£å??表达å¼?"
+#: ../src/pref-manager.c:1943
+msgid "Mark quoted text"
+msgstr "æ ?è®°å¼?ç?¨æ??æ?¬"
 
-#: ../src/pref-manager.c:1717
-#, fuzzy
-msgid "Wrap Incoming Text at:"
-msgstr "å??å?ºç??é?®ä»¶è?ªå?¨æ?¢è¡?å?¨ï¼?"
+#: ../src/pref-manager.c:1948
+msgid ""
+"Quoted text\n"
+"regular expression:"
+msgstr ""
+"å¼?ç?¨ç??æ??æ?¬\n"
+"æ­£å??表达å¼?ï¼?"
 
-#: ../src/pref-manager.c:1728 ../src/pref-manager.c:1891
-#, fuzzy
+#: ../src/pref-manager.c:1957
+msgid "Wrap text at"
+msgstr "æ??æ?¬è?ªå?¨æ?¢è¡?ä½?ç½®"
+
+#: ../src/pref-manager.c:1968 ../src/pref-manager.c:2135
 msgid "characters"
 msgstr "�符"
 
+# src/balsa-message.c:159 src/balsa-message.c:162
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:1743
-msgid "Display of Multipart/Alternative Parts"
-msgstr ""
+#: ../src/pref-manager.c:1983
+msgid "Display of multipart/alternative parts"
+msgstr "æ?¾ç¤ºå¤?个å?ºæ®µ/å?¯é??å?ºæ®µ"
 
-#: ../src/pref-manager.c:1746
-msgid "prefer text/plain over html"
-msgstr ""
+#: ../src/pref-manager.c:1986
+msgid "Prefer text/plain over html"
+msgstr "å??å??äº?使ç?¨çº¯æ??æ?¬è??é?? html"
 
-#. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:1762
+#: ../src/pref-manager.c:2002
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 
 # src/pref-manager.c:151
-#: ../src/pref-manager.c:1768
-#, fuzzy
+#: ../src/pref-manager.c:2009
 msgid "display as \"?\""
-msgstr "�示格�"
+msgstr "æ?¾ç¤ºä¸ºâ???â??"
 
-#: ../src/pref-manager.c:1777
-#, fuzzy
-msgid "display using codeset"
-msgstr "��示信头"
+#: ../src/pref-manager.c:2018
+msgid "display in codeset"
+msgstr "æ?¾ç¤ºå?¨å­?符é??中"
 
 #. How to handle received MDN requests
-#: ../src/pref-manager.c:1809
+#: ../src/pref-manager.c:2048
 #, fuzzy
-msgid "Message Disposition Notification Requests"
-msgstr "é?®ä»¶é??读é??å??请æ±?"
+msgid "Message disposition notification requests"
+msgstr "è¦?æ±?é?®ä»¶é??读é??ç?¥"
 
-#: ../src/pref-manager.c:1811
+#: ../src/pref-manager.c:2050
+#, fuzzy
+#| msgid ""
+#| "When I receive a message and its sender requested to return a\n"
+#| "Message Disposition Notification (MDN), send it in the following cases:"
 msgid ""
-"When I receive a message and its sender requested to return a\n"
-"Message Disposition Notification (MDN), send it in the following cases:"
+"When I receive a message whose sender requested a Message Disposition "
+"Notification (MDN), send it if:"
 msgstr ""
-"å½?æ?¶å?°é?®ä»¶ä¸?å??é??è??请æ±?é?®ä»¶é??读é??å??(MDN)ï¼?å?¨ä¸?å??æ??å?µä¸?\n"
-"å??é??é??å??ï¼?"
+"å½?æ?¶å?°å??é??è??è¦?æ±?é?®ä»¶é??读é??ç?¥(MDN)ç??é?®ä»¶æ?¶ï¼?å?¨ä¸?å??æ??å?µä¸?\n"
+"å??é??é??ç?¥ï¼?"
 
-#: ../src/pref-manager.c:1822
-#, fuzzy
+#: ../src/pref-manager.c:2062
 msgid ""
 "The message header looks clean\n"
-"(the notify-to address is equal to the return path,\n"
-"I am in the \"To:\" or \"Cc:\" list)."
+"(the notify-to address is the return path,\n"
+"and I am in the \"To:\" or \"Cc:\" list)."
 msgstr ""
-"�件头��\n"
-"(notify-to å?°å??å??è¿?å??è·¯å¾?ä¸?è?´ï¼?æ??å?¨æ?¶ä»¶äººæ??æ??é??å??表ä¸?)"
+"信头正确\n"
+"(é??ç?¥å?°å??æ?¯å??å¤?è·¯å¾?ï¼?\n"
+"并ä¸?æ??å?¨ â??å??é??å?°ï¼?â??æ??â??æ??é??ï¼?â??å??表中)ã??"
 
-#: ../src/pref-manager.c:1837
-#, fuzzy
+#: ../src/pref-manager.c:2079
 msgid "The message header looks suspicious."
-msgstr "é?®ä»¶å¤´æ??é?®é¢?"
+msgstr "é?®ä»¶ç??信头å?¯ç??ã??"
 
-#: ../src/pref-manager.c:1872
-msgid "Word Wrap"
-msgstr "����"
+#: ../src/pref-manager.c:2116
+msgid "Word wrap"
+msgstr "å??è¯?æ?¢è¡?"
 
-#: ../src/pref-manager.c:1877
-msgid "Wrap Outgoing Text at:"
-msgstr "å??å?ºç??é?®ä»¶è?ªå?¨æ?¢è¡?å?¨ï¼?"
+#: ../src/pref-manager.c:2121
+msgid "Wrap outgoing text at"
+msgstr "å??å?ºç??é?®ä»¶è?ªå?¨æ?¢è¡?äº?"
 
-#: ../src/pref-manager.c:1905
-#, fuzzy
-msgid "Other Options"
-msgstr "å?¶å®?é??项"
+#: ../src/pref-manager.c:2149
+msgid "Other options"
+msgstr "å?¶ä»?é??项"
 
 # src/pref-manager.c:601
-#: ../src/pref-manager.c:1910
-#, fuzzy
-msgid "Reply Prefix:"
+#: ../src/pref-manager.c:2154
+msgid "Reply prefix:"
 msgstr "å??å¤?å??ç¼?ï¼?"
 
-#: ../src/pref-manager.c:1913
-msgid "Edit headers in external editor"
-msgstr ""
-
-#: ../src/pref-manager.c:1915
+#: ../src/pref-manager.c:2157
 msgid "Automatically quote original when replying"
 msgstr "å??å¤?æ?¶è?ªå?¨å¼?ç?¨å??æ??"
 
-#: ../src/pref-manager.c:1918
-msgid "Don't include HTML parts as text when replying or forwarding mail"
-msgstr "å½?å??å¤?æ??转å??é?®ä»¶æ?¶æ­£æ??ä¸?å??æ?¬ HTML å??容"
-
-#: ../src/pref-manager.c:1921
+#: ../src/pref-manager.c:2160
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "å°?é?®ä»¶ä½?为é??件转å??è??ä¸?æ?¯å¼?ç?¨å®?"
 
-#: ../src/pref-manager.c:1924
+#: ../src/pref-manager.c:2163
+msgid "Copy outgoing messages to sentbox"
+msgstr "æ­£å?¨å°?é?®ä»¶å¤?å?¶å?°å??件箱"
+
+#: ../src/pref-manager.c:2165
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "å??é??æ??é?®æ?»æ?¯å°?å??é??é?®ä»¶ç¼?å­?å?°å??件箱中"
 
-#: ../src/pref-manager.c:1927
-msgid "Copy outgoing messages to sentbox"
-msgstr "æ­£å?¨å°?é?®ä»¶å¤?å?¶å?°å??件箱"
+#: ../src/pref-manager.c:2168
+msgid "Edit headers in external editor"
+msgstr "������中��信头"
+
+#: ../src/pref-manager.c:2170
+msgid "Include HTML parts as text when replying or forwarding"
+msgstr "å½?å??å¤?æ??转å??以æ??æ?¬æ ¼å¼?å??å?« HTML å?ºæ®µ"
+
+# src/sendmsg-window.c:685 src/sendmsg-window.c:688
+#: ../src/pref-manager.c:2187
+msgid "Layout"
+msgstr "��"
+
+#: ../src/pref-manager.c:2189
+#, fuzzy
+msgid "Sort and thread"
+msgstr "_JWZ 线索"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:1944
-msgid "Status Messages"
-msgstr "ç?¶æ??ä¿¡æ?¯"
+#: ../src/pref-manager.c:2191 ../src/print-gtk.c:489
+msgid "Message"
+msgstr "�件"
 
 # src/main-window.c:161
-#: ../src/pref-manager.c:1946
+#: ../src/pref-manager.c:2193
 msgid "Colors"
 msgstr "��"
 
-# src/main-window.c:200
-#: ../src/pref-manager.c:1948
-#, fuzzy
-msgid "Message"
-msgstr "�件(_M)"
+#: ../src/pref-manager.c:2195 ../src/pref-manager.c:2286
+msgid "Format"
+msgstr "格�"
 
-#: ../src/pref-manager.c:1950
-msgid "Sort and Thread"
-msgstr ""
+# src/main-window.c:200
+#: ../src/pref-manager.c:2197
+msgid "Status messages"
+msgstr "ç?¶æ??æ¶?æ?¯"
 
 # src/pref-manager.c:555
-#: ../src/pref-manager.c:1975
-#, fuzzy
-msgid "Main Window"
+#: ../src/pref-manager.c:2222 ../src/toolbar-prefs.c:168
+msgid "Main window"
 msgstr "主��"
 
 # src/pref-manager.c:558
-#: ../src/pref-manager.c:1978
+#: ../src/pref-manager.c:2225
 msgid "Use preview pane"
 msgstr "使�����"
 
-#: ../src/pref-manager.c:1980
+#: ../src/pref-manager.c:2227
 msgid "Show mailbox statistics in left pane"
-msgstr "�左���示�件箱�计��"
-
-#: ../src/pref-manager.c:1982
-msgid "Use alternative main window layout"
-msgstr "使ç?¨å?¶å®?ç??主çª?å?£å¸?å±?"
+msgstr "�左侧���示�箱�计"
 
-#: ../src/pref-manager.c:1984
+#: ../src/pref-manager.c:2231
 msgid "Automatically view message when mailbox opened"
-msgstr "å½?æ??å¼?é?®ä»¶ç®±æ?¶è?ªå?¨æ?¥ç??é?®ä»¶"
+msgstr "å½?æ??å¼?é?®ç®±æ?¶è?ªå?¨æ?¥ç??é?®ä»¶"
+
+#: ../src/pref-manager.c:2234
+msgid "Ask me before selecting a different mailbox to show an unread message"
+msgstr "å?¨é??æ?©å?¦ä¸?个é?®ç®±æ?¥æ?¾ç¤ºæ?ªè¯»é?®ä»¶æ?¶è¯¢é?®æ??"
 
-#: ../src/pref-manager.c:1990
-msgid "PageUp/PageDown keys scroll message by:"
-msgstr "PageUp/PageDown æ??é?®å?·å?¨é?®ä»¶ï¼?"
+#: ../src/pref-manager.c:2240
+msgid "PageUp/PageDown keys scroll text by"
+msgstr "PageUp/PageDown é?®æ»?å?¨æ??æ?¬ç??å¹?度"
 
-#: ../src/pref-manager.c:2001
+#: ../src/pref-manager.c:2251
 msgid "percent"
 msgstr "ç?¾å??æ¯?"
 
-#: ../src/pref-manager.c:2016
-#, fuzzy
-msgid "Display Progress Dialog"
-msgstr "�示�度对�"
-
-#: ../src/pref-manager.c:2036
-msgid "Encoding"
-msgstr "ç¼?ç ?"
+#: ../src/pref-manager.c:2266
+msgid "Display progress dialog"
+msgstr "�示�度对��"
 
-#: ../src/pref-manager.c:2041
+#: ../src/pref-manager.c:2291
 msgid "Date encoding (for strftime):"
 msgstr "æ?¥æ??ç¼?ç ?(strftime 使ç?¨)ï¼?"
 
-#: ../src/pref-manager.c:2043
+#: ../src/pref-manager.c:2293
 msgid "Selected headers:"
-msgstr "é??中ç??信头ï¼?"
+msgstr "é??æ?©ç??信头ï¼?"
+
+# src/main-window.c:213
+#: ../src/pref-manager.c:2315
+msgid "Information messages"
+msgstr "é??ç?¥æ¶?æ?¯"
 
 # src/main-window.c:213
-#: ../src/pref-manager.c:2064 ../src/pref-manager.c:2069
-msgid "Information Messages"
-msgstr "ä¿¡æ?¯"
+#: ../src/pref-manager.c:2320
+msgid "Information messages:"
+msgstr "é??ç?¥æ¶?æ?¯ï¼?"
 
-#: ../src/pref-manager.c:2073
-msgid "Warning Messages"
-msgstr "è­¦å??ä¿¡æ?¯"
+#: ../src/pref-manager.c:2324
+msgid "Warning messages:"
+msgstr "è­¦å??æ¶?æ?¯ï¼?"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:2077
-msgid "Error Messages"
-msgstr "é??误信æ?¯"
+#: ../src/pref-manager.c:2328
+msgid "Error messages:"
+msgstr "é??误æ¶?æ?¯ï¼?"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:2081
-msgid "Fatal Error Messages"
-msgstr "严é??é??误信æ?¯"
+#: ../src/pref-manager.c:2332
+msgid "Fatal error messages:"
+msgstr "è?´å?½é??误æ¶?æ?¯ï¼?"
 
 # src/main-window.c:211
-#: ../src/pref-manager.c:2085
-msgid "Debug Messages"
-msgstr "��信�"
+#: ../src/pref-manager.c:2336
+msgid "Debug messages:"
+msgstr "�����"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:2111
-msgid "Message Colors"
+#: ../src/pref-manager.c:2362
+msgid "Message colors"
 msgstr "�件��"
 
-#: ../src/pref-manager.c:2116
+#: ../src/pref-manager.c:2367
 #, c-format
 msgid "Quote level %d color"
 msgstr "��级� %d ��"
 
 # src/main-window.c:161
-#: ../src/pref-manager.c:2129
-msgid "Link Color"
+#: ../src/pref-manager.c:2380
+msgid "Link color"
 msgstr "����"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:2382
 msgid "Hyperlink color"
-msgstr "�级����"
+msgstr "�����"
 
 # src/main-window.c:213
-#: ../src/pref-manager.c:2142
-#, fuzzy
-msgid "Composition Window"
+#: ../src/pref-manager.c:2393
+msgid "Composition window"
 msgstr "æ?°å??çª?å?£"
 
-#: ../src/pref-manager.c:2146
+#: ../src/pref-manager.c:2397
 msgid "Invalid or incomplete address label color"
-msgstr ""
+msgstr "æ? æ??æ??ä¸?å®?æ?´ç??å?°å??æ ?ç­¾é¢?è?²"
 
-#: ../src/pref-manager.c:2171
+#: ../src/pref-manager.c:2483 ../src/print-gtk.c:498
 msgid "Fonts"
 msgstr "å­?ä½?"
 
 # src/main-window.c:200
-#: ../src/pref-manager.c:2175
-#, fuzzy
-msgid "Message Font"
-msgstr "�件(_M)"
+#: ../src/pref-manager.c:2487
+msgid "Message font:"
+msgstr "�件���"
 
-# src/main-window.c:200
-#: ../src/pref-manager.c:2187
-#, fuzzy
-msgid "Message Subject Font"
-msgstr "�件��"
+# src/balsa-message.c:558 src/sendmsg-window.c:358
+#: ../src/pref-manager.c:2492
+msgid "Subject font:"
+msgstr "主����"
+
+#: ../src/pref-manager.c:2498
+msgid "Use default font size"
+msgstr "使��认��大�"
 
-#: ../src/pref-manager.c:2218
+#: ../src/pref-manager.c:2546
 #, fuzzy
-msgid "Sorting and Threading"
+msgid "Sorting and threading"
 msgstr "_JWZ 线索"
 
-#: ../src/pref-manager.c:2222
-#, fuzzy
-msgid "Default sort column"
-msgstr "�认"
+#: ../src/pref-manager.c:2550
+msgid "Default sort column:"
+msgstr "é»?认æ??åº?å??ï¼?"
 
-#: ../src/pref-manager.c:2226
+#: ../src/pref-manager.c:2554
 #, fuzzy
-msgid "Default threading style"
+msgid "Default threading style:"
 msgstr "�线索"
 
-#: ../src/pref-manager.c:2231
+#: ../src/pref-manager.c:2559
 #, fuzzy
 msgid "Expand threads on open"
 msgstr "å±?å¼?æ??æ??线索"
 
 # src/sendmsg-window.c:76
-#: ../src/pref-manager.c:2307
-msgid "Pspell Settings"
-msgstr "æ?¼å??设置"
+#: ../src/pref-manager.c:2634
+msgid "Pspell settings"
+msgstr "Pspell 设置"
 
-#: ../src/pref-manager.c:2313
-msgid "Spell Check Module"
+#: ../src/pref-manager.c:2640
+msgid "Spell check module"
 msgstr "æ?¼å??æ£?æ?¥æ¨¡å??"
 
-#: ../src/pref-manager.c:2319
-msgid "Suggestion Level"
-msgstr "æ??示级å?«"
+#: ../src/pref-manager.c:2646
+msgid "Suggestion level"
+msgstr "建议级�"
 
 #. do the ignore length
-#: ../src/pref-manager.c:2324
+#: ../src/pref-manager.c:2651
 msgid "Ignore words shorter than"
-msgstr "忽ç?¥å??è¯?ç?­äº?"
+msgstr "忽ç?¥å??è¯?ï¼?è?¥ç?­äº?"
 
-#: ../src/pref-manager.c:2345
-#, fuzzy
-msgid "Miscellaneous Spelling Settings"
-msgstr "å?¶å®?æ?¼å??设置"
+#: ../src/pref-manager.c:2669
+msgid "Miscellaneous spelling settings"
+msgstr "å?¶ä»?æ?¼å??设置"
 
 # src/pref-manager.c:397
-#: ../src/pref-manager.c:2347
+#: ../src/pref-manager.c:2671
 msgid "Check signature"
 msgstr "æ£?æ?¥ç­¾å??"
 
-#: ../src/pref-manager.c:2348
+#: ../src/pref-manager.c:2672
 msgid "Check quoted"
 msgstr "����"
 
-#: ../src/pref-manager.c:2373
-msgid "Miscellaneous"
-msgstr ""
-
 # src/pref-manager.c:594
-#: ../src/pref-manager.c:2375
+#: ../src/pref-manager.c:2699
 msgid "Debug"
 msgstr "��"
 
-#: ../src/pref-manager.c:2376
-msgid "Empty Trash on exit"
-msgstr "é??å?ºæ?¶æ¸?空åº?纸ç¯?"
+#: ../src/pref-manager.c:2700
+#, fuzzy
+#| msgid "Empty Trash on exit"
+msgid "Empty trash on exit"
+msgstr "é??å?ºæ?¶æ¸?空åº?件箱"
 
-#: ../src/pref-manager.c:2382
-msgid "Automatically close mailbox if unused more than"
-msgstr "è?ªå?¨å?³é?­é?®ä»¶ç®±ï¼?å¦?æ??æ?ªä½¿ç?¨æ?¶é?´è¶?è¿?"
+#: ../src/pref-manager.c:2707
+msgid "Close mailbox if unused more than"
+msgstr "è?ªå?¨å?³é?­é?®ç®±ï¼?å¦?æ??æ?ªä½¿ç?¨æ?¶é?´è¶?è¿?"
 
 # src/main-window.c:211
-#: ../src/pref-manager.c:2410
-#, fuzzy
-msgid "Deleting Messages"
-msgstr "��信�"
+#: ../src/pref-manager.c:2735
+msgid "Deleting messages"
+msgstr "���件"
 
-#: ../src/pref-manager.c:2412
+#. Translators: this used to be "using Mailbox -> Hide messages";
+#. * the UTF-8 string for the right-arrow symbol is broken out to
+#. * avoid msgconv problems.
+#: ../src/pref-manager.c:2740
+#, c-format
 msgid ""
-"The following setting is global, but may be overridden\n"
-"for the selected mailbox using Mailbox -> Hide messages:"
+"The following setting is global, but may be overridden for the selected "
+"mailbox using Mailbox %s Hide messages:"
 msgstr ""
 
-#: ../src/pref-manager.c:2420
-#, fuzzy
+#: ../src/pref-manager.c:2752
 msgid "Hide messages marked as deleted"
-msgstr "æ­£å?¨æ ?è®°è¦?å? é?¤ç?? %d 个é?®ä»¶..."
+msgstr "é??è??æ ?记为å? é?¤ç??é?®ä»¶"
 
-#: ../src/pref-manager.c:2422
-msgid "The following settings are global."
-msgstr ""
+#: ../src/pref-manager.c:2754
+msgid "The following settings are global:"
+msgstr "以ä¸?设置æ?¯å?¨å±?ç??ï¼?"
 
-#: ../src/pref-manager.c:2427
-#, fuzzy
+#: ../src/pref-manager.c:2760
 msgid "Expunge deleted messages when mailbox is closed"
-msgstr "å½?æ??å¼?é?®ä»¶ç®±æ?¶è?ªå?¨æ?¥ç??é?®ä»¶"
+msgstr "å?¨å?³é?­é?®ç®±æ?¶æ¸?é?¤å? é?¤ç??é?®ä»¶"
 
-#: ../src/pref-manager.c:2434
-#, fuzzy
-msgid " ...and if mailbox is unused more than"
-msgstr "è?ªå?¨å?³é?­é?®ä»¶ç®±ï¼?å¦?æ??æ?ªä½¿ç?¨æ?¶é?´è¶?è¿?"
+#: ../src/pref-manager.c:2767
+msgid "...and if unused more than"
+msgstr "...并ä¸?å¦?æ??ä¸?使ç?¨è¶?è¿?"
 
 # src/pref-manager.c:555
-#: ../src/pref-manager.c:2460
-#, fuzzy
-msgid "Message Window"
+#: ../src/pref-manager.c:2792 ../src/toolbar-prefs.c:182
+msgid "Message window"
 msgstr "�件��"
 
-#: ../src/pref-manager.c:2462
-msgid "Action after moving/trashing a message"
-msgstr ""
+# src/main-window.c:200
+#: ../src/pref-manager.c:2797
+msgid "After moving a message:"
+msgstr "å?¨ç§»å?¨é?®ä»¶å??ï¼?"
 
-# src/filter-edit-dialog.c:707
-#: ../src/pref-manager.c:2497
-msgid "Options"
-msgstr "é??项"
+# src/pref-manager.c:538
+#: ../src/pref-manager.c:2826
+msgid "Startup options"
+msgstr "å?¯å?¨é??项"
 
-#: ../src/pref-manager.c:2500
+#: ../src/pref-manager.c:2829
 msgid "Open Inbox upon startup"
 msgstr "å?¯å?¨æ?¶æ??å¼?æ?¶ä»¶ç®±"
 
-#: ../src/pref-manager.c:2502
+#: ../src/pref-manager.c:2831
 msgid "Check mail upon startup"
 msgstr "������件"
 
-#: ../src/pref-manager.c:2504
+#: ../src/pref-manager.c:2833
 msgid "Remember open mailboxes between sessions"
 msgstr "å?¨ä¼?è¯?中记ä½?æ??å¼?ç??é?®ä»¶ç®±"
 
-#: ../src/pref-manager.c:2518
-msgid "Folder Scanning"
-msgstr ""
+#: ../src/pref-manager.c:2847
+msgid "Folder scanning"
+msgstr "æ??件夹æ?«æ??"
 
-#: ../src/pref-manager.c:2520
+#: ../src/pref-manager.c:2849
 msgid ""
-"Choose depth 1 for fast startup; this defers scanning some folders.\n"
-"To see more of the tree at startup, choose a greater depth."
+"Choose depth 1 for fast startup; this defers scanning some folders.  To see "
+"more of the tree at startup, choose a greater depth."
 msgstr ""
+"è¦?å¿«é??å?¯å?¨ï¼?é??æ?©æ·±åº¦1ã??è¿?å°?延è¿?æ?«æ??ä¸?äº?æ??件夹ã??æ?³å?¨å?¯å?¨æ?¶ç??å?°æ ?ç??æ?´å¤?å??容ï¼?é??"
+"æ?©å¤§ä¸?äº?ç??深度ã??"
 
-#: ../src/pref-manager.c:2530
+#: ../src/pref-manager.c:2860
 msgid "Scan local folders to depth"
-msgstr ""
+msgstr "æ??ç´¢æ?¬å?°æ??件夹ç??深度"
 
 # src/mailbox-conf.c:648
-#: ../src/pref-manager.c:2543
-#, fuzzy
+#: ../src/pref-manager.c:2873
 msgid "Scan IMAP folders to depth"
-msgstr "è¿?ç¨? IMAP æ??件夹é??å??"
+msgstr "IMAP æ??件夹æ?«æ??深度"
 
-#: ../src/pref-manager.c:2608
-msgid "Address Book Name"
-msgstr "å?°å??ç°¿å??"
+#: ../src/pref-manager.c:2938
+msgid "Address book name"
+msgstr "å?°å??ç°¿å??称"
 
-#: ../src/pref-manager.c:2616
-msgid "Expand aliases"
-msgstr "å±?å¼?å?«å??"
+#: ../src/pref-manager.c:2946
+msgid "Auto-complete"
+msgstr "è?ªå?¨å®?æ??"
 
-#: ../src/pref-manager.c:2635
-#, fuzzy
+#: ../src/pref-manager.c:2971
 msgid "_Set as default"
-msgstr "设为�认�"
+msgstr "设为�认�(_S)"
 
-#: ../src/pref-manager.c:2949
+#: ../src/pref-manager.c:3276
 msgid "Remote POP3 mailbox..."
-msgstr "�� POP3 �件箱..."
+msgstr "�� POP3 �箱..."
 
-#: ../src/pref-manager.c:3072
+#: ../src/pref-manager.c:3408
 msgid "Show nothing"
 msgstr "��示"
 
-#: ../src/pref-manager.c:3074
+#: ../src/pref-manager.c:3410
 msgid "Show dialog"
 msgstr "�示对�"
 
-#: ../src/pref-manager.c:3076
+#: ../src/pref-manager.c:3412
 msgid "Show in list"
 msgstr "å?¨å??表中æ?¾ç¤º"
 
-#: ../src/pref-manager.c:3078
-#, fuzzy
+#: ../src/pref-manager.c:3414
 msgid "Show in status bar"
-msgstr "å?¨å??表中æ?¾ç¤º"
+msgstr "å?¨ç?¶æ??æ ?中æ?¾ç¤º"
 
-#: ../src/pref-manager.c:3080
+#: ../src/pref-manager.c:3416
 msgid "Print to console"
 msgstr "æ??å?°å?°æ?§å?¶å?°"
 
-#: ../src/pref-manager.c:3091
+#: ../src/pref-manager.c:3427
 msgid "Ask me"
 msgstr "询�"
 
+#: ../src/pref-manager.c:3543
+msgid "Default layout"
+msgstr "�认��"
+
+# src/main-window.c:139
+#: ../src/pref-manager.c:3544
+msgid "Wide message layout"
+msgstr "宽��件��"
+
+#: ../src/pref-manager.c:3545
+msgid "Wide screen layout"
+msgstr "宽���"
+
 # src/main-window.c:211
-#: ../src/pref-manager.c:3168
-#, fuzzy
+#: ../src/pref-manager.c:3553
 msgid "Show next unread message"
-msgstr "���读�件"
+msgstr "�示����读�件"
 
 # src/main-window.c:219
-#: ../src/pref-manager.c:3169
-#, fuzzy
+#: ../src/pref-manager.c:3554
 msgid "Show next message"
-msgstr "���件"
+msgstr "�示����件"
 
 # src/main-window.c:213
-#: ../src/pref-manager.c:3170
-#, fuzzy
+#: ../src/pref-manager.c:3555
 msgid "Close message window"
-msgstr "æ­£å?¨å?³é?­æ?°å??çª?å?£"
+msgstr "���件��"
 
-#: ../src/pref-manager.c:3194
-#, fuzzy, c-format
+#: ../src/pref-manager.c:3596
+#, c-format
 msgid "Error displaying link_id %s: %s\n"
-msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
+msgstr "�示 link_id %s 失败�%s\n"
 
-#: ../src/print.c:246 ../src/print.c:727
+# src/main-window.c:211
+#: ../src/print-gtk.c:91 ../src/print-gtk.c:242
 #, c-format
-msgid "Page: %i/%i"
-msgstr "页�%i/%i"
+msgid "Page %d of %d"
+msgstr "页 %d / %d"
 
-#: ../src/print.c:662
-msgid ""
-"Preparing an HTML part, which must start on a new page.\n"
-"Print this part?"
-msgstr ""
-
-#: ../src/print.c:675
-#, fuzzy, c-format
-msgid "Could not get part: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
-
-# src/pref-manager.c:440
-#. gather some info about this part
-#. four fields, one terminator
-#: ../src/print.c:981
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
+#: ../src/print-gtk.c:145 ../src/print-gtk.c:164
+#, fuzzy
+msgid "Signed and encrypted matter"
+msgstr "POP �令��失败"
 
-# src/filter-edit-dialog.c:456
-#: ../src/print.c:984
+# src/pref-manager.c:397
+#: ../src/print-gtk.c:149 ../src/print-gtk.c:168
 #, fuzzy
-msgid "File name:"
-msgstr "æ??件å??ï¼?"
+msgid "Signed matter"
+msgstr "é??å? ç­¾å??"
 
-#: ../src/print.c:1300
+#: ../src/print-gtk.c:192
 #, c-format
 msgid "This is an inline %s signed %s message part:"
 msgstr ""
 
-#: ../src/print.c:1547
-msgid "Font available for printing"
-msgstr ""
-
-#: ../src/print.c:1553
+#: ../src/print-gtk.c:346
 #, c-format
-msgid "Font <b>not</b> available for printing. Closest: %s"
-msgstr ""
+msgid "Cannot print page %d because the document has only %d pages."
+msgstr "æ? æ³?æ??å?°ç¬¬ %d 页ï¼?å? ä¸ºæ??æ¡£å?ªæ?? %d 页ã??"
 
-# src/main-window.c:215
-#: ../src/print.c:1566
-#, fuzzy
-msgid "Select Font"
-msgstr "é??中æ??å­?(_S)"
+#. Translate to the default units to use for presenting
+#. * lengths to the user. Translate to default:inch if you
+#. * want inches, otherwise translate to default:mm.
+#. * Do *not* translate it to "predefinito:mm", if it
+#. * it isn't default:mm or default:inch it will not work
+#.
+#: ../src/print-gtk.c:380
+msgid "default:mm"
+msgstr "�认:毫米"
 
-#: ../src/print.c:1599
-#, fuzzy
-msgid "Change..."
-msgstr "正�载�..."
+#: ../src/print-gtk.c:437
+msgid "inch"
+msgstr "�寸"
 
-# src/main-window.c:222
-#: ../src/print.c:1634
-msgid "Print message"
-msgstr "æ??å?°é?®ä»¶"
-
-#. create a 2nd notebook page for the fonts
-#: ../src/print.c:1645
-#, fuzzy
-msgid "_Fonts"
-msgstr "å­?ä½?"
+#: ../src/print-gtk.c:444
+msgid "mm"
+msgstr "毫米"
 
 # src/filter-edit-dialog.c:267
-#: ../src/print.c:1648
-#, fuzzy
-msgid "Header font"
-msgstr "信头"
+#: ../src/print-gtk.c:519
+msgid "_Header Font:"
+msgstr "信头��(_H)�"
 
 # src/filter-edit-dialog.c:279
-#: ../src/print.c:1650
-#, fuzzy
-msgid "Body font"
-msgstr "ä¿¡ä½?"
+#: ../src/print-gtk.c:522
+msgid "B_ody Font:"
+msgstr "主���(_O)�"
 
-#: ../src/print.c:1652
-msgid "Footer font"
-msgstr ""
+# src/filter-edit-dialog.c:456
+#: ../src/print-gtk.c:525
+msgid "_Footer Font:"
+msgstr "页è??å­?ä½?(_F)ï¼?"
 
-#. highlight cited stuff
-#: ../src/print.c:1656
-msgid "Highlight cited text"
-msgstr ""
+#: ../src/print-gtk.c:532
+msgid "Highlighting"
+msgstr "�亮"
 
-#: ../src/print.c:1660
-msgid "_Enable highlighting of cited text"
-msgstr ""
+#: ../src/print-gtk.c:547
+msgid "Highlight _cited text"
+msgstr "é«?亮æ?¾ç¤ºå¼?ç?¨æ??æ?¬(_C)"
 
-#: ../src/print.c:1686
-#, c-format
-msgid ""
-"Balsa could not find font \"%s\".\n"
-"Use the \"Fonts\" page on the \"Print message\" dialog to change it."
+#: ../src/print-gtk.c:556
+msgid "Highlight _structured phrases"
 msgstr ""
 
-#: ../src/print.c:1787
-msgid "Balsa: message print preview"
-msgstr "Balsaï¼?é?®ä»¶æ??å?°é¢?è§?"
+#: ../src/print-gtk.c:567
+msgid "Margins"
+msgstr "页边�"
+
+# src/balsa-message.c:526 src/filter-edit-dialog.c:291
+# src/sendmsg-window.c:315
+#: ../src/print-gtk.c:589
+msgid "_Top"
+msgstr "顶�(_T)"
+
+#: ../src/print-gtk.c:595
+msgid "_Bottom"
+msgstr "��(_B)"
+
+#: ../src/print-gtk.c:607
+msgid "_Left"
+msgstr "左侧(_L)"
+
+#: ../src/print-gtk.c:613
+msgid "_Right"
+msgstr "�侧(_R)"
+
+# src/sendmsg-window.c:71
+#: ../src/print-gtk.c:739
+#, c-format
+msgid "Error printing message: %s"
+msgstr "æ??å?°é?®ä»¶æ?¶å??ç??é??误ï¼?%s"
 
-#: ../src/save-restore.c:631
+#: ../src/save-restore.c:601
 msgid "Error during filters loading: "
-msgstr ""
+msgstr "è½½å?¥è¿?滤è§?å??æ?¶å?ºé??ï¼?"
 
-#: ../src/save-restore.c:633
-#, fuzzy, c-format
+#: ../src/save-restore.c:603
+#, c-format
 msgid ""
 "Error during filters loading: %s\n"
 "Filters may not be correct."
-msgstr "æ? æ³?读å??æ??件 %s\n"
+msgstr ""
+"å?¨è½½å?¥è¿?滤è§?å??æ?¶å?ºé??ï¼?%s\n"
+"è¿?滤è§?å??å?¯è?½ä¸?正确ã??"
 
-#: ../src/save-restore.c:748
+#: ../src/save-restore.c:727
 msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgstr ""
 
-#: ../src/save-restore.c:1004
+#: ../src/save-restore.c:1008
 msgid ""
-"The option not to send \"format=flowed\" is now on the Options menu of the "
-"compose window."
+"The option not to send \"format=flowed\" text is now on the Options menu of "
+"the compose window."
 msgstr ""
 
-#: ../src/save-restore.c:1036
+#: ../src/save-restore.c:1040
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 
-#: ../src/save-restore.c:1843
-msgid "Filter with no condition was ignored"
+#: ../src/save-restore.c:1122
+msgid ""
+"This version of Balsa uses a new user interface; if you have changed Balsa's "
+"keyboard accelerators, you will need to set them again."
 msgstr ""
+"æ­¤ç??æ?¬ç?? Balsa 使ç?¨äº?æ?°ç??ç?¨æ?·ç??é?¢ï¼?å¦?æ??æ?¨ä¿®æ?¹äº? Balsa ç??é?®ç??å¿«æ?·é?®ï¼?é??è¦?é??æ?°"
+"设置å®?们ã??"
 
-#: ../src/save-restore.c:2040
-#, fuzzy
+#: ../src/save-restore.c:2154
 msgid "Error opening GConf database\n"
-msgstr "æ??å¼?é?®ä»¶ç®±æ?¶å??ç??é??误"
+msgstr "æ??å¼? GConf æ?°æ?®åº?æ?¶å?ºé??\n"
 
-#: ../src/save-restore.c:2048 ../src/save-restore.c:2059
+#: ../src/save-restore.c:2162 ../src/save-restore.c:2173
 #, c-format
 msgid "Error setting GConf field: %s\n"
-msgstr ""
+msgstr "设置 GConf �段失败�%s\n"
 
-#: ../src/sendmsg-window.c:211
+#. Translators: please use the initial letter of each language as
+#. * its accelerator; this is a long list, and unique accelerators
+#. * cannot be found.
+#: ../src/sendmsg-window.c:257
 #, fuzzy
-msgid "_Brazilian"
-msgstr "西ç?­ç??语"
+msgid "_Brazilian Portuguese"
+msgstr "西ç?­ç??语(_C)"
 
-#: ../src/sendmsg-window.c:212
+#: ../src/sendmsg-window.c:258
 #, fuzzy
 msgid "_Catalan"
-msgstr "�泰�尼�语"
+msgstr "�泰�尼�语(_C)"
 
-#: ../src/sendmsg-window.c:213
-#, fuzzy
+#: ../src/sendmsg-window.c:259
 msgid "_Chinese Simplified"
-msgstr "ç®?ä½?中æ??"
+msgstr "ç®?ä½?中æ??(_C)"
 
-#: ../src/sendmsg-window.c:214
-#, fuzzy
+#: ../src/sendmsg-window.c:260
 msgid "_Chinese Traditional"
-msgstr "ç¹?ä½?中æ??"
+msgstr "ç¹?ä½?中æ??(_C)"
 
 # src/balsa-message.c:534
-#: ../src/sendmsg-window.c:215
+#: ../src/sendmsg-window.c:261
 #, fuzzy
 msgid "_Czech"
-msgstr "æ??é??(_C)"
+msgstr "æ?·å??语(_C)"
 
 # src/balsa-init.c:533
-#: ../src/sendmsg-window.c:216
+#: ../src/sendmsg-window.c:262
 #, fuzzy
 msgid "_Danish"
 msgstr "丹麦语"
 
 # src/filter-edit-dialog.c:704
-#: ../src/sendmsg-window.c:217
+#: ../src/sendmsg-window.c:263
 #, fuzzy
 msgid "_Dutch"
 msgstr "��语"
 
-#: ../src/sendmsg-window.c:218
+#: ../src/sendmsg-window.c:264
 msgid "_English (American)"
-msgstr ""
+msgstr "�语(��)(_E)"
 
-#: ../src/sendmsg-window.c:219
+#: ../src/sendmsg-window.c:265
 msgid "_English (British)"
-msgstr ""
+msgstr "�语(��)(_E)"
 
-#: ../src/sendmsg-window.c:220
+#: ../src/sendmsg-window.c:266
 msgid "_Esperanto"
-msgstr ""
+msgstr "ä¸?ç??语(_E)"
 
-#: ../src/sendmsg-window.c:221
+#: ../src/sendmsg-window.c:267
 #, fuzzy
 msgid "_Estonian"
-msgstr "��尼�语"
+msgstr "��尼�语(_E)"
 
 # src/balsa-init.c:533
-#: ../src/sendmsg-window.c:222
+#: ../src/sendmsg-window.c:268
 #, fuzzy
 msgid "_Finnish"
-msgstr "��语"
+msgstr "��语(_F)"
 
-#: ../src/sendmsg-window.c:223
+#: ../src/sendmsg-window.c:269
 #, fuzzy
 msgid "_French"
-msgstr "�语"
+msgstr "�语(_F)"
 
-#: ../src/sendmsg-window.c:224
+#: ../src/sendmsg-window.c:270
 #, fuzzy
 msgid "_German"
-msgstr "德语"
+msgstr "德语(_G)"
 
-#: ../src/sendmsg-window.c:225
+#: ../src/sendmsg-window.c:271
+msgid "_German (Austrian)"
+msgstr "德语(奥��)(_G)"
+
+#: ../src/sendmsg-window.c:272
+#, fuzzy
+msgid "_German (Swiss)"
+msgstr "德语(_G)"
+
+#: ../src/sendmsg-window.c:273
 #, fuzzy
 msgid "_Greek"
-msgstr "å¸?è??语"
+msgstr "å¸?è??语(_G)"
 
-#: ../src/sendmsg-window.c:226
+#: ../src/sendmsg-window.c:274
 msgid "_Hebrew"
-msgstr ""
+msgstr "�伯�语(_H)"
 
-#: ../src/sendmsg-window.c:227
+#: ../src/sendmsg-window.c:275
 #, fuzzy
 msgid "_Hungarian"
-msgstr "å??ç??å?©è¯­"
+msgstr "å??ç??å?©è¯­(_H)"
 
-#: ../src/sendmsg-window.c:228
+#: ../src/sendmsg-window.c:276
 #, fuzzy
 msgid "_Italian"
-msgstr "æ??大å?©è¯­"
+msgstr "æ??大å?©è¯­(_I)"
 
-#: ../src/sendmsg-window.c:229
+#: ../src/sendmsg-window.c:277
 #, fuzzy
 msgid "_Japanese (JIS)"
-msgstr "�语"
+msgstr "�语(_J)"
+
+#: ../src/sendmsg-window.c:278
+msgid "_Kazakh"
+msgstr "å??è?¨å??语(_K)"
 
-#: ../src/sendmsg-window.c:230
+#: ../src/sendmsg-window.c:279
 #, fuzzy
 msgid "_Korean"
-msgstr "�语"
+msgstr "�语(_K)"
 
-#: ../src/sendmsg-window.c:231
+#: ../src/sendmsg-window.c:280
 #, fuzzy
 msgid "_Latvian"
-msgstr "æ??è?±ç»´äº?语"
+msgstr "æ??è?±ç»´äº?语(_L)"
 
-#: ../src/sendmsg-window.c:232
+#: ../src/sendmsg-window.c:281
 #, fuzzy
 msgid "_Lithuanian"
-msgstr "���语"
+msgstr "���语(_L)"
 
-#: ../src/sendmsg-window.c:233
+#: ../src/sendmsg-window.c:282
 #, fuzzy
 msgid "_Norwegian"
-msgstr "��语"
+msgstr "��语(_N)"
 
-#: ../src/sendmsg-window.c:234
+#: ../src/sendmsg-window.c:283
 #, fuzzy
 msgid "_Polish"
-msgstr "波�语"
+msgstr "波�语(_P)"
 
-#: ../src/sendmsg-window.c:235
+#: ../src/sendmsg-window.c:284
 #, fuzzy
 msgid "_Portugese"
-msgstr "è?¡è??ç??语"
+msgstr "è?¡è??ç??语(_P)"
 
-#: ../src/sendmsg-window.c:236
+#: ../src/sendmsg-window.c:285
 #, fuzzy
 msgid "_Romanian"
-msgstr "�马尼�语"
-
-#: ../src/sendmsg-window.c:237
-#, fuzzy
-msgid "_Russian (ISO)"
-msgstr "�语 (ISO)"
+msgstr "�马尼�语(_R)"
 
-#: ../src/sendmsg-window.c:238
+#: ../src/sendmsg-window.c:286
 #, fuzzy
-msgid "_Russian (KOI)"
-msgstr "�语 (KOI)"
+msgid "_Russian"
+msgstr "�语 (KOI)(_R)"
 
 # src/sendmsg-window.c:88
-#: ../src/sendmsg-window.c:239
+#: ../src/sendmsg-window.c:287
 #, fuzzy
 msgid "_Serbian"
-msgstr "å??é??(_S)"
+msgstr "��维�语(_S)"
 
-#: ../src/sendmsg-window.c:240
+#: ../src/sendmsg-window.c:288
 msgid "_Serbian (Latin)"
-msgstr ""
+msgstr "å¡?å°?ç»´äº?语(æ??ä¸?)(_S)"
 
-#: ../src/sendmsg-window.c:241
+#: ../src/sendmsg-window.c:289
 #, fuzzy
 msgid "_Slovak"
-msgstr "æ?¯æ´?ä¼?å??语"
+msgstr "æ?¯æ´?ä¼?å??语(_S)"
 
 # src/balsa-init.c:533
-#: ../src/sendmsg-window.c:242
+#: ../src/sendmsg-window.c:290
 #, fuzzy
 msgid "_Spanish"
-msgstr "西ç?­ç??语"
+msgstr "西ç?­ç??语(_S)"
 
-#: ../src/sendmsg-window.c:243
+#: ../src/sendmsg-window.c:291
 #, fuzzy
 msgid "_Swedish"
-msgstr "ç??å?¸è¯­"
+msgstr "ç??å?¸è¯­(_S)"
+
+#: ../src/sendmsg-window.c:292
+msgid "_Tatar"
+msgstr "é??é?¼è¯­(_T)"
 
 # src/balsa-init.c:606
-#: ../src/sendmsg-window.c:244
+#: ../src/sendmsg-window.c:293
 #, fuzzy
 msgid "_Turkish"
-msgstr "å??è?³å?¶è¯­"
+msgstr "å??è?³å?¶è¯­(_T)"
 
-#: ../src/sendmsg-window.c:245
+#: ../src/sendmsg-window.c:294
 #, fuzzy
 msgid "_Ukrainian"
-msgstr "ä¹?å??å?°è¯­"
+msgstr "ä¹?å??å?°è¯­(_U)"
 
-#: ../src/sendmsg-window.c:246
+#: ../src/sendmsg-window.c:295
 msgid "_Generic UTF-8"
-msgstr ""
+msgstr "é??ç?¨ UTF-8(_G)"
 
-#: ../src/sendmsg-window.c:270
-msgid "_GnuPG uses MIME mode"
-msgstr ""
+#: ../src/sendmsg-window.c:321
+msgid "_Show"
+msgstr "�示(_S)"
 
-#: ../src/sendmsg-window.c:276
-msgid "_GnuPG uses old OpenPGP mode"
-msgstr ""
+#: ../src/sendmsg-window.c:322
+msgid "_Language"
+msgstr "语�(_L)"
 
-#: ../src/sendmsg-window.c:283
-msgid "_S/MIME mode (GpgSM)"
-msgstr ""
+# src/filter-edit-dialog.c:707
+#: ../src/sendmsg-window.c:323
+msgid "_Options"
+msgstr "é??项(_O)"
 
-#: ../src/sendmsg-window.c:298 ../src/sendmsg-window.c:470
+#: ../src/sendmsg-window.c:333
 msgid "_Include File..."
 msgstr "å??å?«æ??件(_I)..."
 
+#: ../src/sendmsg-window.c:334
+msgid "Include a file"
+msgstr "å??å?«æ??件"
+
 # src/sendmsg-window.c:92
-#: ../src/sendmsg-window.c:301 ../src/sendmsg-window.c:483
+#: ../src/sendmsg-window.c:335
 msgid "_Attach File..."
 msgstr "é??å? æ??件(_A)..."
 
+# src/sendmsg-window.c:239
+#: ../src/sendmsg-window.c:336
+msgid "Attach a file"
+msgstr "é??å? æ??件"
+
 # src/main-window.c:211
-#: ../src/sendmsg-window.c:304 ../src/sendmsg-window.c:472
-#, fuzzy
+#: ../src/sendmsg-window.c:337
 msgid "I_nclude Message(s)"
-msgstr "å??æ?¬é?®ä»¶(_I)"
+msgstr "å??æ?¬é?®ä»¶(_N)"
+
+# src/main-window.c:211
+#: ../src/sendmsg-window.c:338
+msgid "Include selected message(s)"
+msgstr "å??æ?¬é??æ?©ç??é?®ä»¶"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:307 ../src/sendmsg-window.c:475
+#: ../src/sendmsg-window.c:339
 msgid "Attach _Message(s)"
 msgstr "é??å? é?®ä»¶(_M)"
 
-# src/sendmsg-window.c:88
-#: ../src/sendmsg-window.c:313 ../src/sendmsg-window.c:500
-#, fuzzy
-msgid "Sen_d"
-msgstr "å??é??(_S)"
-
-# src/sendmsg-window.c:71
-#: ../src/sendmsg-window.c:314 ../src/sendmsg-window.c:501
-#: ../src/toolbar-factory.c:111
-msgid "Send this message"
-msgstr "å??é??é?®ä»¶"
-
-#: ../src/sendmsg-window.c:318
-msgid "_Queue"
-msgstr "ç¼?å­?(_Q)"
-
-#: ../src/sendmsg-window.c:319 ../src/sendmsg-window.c:506
-msgid "Queue this message in Outbox for sending"
-msgstr "å°?æ­¤é?®ä»¶æ?¾å?¨å??件箱中æ??é??è¿?è¡?å??é??"
-
-#: ../src/sendmsg-window.c:323
-msgid "_Postpone"
-msgstr "延�(_P)"
+# src/main-window.c:200
+#: ../src/sendmsg-window.c:340
+msgid "Attach selected message(s)"
+msgstr "é??å? é??æ?©ç??é?®ä»¶"
 
 # src/balsa-message.c:160
-#: ../src/sendmsg-window.c:326 ../src/sendmsg-window.c:487
+#: ../src/sendmsg-window.c:341
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
 # src/sendmsg-window.c:71
-#: ../src/sendmsg-window.c:327 ../src/sendmsg-window.c:488
-#, fuzzy
+#: ../src/sendmsg-window.c:342
 msgid "Save this message"
-msgstr "å??é??é?®ä»¶"
+msgstr "��此�件"
 
 # src/main-window.c:222
-#: ../src/sendmsg-window.c:331 ../src/sendmsg-window.c:492
+#: ../src/sendmsg-window.c:348
 msgid "Print the edited message"
 msgstr "æ??å?°å½?å??é?®ä»¶"
 
-#: ../src/sendmsg-window.c:360 ../src/sendmsg-window.c:517
+# src/index-child.c:422
+#: ../src/sendmsg-window.c:351
+msgid "_Undo"
+msgstr "æ?¤é??(_U)"
+
+#: ../src/sendmsg-window.c:352
+msgid "Undo most recent change"
+msgstr "æ?¤é??å??è¿?è¡?ç??æ?´æ?¹"
+
+# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
+#: ../src/sendmsg-window.c:353
+msgid "_Redo"
+msgstr "é??å??(_R)"
+
+#: ../src/sendmsg-window.c:354
+msgid "Redo most recent change"
+msgstr "é??å??å??è¿?è¡?ç??æ?´æ?¹"
+
+#: ../src/sendmsg-window.c:355
+msgid "Cu_t"
+msgstr "å?ªå??(_T)"
+
+# src/main-window.c:166
+#: ../src/sendmsg-window.c:356
+msgid "Cut the selected text"
+msgstr "å?ªå??é??æ?©ç??æ??æ?¬"
+
+#: ../src/sendmsg-window.c:358
+msgid "Copy to the clipboard"
+msgstr "����贴�"
+
+#: ../src/sendmsg-window.c:359
+msgid "_Paste"
+msgstr "ç²?è´´(_P)"
+
+#: ../src/sendmsg-window.c:360
+msgid "Paste from the clipboard"
+msgstr "�贴��贴�"
+
+#: ../src/sendmsg-window.c:363
 msgid "_Wrap Body"
 msgstr "�件����(_W)"
 
 # src/main-window.c:215
-#: ../src/sendmsg-window.c:364 ../src/sendmsg-window.c:521
+#: ../src/sendmsg-window.c:365
 #, fuzzy
 msgid "_Reflow Selected Text"
 msgstr "é??中æ??å­?(_S)"
 
 # src/pref-manager.c:397
-#: ../src/sendmsg-window.c:369 ../src/sendmsg-window.c:549
-#, fuzzy
+#: ../src/sendmsg-window.c:367
 msgid "Insert Si_gnature"
-msgstr "æ??å?¥ç­¾å??(_S)"
+msgstr "æ??å?¥ç­¾å??(_N)"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:525
+#: ../src/sendmsg-window.c:369
 msgid "_Quote Message(s)"
 msgstr "���件(_Q)"
 
 # src/sendmsg-window.c:76
-#: ../src/sendmsg-window.c:378 ../src/sendmsg-window.c:598
-#, fuzzy
+#: ../src/sendmsg-window.c:372 ../src/sendmsg-window.c:414
 msgid "C_heck Spelling"
-msgstr "æ£?æ?¥æ?¼å??(_C)"
+msgstr "æ£?æ?¥æ?¼å??(_H)"
 
 # src/message-window.c:61
-#: ../src/sendmsg-window.c:379 ../src/sendmsg-window.c:599
+#: ../src/sendmsg-window.c:373 ../src/sendmsg-window.c:415
 msgid "Check the spelling of the message"
 msgstr "æ£?æ?¥é?®ä»¶ç??æ?¼å??"
 
 # src/main-window.c:133 src/main-window.c:168
-#: ../src/sendmsg-window.c:384 ../src/sendmsg-window.c:605
+#: ../src/sendmsg-window.c:376
 msgid "Select _Identity..."
 msgstr "é??æ?©èº«ä»½(_I)..."
 
-#: ../src/sendmsg-window.c:385 ../src/sendmsg-window.c:606
+#: ../src/sendmsg-window.c:377
 msgid "Select the Identity to use for the message"
 msgstr "é??æ?©å??é??该é?®ä»¶æ??使ç?¨ç??身份"
 
-#: ../src/sendmsg-window.c:390
+#: ../src/sendmsg-window.c:380
 msgid "_Edit with Gnome-Editor"
-msgstr ""
+msgstr "使� Gnome-Editor ��(_E)"
 
-#: ../src/sendmsg-window.c:391
+#: ../src/sendmsg-window.c:381
 msgid "Edit the current message with the default Gnome editor"
-msgstr ""
+msgstr "使ç?¨é»?认ç?? Gnome ç¼?è¾?å?¨ç¼?è¾?å½?å??é?®ä»¶"
 
-# src/balsa-index.c:231
-#: ../src/sendmsg-window.c:403 ../src/sendmsg-window.c:562
-msgid "Fr_om"
-msgstr "å??件人(_O)"
+# src/sendmsg-window.c:88
+#. All three "Send" and "Queue" actions have the same
+#. * stock_id; the first in this list defines the action tied to the
+#. * toolbar's "Send" button, so "ToolbarSend" must come before
+#. * the others.
+#: ../src/sendmsg-window.c:392 ../src/sendmsg-window.c:394
+msgid "Sen_d"
+msgstr "å??é??(_D)"
 
-# src/balsa-message.c:534
-#: ../src/sendmsg-window.c:405 ../src/sendmsg-window.c:564
-msgid "_Cc"
-msgstr "æ??é??(_C)"
+# src/sendmsg-window.c:71
+#: ../src/sendmsg-window.c:393 ../src/sendmsg-window.c:395
+msgid "Send this message"
+msgstr "å??é??æ­¤é?®ä»¶"
+
+#: ../src/sendmsg-window.c:397
+#, fuzzy
+msgid "_Queue"
+msgstr "ç¼?å­?(_Q)"
 
-#: ../src/sendmsg-window.c:407 ../src/sendmsg-window.c:566
-msgid "_Bcc"
-msgstr "æ??é??(_B)"
+#: ../src/sendmsg-window.c:398 ../src/sendmsg-window.c:404
+#, fuzzy
+msgid "Queue this message in Outbox for sending"
+msgstr "å°?æ­¤é?®ä»¶æ?¾å?¨å??件箱中æ??é??è¿?è¡?å??é??"
 
-#: ../src/sendmsg-window.c:409 ../src/sendmsg-window.c:568
-msgid "_Fcc"
-msgstr "æ??件æ??é??(_F)"
+#: ../src/sendmsg-window.c:400
+msgid "_Postpone"
+msgstr "延�(_P)"
+
+# src/sendmsg-window.c:71
+#: ../src/sendmsg-window.c:401
+msgid "Save this message and close"
+msgstr "å??é??æ­¤é?®ä»¶å¹¶å?³é?­"
+
+#: ../src/sendmsg-window.c:403
+msgid "Send _Later"
+msgstr "ç¨?å??å??é??(_L)"
+
+#: ../src/sendmsg-window.c:406
+msgid "Sa_ve and Close"
+msgstr "��并��(_V)"
+
+# src/pref-manager.c:538
+#: ../src/sendmsg-window.c:418
+msgid "Too_lbar"
+msgstr "工��(_L)"
+
+# src/balsa-message.c:544 src/filter-edit-dialog.c:303
+# src/sendmsg-window.c:338
+#: ../src/sendmsg-window.c:420
+msgid "F_rom"
+msgstr "��(_R)"
+
+#: ../src/sendmsg-window.c:422
+msgid "Rec_ipients"
+msgstr ""
 
 # src/main-window.c:113 src/message-window.c:54
-#: ../src/sendmsg-window.c:411
-msgid "_Reply To"
-msgstr "å??å¤?å?°(_R)"
+#: ../src/sendmsg-window.c:425
+msgid "R_eply To"
+msgstr "å??å¤?å?°(_E)"
+
+# src/sendmsg-window.c:368
+#: ../src/sendmsg-window.c:428
+#, fuzzy
+msgid "F_cc"
+msgstr "转å??æ??é??(_C)"
 
-#: ../src/sendmsg-window.c:417 ../src/sendmsg-window.c:610
+#: ../src/sendmsg-window.c:431
 msgid "_Request Disposition Notification"
-msgstr "è¦?æ±?å??é??é??读é??å??(_R)"
+msgstr "è¦?æ±?é??读é??ç?¥(_R)"
 
-#: ../src/sendmsg-window.c:420 ../src/sendmsg-window.c:580
+#: ../src/sendmsg-window.c:432
+#, fuzzy
+#| msgid "_Request Disposition Notification"
+msgid "Request Message Disposition Notification"
+msgstr "è¦?æ±?é?®ä»¶é??读é??ç?¥"
+
+#: ../src/sendmsg-window.c:434
 msgid "_Format = Flowed"
-msgstr ""
+msgstr "_Format = Flowed"
+
+#. Send as message/alternative with text/plain and text/html parts
+#: ../src/sendmsg-window.c:437
+msgid "Send as plain text and _HTML"
+msgstr "以纯æ??æ?¬å?? _HTML å??é??"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:425 ../src/sendmsg-window.c:585
-#, fuzzy
+#: ../src/sendmsg-window.c:441 ../src/sendmsg-window.c:447
 msgid "_Sign Message"
-msgstr "�件(_M)"
+msgstr "ç­¾å??é?®ä»¶(_S)"
 
-#: ../src/sendmsg-window.c:426 ../src/sendmsg-window.c:586
-msgid "signs the message using GnuPG"
-msgstr ""
+#: ../src/sendmsg-window.c:442
+msgid "Sign message using GPG"
+msgstr "使ç?¨ GPG 对é?®ä»¶ç­¾å??"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:429 ../src/sendmsg-window.c:589
-#, fuzzy
+#: ../src/sendmsg-window.c:443 ../src/sendmsg-window.c:450
 msgid "_Encrypt Message"
-msgstr "é??误信æ?¯"
+msgstr "���件(_E)"
 
-#: ../src/sendmsg-window.c:430 ../src/sendmsg-window.c:590
-msgid "signs the message using GnuPG for all To: and CC: recipients"
-msgstr ""
+# src/sendmsg-window.c:518
+#: ../src/sendmsg-window.c:444
+msgid "Encrypt message using GPG"
+msgstr "使� GPG ���件"
 
-#: ../src/sendmsg-window.c:450 ../src/sendmsg-window.c:626
-msgid "_Show"
-msgstr "�示(_S)"
+#: ../src/sendmsg-window.c:448
+msgid "signs the message using GnuPG"
+msgstr "使ç?¨ GnuPG 对é?®ä»¶ç­¾å??"
 
-#: ../src/sendmsg-window.c:452 ../src/sendmsg-window.c:603
-msgid "_Language"
-msgstr "语�(_L)"
+#: ../src/sendmsg-window.c:452
+msgid "signs the message using GnuPG for all To: and CC: recipients"
+msgstr "使ç?¨ GnuPG 对æ??æ??å??ç»?â??å??é??å?°ï¼?â??å??â??æ??é??ï¼?â??ç??é?®ä»¶ç­¾å??"
 
-# src/filter-edit-dialog.c:707
-#: ../src/sendmsg-window.c:454
-msgid "_Options"
-msgstr "é??项(_O)"
+#: ../src/sendmsg-window.c:462
+msgid "_GnuPG uses MIME mode"
+msgstr "_GnuPG 使� MIME 模�"
 
-#: ../src/sendmsg-window.c:496
-msgid "Sa_ve and Close"
-msgstr ""
+#: ../src/sendmsg-window.c:464
+msgid "_GnuPG uses old OpenPGP mode"
+msgstr "_GnuPG 使ç?¨æ?§ç?? OpenPGP 模å¼?"
 
-#: ../src/sendmsg-window.c:505
-msgid "Send _Later"
-msgstr ""
+#: ../src/sendmsg-window.c:467
+msgid "_S/MIME mode (GpgSM)"
+msgstr "_S/MIME 模�(GpgSM)"
 
 # src/sendmsg-window.c:414
-#: ../src/sendmsg-window.c:656
-#, fuzzy
+#: ../src/sendmsg-window.c:679
 msgid "Attachment"
-msgstr "é??件(_A)"
+msgstr "é??件"
 
-#: ../src/sendmsg-window.c:656
+#: ../src/sendmsg-window.c:679
 msgid "Inline"
 msgstr ""
 
-#: ../src/sendmsg-window.c:656
-#, fuzzy
+#: ../src/sendmsg-window.c:679
 msgid "Reference"
-msgstr "å??è??ï¼?%s"
+msgstr "å¼?ç?¨"
 
-#: ../src/sendmsg-window.c:871
+# src/filter-edit-dialog.c:267
+#: ../src/sendmsg-window.c:920
+msgid "(No name)"
+msgstr "(æ? å??称)"
+
+#: ../src/sendmsg-window.c:926
 #, c-format
 msgid ""
 "The message to '%s' is modified.\n"
 "Save message to Draftbox?"
 msgstr ""
 "å??ç»?â??%sâ??ç??é?®ä»¶è¢«ä¿®æ?¹ã??\n"
-"��件���稿件箱中�"
+"å°?é?®ä»¶ä¿?å­?å?°è??稿箱中ï¼?"
 
-#: ../src/sendmsg-window.c:1140
+#: ../src/sendmsg-window.c:1220
 msgid "Gnome editor is not defined in your preferred applications."
-msgstr ""
+msgstr "Gnome ç¼?è¾?å?¨å?¨æ?¨ç??é¦?é??åº?ç?¨ç¨?åº?中没æ??å®?ä¹?ã??"
 
 # src/pref-manager.c:137
-#: ../src/sendmsg-window.c:1191
+#: ../src/sendmsg-window.c:1276
 msgid "Select Identity"
 msgstr "é??æ?©èº«ä»½"
 
-#: ../src/sendmsg-window.c:1568
+#: ../src/sendmsg-window.c:1753
 #, c-format
 msgid ""
 "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -6084,18 +6953,17 @@ msgstr ""
 "æ?¨ç??ç??è¦?å°?该æ??件é??å? ä»¥ä½?为å??è??å??ï¼?"
 
 # src/pref-manager.c:117
-#: ../src/sendmsg-window.c:1579
+#: ../src/sendmsg-window.c:1766
 #, fuzzy
 msgid "Attach as Reference?"
-msgstr "é??å? ä½?为å??è??ï¼?"
+msgstr "ä½?为å¼?ç?¨é??å? ï¼?"
 
 # src/pref-manager.c:387
-#: ../src/sendmsg-window.c:1692
-#, fuzzy
+#: ../src/sendmsg-window.c:1859
 msgid "Choose charset"
-msgstr "é??æ?©å?°å??"
+msgstr "é??æ?©å­?符é??"
 
-#: ../src/sendmsg-window.c:1699
+#: ../src/sendmsg-window.c:1866
 #, c-format
 msgid ""
 "File\n"
@@ -6103,78 +6971,67 @@ msgid ""
 "is not encoded in US-ASCII or UTF-8.\n"
 "Please choose the charset used to encode the file."
 msgstr ""
+"æ??件\n"
+"%s\n"
+"ç??ç¼?ç ?ä¸?æ?¯ US-ASCII æ?? UTF-8ã??\n"
+"请é??æ?©ç¼?ç ?æ??件ç??å­?符é??ã??"
 
-#: ../src/sendmsg-window.c:1715
+#: ../src/sendmsg-window.c:1886
 msgid "Attach as MIME type:"
-msgstr ""
+msgstr "æ·»å? ä¸º MIME ç±»å??ç??é??件ï¼?"
 
-#: ../src/sendmsg-window.c:1771
+#: ../src/sendmsg-window.c:1942
 #, c-format
 msgid "Character set for file %s changed from \"%s\" to \"%s\"."
-msgstr ""
+msgstr "%s æ??件ç??å­?符é??ä»?â??%sâ??æ?´æ?¹ä¸ºâ??%sâ??ã??"
 
 # src/balsa-index.c:232 src/filter-edit-dialog.c:315
-#: ../src/sendmsg-window.c:1814
-#, fuzzy
+#: ../src/sendmsg-window.c:1985 ../src/sendmsg-window.c:5706
 msgid "(no subject)"
-msgstr "主�"
+msgstr "(�主�)"
+
+# src/main-window.c:182
+#: ../src/sendmsg-window.c:2023
+#, c-format
+msgid "Cannot create file URI object for %s"
+msgstr "æ? æ³?为 %s å??建æ??件 URI"
+
+#: ../src/sendmsg-window.c:2031
+msgid "unknown error"
+msgstr "æ?ªç?¥é??误"
 
 # src/main-window.c:126
-#: ../src/sendmsg-window.c:1900
-#, fuzzy
+#: ../src/sendmsg-window.c:2078
 msgid "forwarded message"
-msgstr "å°?å½?å??é?®ä»¶ä½?为æ?°é?®ä»¶è½¬å??"
+msgstr "已转å??é?®ä»¶"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:1905
-#, fuzzy, c-format
-msgid "Message from %s, subject: \"%s\""
-msgstr "�件���%s\n"
-
-#: ../src/sendmsg-window.c:1923
+#: ../src/sendmsg-window.c:2083
 #, c-format
-msgid "Error converting \"%s\" to UTF-8: %s\n"
-msgstr ""
+msgid "Message from %s, subject: \"%s\""
+msgstr "é?®ä»¶æ?¥è?ª %sï¼?主é¢?ï¼?â??%sâ??"
 
 # src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/sendmsg-window.c:1993 ../src/sendmsg-window.c:2064
+#: ../src/sendmsg-window.c:2159 ../src/sendmsg-window.c:2232
 msgid "Remove"
 msgstr "å? é?¤"
 
 # src/main-window.c:159
-#: ../src/sendmsg-window.c:2076
-#, fuzzy
+#: ../src/sendmsg-window.c:2244
 msgid "Open..."
-msgstr "æ??å¼?"
+msgstr "æ??å¼?..."
 
-#: ../src/sendmsg-window.c:2088
+#: ../src/sendmsg-window.c:2256
 msgid "(URL)"
-msgstr ""
-
-# src/sendmsg-window.c:185
-#: ../src/sendmsg-window.c:2109
-#, c-format
-msgid "Cannot get info on file '%s': %s"
-msgstr "æ? æ³?è?·å¾?æ??件â??%sâ??ç??ä¿¡æ?¯ï¼?%s"
-
-# src/sendmsg-window.c:188
-#: ../src/sendmsg-window.c:2114
-#, c-format
-msgid "Attachment %s is not a regular file."
-msgstr "é??件 %s ä¸?æ?¯å¸¸è§?æ??件ã??"
-
-#: ../src/sendmsg-window.c:2117
-#, c-format
-msgid "File %s cannot be read\n"
-msgstr "æ? æ³?读å??æ??件 %s\n"
+msgstr "(URL)"
 
 # src/sendmsg-window.c:239
-#: ../src/sendmsg-window.c:2166
+#: ../src/sendmsg-window.c:2314
 msgid "Attach file"
 msgstr "ç²?é??æ??件"
 
-#: ../src/sendmsg-window.c:2253 ../src/sendmsg-window.c:2362
-#: ../src/sendmsg-window.c:4024
+#: ../src/sendmsg-window.c:2415 ../src/sendmsg-window.c:2525
+#: ../src/sendmsg-window.c:4965
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6184,712 +7041,1132 @@ msgstr ""
 
 # src/balsa-message.c:544 src/filter-edit-dialog.c:303
 # src/sendmsg-window.c:338
-#: ../src/sendmsg-window.c:2582
-#, fuzzy
+#: ../src/sendmsg-window.c:2758
 msgid "F_rom:"
-msgstr "å??件人ï¼?"
+msgstr "å??件人(_R)ï¼?"
 
 # src/balsa-message.c:558 src/sendmsg-window.c:358
 #. Subject:
-#: ../src/sendmsg-window.c:2717
-#, fuzzy
+#: ../src/sendmsg-window.c:2896
 msgid "S_ubject:"
-msgstr "主��"
+msgstr "主�(_U)�"
 
 # src/sendmsg-window.c:368
 #. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2731
+#: ../src/sendmsg-window.c:2907
 #, fuzzy
 msgid "F_cc:"
-msgstr "æ??件æ??é??ï¼?"
-
-# src/main-window.c:113 src/message-window.c:54
-#. Reply To:
-#: ../src/sendmsg-window.c:2762
-#, fuzzy
-msgid "_Reply To:"
-msgstr "å??å¤?å?°(_R)"
+msgstr "æ??件æ??é??(_C)ï¼?"
 
 # src/sendmsg-window.c:414
 #. Attachment list
-#: ../src/sendmsg-window.c:2767
-#, fuzzy
+#: ../src/sendmsg-window.c:2936
 msgid "_Attachments:"
-msgstr "é??件ï¼?"
+msgstr "é??件(_A)ï¼?"
 
 # src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/sendmsg-window.c:2812
-#, fuzzy
+#: ../src/sendmsg-window.c:2985
 msgid "Mode"
-msgstr "移�"
+msgstr "模�"
 
-#: ../src/sendmsg-window.c:2835
-#, fuzzy
-msgid "Description"
-msgstr "æ??è¿°æ?§å??å­?(_N)ï¼?"
+#: ../src/sendmsg-window.c:3330
+#, c-format
+msgid "Could not save attachment: %s"
+msgstr "æ? æ³?ä¿?å­?é??件ï¼?%s"
+
+# src/balsa-index.c:232 src/filter-edit-dialog.c:315
+#: ../src/sendmsg-window.c:3354
+msgid "No subject"
+msgstr "�主�"
 
-#: ../src/sendmsg-window.c:3108
+# src/main-window.c:182
+#: ../src/sendmsg-window.c:3387
 #, fuzzy, c-format
-msgid "Could not save attachment: %s"
-msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
+msgid "inlined file \"%s\" (%s)"
+msgstr "æ? æ??ç??è¿?滤è§?å??ï¼?%s"
+
+#: ../src/sendmsg-window.c:3390
+#, c-format
+msgid "attached file \"%s\" (%s)"
+msgstr "é??å? äº?æ??件â??%sâ??(%s)"
+
+# src/balsa-message.c:159 src/balsa-message.c:162
+#: ../src/sendmsg-window.c:3394
+#, fuzzy, c-format
+msgid "inlined %s part"
+msgstr "ä¿?å­?é?¨å??"
+
+# src/sendmsg-window.c:239
+#: ../src/sendmsg-window.c:3396
+#, c-format
+msgid "attached %s part"
+msgstr "å·²é??å?  %s å?ºæ®µ"
+
+# src/main-window.c:200
+#: ../src/sendmsg-window.c:3464
+#, c-format
+msgid "message from %s, subject \"%s\""
+msgstr "é?®ä»¶æ?¥è?ª %sï¼?主é¢?â??%sâ??"
+
+#: ../src/sendmsg-window.c:3591
+msgid "quoted"
+msgstr "å¼?ç?¨ç??"
+
+# src/sendmsg-window.c:414
+#: ../src/sendmsg-window.c:3596 ../src/sendmsg-window.c:3599
+msgid "quoted attachment"
+msgstr "å¼?ç?¨ç??é??件"
+
+#: ../src/sendmsg-window.c:3625
+msgid "Select parts for quotation"
+msgstr "é??æ?©è¦?å¼?ç?¨ç??å?ºæ®µ"
+
+#: ../src/sendmsg-window.c:3634
+msgid "Select the parts of the message which shall be quoted in the reply"
+msgstr "é??æ?©é?®ä»¶ä¸­è¦?å?¨å??å¤?中å¼?ç?¨ç??å?ºæ®µ"
 
 # src/sendmsg-window.c:685 src/sendmsg-window.c:688
-#: ../src/sendmsg-window.c:3144
+#: ../src/sendmsg-window.c:3776
 msgid "you"
 msgstr "æ?¨"
 
 # src/sendmsg-window.c:518
-#: ../src/sendmsg-window.c:3153
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:3785
+#, c-format
 msgid "------forwarded message from %s------\n"
-msgstr "------转å??ç??é?®ä»¶------\n"
+msgstr "------转å??ç??é?®ä»¶ï¼?æ?¥è?ª %s------\n"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:3192
+#: ../src/sendmsg-window.c:3822
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "�件���%s\n"
 
-#: ../src/sendmsg-window.c:3198
+#: ../src/sendmsg-window.c:3828
 #, fuzzy
 msgid "References:"
-msgstr "å??è??ï¼?%s"
+msgstr "���"
 
 # src/sendmsg-window.c:690
-#: ../src/sendmsg-window.c:3209
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:3839
+#, c-format
 msgid "On %s, %s wrote:\n"
-msgstr "å?¨ %s %s å??é??ï¼?\n"
+msgstr "å?¨ %sï¼?%s å??é??ï¼?\n"
 
 # src/sendmsg-window.c:690
-#: ../src/sendmsg-window.c:3211
+#: ../src/sendmsg-window.c:3841
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s å??é??ï¼?\n"
 
 # src/pref-manager.c:397
-#: ../src/sendmsg-window.c:3309
-#, fuzzy
+#: ../src/sendmsg-window.c:3951
 msgid "No signature found!"
-msgstr "æ£?æ?¥ç­¾å??"
+msgstr "æ?ªæ?¾å?°ç­¾å??ï¼?"
 
-#: ../src/sendmsg-window.c:4142
-#, c-format
-msgid "Error executing signature generator %s"
-msgstr ""
+# src/main-window.c:171
+#: ../src/sendmsg-window.c:4139
+msgid "Could not save message."
+msgstr "æ? æ³?ä¿?å­?é?®ä»¶ã??"
 
-#: ../src/sendmsg-window.c:4154
+# src/main-window.c:171
+#: ../src/sendmsg-window.c:4146
 #, fuzzy, c-format
-msgid "Cannot open signature file '%s' for reading"
-msgstr "æ? æ³?æ??å¼? LDIF å?°å??ç°¿ %s æ?¥è¿?è¡?ä¿?å­?\n"
+msgid "Could not open draftbox: %s"
+msgstr "æ? æ³?æ??å¼?è??稿箱ï¼?%s"
 
-#: ../src/sendmsg-window.c:4164
-#, fuzzy, c-format
-msgid "Error reading signature from %s"
-msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
+# src/main-window.c:200
+#: ../src/sendmsg-window.c:4171
+msgid "Message saved."
+msgstr "é?®ä»¶å·²ä¿?å­?ã??"
 
-#: ../src/sendmsg-window.c:4168
+#: ../src/sendmsg-window.c:5145 ../src/sendmsg-window.c:5153
+#: ../src/sendmsg-window.c:5160 ../src/sendmsg-window.c:5167
+#: ../src/sendmsg-window.c:5191
 #, c-format
-msgid "Signature in %s is not a UTF-8 text."
+msgid "Could not attach the file %s: %s."
+msgstr "æ? æ³?é??å?  %s æ??件ï¼?%sã??"
+
+#: ../src/sendmsg-window.c:5146
+msgid "not an absolute path"
+msgstr "���个�对路�"
+
+# src/pref-manager.c:481
+#: ../src/sendmsg-window.c:5154
+msgid "not in your directory"
+msgstr "ä¸?å?¨æ?¨ç??æ??件夹中"
+
+# src/mailbox-conf.c:671 src/mailbox-conf.c:706
+#: ../src/sendmsg-window.c:5161
+msgid "does not exist"
+msgstr "���"
+
+#: ../src/sendmsg-window.c:5192
+msgid "not in current directory"
+msgstr "ä¸?å?¨å½?å??æ??件夹中"
+
+#: ../src/sendmsg-window.c:5242
+msgid ""
+"The link that you selected created\n"
+"a \"Blind copy\" (Bcc) address.\n"
+"Please check that the address\n"
+"is appropriate."
 msgstr ""
+"æ?¨æ??é??æ?©ç??é?¾æ?¥å??建äº?ä¸?个â??å¯?é??â??\n"
+"å?°å??ã??请æ£?æ?¥è¯¥å?°å??æ?¯å?¦æ?°å½?ã??"
 
-#: ../src/sendmsg-window.c:4231
+#: ../src/sendmsg-window.c:5326
 #, c-format
 msgid "Could not open the file %s.\n"
 msgstr "æ? æ³?æ??å¼?æ??件 %sã??\n"
 
-#: ../src/sendmsg-window.c:4288
+#: ../src/sendmsg-window.c:5374
 msgid "Include file"
 msgstr "å??å?«æ??件"
 
-#: ../src/sendmsg-window.c:4640
+#. Translators: please do not translate Face.
+#: ../src/sendmsg-window.c:5560
+#, c-format
+msgid "Could not load Face header file %s: %s"
+msgstr "æ? æ³?è½½å?¥ Face 信头æ??件 %sï¼?%s"
+
+#. Translators: please do not translate Face.
+#: ../src/sendmsg-window.c:5563
+#, c-format
+msgid "Could not load X-Face header file %s: %s"
+msgstr "æ? æ³?è½½å?¥ X-Face 信头æ??件 %sï¼?%s"
+
+#: ../src/sendmsg-window.c:5690
+msgid "You did not specify a subject for this message"
+msgstr "è¿?å°?é?®ä»¶æ?¨æ²¡æ??å¡«å??主é¢?"
+
+#: ../src/sendmsg-window.c:5691
+msgid "If you would like to provide one, enter it below."
+msgstr "å¦?æ??æ?¨è¦?æ??ä¾?ä¸?个ï¼?请å?¨ä¸?é?¢è¾?å?¥ã??"
+
+# src/sendmsg-window.c:88
+#: ../src/sendmsg-window.c:5741
+msgid "_Send"
+msgstr "å??é??(_S)"
+
+#: ../src/sendmsg-window.c:5824
+#, c-format
 msgid ""
-"You selected OpenPGP mode for a message with attachments. In this mode, only "
-"the first part will be signed and/or encrypted. You should select MIME mode "
-"if the complete message shall be protected. Do you really want to proceed?"
+"You did not select encryption for this message, although %s public keys are "
+"available for all recipients. In order to protect your privacy, the message "
+"could be %s encrypted."
 msgstr ""
+"æ?¨æ²¡æ??é??æ?©å? å¯?æ­¤é?®ä»¶ï¼?尽管æ??é??对æ??æ??æ?¶ä¿¡äººç?? %s 个å?¬é?¥ã??为äº?ä¿?æ?¤æ?¨ç??é??ç§?ï¼?建"
+"è®®æ?¨ç?¨ %s å? å¯?该é?®ä»¶ã??"
+
+#: ../src/sendmsg-window.c:5851
+msgid "Send _encrypted"
+msgstr "å? å¯?å??é??(_E)"
+
+#: ../src/sendmsg-window.c:5869
+msgid "Send _unencrypted"
+msgstr "ä¸?å? å¯?å??é??(_U)"
+
+#: ../src/sendmsg-window.c:5932
+msgid "You selected OpenPGP security for this message.\n"
+msgstr "æ?¨é??æ?©äº? OpenPGP ä½?为此é?®ä»¶ç??å®?å?¨ä¿?é??ã??\n"
+
+#: ../src/sendmsg-window.c:5937
+msgid ""
+"The message text will be sent as plain text and as HTML, but only the plain "
+"part can be signed.\n"
+msgstr "é?®ä»¶æ??å­?ä¼?以纯æ??æ?¬å?? HTML å??é??ï¼?ä½?å?ªæ??纯æ??æ?¬å?ºæ®µå?¯ä»¥ç­¾å??ã??\n"
 
-#: ../src/sendmsg-window.c:4656
+#: ../src/sendmsg-window.c:5942
+msgid ""
+"The message contains attachments, which cannot be signed or encrypted.\n"
+msgstr "é?®ä»¶å??å?«ç??é??件ä¸?è?½ç­¾å??æ??å? å¯?ã??\n"
+
+#: ../src/sendmsg-window.c:5946
+msgid ""
+"You should select MIME mode if the complete message shall be protected. Do "
+"you really want to proceed?"
+msgstr "å¦?æ??æ?³ä¿?æ?¤æ?´ä¸ªé?®ä»¶ï¼?æ?¨åº?该é??æ?© MIME 模å¼?ã??æ?¨ç??ç??è¦?继续å??ï¼?"
+
+#: ../src/sendmsg-window.c:5971
 #, c-format
 msgid "sending message with gpg mode %d"
-msgstr ""
+msgstr "ç?¨ gpg 模å¼? %d å??é??é?®ä»¶"
 
-#: ../src/sendmsg-window.c:4702
+#: ../src/sendmsg-window.c:6008
 msgid "Message could not be created"
-msgstr ""
+msgstr "æ? æ³?å??建é?®ä»¶"
 
-#: ../src/sendmsg-window.c:4704
+#: ../src/sendmsg-window.c:6010
 msgid "Message could not be queued in outbox"
 msgstr ""
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:4706
+#: ../src/sendmsg-window.c:6012
 #, fuzzy
 msgid "Message could not be saved in sentbox"
-msgstr "�件��"
+msgstr "æ? æ³?å°?é?®ä»¶ä¿?å­?å?°å·²å??é??é?®ä»¶ç®±"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:4708
-#, fuzzy
+#: ../src/sendmsg-window.c:6014
 msgid "Message could not be sent"
-msgstr "�件��"
+msgstr "æ? æ³?å??é??é?®ä»¶"
+
+# src/main-window.c:200
+#: ../src/sendmsg-window.c:6017
+msgid "Message could not be signed"
+msgstr "æ? æ³?ç­¾å??é?®ä»¶"
+
+# src/main-window.c:200
+#: ../src/sendmsg-window.c:6019
+msgid "Message could not be encrypted"
+msgstr "�����件"
 
 # src/main-window.c:182
-#: ../src/sendmsg-window.c:4712
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:6025
+#, c-format
+msgid ""
+"Send failed: %s\n"
+"%s"
+msgstr ""
+"å??é??失败ï¼?%s\n"
+"%s"
+
+# src/main-window.c:182
+#: ../src/sendmsg-window.c:6030
+#, c-format
 msgid "Send failed: %s"
-msgstr "æ? æ??ç??è¿?滤è§?å??ï¼?%s"
+msgstr "å??é??失败ï¼?%s"
 
 # src/main-window.c:171
-#: ../src/sendmsg-window.c:4778
-#, fuzzy
-msgid "Could not postpone message."
-msgstr "��追��件"
+#: ../src/sendmsg-window.c:6121
+#, c-format
+msgid "Could not postpone message: %s"
+msgstr "æ? æ³?延æ??å??é??é?®ä»¶ï¼?%s"
 
 # src/main-window.c:200
-#: ../src/sendmsg-window.c:4792
-#, fuzzy
+#: ../src/sendmsg-window.c:6138
 msgid "Message postponed."
-msgstr "�件��"
+msgstr "é?®ä»¶å·²å»¶æ??ã??"
 
 # src/main-window.c:171
-#: ../src/sendmsg-window.c:4808
-#, fuzzy, c-format
-msgid "Could not open draftbox: %s"
-msgstr "æ? æ³?é??æ?°æ??å¼?é?®ä»¶ç®±ï¼?"
+#: ../src/sendmsg-window.c:6143
+msgid "Could not postpone message."
+msgstr "æ? æ³?延æ??å??é??é?®ä»¶ã??"
 
-# src/main-window.c:200
-#: ../src/sendmsg-window.c:4830
-#, fuzzy
-msgid "Message saved."
-msgstr "�件��"
+#: ../src/sendmsg-window.c:6296
+#, c-format
+msgid "Error starting spell checker: %s"
+msgstr "å?¨å?¯å?¨æ?¼å??æ£?æ?¥å?¨æ?¶å?ºé??ï¼?%s"
 
-#: ../src/sendmsg-window.c:4998
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:6463
+#, c-format
 msgid "Could not compile %s"
-msgstr "æ? æ³?æ??å¼?æ??件 %sã??\n"
+msgstr "���� %s"
+
+#: ../src/sendmsg-window.c:6464
+msgid "Quoted Text Regular Expression"
+msgstr "å¼?ç?¨æ??æ?¬ç??æ­£å??表达å¼?"
 
 # src/sendmsg-window.c:513
-#: ../src/sendmsg-window.c:5491
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:6971
+#, c-format
 msgid "Reply to %s: %s"
-msgstr "å??å¤?å?°"
+msgstr "å??å¤?ç»? %sï¼?%s"
 
 # src/sendmsg-window.c:518
-#: ../src/sendmsg-window.c:5496
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:6976
+#, c-format
 msgid "Forward message to %s: %s"
-msgstr "转å??é?®ä»¶"
-
-# src/sendmsg-window.c:523
-#: ../src/sendmsg-window.c:5500
-#, fuzzy, c-format
-msgid "Continue message to %s: %s"
-msgstr "继续�件"
+msgstr "转å??é?®ä»¶ç»? %sï¼?%s"
 
 # src/sendmsg-window.c:523
-#: ../src/sendmsg-window.c:5504
-#, fuzzy, c-format
+#: ../src/sendmsg-window.c:6980
+#, c-format
 msgid "New message to %s: %s"
-msgstr "�建�件"
+msgstr "�建�件� %s�%s"
+
+#: ../src/spell-check.c:513
+msgid "_Change"
+msgstr "修�(_C)"
 
-#: ../src/spell-check.c:511
+#: ../src/spell-check.c:515
 msgid "Replace the current word with the selected suggestion"
 msgstr "æ??å½?å??è¯?æ?¿æ?¢ä¸ºé??中ç??建议è¯?"
 
+#: ../src/spell-check.c:520
+msgid "Change _All"
+msgstr "��修�(_A)"
+
 # src/main-window.c:120
-#: ../src/spell-check.c:519
-msgid "Replace all occurences of the current word with the selected suggestion"
+#: ../src/spell-check.c:522
+#, fuzzy
+#| msgid ""
+#| "Replace all occurences of the current word with the selected suggestion"
+msgid ""
+"Replace all occurrences of the current word with the selected suggestion"
 msgstr "æ??æ??æ??å?ºç?°ç??è¿?个è¯?æ?¿æ?¢ä¸ºé??中ç??建议è¯?"
 
+# src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
 #: ../src/spell-check.c:531
+msgid "_Ignore"
+msgstr "忽�(_I)"
+
+#: ../src/spell-check.c:534
 msgid "Skip the current word"
 msgstr "è·³è¿?å½?å??è¯?"
 
+#: ../src/spell-check.c:538
+msgid "Ignore A_ll"
+msgstr "��忽�(_L)"
+
 # src/main-window.c:120
-#: ../src/spell-check.c:537
+#: ../src/spell-check.c:540
 #, fuzzy
 msgid "Skip all occurrences of the current word"
 msgstr "以å??ä¸?æ£?æ?¥è¿?个è¯?"
 
-#: ../src/spell-check.c:547
+# src/main-window.c:161
+#: ../src/spell-check.c:546
+msgid "_Learn"
+msgstr "学习(_L)"
+
+#: ../src/spell-check.c:548
 msgid "Add the current word to your personal dictionary"
 msgstr "æ??å½?å??è¯?æ·»å? å?°æ?¨ç??个人è¯?å?¸ä¸­"
 
-#: ../src/spell-check.c:556
+# src/filter-edit-dialog.c:171
+#: ../src/spell-check.c:553
+msgid "_Done"
+msgstr "å®?æ??(_D)"
+
+#: ../src/spell-check.c:554
 msgid "Finish spell checking"
 msgstr "å®?æ??æ?¼å??æ£?æ?¥"
 
-#: ../src/spell-check.c:561
+#: ../src/spell-check.c:559
 msgid "Revert all changes and finish spell checking"
 msgstr "æ?¢å¤?æ??æ??æ?´æ?¹ï¼?å®?æ??æ?¼å??æ£?æ?¥"
 
-#: ../src/spell-check.c:592
-#, fuzzy
+#: ../src/spell-check.c:588
 msgid "Spell check"
-msgstr "å®?æ??æ?¼å??æ£?æ?¥"
+msgstr "æ?¼å??æ£?æ?¥"
+
+#: ../src/spell-check.c:866
+msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
+msgstr "Balsa æ?¼å??æ£?æ?¥ï¼?å¼?ç?¨æ??æ?¬ç??æ­£å??表达å¼?ç¼?è¾?失败\n"
 
-#: ../src/store-address.c:104
+#: ../src/spell-check.c:990
+#, c-format
+msgid ""
+"BalsaSpellCheck: Learn operation failed;\n"
+"%s\n"
+msgstr ""
+"Balsa æ?¼å??æ£?æ?¥ï¼?学习æ??ä½?失败ï¼?\n"
+"%s\n"
+
+#: ../src/spell-check.c:996
+msgid "BalsaSpellCheck: Learn operation failed.\n"
+msgstr "Balsa æ?¼å??æ£?æ?¥ï¼?学习æ??ä½?失败ã??\n"
+
+#: ../src/spell-check.c:1195
+#, c-format
+msgid "BalsaSpellCheck: Suggest %s (%s)\n"
+msgstr "Balsa æ?¼å??æ£?æ?¥ï¼?建议 %s (%s)\n"
+
+#: ../src/spell-check.c:1297
+#, c-format
+msgid "BalsaSpellCheck: Pspell Error: %s\n"
+msgstr "Balsa æ?¼å??æ£?æ?¥ï¼?Pspell é??误ï¼?%s\n"
+
+#: ../src/store-address.c:109
 msgid "Store address: no addresses"
 msgstr "ä¿?å­?å?°å??ï¼?没æ??å?°å??"
 
 # src/pref-manager.c:387
-#: ../src/store-address.c:181
+#: ../src/store-address.c:204
 msgid "Store Address"
 msgstr "ä¿?å­?å?°å??"
 
-#: ../src/store-address.c:199
+#: ../src/store-address.c:225
 msgid "Save this address and close the dialog?"
-msgstr ""
+msgstr "ä¿?å­?该å?°å??并å?³é?­å¯¹è¯?æ¡?ï¼?"
 
-#: ../src/store-address.c:217
+#: ../src/store-address.c:243
 msgid "No address book selected...."
 msgstr "没æ??é??中å?°å??ç°¿..."
 
 # src/mailbox-conf.c:488
-#: ../src/store-address.c:230
-#, fuzzy
+#: ../src/store-address.c:256
 msgid "Address could not be written to this address book."
-msgstr "æ? æ³?æ??å¼? LDIF å?°å??ç°¿ %sã??"
+msgstr "å?°å??æ? æ³?å??å?¥æ­¤å?°å??ç°¿ã??"
 
-#: ../src/store-address.c:233
+#: ../src/store-address.c:259
 msgid "Address book could not be accessed."
-msgstr ""
+msgstr "æ? æ³?访é?®å?°å??ç°¿ã??"
 
-#: ../src/store-address.c:235
-#, fuzzy
+#: ../src/store-address.c:261
 msgid "This mail address is already in this address book."
-msgstr "%s å·²ç»?å?¨å?°å??簿中ã??"
+msgstr "æ­¤é?®ä»¶å?°å??å·²ç»?å?¨è¯¥å?°å??簿中ã??"
 
-#: ../src/store-address.c:238
+#: ../src/store-address.c:264
 msgid "Unexpected address book error. Report it."
-msgstr ""
+msgstr "æ??å¤?ç??å?°å??ç°¿é??误ã??请æ?¥å??ç»?æ??们ã??"
 
-#: ../src/store-address.c:254
+#: ../src/store-address.c:280
 msgid "Choose Address Book"
 msgstr "é??æ?©å?°å??ç°¿"
 
 # src/pref-manager.c:387
-#: ../src/store-address.c:293
+#: ../src/store-address.c:319
 msgid "Choose Address"
 msgstr "é??æ?©å?°å??"
 
 # src/balsa-message.c:159 src/balsa-message.c:162
-#: ../src/toolbar-factory.c:77
+#: ../src/toolbar-factory.c:133
 msgid "Separator"
 msgstr "å??é??符"
 
+#: ../src/toolbar-factory.c:134
+msgid "Quit"
+msgstr "é??å?º"
+
 # src/mailbox-conf.c:774 src/main-window.c:209
-#: ../src/toolbar-factory.c:78
-#, fuzzy
+#: ../src/toolbar-factory.c:135
 msgid "Check"
 msgstr "��"
 
-#: ../src/toolbar-factory.c:79
-#, fuzzy
-msgid "Check for new email"
-msgstr "����件��(_E)"
-
 # src/main-window.c:213
-#: ../src/toolbar-factory.c:80
-#, fuzzy
+#: ../src/toolbar-factory.c:136
 msgid "Compose"
-msgstr "æ?°å??çª?å?£"
-
-# src/main-window.c:107
-#: ../src/toolbar-factory.c:81
-#, fuzzy
-msgid "Compose message"
-msgstr "ç¼?å??æ?°é?®ä»¶"
+msgstr "å??ä¿¡"
 
-#: ../src/toolbar-factory.c:82
-#, fuzzy
+#: ../src/toolbar-factory.c:137
 msgid "Continue"
-msgstr "继续(_C)"
-
-# src/sendmsg-window.c:523
-#: ../src/toolbar-factory.c:83
-msgid "Continue message"
-msgstr "继续�件"
+msgstr "继续"
 
 # src/main-window.c:214
-#: ../src/toolbar-factory.c:84
-#, fuzzy
+#: ../src/toolbar-factory.c:138
 msgid "Reply"
-msgstr "å??å¤?..."
+msgstr "å??å¤?"
 
 # src/sendmsg-window.c:513
-#: ../src/toolbar-factory.c:86
-#, fuzzy
+#: ../src/toolbar-factory.c:139
 msgid ""
 "Reply\n"
 "to all"
-msgstr "å??å¤?å?°"
-
-# src/message-window.c:61
-#: ../src/toolbar-factory.c:87
-#, fuzzy
-msgid "Reply to all recipients"
-msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
+msgstr ""
+"å??å¤?\n"
+"��"
 
 # src/main-window.c:119 src/message-window.c:60
-#: ../src/toolbar-factory.c:88
-#, fuzzy
+#: ../src/toolbar-factory.c:140
 msgid ""
 "Reply\n"
 "to group"
-msgstr "å??å¤?ç»?ç»?(_G)..."
+msgstr ""
+"å??å¤?\n"
+"ç»?ç»?"
 
 # src/sendmsg-window.c:518
-#: ../src/toolbar-factory.c:90
-#, fuzzy
+#: ../src/toolbar-factory.c:141
 msgid "Forward"
-msgstr "转å??é?®ä»¶"
-
-# src/main-window.c:218
-#: ../src/toolbar-factory.c:92
-#, fuzzy
-msgid "Previous"
-msgstr "å??ä¸?é?¨å??"
-
-#: ../src/toolbar-factory.c:93
-msgid "Open previous"
-msgstr ""
-
-# src/pref-manager.c:66
-#: ../src/toolbar-factory.c:94
-#, fuzzy
-msgid "Next"
-msgstr "æ??æ?¬"
-
-# src/main-window.c:159
-#: ../src/toolbar-factory.c:95
-#, fuzzy
-msgid "Open next"
-msgstr "æ??å¼?"
+msgstr "转å??"
 
 # src/main-window.c:211
-#: ../src/toolbar-factory.c:96
-#, fuzzy
+#: ../src/toolbar-factory.c:144
 msgid ""
 "Next\n"
 "unread"
-msgstr "���读�件"
-
-# src/main-window.c:211
-#: ../src/toolbar-factory.c:97
-#, fuzzy
-msgid "Open next unread message"
-msgstr "���读�件"
+msgstr ""
+"���\n"
+"�读"
 
-#: ../src/toolbar-factory.c:98
-#, fuzzy
+#: ../src/toolbar-factory.c:145
 msgid ""
 "Next\n"
 "flagged"
-msgstr "æ ?è®°ç??"
-
-# src/main-window.c:211
-#: ../src/toolbar-factory.c:99
-#, fuzzy
-msgid "Open next flagged message"
-msgstr "ä¸?ä¸?å??æ ?è®°é?®ä»¶"
+msgstr ""
+"���\n"
+"带æ ?è®°ç??"
 
 # src/main-window.c:218
-#: ../src/toolbar-factory.c:100
-#, fuzzy
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Previous\n"
 "part"
-msgstr "å??ä¸?é?¨å??"
-
-# src/main-window.c:218
-#: ../src/toolbar-factory.c:101
-#, fuzzy
-msgid "View previous part of message"
-msgstr "é?®ä»¶ç??å??ä¸?é?¨å??"
+msgstr ""
+"��\n"
+"�段"
 
 # src/main-window.c:219
-#: ../src/toolbar-factory.c:102
-#, fuzzy
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Next\n"
 "part"
-msgstr "ä¸?ä¸?é?¨å??"
-
-# src/main-window.c:219
-#: ../src/toolbar-factory.c:103
-#, fuzzy
-msgid "View next part of message"
-msgstr "é?®ä»¶ç??ä¸?ä¸?é?¨å??"
+msgstr ""
+"��\n"
+"�段"
 
 # src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
 # src/pref-manager.c:471
-#: ../src/toolbar-factory.c:104
+#: ../src/toolbar-factory.c:148
 #, fuzzy
 msgid ""
 "Trash /\n"
 "Delete"
 msgstr "å? é?¤"
 
-# src/main-window.c:168
-#: ../src/toolbar-factory.c:105
-#, fuzzy
-msgid "Move the current message to trash"
-msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
-
-#: ../src/toolbar-factory.c:106
-#, fuzzy
+#: ../src/toolbar-factory.c:149
 msgid "Postpone"
-msgstr "延�(_P)"
-
-# src/main-window.c:113
-#: ../src/toolbar-factory.c:107
-#, fuzzy
-msgid "Postpone current message"
-msgstr "å??å¤?å½?å??é?®ä»¶"
+msgstr "延æ??"
 
 # src/main-window.c:222 src/sendmsg-window.c:78
-#: ../src/toolbar-factory.c:108
-#, fuzzy
+#: ../src/toolbar-factory.c:150
 msgid "Print"
-msgstr "æ??å?°..."
+msgstr "æ??å?°"
+
+#: ../src/toolbar-factory.c:151
+msgid ""
+"Request\n"
+"MDN"
+msgstr ""
+"请�\n"
+"MDN"
 
 # src/sendmsg-window.c:88
-#: ../src/toolbar-factory.c:110
-#, fuzzy
+#: ../src/toolbar-factory.c:152
 msgid "Send"
-msgstr "å??é??(_S)"
+msgstr "å??é??"
 
-#: ../src/toolbar-factory.c:112
+#: ../src/toolbar-factory.c:153
 msgid "Exchange"
-msgstr ""
+msgstr "交�"
 
 # src/sendmsg-window.c:239
-#: ../src/toolbar-factory.c:114
-#, fuzzy
+#: ../src/toolbar-factory.c:154
 msgid "Attach"
-msgstr "ç²?é??æ??件"
-
-# src/message-window.c:61
-#: ../src/toolbar-factory.c:115
-#, fuzzy
-msgid "Add attachments to this message"
-msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
+msgstr "é??å? "
 
 # src/balsa-message.c:160
-#: ../src/toolbar-factory.c:116
-#, fuzzy
+#: ../src/toolbar-factory.c:155
 msgid "Save"
-msgstr "ä¿?å­?(_S)"
-
-#: ../src/toolbar-factory.c:117
-#, fuzzy
-msgid "Save the current item"
-msgstr "è·³è¿?å½?å??è¯?"
+msgstr "ä¿?å­?"
 
 # src/pref-manager.c:137
-#: ../src/toolbar-factory.c:118
-#, fuzzy
+#: ../src/toolbar-factory.c:156
 msgid "Identity"
-msgstr "��身份"
-
-#: ../src/toolbar-factory.c:119
-#, fuzzy
-msgid "Set identity to use for this message"
-msgstr "é??æ?©å??é??该é?®ä»¶æ??使ç?¨ç??身份"
-
-#: ../src/toolbar-factory.c:121
-#, fuzzy
-msgid "Run a spell check"
-msgstr "å®?æ??æ?¼å??æ£?æ?¥"
+msgstr "身份"
 
 # src/main-window.c:161
-#: ../src/toolbar-factory.c:122 ../src/toolbar-factory.c:132
+#: ../src/toolbar-factory.c:158
 msgid "Close"
 msgstr "��"
 
-# src/main-window.c:213
-#: ../src/toolbar-factory.c:123
-#, fuzzy
-msgid "Close the compose window"
-msgstr "æ­£å?¨å?³é?­æ?°å??çª?å?£"
-
-#: ../src/toolbar-factory.c:124
+#: ../src/toolbar-factory.c:159
 #, fuzzy
 msgid ""
 "Toggle\n"
 "new"
 msgstr "å??转æ?ªè¯»"
 
-# src/main-window.c:107
-#: ../src/toolbar-factory.c:125
-#, fuzzy
-msgid "Toggle new message flag"
-msgstr "ç¼?å??æ?°é?®ä»¶"
-
-#: ../src/toolbar-factory.c:126
+#: ../src/toolbar-factory.c:160
 msgid "Mark all"
-msgstr ""
-
-#: ../src/toolbar-factory.c:127
-#, fuzzy
-msgid "Mark all messages in current mailbox"
-msgstr "é??中å½?å??é?®ä»¶ç®±ä¸­ç??å?¨é?¨é?®ä»¶"
+msgstr "�记��"
 
-# src/filter-edit-dialog.c:267
-#: ../src/toolbar-factory.c:128
+# src/filter-edit-dialog.c:749
+#: ../src/toolbar-factory.c:162
 #, fuzzy
 msgid ""
-"All\n"
-"headers"
-msgstr "��信头(_H)"
-
-#: ../src/toolbar-factory.c:129
-#, fuzzy
-msgid "Show all headers"
-msgstr "æ?¾ç¤ºæ??æ??信头"
-
-#: ../src/toolbar-factory.c:130
-#, fuzzy
-msgid "Empty Trash"
-msgstr "�空�纸�(_T)"
-
-# src/mailbox-conf.c:640
-#: ../src/toolbar-factory.c:133
-#, fuzzy
-msgid "Close current mailbox"
-msgstr "���件箱"
-
-# src/pref-manager.c:558
-#: ../src/toolbar-factory.c:134
-#, fuzzy
-msgid "Msg Preview"
-msgstr "��"
-
-# src/pref-manager.c:558
-#: ../src/toolbar-factory.c:135
-#, fuzzy
-msgid "Show preview pane"
-msgstr "使�����"
-
-#: ../src/toolbar-factory.c:137
-msgid "Sign"
+"Reset\n"
+"Filter"
 msgstr ""
+"é??ç½®\n"
+"è¿?滤è§?å??"
 
-#: ../src/toolbar-factory.c:138
-msgid "Sign message using GPG"
-msgstr ""
+#: ../src/toolbar-factory.c:165
+msgid "Sign"
+msgstr "ç­¾å??"
 
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:166
 msgid "Encrypt"
-msgstr ""
-
-# src/sendmsg-window.c:518
-#: ../src/toolbar-factory.c:140
-#, fuzzy
-msgid "Encrypt message using GPG"
-msgstr "�件����"
+msgstr "��"
 
 # src/index-child.c:422
-#: ../src/toolbar-factory.c:142
-#, fuzzy
+#: ../src/toolbar-factory.c:168
 msgid "Undo"
-msgstr "�读"
-
-#: ../src/toolbar-factory.c:143
-msgid "Undo most recent change"
-msgstr ""
+msgstr "æ?¤é??"
 
 # src/filter-edit-dialog.c:391 src/sendmsg-window.c:145
-#: ../src/toolbar-factory.c:144
-#, fuzzy
+#: ../src/toolbar-factory.c:169
 msgid "Redo"
-msgstr "å? é?¤"
+msgstr "é??å??"
 
-#: ../src/toolbar-factory.c:145
-msgid "Redo most recent change"
+#: ../src/toolbar-factory.c:170
+msgid "Expunge"
 msgstr ""
 
-#: ../src/toolbar-factory.c:233
-#, c-format
-msgid "Unknown toolbar icon \"%s\""
-msgstr ""
+#: ../src/toolbar-factory.c:171
+#, fuzzy
+msgid ""
+"Empty\n"
+"Trash"
+msgstr "�空�件箱(_T)"
 
-#: ../src/toolbar-factory.c:315
+# src/main-window.c:166
+#: ../src/toolbar-factory.c:172
+msgid "Edit"
+msgstr "ç¼?è¾?"
+
+#: ../src/toolbar-factory.c:185
 #, fuzzy
 msgid "Queue"
 msgstr "ç¼?å­?(_Q)"
 
-#: ../src/toolbar-factory.c:352
+#: ../src/toolbar-factory.c:390
+#, c-format
+msgid "Unknown toolbar icon \"%s\""
+msgstr "æ?ªç?¥ç??å·¥å?·æ ?å?¾æ ?â??%sâ??"
+
+#: ../src/toolbar-factory.c:461
 #, fuzzy
 msgid "Queue this message for sending"
 msgstr "å°?æ­¤é?®ä»¶æ?¾å?¨å??件箱中æ??é??è¿?è¡?å??é??"
 
-#: ../src/toolbar-prefs.c:123
-#, fuzzy
-msgid "Customize Toolbars"
-msgstr "å®?å?¶å·¥å?·æ ?å??è??å??"
+#: ../src/toolbar-factory.c:519
+msgid "Text Be_low Icons"
+msgstr "æ??å­?å?¨å?¾æ ?ä¸?æ?¹(_L)"
 
-# src/pref-manager.c:555
-#: ../src/toolbar-prefs.c:144
-msgid "Main window"
-msgstr "主��"
+#: ../src/toolbar-factory.c:520
+msgid "Priority Text Be_side Icons"
+msgstr "ä¼?å??å°?æ??å­?æ?¾ç¤ºå?¨å?¾æ ?æ??(_S)"
+
+# src/pref-manager.c:67
+#: ../src/toolbar-factory.c:522
+msgid "_Icons Only"
+msgstr "���(_I)"
+
+#: ../src/toolbar-factory.c:523
+msgid "_Text Only"
+msgstr "ä»?æ??å­?(_T)"
+
+#: ../src/toolbar-factory.c:746
+#, c-format
+msgid "Use Desktop _Default (%s)"
+msgstr "使����认(%s)(_D)"
+
+#: ../src/toolbar-factory.c:776
+msgid "_Customize Toolbars..."
+msgstr "��工��(_C)..."
+
+#: ../src/toolbar-prefs.c:138
+msgid "Customize Toolbars"
+msgstr "��工��"
 
 # src/main-window.c:213
-#: ../src/toolbar-prefs.c:148
+#: ../src/toolbar-prefs.c:175
 msgid "Compose window"
 msgstr "æ?°å??çª?å?£"
 
-# src/pref-manager.c:555
-#: ../src/toolbar-prefs.c:152
-msgid "Message window"
-msgstr "�件��"
-
 # src/pref-manager.c:538
-#: ../src/toolbar-prefs.c:154
-#, fuzzy
+#: ../src/toolbar-prefs.c:184
 msgid "Toolbar options"
-msgstr "工��"
+msgstr "å·¥å?·æ ?é??项"
 
-#: ../src/toolbar-prefs.c:164
-#, fuzzy
+#: ../src/toolbar-prefs.c:193
 msgid "_Wrap button labels"
-msgstr "æ??é?®æ ?ç­¾æ?¢è¡?"
+msgstr "æ??é?®æ ?ç­¾æ?¢è¡?(_W)"
 
-#: ../src/toolbar-prefs.c:363
+#: ../src/toolbar-prefs.c:408
 #, c-format
 msgid "Error displaying toolbar help: %s\n"
-msgstr ""
+msgstr "æ?¾ç¤ºå·¥å?·æ ?帮å?©å?ºé??ï¼?%s\n"
 
 # src/pref-manager.c:558
 #. Preview display
-#: ../src/toolbar-prefs.c:399
+#: ../src/toolbar-prefs.c:444
 msgid "Preview"
 msgstr "��"
 
-#: ../src/toolbar-prefs.c:427
+#: ../src/toolbar-prefs.c:481
 msgid "_Restore toolbar to standard buttons"
-msgstr ""
+msgstr "æ?¢å¤?å·¥å?·æ ?é»?认æ??é?®(_R)"
 
-#: ../src/toolbar-prefs.c:446
+# src/pref-manager.c:538
+#. Style button
+#: ../src/toolbar-prefs.c:485
+msgid "Toolbar _style..."
+msgstr "工��样�(_S)..."
+
+#: ../src/toolbar-prefs.c:502
 msgid "Available buttons"
 msgstr "å?¯ç?¨ç??æ??é?®"
 
-#: ../src/toolbar-prefs.c:462
+#: ../src/toolbar-prefs.c:518
 msgid "Current toolbar"
 msgstr "å½?å??å·¥å?·æ ?"
 
 # src/filter-edit-dialog.c:165
-#: ../src/toolbar-prefs.c:479
+#: ../src/toolbar-prefs.c:535
 msgid "Up"
 msgstr "å??ä¸?"
 
 # src/filter-edit-dialog.c:171
-#: ../src/toolbar-prefs.c:495
+#: ../src/toolbar-prefs.c:551
 msgid "Down"
 msgstr "å??ä¸?"
 
+#, fuzzy
+#~ msgid "%s: encryption failed: %s"
+#~ msgstr "身份��失败"
+
+# src/main-window.c:168
+#, fuzzy
+#~ msgid "Error setting flags on messages in mailbox %s"
+#~ msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+
+#~ msgid "POP3 mailbox %s temp mailbox error:\n"
+#~ msgstr "POP3 é?®ä»¶ç®± %s 临æ?¶é?®ä»¶ç®±é??误ï¼?\n"
+
+#, fuzzy
+#~ msgid "signing failed: %s"
+#~ msgstr "ç?»å½?失败ã??"
+
+#, fuzzy
+#~ msgid "encryption failed: %s"
+#~ msgstr "身份��失败"
+
+#, fuzzy
+#~ msgid "Error displaying %s: %s\n"
+#~ msgstr "å?? %s (%s)å??å??æ?¶å??ç??é??误"
+
+# src/mailbox-conf.c:723 src/mailbox-conf.c:804
+#, fuzzy
+#~ msgid "_Server"
+#~ msgstr "æ??å?¡å?¨(_S)ï¼?"
+
+#~ msgid "_Expand aliases as you type"
+#~ msgstr "å?¨è¾?å?¥ç??æ?¶å??å±?å¼?å?«å??(_E)"
+
+#, fuzzy
+#~ msgid "The address book file path \"%s\" is not correct. %s"
+#~ msgstr ""
+#~ "å?°å??ç°¿æ??件路å¾?â??%sâ??ä¸?正确ã??\n"
+#~ "æ?¨è¦?æ?´æ­£æ??件å??å??ï¼?"
+
+#, fuzzy
+#~ msgid "The load program path \"%s\" is not correct. %s"
+#~ msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
+
+#, fuzzy
+#~ msgid "The save program path \"%s\" is not correct. %s"
+#~ msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
+
+#, fuzzy
+#~ msgid "The path \"%s\" is not correct. %s"
+#~ msgstr "â??%sâ??ä¸?æ?¯ç?®å½?ã??"
+
+#~ msgid "Opening mailbox %s. Please wait..."
+#~ msgstr "æ­£å?¨æ??å¼?é?®ä»¶ç®± %sã??请ç­?å¾?..."
+
+# src/main-window.c:168
+#, fuzzy
+#~ msgid "Failed to copy messages to mailbox \"%s\": %s"
+#~ msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+
+#, fuzzy
+#~ msgid "Shown mailbox: %s with %d message, "
+#~ msgid_plural "Shown mailbox: %s with %d messages, "
+#~ msgstr[0] "æ?¾ç¤ºç??é?®ä»¶ç®±ï¼?%s æ?? %ld 个é?®ä»¶ï¼?%ld 个æ?°é?®ä»¶"
+#~ msgstr[1] "æ?¾ç¤ºç??é?®ä»¶ç®±ï¼?%s æ?? %ld 个é?®ä»¶ï¼?%ld 个æ?°é?®ä»¶"
+
+#~ msgid "Rename or move subfolder"
+#~ msgstr "é??å?½å??æ??移å?¨å­?æ??件夹"
+
+# src/index-child.c:149 src/mailbox-conf.c:759 src/mailbox-conf.c:848
+#, fuzzy
+#~ msgid "_Remember Password"
+#~ msgstr "�令(_P)�"
+
+# src/pref-manager.c:387
+#, fuzzy
+#~ msgid "Show address:"
+#~ msgstr "ä¿?å­?å?°å??"
+
+# src/balsa-index.c:231
+#, fuzzy
+#~ msgid "_From"
+#~ msgstr "å??件人"
+
+# src/main-window.c:166
+#~ msgid "_Edit..."
+#~ msgstr "ç¼?è¾?(_E)..."
+
+# src/mailbox-conf.c:640
+#, fuzzy
+#~ msgid "_Compress Mailbox"
+#~ msgstr "���件箱"
+
+# src/main-window.c:107
+#, fuzzy
+#~ msgid "_New..."
+#~ msgstr "�建(_N)"
+
+# src/main-window.c:200
+#, fuzzy
+#~ msgid "_Manage..."
+#~ msgstr "�件(_M)..."
+
+# src/main-window.c:215
+#, fuzzy
+#~ msgid "_Select Filters"
+#~ msgstr "å?¨é?¨é??中(_S)"
+
+# src/main-window.c:409
+#, fuzzy
+#~ msgid ""
+#~ "The Balsa email client is part of the GNOME desktop environment.  "
+#~ "Information on Balsa can be found at http://balsa.gnome.org/\n";
+#~ "\n"
+#~ "If you need to report bugs, please do so at: http://bugzilla.gnome.org/";
+#~ msgstr ""
+#~ "Balsa é?®ä»¶å®¢æ?·ç¨?åº?æ?¯ GNOME æ¡?é?¢ç?¯å¢?ç??ä¸?é?¨å??ã??å?³äº? Balsa ç??ä¿¡æ?¯å?¯ä»¥è®¿é?® "
+#~ "http://www.balsa.net\n";
+#~ "\n"
+#~ "å¦?æ??æ?¨è¦?æ?¥å??软件ç??é?®é¢?ï¼?请访é?®http://bugzilla.gnome.org/";
+
+# src/filter-edit-dialog.c:267
+#~ msgid "N_o Headers"
+#~ msgstr "没æ??信头(_O)"
+
+# src/message-window.c:54
+#~ msgid "Reply to this message"
+#~ msgstr "å??å¤?æ­¤é?®ä»¶"
+
+# src/message-window.c:61
+#~ msgid "Reply to all recipients of this message"
+#~ msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
+
+# src/message-window.c:67
+#~ msgid "Forward this message as attachment"
+#~ msgstr "å°?æ­¤é?®ä»¶ä½?为é??件转å??"
+
+# src/main-window.c:216
+#~ msgid "Forward inline..."
+#~ msgstr "ç?´æ?¥è½¬å??..."
+
+# src/message-window.c:67
+#~ msgid "Forward this message inline"
+#~ msgstr "ç?´æ?¥è½¬å??æ­¤é?®ä»¶"
+
+# src/main-window.c:219
+#~ msgid "Next Part"
+#~ msgstr "ä¸?ä¸?é?¨å??"
+
+# src/main-window.c:218
+#~ msgid "Previous Part"
+#~ msgstr "å??ä¸?é?¨å??"
+
+#~ msgid "Save current part in message"
+#~ msgstr "ä¿?å­?é?®ä»¶å½?å??é?¨å??"
+
+# src/main-window.c:219
+#, fuzzy
+#~ msgid "_Next Message"
+#~ msgstr "���件"
+
+# src/main-window.c:219
+#, fuzzy
+#~ msgid "Next message"
+#~ msgstr "���件"
+
+# src/main-window.c:218
+#, fuzzy
+#~ msgid "_Previous Message"
+#~ msgstr "å??ä¸?é?®ä»¶"
+
+#, fuzzy
+#~ msgid "Could not create temporary file %s: "
+#~ msgstr "æ? æ³?å??建临æ?¶æ??件 %s"
+
+# src/pref-manager.c:151
+#~ msgid "Display"
+#~ msgstr "�示"
+
+# src/pref-manager.c:158 src/pref-manager.c:587
+#~ msgid "Misc"
+#~ msgstr "��"
+
+# src/pref-manager.c:476
+#, fuzzy
+#~ msgid "Local Mail"
+#~ msgstr "���件"
+
+#, fuzzy
+#~ msgid "Display message if new mail has arrived in an open mailbox"
+#~ msgstr "å¦?æ??æ?°é?®ä»¶å?°è¾¾å??æ?¾ç¤º"
+
+#, fuzzy
+#~ msgid "Wrap Incoming Text at:"
+#~ msgstr "å??å?ºç??é?®ä»¶è?ªå?¨æ?¢è¡?å?¨ï¼?"
+
+# src/pref-manager.c:555
+#, fuzzy
+#~ msgid "Main Window"
+#~ msgstr "主��"
+
+#~ msgid "Use alternative main window layout"
+#~ msgstr "使ç?¨å?¶å®?ç??主çª?å?£å¸?å±?"
+
+#~ msgid "Encoding"
+#~ msgstr "ç¼?ç ?"
+
+# src/main-window.c:200
+#, fuzzy
+#~ msgid "Message Subject Font"
+#~ msgstr "�件��"
+
+# src/pref-manager.c:555
+#, fuzzy
+#~ msgid "Message Window"
+#~ msgstr "�件��"
+
+# src/filter-edit-dialog.c:707
+#~ msgid "Options"
+#~ msgstr "é??项"
+
+#~ msgid "Expand aliases"
+#~ msgstr "å±?å¼?å?«å??"
+
+#~ msgid "Page: %i/%i"
+#~ msgstr "页�%i/%i"
+
+#, fuzzy
+#~ msgid "Could not get part: %s"
+#~ msgstr " æ? æ³?ä¿?å­? %sï¼?%s "
+
+# src/main-window.c:215
+#, fuzzy
+#~ msgid "Select Font"
+#~ msgstr "é??中æ??å­?(_S)"
+
+#, fuzzy
+#~ msgid "_Fonts"
+#~ msgstr "å­?ä½?"
+
+#~ msgid "Balsa: message print preview"
+#~ msgstr "Balsaï¼?é?®ä»¶æ??å?°é¢?è§?"
+
+#, fuzzy
+#~ msgid "_Russian (ISO)"
+#~ msgstr "�语 (ISO)"
+
+#, fuzzy
+#~ msgid "_Russian (KOI)"
+#~ msgstr "�语 (KOI)"
+
+# src/balsa-index.c:231
+#~ msgid "Fr_om"
+#~ msgstr "å??件人(_O)"
+
+# src/balsa-message.c:534
+#~ msgid "_Cc"
+#~ msgstr "æ??é??(_C)"
+
+#~ msgid "_Bcc"
+#~ msgstr "æ??é??(_B)"
+
+#~ msgid "_Fcc"
+#~ msgstr "æ??件æ??é??(_F)"
+
+# src/sendmsg-window.c:185
+#~ msgid "Cannot get info on file '%s': %s"
+#~ msgstr "æ? æ³?è?·å¾?æ??件â??%sâ??ç??ä¿¡æ?¯ï¼?%s"
+
+#~ msgid "File %s cannot be read\n"
+#~ msgstr "æ? æ³?读å??æ??件 %s\n"
+
+# src/main-window.c:113 src/message-window.c:54
+#, fuzzy
+#~ msgid "_Reply To:"
+#~ msgstr "å??å¤?å?°(_R)"
+
+# src/sendmsg-window.c:523
+#, fuzzy
+#~ msgid "Continue message to %s: %s"
+#~ msgstr "继续�件"
+
+#, fuzzy
+#~ msgid "Check for new email"
+#~ msgstr "����件��(_E)"
+
+# src/message-window.c:61
+#, fuzzy
+#~ msgid "Reply to all recipients"
+#~ msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
+
+# src/main-window.c:211
+#, fuzzy
+#~ msgid "Open next unread message"
+#~ msgstr "���读�件"
+
+# src/main-window.c:211
+#, fuzzy
+#~ msgid "Open next flagged message"
+#~ msgstr "ä¸?ä¸?å??æ ?è®°é?®ä»¶"
+
+# src/main-window.c:218
+#, fuzzy
+#~ msgid "View previous part of message"
+#~ msgstr "é?®ä»¶ç??å??ä¸?é?¨å??"
+
+# src/main-window.c:219
+#, fuzzy
+#~ msgid "View next part of message"
+#~ msgstr "é?®ä»¶ç??ä¸?ä¸?é?¨å??"
+
+# src/main-window.c:168
+#, fuzzy
+#~ msgid "Move the current message to trash"
+#~ msgstr "å°?å½?å??é?®ä»¶ç§»å?°å·²å? é?¤é?®ä»¶ç®±"
+
+# src/main-window.c:113
+#, fuzzy
+#~ msgid "Postpone current message"
+#~ msgstr "å??å¤?å½?å??é?®ä»¶"
+
+# src/message-window.c:61
+#, fuzzy
+#~ msgid "Add attachments to this message"
+#~ msgstr "å??å¤?ç»?æ­¤é?®ä»¶ç??æ??æ??æ?¶ä»¶äºº"
+
+#, fuzzy
+#~ msgid "Save the current item"
+#~ msgstr "è·³è¿?å½?å??è¯?"
+
+#, fuzzy
+#~ msgid "Run a spell check"
+#~ msgstr "å®?æ??æ?¼å??æ£?æ?¥"
+
+# src/main-window.c:213
+#, fuzzy
+#~ msgid "Close the compose window"
+#~ msgstr "æ­£å?¨å?³é?­æ?°å??çª?å?£"
+
+# src/main-window.c:107
+#, fuzzy
+#~ msgid "Toggle new message flag"
+#~ msgstr "ç¼?å??æ?°é?®ä»¶"
+
+#, fuzzy
+#~ msgid "Mark all messages in current mailbox"
+#~ msgstr "é??中å½?å??é?®ä»¶ç®±ä¸­ç??å?¨é?¨é?®ä»¶"
+
+# src/mailbox-conf.c:640
+#, fuzzy
+#~ msgid "Close current mailbox"
+#~ msgstr "���件箱"
+
 # src/mailbox-conf.c:671 src/mailbox-conf.c:706
 #, fuzzy
 #~ msgid "_Middle Name:"
@@ -6947,10 +8224,6 @@ msgstr "å??ä¸?"
 #~ msgid "8 Bits"
 #~ msgstr "8ä½?ç¼?ç ?"
 
-#, fuzzy
-#~ msgid "Quoted"
-#~ msgstr "å¼?ç?¨ç??"
-
 # src/pref-manager.c:496
 #~ msgid "Remote SMTP Server"
 #~ msgstr "è¿?ç¨? SMTP æ??å?¡å?¨"
@@ -6972,10 +8245,6 @@ msgstr "å??ä¸?"
 #~ msgid "attach as reference"
 #~ msgstr "é??å? ä½?为å??è??"
 
-# src/sendmsg-window.c:239
-#~ msgid "attach as file"
-#~ msgstr "é??å? ä¸ºæ??件"
-
 #, fuzzy
 #~ msgid "_Attach as %s type \"%s\""
 #~ msgstr "访é?®ç±»å??ï¼?%s\n"
@@ -7003,11 +8272,6 @@ msgstr "å??ä¸?"
 #~ msgid "Please enter information about yourself."
 #~ msgstr "请è¾?å?¥æ?¨è?ªå·±ç??ä¿¡æ?¯ã??"
 
-# src/filter-edit-dialog.c:101
-#, fuzzy
-#~ msgid "_Name:"
-#~ msgstr "å??å­?ï¼?"
-
 #, fuzzy
 #~ msgid ""
 #~ "You seem to be running Balsa for the first time. The following steps will "
@@ -7033,10 +8297,6 @@ msgstr "å??ä¸?"
 #~ msgid "By _Date"
 #~ msgstr "��"
 
-# src/main-window.c:139
-#~ msgid "Cannot access the message's body\n"
-#~ msgstr "æ? æ³?访é?®é?®ä»¶ç??å??容\n"
-
 #~ msgid "Display message size as number of lines"
 #~ msgstr "以���示�件大�"
 
@@ -7092,11 +8352,6 @@ msgstr "å??ä¸?"
 #~ msgid "Cannot delete default profile, please make another default first."
 #~ msgstr "æ? æ³?å? é?¤é»?认é??ç½®ï¼?请å??设置å?¦å¤?ä¸?个é»?认é??ç½®ã??"
 
-# src/filter-edit-dialog.c:194 src/index-child.c:449 src/main-window.c:211
-# src/pref-manager.c:471
-#~ msgid "Delete"
-#~ msgstr "å? é?¤"
-
 # src/filter-edit-dialog.c:171
 #~ msgid "Do"
 #~ msgstr "�"
@@ -7139,25 +8394,12 @@ msgstr "å??ä¸?"
 #~ msgid "Could not open mailbox for spooling"
 #~ msgstr "æ? æ³?æ??å¼?é?®ä»¶ç®±æ?¥è?±æ?ºç¼?å?²"
 
-#~ msgid "Host not found"
-#~ msgstr "����主�"
-
 #~ msgid "Connection refused"
 #~ msgstr "è¿?æ?¥è¢«æ??ç»?"
 
 #~ msgid "Unable to open sentbox - could not get IMAP server information"
 #~ msgstr "æ? æ³?æ??å¼?å·²å??é??é?®ä»¶ç®±ï¼?æ? æ³?è?·å?? IMAP æ??å?¡å?¨ä¿¡æ?¯"
 
-#~ msgid "From: %d <%s>"
-#~ msgstr "ä»?ï¼?%d <%s>"
-
-#~ msgid "To: %d <%s>"
-#~ msgstr "��%d <%s>"
-
-# src/mailbox-conf.c:531
-#~ msgid "To %s: %d %s"
-#~ msgstr "è?³ %sï¼?%d %s"
-
 #~ msgid ""
 #~ "The mailbox \"%s\" does not appear to be valid.\n"
 #~ "Your system does not allow for creation of mailboxes\n"
@@ -7187,10 +8429,6 @@ msgstr "å??ä¸?"
 #~ msgid "Invoking autoview command: %s"
 #~ msgstr "è°?ç?¨è?ªå?¨æ?¥ç??å?½ä»¤ï¼?%s"
 
-# src/main-window.c:182
-#~ msgid "Can't create filter"
-#~ msgstr "æ? æ³?å??建è¿?滤å?¨"
-
 #~ msgid "[-- Can't run %s. --]\n"
 #~ msgstr "[-- æ? æ³?è¿?è¡? %sã??--]\n"
 
@@ -7272,9 +8510,6 @@ msgstr "å??ä¸?"
 #~ msgid "LOGIN disabled on this server."
 #~ msgstr "该æ??å?¡å?¨ç¦?æ­¢ç?»å½?ã??"
 
-#~ msgid "Logging in..."
-#~ msgstr "正���..."
-
 #~ msgid "Authenticating (SASL)..."
 #~ msgstr "正���身份��(SASL)..."
 
@@ -7297,7 +8532,7 @@ msgstr "å??ä¸?"
 
 # src/main-window.c:200
 #~ msgid "Fatal error.  Message count is out of sync!"
-#~ msgstr "严é??é??误ã??æ¶?æ?¯æ??æ?¯ä¸?å??æ­¥ï¼?"
+#~ msgstr "严é??é??误ã??é?®ä»¶æ??æ?¯ä¸?å??æ­¥ï¼?"
 
 #~ msgid "Closing connection to %s..."
 #~ msgstr "æ­£å?¨å?³é?­å?° %s ç??è¿?æ?¥..."
@@ -7351,12 +8586,6 @@ msgstr "å??ä¸?"
 #~ msgid "The message index is incorrect. Try reopening the mailbox."
 #~ msgstr "é?®ä»¶ç´¢å¼?ä¸?正确ã??请é??æ?°æ??å¼?é?®ä»¶ç®±ã??"
 
-#~ msgid "Uploading message ..."
-#~ msgstr "正��传�件..."
-
-#~ msgid "Copying %d messages to %s..."
-#~ msgstr "正��� %d 个�件� %s..."
-
 #~ msgid "Continue?"
 #~ msgstr "继续�"
 
@@ -7387,9 +8616,6 @@ msgstr "å??ä¸?"
 #~ msgid "Write failed!  Saved partial mailbox to %s"
 #~ msgstr "å??é??误ï¼?å·²å°?é?¨å??é?®ä»¶ç®±ä¿?å­?å?° %s"
 
-#~ msgid "Connection to %s closed"
-#~ msgstr "å·²å?³é?­å?° %s ç??è¿?æ?¥"
-
 #~ msgid "SSL is unavailable."
 #~ msgstr "SSL ä¸?å?¯ç?¨ã??"
 
@@ -7457,9 +8683,6 @@ msgstr "å??ä¸?"
 #~ msgid "Exit  "
 #~ msgstr "é??å?º"
 
-#~ msgid "Help"
-#~ msgstr "帮�"
-
 #~ msgid "Warning: Couldn't save certificate"
 #~ msgstr "è­¦å??ï¼?æ? æ³?ä¿?å­?è¯?书"
 
@@ -7481,9 +8704,6 @@ msgstr "å??ä¸?"
 #~ msgid "Couldn't lock %s\n"
 #~ msgstr "æ? æ³?é??ä½? %s\n"
 
-#~ msgid "Reading %s..."
-#~ msgstr "æ­£å?¨è¯»å?? %s..."
-
 #~ msgid "Writing %s..."
 #~ msgstr "æ­£å?¨å?? %s..."
 
@@ -7506,9 +8726,6 @@ msgstr "å??ä¸?"
 #~ msgid "Mailbox is marked unwritable. %s"
 #~ msgstr "é?®ä»¶ç®±æ ?记为ä¸?å?¯è¯»ã??%s"
 
-#~ msgid "Mailbox is read-only."
-#~ msgstr "é?®ä»¶ç®±æ?¯å?ªè¯»ç??ã??"
-
 # src/main-window.c:139
 #~ msgid "Purge %d deleted message?"
 #~ msgstr "æ¸?é?¤ %d 个已å? é?¤ç??é?®ä»¶ï¼?"
@@ -7519,17 +8736,9 @@ msgstr "å??ä¸?"
 #~ msgid "Address Book Configuration"
 #~ msgstr "å?°å??ç°¿é??ç½®"
 
-# src/main-window.c:214
-#~ msgid "Reply..."
-#~ msgstr "å??å¤?..."
-
 #~ msgid "Store Address..."
 #~ msgstr "ä¿?å­?å?°å??..."
 
-# src/index-child.c:457
-#~ msgid "Undelete"
-#~ msgstr "å??æ¶?å? é?¤"
-
 # src/mailbox-conf.c:861
 #~ msgid "Folder"
 #~ msgstr "æ??件夹"
@@ -7615,11 +8824,6 @@ msgstr "å??ä¸?"
 #~ msgid "OK"
 #~ msgstr "确�"
 
-# src/sendmsg-window.c:523
-#, fuzzy
-#~ msgid "Search a message"
-#~ msgstr "�建�件"
-
 # src/main-window.c:219
 #~ msgid "Next part in Message"
 #~ msgstr "é?®ä»¶ç??ä¸?ä¸?é?¨å??"
@@ -7632,10 +8836,6 @@ msgstr "å??ä¸?"
 #~ msgid "Text"
 #~ msgstr "æ??æ?¬"
 
-# src/pref-manager.c:67
-#~ msgid "Icons"
-#~ msgstr "��"
-
 # src/pref-manager.c:68
 #~ msgid "Both"
 #~ msgstr "两è??"
@@ -7778,7 +8978,7 @@ msgstr "å??ä¸?"
 # src/main-window.c:168
 #, fuzzy
 #~ msgid "Delete messages from the trash mailbox"
-#~ msgstr "å? é?¤åº?纸ç¯?中ç??é?®ä»¶"
+#~ msgstr "å? é?¤åº?件箱中ç??é?®ä»¶"
 
 # src/pref-manager.c:558
 #, fuzzy



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]