update translations

[claws.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1242f1006b9513ba36b13f91e6d120d7bee01c21..d1b118aa079402c856ac010643778101cb80d81a 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,22 @@
-# Taiwanese translation of sylpheed-claws
+# Chinese translation of sylpheed-claws
 # Copyright (C) 2003 Tsu-Fan Cheng
 # This file is distributed under the same license as the sylpheed-claws package.
 # Tsu-Fan Cheng <tscheng@ic.sunysb.edu> 2003
+# Hansom Young <glyoung@users.sourceforge.net> 2003
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
-"POT-Creation-Date: 2003-09-10 17:22+0100\n"
-"PO-Revision-Date: 2003-05-22 14:05+0000\n"
+"POT-Creation-Date: 2003-12-18 05:54+0000\n"
+"PO-Revision-Date: 2003-09-22 14:05+0000\n"
 "Last-Translator: Hansom Young <glyoung@users.sourceforge.net>\n"
 "Language-Team: Hansom Young <glyoung@users.sourceforge.net> \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: glyoung@users.sourceforge.net\n"
+"Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 
-#: src/account.c:305
+#: src/account.c:312
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -23,11 +24,11 @@ msgstr ""
 "ÄúÕýÔÚ׫дÓʼþ£¬\n"
 "Çë¹ØµôËùÓÐ׫дÖеÄÓʼþÔÙ½øÐÐÕʺÅÉèÖá£"
 
-#: src/account.c:555
+#: src/account.c:563
 msgid "Edit accounts"
 msgstr "±à¼­ÕʺÅÉèÖÃ"
 
-#: src/account.c:573
+#: src/account.c:581
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
@@ -35,103 +36,214 @@ msgstr ""
 "¼ì²éÐÂÓʼþʱ½«»áÒÀÕÕÏÂÃæµÄ˳Ðò¡£Äú¿ÉÒÔ¹´Ñ¡ G À¸Î»Öеķ½¿é£¬\n"
 "À´¾ö¶¨ÊÇ·ñÔÚ¡¸È«²¿¼ì²é¡¹Ê±Òª¼ì²é¸ÃÕʺŵÄÓʼþ¡£"
 
-#: src/account.c:593 src/addressadd.c:182 src/addressbook.c:618
-#: src/compose.c:4662 src/compose.c:4832 src/editaddress.c:774
+#: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
+#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
-#: src/editjpilot.c:295 src/editldap.c:394 src/editvcard.c:210
-#: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:199
+#: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
+#: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/select-keys.c:301
 msgid "Name"
 msgstr "Ãû³Æ"
 
-#: src/account.c:594 src/prefs_account.c:927
+#: src/account.c:602 src/prefs_account.c:928
 msgid "Protocol"
 msgstr "ͨѶЭÒé"
 
-#: src/account.c:595 src/ssl_manager.c:105
+#: src/account.c:603 src/ssl_manager.c:105
 msgid "Server"
 msgstr "·þÎñÆ÷"
 
-#: src/account.c:624 src/addressbook.c:757 src/editaddress.c:722
+#: src/account.c:632 src/addressbook.c:774 src/editaddress.c:722
 #: src/editaddress.c:856 src/prefs_actions.c:221 src/prefs_customheader.c:234
 #: src/prefs_display_header.c:275 src/prefs_display_header.c:330
-#: src/prefs_filtering.c:293 src/prefs_matcher.c:557 src/prefs_scoring.c:271
-#: src/prefs_template.c:216 src/prefs_toolbar.c:769
+#: src/prefs_filtering_action.c:449 src/prefs_filtering.c:280
+#: src/prefs_matcher.c:557 src/prefs_template.c:216 src/prefs_toolbar.c:769
 msgid "Add"
 msgstr "ÐÂÔö"
 
-#: src/account.c:630
+#: src/account.c:638
 msgid "Edit"
 msgstr "±à¼­"
 
-#: src/account.c:636 src/prefs_customheader.c:241
+#: src/account.c:644 src/prefs_customheader.c:241
 msgid " Delete "
 msgstr "ɾ³ý"
 
-#: src/account.c:642 src/prefs_actions.c:284 src/prefs_customheader.c:289
-#: src/prefs_display_header.c:294 src/prefs_filtering.c:355
-#: src/prefs_matcher.c:639 src/prefs_scoring.c:325
+#: src/account.c:650
+msgid " Clone "
+msgstr " ¿Ë¡ "
+
+#: src/account.c:656 src/prefs_actions.c:284 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:294 src/prefs_filtering_action.c:503
+#: src/prefs_filtering.c:342 src/prefs_matcher.c:639
 #: src/prefs_summary_column.c:289 src/prefs_toolbar.c:830
 msgid "Down"
 msgstr "ÏÂÒÆ"
 
-#: src/account.c:648 src/prefs_actions.c:278 src/prefs_customheader.c:283
-#: src/prefs_display_header.c:288 src/prefs_filtering.c:349
-#: src/prefs_matcher.c:633 src/prefs_scoring.c:319
+#: src/account.c:662 src/prefs_actions.c:278 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:288 src/prefs_filtering_action.c:497
+#: src/prefs_filtering.c:336 src/prefs_matcher.c:633
 #: src/prefs_summary_column.c:285 src/prefs_toolbar.c:826
 msgid "Up"
 msgstr "ÉÏÒÆ"
 
-#: src/account.c:662
+#: src/account.c:676
 msgid " Set as default account "
-msgstr "ÉèΪȱʡÕʺÅ"
+msgstr " ÉèΪȱʡÕʺŠ"
 
-#: src/account.c:668 src/addressbook.c:984 src/addressbook.c:3013
-#: src/addressbook.c:3017 src/addressbook.c:3055 src/crash.c:242
-#: src/exphtmldlg.c:196 src/expldifdlg.c:203 src/gtk/pluginwindow.c:224
-#: src/inc.c:691 src/message_search.c:135 src/summary_search.c:208
+#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
+#: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: src/account.c:736
+#: src/account.c:758
+msgid "Accounts with remote folders cannot be cloned"
+msgstr "²»ÄÜ¿Ë¡ÓÐÔ¶³ÌÓʼþ¼ÐµÄÕÊ»§"
+
+#: src/account.c:764
+#, c-format
+msgid "Cloned %s"
+msgstr "ÒÑ¿Ë¡ %s"
+
+#: src/account.c:906
 msgid "Delete account"
 msgstr "ɾ³ýÕʺÅ"
 
-#: src/account.c:737
+#: src/account.c:907
 msgid "Do you really want to delete this account?"
 msgstr "ÄúÈ·¶¨ÒªÉ¾³ýÕâ¸öÕʺÅÂð£¿"
 
-#: src/account.c:738 src/addressbook.c:1007 src/addressbook.c:2205
-#: src/compose.c:2982 src/compose.c:3468 src/compose.c:5947 src/compose.c:6255
+#: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
+#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
+#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
-#: src/folderview.c:2122 src/folderview.c:2177 src/folderview.c:2268
-#: src/folderview.c:2403 src/folderview.c:2442 src/inc.c:168 src/inc.c:270
-#: src/mainwindow.c:1436 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:854
-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1666 src/prefs_scoring.c:623
-#: src/prefs_scoring.c:760 src/prefs_template.c:544 src/ssl_manager.c:271
-#: src/summary_search.c:324 src/summaryview.c:917 src/summaryview.c:1380
-#: src/summaryview.c:1424 src/summaryview.c:1467 src/summaryview.c:1491
-#: src/summaryview.c:1523 src/summaryview.c:1548 src/summaryview.c:1573
-#: src/summaryview.c:1598 src/summaryview.c:3083 src/toolbar.c:2048
+#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
+#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
+#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
+#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
+#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
+#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
+#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
 msgid "Yes"
-msgstr "ÊǵÄ"
+msgstr "ÊÇ"
 
-#: src/account.c:738 src/compose.c:3468 src/compose.c:5947
-#: src/folderview.c:2122 src/folderview.c:2177 src/folderview.c:2268
-#: src/folderview.c:2403 src/folderview.c:2442 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
+#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
+#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
 msgid "+No"
-msgstr "+²»Òª"
+msgstr "+·ñ"
+
+#: src/action.c:346
+#, c-format
+msgid "Could not get message file %d"
+msgstr "ÎÞ·¨È¡µÃÓʼþÎļþ %d"
+
+#: src/action.c:365
+msgid "Could not get message part."
+msgstr "ÎÞ·¨¶ÁÈ¡ÓʼþÄÚÈÝ"
+
+#: src/action.c:382
+msgid "Can't get part of multipart message"
+msgstr "ÎÞ·¨¶ÁÈ¡·ûºÏÓʼþµÄÒ»²¿·Ö¡£"
+
+#: src/action.c:488
+#, c-format
+msgid ""
+"The selected action cannot be used in the compose window\n"
+"because it contains %%f, %%F, %%as or %%p."
+msgstr "±»Ñ¡ÔñµÄ¶¯×÷²»ÄÜÓÃÓÚÓʼþ׫д´°¿Ú\n"
+"ÒòÆä°üº¬ %%f, %%F, %%as»òÕß%%p¡£"
+
+#: src/action.c:776
+#, c-format
+msgid ""
+"Command could not be started. Pipe creation failed.\n"
+"%s"
+msgstr ""
+"ÎÞ·¨Æô¶¯ÃüÁî¡£´´½¨¹ÜµÀʧ°Ü¡£\n"
+"%s"
+
+#: src/action.c:861
+#, c-format
+msgid ""
+"Could not fork to execute the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"ÎÞ·¨Éú³É×Ó½ø³ÌÒÔÖ´ÐÐÏÂÊöÃüÁî:\n"
+"%s\n"
+"%s"
+
+#: src/action.c:1088
+#, c-format
+msgid "--- Running: %s\n"
+msgstr ""
+
+#: src/action.c:1092
+#, c-format
+msgid "--- Ended: %s\n"
+msgstr ""
+
+#: src/action.c:1128
+msgid "Action's input/output"
+msgstr "¶¯×÷ÊäÈë/Êä³ö"
+
+#: src/action.c:1174
+msgid " Send "
+msgstr " ·¢ËÍ "
+
+#: src/action.c:1194
+msgid "Completed %v/%u"
+msgstr "ÒÑÍê³É %v/%u"
+
+#: src/action.c:1204
+msgid "Abort"
+msgstr "ÖÐÖ¹"
+
+#: src/action.c:1353
+#, fuzzy, c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"(`%%h' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"ÇëÊäÈëÓÃÓÚ´òÓ¡µÄÃüÁîÐÐ:\n"
+"(`%s' ½«±»Ì滻ΪÎļþÃû)"
+
+#: src/action.c:1358
+msgid "Action's hidden user argument"
+msgstr "Óû§ÌṩµÄ²ÎÊý(ÊäÈëʱ²»»ØÏÔ)"
+
+#: src/action.c:1362
+#,  c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"(`%%u' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"ÇëÊäÈëÓÃÓÚÏÂÊö¶¯×÷µÄ²ÎÊý:\n"
+"(`%%u' ½«±»ÊäÈëµÄ²ÎÊýÌæ»»)\n"
+"  %s"
+
+#: src/action.c:1367
+msgid "Action's user argument"
+msgstr "Óû§ÌṩµÄ²ÎÊý"
 
 #: src/addressadd.c:162
 msgid "Add to address book"
 msgstr "½«µØÖ·¼ÓÈëµØÖ·²¾"
 
-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:424
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
 msgid "Address"
 msgstr "µØÖ·"
 
-#: src/addressadd.c:204 src/addressbook.c:620 src/editaddress.c:628
+#: src/addressadd.c:204 src/addressbook.c:637 src/editaddress.c:628
 #: src/editaddress.c:692 src/editgroup.c:259
 msgid "Remarks"
 msgstr "±¸×¢"
@@ -141,410 +253,427 @@ msgid "Select Address Book Folder"
 msgstr "Ñ¡ÔñµØÖ·²¾×ÊÁϼÐ"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
-#: src/alertpanel.c:324 src/compose.c:3107 src/compose.c:5769
+#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
-#: src/editjpilot.c:344 src/editldap.c:340 src/editldap_basedn.c:212
+#: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
-#: src/grouplistdialog.c:241 src/gtk/about.c:233 src/gtk/prefswindow.c:319
-#: src/gtk/sslcertwindow.c:230 src/gtk/gtkaspell.c:1425
-#: src/gtk/gtkaspell.c:2378 src/import.c:190 src/importmutt.c:287
-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:613
-#: src/mainwindow.c:2218 src/messageview.c:900 src/mimeview.c:1016
-#: src/mimeview.c:1080 src/passphrase.c:130 src/prefs_gtk.c:449
-#: src/prefs_actions.c:161 src/prefs_common.c:2991 src/prefs_common.c:3160
-#: src/prefs_common.c:3487 src/prefs_customheader.c:157
-#: src/prefs_display_header.c:194 src/prefs_filtering.c:212
-#: src/prefs_matcher.c:370 src/prefs_scoring.c:196
-#: src/prefs_summary_column.c:313 src/prefs_template.c:263 src/sigstatus.c:134
-#: src/ssl_manager.c:98
+#: src/grouplistdialog.c:244 src/gtk/about.c:233
+#: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
+#: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
+#: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
+#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
+#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_customheader.c:157 src/prefs_display_header.c:194
+#: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
+#: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
+#: src/prefs_template.c:263 src/ssl_manager.c:98
 msgid "OK"
 msgstr "È·¶¨"
 
-#: src/addressadd.c:241 src/addressbook.c:2199 src/addrgather.c:507
-#: src/compose.c:3107 src/compose.c:5770 src/compose.c:6438 src/compose.c:6476
+#: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
+#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
-#: src/editjpilot.c:345 src/editldap.c:341 src/editldap_basedn.c:213
+#: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
-#: src/export.c:189 src/foldersel.c:194 src/grouplistdialog.c:242
-#: src/gtk/prefswindow.c:320 src/gtk/gtkaspell.c:1434 src/import.c:191
-#: src/importldif.c:1034 src/importmutt.c:288 src/importpine.c:288
-#: src/inputdialog.c:204 src/main.c:613 src/mainwindow.c:2218
-#: src/messageview.c:900 src/mimeview.c:1017 src/mimeview.c:1081
-#: src/passphrase.c:134 src/prefs_gtk.c:450 src/prefs_actions.c:162
-#: src/prefs_common.c:2992 src/prefs_common.c:3488
+#: src/export.c:189 src/foldersel.c:194 src/grouplistdialog.c:245
+#: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
+#: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
+#: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
+#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
+#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
-#: src/prefs_filtering.c:213 src/prefs_matcher.c:371 src/prefs_scoring.c:197
-#: src/prefs_summary_column.c:314 src/prefs_template.c:264
-#: src/progressdialog.c:77 src/select-keys.c:332 src/summaryview.c:917
-#: src/summaryview.c:3425
+#: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
+#: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
+#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
+#: src/summaryview.c:3453
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: src/addressbook.c:357 src/compose.c:499 src/mainwindow.c:417
-#: src/messageview.c:141
+#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/messageview.c:143
 msgid "/_File"
 msgstr "/Îļþ(_F)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:364
 msgid "/_File/New _Book"
 msgstr "/Îļþ(_F)/ÐÂÔöµØÖ·²¾(_B)"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:365
 msgid "/_File/New _vCard"
 msgstr "/Îļþ(_F)/ÐÂÔövCard(_v)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:367
 msgid "/_File/New _JPilot"
 msgstr "/Îļþ(_F)/ÐÂÔöJ-Pilot(_J)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:370
 msgid "/_File/New _Server"
 msgstr "/Îļþ(_F)/ÐÂÔö·þÎñÆ÷(_S)"
 
-#: src/addressbook.c:366 src/addressbook.c:369 src/compose.c:503
-#: src/mainwindow.c:433 src/mainwindow.c:436 src/messageview.c:144
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
+#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/Îļþ(_F)/---"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:373
 msgid "/_File/_Edit"
 msgstr "/Îļþ(_F)/±à¼­(_E)"
 
-#: src/addressbook.c:368
+#: src/addressbook.c:374
 msgid "/_File/_Delete"
 msgstr "/Îļþ(_F)/ɾ³ý(_D)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:376
 msgid "/_File/_Save"
 msgstr "/Îļþ(_F)/±£´æ(_S)"
 
-#: src/addressbook.c:371 src/compose.c:504 src/messageview.c:145
+#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
 msgid "/_File/_Close"
 msgstr "/Îļþ(_F)/¹Ø±Õ(_C)"
 
-#: src/addressbook.c:372 src/addressbook.c:402 src/addressbook.c:416
-#: src/compose.c:506 src/mainwindow.c:440 src/messageview.c:147
+#: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
+#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
 msgid "/_Edit"
 msgstr "/±à¼­(_E)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:379
 msgid "/_Edit/C_ut"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_u)"
 
-#: src/addressbook.c:374 src/compose.c:511 src/mainwindow.c:441
-#: src/messageview.c:148
+#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/±à¼­(_E)/¿½±´(_C)"
 
-#: src/addressbook.c:375 src/compose.c:512
+#: src/addressbook.c:381 src/compose.c:520
 msgid "/_Edit/_Paste"
 msgstr "/±à¼­(_E)/Õ³Ìù(_P)"
 
-#: src/addressbook.c:376 src/compose.c:509 src/compose.c:592
-#: src/mainwindow.c:444 src/messageview.c:150
+#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
+#: src/mainwindow.c:452 src/messageview.c:152
 msgid "/_Edit/---"
 msgstr "/±à¼­(_E)/---"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:383
 msgid "/_Edit/Pa_ste Address"
 msgstr "/±à¼­(_E)/Õ³ÌùµØÖ·(_s)"
 
-#: src/addressbook.c:378
+#: src/addressbook.c:384
 msgid "/_Address"
 msgstr "/µØÖ·(_A)"
 
-#: src/addressbook.c:379
+#: src/addressbook.c:385
 msgid "/_Address/New _Address"
 msgstr "/µØÖ·(_A)/ÐÂÔöµØÖ·(_A)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:386
 msgid "/_Address/New _Group"
 msgstr "/µØÖ·(_A)/ÐÂÔöȺ×é(_G)"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:387
 msgid "/_Address/New _Folder"
 msgstr "/µØÖ·(_A)/ÐÂÔö×ÊÁϼÐ(_F)"
 
-#: src/addressbook.c:382
+#: src/addressbook.c:388
 msgid "/_Address/---"
 msgstr "/µØÖ·(_A)/---"
 
-#: src/addressbook.c:383
+#: src/addressbook.c:389
 msgid "/_Address/_Edit"
 msgstr "/µØÖ·(_A)/±à¼­(_E)"
 
-#: src/addressbook.c:384
+#: src/addressbook.c:390
 msgid "/_Address/_Delete"
 msgstr "/µØÖ·(_A)/ɾ³ý(_D)"
 
-#: src/addressbook.c:385 src/addressbook.c:389 src/mainwindow.c:657
-#: src/mainwindow.c:668 src/mainwindow.c:670 src/mainwindow.c:673
-#: src/mainwindow.c:676 src/mainwindow.c:680 src/messageview.c:263
-#: src/messageview.c:274
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
+#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
+#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
+#: src/messageview.c:284
 msgid "/_Tools/---"
 msgstr "/¹¤¾ß(_T)/---"
 
-#: src/addressbook.c:386
+#: src/addressbook.c:392
 msgid "/_Tools/Import _LDIF file..."
 msgstr "/¹¤¾ß(_T)/µ¼Èë LDIF Îļþ(_L)..."
 
-#: src/addressbook.c:387
+#: src/addressbook.c:393
 msgid "/_Tools/Import M_utt file..."
 msgstr "/¹¤¾ß(_T)/µ¼Èë Mutt Îļþ(_u)..."
 
-#: src/addressbook.c:388
+#: src/addressbook.c:394
 msgid "/_Tools/Import _Pine file..."
 msgstr "/¹¤¾ß(_T)/µ¼Èë Pine Îļþ(_P)..."
 
-#: src/addressbook.c:390
+#: src/addressbook.c:396
 msgid "/_Tools/Export _HTML..."
 msgstr "/¹¤¾ß(_T)/Êä³ö HTML(_H)..."
 
-#: src/addressbook.c:391
+#: src/addressbook.c:397
 msgid "/_Tools/Export LDI_F..."
 msgstr "/¹¤¾ß(_T)/Êä³ö LDI_F..."
 
-#: src/addressbook.c:392 src/compose.c:669 src/mainwindow.c:704
-#: src/messageview.c:277
+#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
+#: src/messageview.c:287
 msgid "/_Help"
 msgstr "/°ïÖú(_H)"
 
-#: src/addressbook.c:393 src/compose.c:670 src/mainwindow.c:714
-#: src/messageview.c:278
+#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
+#: src/messageview.c:288
 msgid "/_Help/_About"
 msgstr "/°ïÖú(_H)/¹ØÓÚ(_A)"
 
-#: src/addressbook.c:398 src/addressbook.c:412
+#: src/addressbook.c:404 src/addressbook.c:418
 msgid "/New _Address"
 msgstr "/еØÖ·(_A)"
 
-#: src/addressbook.c:399 src/addressbook.c:413
+#: src/addressbook.c:405 src/addressbook.c:419
 msgid "/New _Group"
 msgstr "/ÐÂȺ×é(_G)"
 
-#: src/addressbook.c:400 src/addressbook.c:414
+#: src/addressbook.c:406 src/addressbook.c:420
 msgid "/New _Folder"
 msgstr "/ÐÂ×ÊÁϼÐ(_F)"
 
-#: src/addressbook.c:401 src/addressbook.c:404 src/addressbook.c:415
-#: src/addressbook.c:418 src/addressbook.c:422 src/compose.c:493
-#: src/folderview.c:289 src/folderview.c:291 src/folderview.c:300
+#: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
+#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
 #: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:321 src/folderview.c:326 src/folderview.c:330
-#: src/folderview.c:332 src/folderview.c:342 src/folderview.c:346
-#: src/folderview.c:349 src/folderview.c:351 src/summaryview.c:411
-#: src/summaryview.c:414 src/summaryview.c:416 src/summaryview.c:422
-#: src/summaryview.c:436 src/summaryview.c:448 src/summaryview.c:454
-#: src/summaryview.c:457
+#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
+#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
+#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
+#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
+#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
+#: src/summaryview.c:465
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:403 src/addressbook.c:417 src/summaryview.c:419
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
 msgid "/_Delete"
 msgstr "/ɾ³ý(_D)"
 
-#: src/addressbook.c:405 src/addressbook.c:419
+#: src/addressbook.c:411 src/addressbook.c:425
 msgid "/C_ut"
 msgstr "/¼ôÇÐ(_u)"
 
-#: src/addressbook.c:406 src/addressbook.c:420
+#: src/addressbook.c:412 src/addressbook.c:426
 msgid "/_Copy"
 msgstr "/¸´ÖÆ(_C)"
 
-#: src/addressbook.c:407 src/addressbook.c:421
+#: src/addressbook.c:413 src/addressbook.c:427
 msgid "/_Paste"
 msgstr "/Õ³Ìù(_P)"
 
-#: src/addressbook.c:423
+#: src/addressbook.c:430 src/addressbook.c:433
 msgid "/Pa_ste Address"
 msgstr "/Õ³ÌùµØÖ·(_s)"
 
-#: src/addressbook.c:435 src/crash.c:444 src/crash.c:463 src/importldif.c:118
+#: src/addressbook.c:431
+msgid "/_Browse Entry"
+msgstr "/²é¿´ÏîÄ¿(_B)"
+
+#: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
+#: src/sgpgme.c:86
 msgid "Unknown"
 msgstr "δ֪"
 
-#: src/addressbook.c:442 src/addressbook.c:461 src/importldif.c:125
+#: src/addressbook.c:453 src/addressbook.c:472 src/importldif.c:125
 msgid "Success"
 msgstr "³É¹¦"
 
-#: src/addressbook.c:443 src/importldif.c:126
+#: src/addressbook.c:454 src/importldif.c:126
 msgid "Bad arguments"
 msgstr "´íÎóµÄ²ÎÊý"
 
-#: src/addressbook.c:444 src/importldif.c:127
+#: src/addressbook.c:455 src/importldif.c:127
 msgid "File not specified"
 msgstr "δָ¶¨Îļþ"
 
-#: src/addressbook.c:445 src/importldif.c:128
+#: src/addressbook.c:456 src/importldif.c:128
 msgid "Error opening file"
 msgstr "´ò¿ªÎļþ´íÎó"
 
-#: src/addressbook.c:446 src/importldif.c:129
+#: src/addressbook.c:457 src/importldif.c:129
 msgid "Error reading file"
 msgstr "¶ÁÈ¡Îļþ´íÎó"
 
-#: src/addressbook.c:447 src/importldif.c:130
+#: src/addressbook.c:458 src/importldif.c:130
 msgid "End of file encountered"
 msgstr "Óöµ½Îļþĩβ"
 
-#: src/addressbook.c:448 src/importldif.c:131
+#: src/addressbook.c:459 src/importldif.c:131
 msgid "Error allocating memory"
 msgstr "ÄÚ´æ·ÖÅä´íÎó"
 
-#: src/addressbook.c:449 src/importldif.c:132
+#: src/addressbook.c:460 src/importldif.c:132
 msgid "Bad file format"
 msgstr "Îļþ¸ñʽ´íÎó"
 
-#: src/addressbook.c:450 src/importldif.c:133
+#: src/addressbook.c:461 src/importldif.c:133
 msgid "Error writing to file"
 msgstr "ÎļþдÈë´íÎó"
 
-#: src/addressbook.c:451 src/importldif.c:134
+#: src/addressbook.c:462 src/importldif.c:134
 msgid "Error opening directory"
 msgstr "´ò¿ªÄ¿Â¼´íÎó"
 
-#: src/addressbook.c:452 src/importldif.c:135
+#: src/addressbook.c:463 src/importldif.c:135
 msgid "No path specified"
 msgstr "δָ¶¨Îļþ·¾¶"
 
-#: src/addressbook.c:462
+#: src/addressbook.c:473
 msgid "Error connecting to LDAP server"
 msgstr "LDAP ·þÎñÆ÷Á¬½Ó´íÎó"
 
-#: src/addressbook.c:463
+#: src/addressbook.c:474
 msgid "Error initializing LDAP"
 msgstr "LDAP Æðʼ´íÎó"
 
-#: src/addressbook.c:464
+#: src/addressbook.c:475
 msgid "Error binding to LDAP server"
 msgstr ""
 
-#: src/addressbook.c:465
+#: src/addressbook.c:476
 msgid "Error searching LDAP database"
 msgstr "ËÑÑ°LDAP×ÊÁÏ¿âʱ³ö´í"
 
-#: src/addressbook.c:466
+#: src/addressbook.c:477
 msgid "Timeout performing LDAP operation"
 msgstr "½øÐÐLDAP²Ù×÷ʱ³¬Ê±"
 
-#: src/addressbook.c:467 src/addressbook.c:468
+#: src/addressbook.c:478
 msgid "Error in LDAP search criteria"
 msgstr "LDAPËÑÑ°±ê×¼´íÎó"
 
-#: src/addressbook.c:469
+#: src/addressbook.c:479
 msgid "No LDAP entries found for search criteria"
 msgstr "LDAPËÑѰûÓнá¹û"
 
-#: src/addressbook.c:619
+#: src/addressbook.c:480
+msgid "LDAP search terminated on request"
+msgstr "LDAPÒÑ°´ÇëÇóÖÕÖ¹"
+
+#: src/addressbook.c:636
 msgid "E-Mail address"
 msgstr "E-Mail µØÖ·"
 
-#: src/addressbook.c:623 src/prefs_common.c:2613 src/toolbar.c:178
-#: src/toolbar.c:1751
+#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
+#: src/toolbar.c:1767
 msgid "Address book"
 msgstr "ͨѶ¼"
 
-#: src/addressbook.c:722
+#: src/addressbook.c:739
 msgid "Name:"
 msgstr "ÐÕÃû"
 
-#: src/addressbook.c:754 src/addressbook.c:2198 src/addressbook.c:2205
-#: src/editaddress.c:716 src/editaddress.c:850 src/prefs_actions.c:234
-#: src/prefs_display_header.c:281 src/prefs_display_header.c:337
-#: src/prefs_filtering.c:306 src/prefs_matcher.c:570 src/prefs_scoring.c:284
-#: src/prefs_template.c:229 src/prefs_toolbar.c:781 src/ssl_manager.c:92
-#: src/toolbar.c:374 src/toolbar.c:466
+#: src/addressbook.c:771 src/addressbook.c:2264 src/addressbook.c:2278
+#: src/addressbook.c:2293 src/editaddress.c:716 src/editaddress.c:850
+#: src/prefs_actions.c:234 src/prefs_display_header.c:281
+#: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
+#: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
+#: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
+#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
 msgid "Delete"
 msgstr "ɾ³ý"
 
-#: src/addressbook.c:760
+#: src/addressbook.c:777
 msgid "Lookup"
 msgstr "²éÕÒ"
 
-#: src/addressbook.c:772 src/compose.c:1424 src/compose.c:3157
-#: src/compose.c:4479 src/compose.c:5186 src/headerview.c:55
-#: src/prefs_template.c:173 src/summary_search.c:156
+#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
+#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
-msgstr "µ½£º"
+msgstr "To:"
 
-#: src/addressbook.c:776 src/compose.c:1408 src/compose.c:3156
+#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:780 src/compose.c:1411 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: src/addressbook.c:982 src/addressbook.c:1005
+#: src/addressbook.c:1006 src/addressbook.c:1029
 msgid "Delete address(es)"
 msgstr "ɾ³ýÓʼþµØÖ·"
 
-#: src/addressbook.c:983
+#: src/addressbook.c:1007
 msgid "This address data is readonly and cannot be deleted."
-msgstr "Õâ·ÖÓʼþµØÖ·ÊÇÖ»¶Á£¬²»¿Éɾ³ý¡£"
+msgstr "´ËÓʼþµØÖ·Êý¾ÝÊÇÖ»¶ÁµÄ£¬²»ÄÜɾ³ý¡£"
 
-#: src/addressbook.c:1006
+#: src/addressbook.c:1030
 msgid "Really delete the address(es)?"
 msgstr "È·¶¨É¾³ýÓʼþµØÖ·?"
 
-#: src/addressbook.c:1007 src/addressbook.c:2205 src/compose.c:2982
-#: src/compose.c:6255 src/exphtmldlg.c:185 src/expldifdlg.c:192
-#: src/expldifdlg.c:250 src/inc.c:168 src/inc.c:270 src/mainwindow.c:1436
-#: src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:854
-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1666 src/prefs_scoring.c:623
-#: src/prefs_scoring.c:760 src/prefs_template.c:544 src/summary_search.c:324
-#: src/summaryview.c:917 src/summaryview.c:1380 src/summaryview.c:1424
-#: src/summaryview.c:1467 src/summaryview.c:1491 src/summaryview.c:1523
-#: src/summaryview.c:1548 src/summaryview.c:1573 src/summaryview.c:1598
-#: src/summaryview.c:3083 src/toolbar.c:2048
+#: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
+#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
+#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
+#: src/prefs_actions.c:525 src/prefs_customheader.c:543
+#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
+#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
+#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
+#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
+#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
+#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
 msgid "No"
 msgstr "²»"
 
-#: src/addressbook.c:1534 src/addressbook.c:1607
+#: src/addressbook.c:1569 src/addressbook.c:1642
 msgid "Cannot paste. Target address book is readonly."
 msgstr "ÎÞ·¨Õ³Ìù£¬¸ÃͨѶ¼ÒÑÉèΪֻ¶Á¡£"
 
-#: src/addressbook.c:1545
+#: src/addressbook.c:1580
 msgid "Cannot paste into an address group."
 msgstr "ÎÞ·¨ÌùÈëÖ¸¶¨µÄͨѶȺ×é¡£"
 
-#: src/addressbook.c:2195
+# c-format
+#: src/addressbook.c:2261
+#, c-format
+msgid "Do you want to delete the query results and addresses in `%s' ?"
+msgstr "ÄúÏëҪɾ³ý'%s'ÀïÃæµÄ²éѯ½á¹ûºÍµØÖ·ÐÅÏ¢Âð?"
+
+#: src/addressbook.c:2273
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ? \n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
-"ÄúÈ·¶¨ÒªÉ¾È¥Õâ¸öĿ¼¼°ÔÚ '%s' Ö®ÖеÃͨѶ¼Â𣿠\n"
+"ÄúÈ·¶¨ÒªÉ¾³ý'%s'Õâ¸öĿ¼ÒÔ¼°ÀïÃæËùÓеĵØÖ·Â𣿠\n"
 "Èç¹ûֻɾ³ýĿ¼£¬Í¨Ñ¶Â¼»á±»ÒƵ½ÉÏÒ»²ãµÄĿ¼ÖС£"
 
-#: src/addressbook.c:2199
+#: src/addressbook.c:2279
 msgid "Folder only"
 msgstr "Ö»ÓÐĿ¼"
 
-#: src/addressbook.c:2199
+#: src/addressbook.c:2280
 msgid "Folder and Addresses"
 msgstr "Ŀ¼¼°Í¨Ñ¶Â¼"
 
-#: src/addressbook.c:2204
+#: src/addressbook.c:2292
 #, c-format
 msgid "Really delete `%s' ?"
-msgstr "È·¶¨ÒªÉ¾ȥ '%s' ?"
+msgstr "È·¶¨ÒªÉ¾³ý '%s' ?"
 
-#: src/addressbook.c:2963
+#: src/addressbook.c:3070
 msgid "New user, could not save index file."
 msgstr "ÐÂÓû§£¬ÎÞ·¨±£´æË÷ÒýÎļþ¡£"
 
-#: src/addressbook.c:2967
+#: src/addressbook.c:3074
 msgid "New user, could not save address book files."
 msgstr "ÐÂÓû§£¬ÎÞ·¨±£´æµØÖ·²¾Îļþ¡£"
 
-#: src/addressbook.c:2977
+#: src/addressbook.c:3084
 msgid "Old address book converted successfully."
 msgstr "ת»»¾ÉµØÖ·²¾¸ñʽÍê³É¡£"
 
-#: src/addressbook.c:2982
+#: src/addressbook.c:3089
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -552,7 +681,7 @@ msgstr ""
 "¾ÉͨѶ¼¸ñʽÒÑת»»£¬\n"
 "µ«ÎÞ·¨±£´æеÄË÷ÒýÎļþ¡£"
 
-#: src/addressbook.c:2995
+#: src/addressbook.c:3102
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -560,7 +689,7 @@ msgstr ""
 "ÎÞ·¨×ª»»Í¨Ñ¶Â¼¸ñʽ£¬\n"
 "µ«ÒѲúÉú¿ÕµÄеØÖ·²¾¡£"
 
-#: src/addressbook.c:3001
+#: src/addressbook.c:3108
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -568,7 +697,7 @@ msgstr ""
 "ÎÞ·¨×ª»»Í¨Ñ¶Â¼¸ñʽ£¬\n"
 "ÎÞ·¨²úÉúеÄͨѶ¼¡£"
 
-#: src/addressbook.c:3006
+#: src/addressbook.c:3113
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -576,65 +705,71 @@ msgstr ""
 "ÎÞ·¨×ª»»Í¨Ñ¶Â¼¸ñʽ£¬\n"
 "ÒàÎÞ·¨²úÉúеÄͨѶ¼¡£"
 
-#: src/addressbook.c:3013
+#: src/addressbook.c:3120
 msgid "Addressbook conversion error"
 msgstr "ת»»Í¨Ñ¶Â¼¸ñʽʱ·¢Éú´íÎó"
 
-#: src/addressbook.c:3017
+#: src/addressbook.c:3124
 msgid "Addressbook conversion"
 msgstr "ͨѶ¼¸ñʽת»»"
 
-#: src/addressbook.c:3053
+#: src/addressbook.c:3160
 msgid "Addressbook Error"
 msgstr "ͨѶ¼·¢Éú´íÎó"
 
-#: src/addressbook.c:3054
+#: src/addressbook.c:3161
 msgid "Could not read address index"
 msgstr "ÎÞ·¨¶ÁȡͨѶ¼Ë÷Òý"
 
-#: src/addressbook.c:3405
+#: src/addressbook.c:3518
 msgid "Busy searching..."
 msgstr "ÕýÔÚËÑË÷..."
 
-#: src/addressbook.c:3606 src/prefs_common.c:1037
+# c-format
+#: src/addressbook.c:3572
+#, c-format
+msgid "Search '%s'"
+msgstr "ËÑË÷ '%s'"
+
+#: src/addressbook.c:3794 src/prefs_common.c:984
 msgid "Interface"
 msgstr "½çÃæ"
 
-#: src/addressbook.c:3622 src/exphtmldlg.c:423 src/expldifdlg.c:435
+#: src/addressbook.c:3810 src/exphtmldlg.c:423 src/expldifdlg.c:435
 #: src/exporthtml.c:1011 src/importldif.c:690
 msgid "Address Book"
 msgstr "ͨѶ¼"
 
-#: src/addressbook.c:3638
+#: src/addressbook.c:3826
 msgid "Person"
 msgstr "ÈËÃû"
 
-#: src/addressbook.c:3654
+#: src/addressbook.c:3842
 msgid "EMail Address"
 msgstr "µç×ÓÓʼþÐÅÏä"
 
-#: src/addressbook.c:3670
+#: src/addressbook.c:3858
 msgid "Group"
 msgstr "Ⱥ×é"
 
-#: src/addressbook.c:3686 src/exporthtml.c:913 src/folderview.c:383
-#: src/prefs_account.c:2125
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
+#: src/prefs_account.c:2126
 msgid "Folder"
-msgstr "×ÊÁϼÐ"
+msgstr "Óʼþ¼Ð"
 
-#: src/addressbook.c:3702
+#: src/addressbook.c:3890
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3718 src/addressbook.c:3734
+#: src/addressbook.c:3906 src/addressbook.c:3922
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3750
+#: src/addressbook.c:3938
 msgid "LDAP Server"
 msgstr "LDAP ·þÎñÆ÷"
 
-#: src/addressbook.c:3766
+#: src/addressbook.c:3954
 msgid "LDAP Query"
 msgstr "LDAP ²éѯ"
 
@@ -648,7 +783,7 @@ msgstr "
 
 #: src/addrgather.c:183
 msgid "Busy harvesting addresses..."
-msgstr "»ñÈ¡E-MailµØÖ·µ±ÖÐ..."
+msgstr "ÕýÔÚÅúÁ¿»ñÈ¡E-MailµØÖ·..."
 
 #: src/addrgather.c:221
 msgid "Addresses gathered successfully."
@@ -656,18 +791,18 @@ msgstr "
 
 #: src/addrgather.c:285
 msgid "No folder or message was selected."
-msgstr "δѡȡÎļþ¼Ð»òѶϢ¡£"
+msgstr "δѡȡÓʼþ¼Ð»òѶϢ¡£"
 
 #: src/addrgather.c:293
 msgid ""
 "Please select a folder to process from the folder\n"
 "list. Alternatively, select one or messages from\n"
 "the message list."
-msgstr "ÇëÑ¡È¡Ò»¸öĿ¼»òÒ»ÏîѶϢÒÔ±ãÖ´ÐС£"
+msgstr "ÇëÑ¡È¡Ò»¸öÓʼþ¼Ð»òÒ»ÏîѶϢÒÔ±ãÖ´ÐС£"
 
 #: src/addrgather.c:345
 msgid "Folder :"
-msgstr "Ŀ¼ :"
+msgstr "Óʼþ¼Ð :"
 
 #: src/addrgather.c:356 src/exphtmldlg.c:637 src/expldifdlg.c:667
 #: src/importldif.c:948
@@ -676,11 +811,11 @@ msgstr "ͨѶ¼ :"
 
 #: src/addrgather.c:366
 msgid "Folder Size :"
-msgstr "Îļþ¼Ð´óС :"
+msgstr "Óʼþ¼Ð´óС :"
 
 #: src/addrgather.c:381
 msgid "Process these mail header fields"
-msgstr "¼ìË÷ÈçÏÂÓʼþÍ·×Ö¶Î"
+msgstr "¼ìË÷ÈçÏÂÐÅÍ·×Ö¶Î"
 
 #: src/addrgather.c:399
 msgid "Include sub-folders"
@@ -694,8 +829,8 @@ msgstr ""
 msgid "Address Count"
 msgstr "ÓʼþµØÖ·ÊýÄ¿"
 
-#: src/addrgather.c:527 src/alertpanel.c:155 src/main.c:263
-#: src/messageview.c:492
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
+#: src/sgpgme.c:279 src/textview.c:1863
 msgid "Warning"
 msgstr "¾¯¸æ"
 
@@ -710,25 +845,26 @@ msgstr "
 
 #: src/addrgather.c:588
 msgid "Harvest E-Mail Addresses - from Selected Messages"
-msgstr "ÓÉÑ¡È¡µÄÓʼþÖлñÈ¡E-MailµØÖ·"
+msgstr "ÓÉÑ¡È¡µÄÓʼþÖÐÅúÁ¿»ñÈ¡E-MailµØÖ·"
 
 #: src/addrgather.c:596
 msgid "Harvest E-Mail Addresses - from Folder"
-msgstr "ÓÉÎļþ¼ÐÖлñÈ¡E-MailµØÖ·"
+msgstr "ÓÉÓʼþ¼ÐÖÐÅúÁ¿»ñÈ¡E-MailµØÖ·"
 
-#: src/addrindex.c:105 src/addrindex.c:109 src/addrindex.c:116
+#: src/addrindex.c:112 src/addrindex.c:116 src/addrindex.c:123
 msgid "Common address"
-msgstr "¹²Í¨ÓʼþµØÖ·"
+msgstr "¹«ÓÃÓʼþµØÖ·"
 
-#: src/addrindex.c:106 src/addrindex.c:110 src/addrindex.c:117
+#: src/addrindex.c:113 src/addrindex.c:117 src/addrindex.c:124
 msgid "Personal address"
 msgstr "¸öÈËÓʼþµØÖ·"
 
-#: src/alertpanel.c:142 src/compose.c:5947 src/main.c:595
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
 msgid "Notice"
 msgstr "×¢Òâ"
 
-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3468 src/inc.c:573
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
+#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
 msgid "Error"
 msgstr "´íÎó"
 
@@ -740,6 +876,26 @@ msgstr "
 msgid "Show this message next time"
 msgstr "ÔÚÏÔʾһ´ÎѶϢ"
 
+#: src/browseldap.c:238
+msgid "Browse Directory Entry"
+msgstr "ä¯ÀÀĿ¼Ïî"
+
+#: src/browseldap.c:258
+msgid "Server Name :"
+msgstr "·þÎñÆ÷Ãû£º"
+
+#: src/browseldap.c:268
+msgid "Distinguished Name (dn) :"
+msgstr "Ãû"
+
+#: src/browseldap.c:291
+msgid "LDAP Name"
+msgstr "LDAPÃû³Æ"
+
+#: src/browseldap.c:293
+msgid "Attribute Value"
+msgstr "ÊôÐÔÖµ"
+
 #: src/common/nntp.c:68
 #, c-format
 msgid "Can't connect to NNTP server: %s:%d\n"
@@ -758,6 +914,10 @@ msgstr "ͨѶЭ
 msgid "Error occurred while posting\n"
 msgstr "·¢±íÎÄÕÂʱ·¢Éú´íÎó\n"
 
+#: src/common/plugin.c:103
+msgid "Failed to allocate memory for Plugin"
+msgstr "Ϊ²å¼þ·ÖÅäÄÚ´æʧ°Ü"
+
 #: src/common/smtp.c:152
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP ÈÏ֤ʧ°Ü\n"
@@ -778,16 +938,16 @@ msgstr "
 msgid "can't start TLS session\n"
 msgstr "ÎÞ·¨Æô¶¯TLS\n"
 
-#: src/common/ssl.c:78
+#: src/common/ssl.c:77
 msgid "Error creating ssl context\n"
 msgstr ""
 
-#: src/common/ssl.c:97
+#: src/common/ssl.c:96
 #, c-format
 msgid "SSL connect failed (%s)\n"
 msgstr "SSLÁ¬½Óʧ°Ü (%s)\n"
 
-#: src/common/ssl.c:105
+#: src/common/ssl.c:104
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "ʹÓà %s ×÷ΪSSLÁ¬½Ó\n"
@@ -816,7 +976,7 @@ msgstr ""
 
 #: src/common/ssl_certificate.c:307
 msgid "Can't load X509 default paths"
-msgstr "ÎÞ·¨Ê¹ÓÃX509Ô¤ÉèµÄ·¾¶"
+msgstr "ÎÞ·¨¼ÓÔØX509ȱʡ·¾¶"
 
 #: src/common/ssl_certificate.c:362
 #, c-format
@@ -824,7 +984,7 @@ msgid ""
 "%s presented an unknown SSL certificate:\n"
 "%s"
 msgstr ""
-"%s ÓÐÒ»¸öδ֪µÄSSLÁ¬½Ó£º\n"
+"%s ÓÐÒ»¸öδ֪µÄSSLÈÏÖ¤£º\n"
 "%s"
 
 #: src/common/ssl_certificate.c:369 src/common/ssl_certificate.c:407
@@ -837,11 +997,11 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"³ý·ÇÄú½«ÈÏÖ¤´¦´æÏÂÀ´£¬·ñÔòÎÞ·¨½«ÐżþÈ¡»Ø¡£\n"
-"(È¡Ïû\"%s\"µÄÆ«ºÃÉèÖÃ)¡£\n"
+"ÔÚÄú±£´æÈÏÖ¤ÐÅϢ֮ǰ£¬ÓʼþÎÞ·¨È¡»Ø¡£\n"
+"(È¡Ïû\"%s\"Æ«ºÃÉèÖÃ)¡£\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
-#: src/prefs_common.c:1211
+#: src/prefs_common.c:1123
 msgid "Don't popup error dialog on receive error"
 msgstr "½ÓÊÕÓдíÎóʱ²»ÒªÏÔʾ´íÎóѶϢ"
 
@@ -866,365 +1026,397 @@ msgstr ""
 "\n"
 "Ä¿Ç°»ØÓ¦µÄ·þÎñÆ÷¿ÉÄÜÒѾ­²»ÊÇͬһ¸ö¡£"
 
-#: src/compose.c:491
+#: src/common/utils.c:178
+#, c-format
+msgid "%dB"
+msgstr ""
+
+#: src/common/utils.c:180
+#, c-format
+msgid "%.1fKB"
+msgstr ""
+
+#: src/common/utils.c:182
+#, c-format
+msgid "%.2fMB"
+msgstr ""
+
+#: src/common/utils.c:184
+#, c-format
+msgid "%.2fGB"
+msgstr ""
+
+#: src/compose.c:499
 msgid "/_Add..."
-msgstr "/ÐÂÔö...(_A)"
+msgstr "/ÐÂÔö(_A)..."
 
-#: src/compose.c:492
+#: src/compose.c:500
 msgid "/_Remove"
-msgstr "ÒƳý(_R)"
+msgstr "/ɾ³ý(_R)"
 
-#: src/compose.c:494 src/folderview.c:292 src/folderview.c:313
-#: src/folderview.c:334 src/folderview.c:353
+#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
+#: src/folderview.c:333 src/folderview.c:351
 msgid "/_Properties..."
-msgstr "/ÊôÐÔ...(_P)"
+msgstr "/ÊôÐÔ(_P)..."
 
-#: src/compose.c:500
+#: src/compose.c:508
 msgid "/_File/_Attach file"
 msgstr "/Îļþ(_F)/¸½¼ÓÎļþ(_A)"
 
-#: src/compose.c:501
+#: src/compose.c:509
 msgid "/_File/_Insert file"
 msgstr "/Îļþ(_F)/²åÈëÎļþ(_I)"
 
-#: src/compose.c:502
+#: src/compose.c:510
 msgid "/_File/Insert si_gnature"
 msgstr "/Îļþ(_F)/²åÈëÇ©Ãû(_g)"
 
-#: src/compose.c:507
+#: src/compose.c:515
 msgid "/_Edit/_Undo"
-msgstr "/±à¼­(_E)/¸´Ô­(_U)"
+msgstr "/±à¼­(_E)/³·Ïû(_U)"
 
-#: src/compose.c:508
+#: src/compose.c:516
 msgid "/_Edit/_Redo"
 msgstr "/±à¼­(_E)/Öظ´Ç°Ò»¸ö¶¯×÷(_R)"
 
-#: src/compose.c:510
+#: src/compose.c:518
 msgid "/_Edit/Cu_t"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_t)"
 
-#: src/compose.c:513
+#: src/compose.c:521
 msgid "/_Edit/Paste as _quotation"
-msgstr "/±à¼­(_E)/Ìù½øÒýÑÔ(_q)"
+msgstr "/±à¼­(_E)/Õ³ÌùΪÒýÎÄ(_q)"
 
-#: src/compose.c:515 src/mainwindow.c:442 src/messageview.c:149
+#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
 msgid "/_Edit/Select _all"
 msgstr "/±à¼­(_E)/È«Ñ¡(_a)"
 
-#: src/compose.c:516
+#: src/compose.c:524
 msgid "/_Edit/A_dvanced"
-msgstr "/±à¼­(_E)/½ø½×(_d)"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)"
 
-#: src/compose.c:517
+#: src/compose.c:525
 msgid "/_Edit/A_dvanced/Move a character backward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ºóÒÆÒ»×Ö·û"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö·û"
 
-#: src/compose.c:522
+#: src/compose.c:530
 msgid "/_Edit/A_dvanced/Move a character forward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Ç°ÒÆÒ»×Ö·û"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö·û"
 
-#: src/compose.c:527
+#: src/compose.c:535
 msgid "/_Edit/A_dvanced/Move a word backward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ºóÒÆÒ»×Ö"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö"
 
-#: src/compose.c:532
+#: src/compose.c:540
 msgid "/_Edit/A_dvanced/Move a word forward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Ç°ÒÆÒ»×Ö"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö"
 
-#: src/compose.c:537
+#: src/compose.c:545
 msgid "/_Edit/A_dvanced/Move to beginning of line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ÒƵ½ÐпªÍ·"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐпªÍ·"
 
-#: src/compose.c:542
+#: src/compose.c:550
 msgid "/_Edit/A_dvanced/Move to end of line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ÒƵ½ÐÐβ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐÐβ"
 
-#: src/compose.c:547
+#: src/compose.c:555
 msgid "/_Edit/A_dvanced/Move to previous line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ÒƵ½Ç°Ò»ÐÐ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½Ç°Ò»ÐÐ"
 
-#: src/compose.c:552
+#: src/compose.c:560
 msgid "/_Edit/A_dvanced/Move to next line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ÒƵ½ÏÂÒ»ÐÐ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÏÂÒ»ÐÐ"
 
-#: src/compose.c:557
+#: src/compose.c:565
 msgid "/_Edit/A_dvanced/Delete a character backward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Íùºóɾ³ýÒ»×Ö·û"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö·û"
 
-#: src/compose.c:562
+#: src/compose.c:570
 msgid "/_Edit/A_dvanced/Delete a character forward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Íùǰɾ³ýÒ»×Ö·û"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö·û"
 
-#: src/compose.c:567
+#: src/compose.c:575
 msgid "/_Edit/A_dvanced/Delete a word backward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Íùºóɾ³ýÒ»×Ö"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö"
 
-#: src/compose.c:572
+#: src/compose.c:580
 msgid "/_Edit/A_dvanced/Delete a word forward"
-msgstr "/±à¼­(_E)/½ø½×(_d)/Íùǰɾ³ýÒ»×Ö"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö"
 
-#: src/compose.c:577
+#: src/compose.c:585
 msgid "/_Edit/A_dvanced/Delete line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ɾ³ýÒ»ÐÐ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 
-#: src/compose.c:582
+#: src/compose.c:590
 msgid "/_Edit/A_dvanced/Delete entire line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/ɾ³ýÒ»ÐÐ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 
-#: src/compose.c:587
+#: src/compose.c:595
 msgid "/_Edit/A_dvanced/Delete to end of line"
-msgstr "/±à¼­(_E)/½ø½×(_d)/´ÓÓα괦Æðɾ³ýÖÁÐÐβ"
+msgstr "/±à¼­(_E)/¸ß¼¶(_d)/´ÓÓα괦Æðɾ³ýÖÁÐÐβ"
 
-#: src/compose.c:593
+#: src/compose.c:601
 msgid "/_Edit/_Wrap current paragraph"
-msgstr "/±à¼­(_E)/½«ĿÇ°¶ÎÂäÕÛÐÐ(_W)"
+msgstr "/±à¼­(_E)/½«µ±Ç°¶ÎÂäÕÛÐÐ(_W)"
 
-#: src/compose.c:595
+#: src/compose.c:603
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/±à¼­(_E)/½«ËùÓйý³¤µÄÐÐÕÛÐÐ(_l)"
 
-#: src/compose.c:597
+#: src/compose.c:605
 msgid "/_Edit/Edit with e_xternal editor"
-msgstr "/±à¼­(_E)/ʹÓÃÆäËûµÄ±à¼­Æ÷(_x)"
+msgstr "/±à¼­(_E)/ʹÓÃÍⲿ±à¼­Æ÷(_x)"
 
-#: src/compose.c:600
+#: src/compose.c:608
 msgid "/_Spelling"
 msgstr "/ƴд(_S)"
 
-#: src/compose.c:601
+#: src/compose.c:609
 msgid "/_Spelling/_Check all or check selection"
-msgstr "/ƴд(_S)/¼ì²éËùÓлòÊÇÑ¡ÔñÇøÓòµÄƴд(_C)"
+msgstr "/ƴд(_S)/¼ì²éÈ«ÎÄ»òÑ¡¶¨ÇøÓò(_C)"
 
-#: src/compose.c:603
+#: src/compose.c:611
 msgid "/_Spelling/_Highlight all misspelled words"
-msgstr "/ƴд(_S)/ÏÔʾËùÓÐÆ´´íµÄ×Ö(_H)"
+msgstr "/ƴд(_S)/ÏÔʾËùÓÐÆ´´íµÄµ¥´Ê(_H)"
 
-#: src/compose.c:605
+#: src/compose.c:613
 msgid "/_Spelling/Check _backwards misspelled word"
-msgstr "/ƴд(_S)/Ïòºó¼ì²éÆ´´íµÄ×Ö(_b)"
+msgstr "/ƴд(_S)/Ïòºó¼ì²éÆ´´íµÄµ¥´Ê(_b)"
 
-#: src/compose.c:607
+#: src/compose.c:615
 msgid "/_Spelling/_Forward to next misspelled word"
-msgstr "Æ´×Ö(_S)/ÏòÇ°¼ì²éÆ´´íµÄ×Ö(_F)"
+msgstr "/ƴд(_S)/ÏòÇ°¼ì²éÆ´´íµÄµ¥´Ê(_F)"
 
-#: src/compose.c:609
+#: src/compose.c:617
 msgid "/_Spelling/---"
-msgstr "Æ´×Ö(_S)/---"
+msgstr "/ƴд(_S)/---"
 
-#: src/compose.c:610
+#: src/compose.c:618
 msgid "/_Spelling/_Spelling Configuration"
-msgstr "Æ´×Ö(_S)/ÅäÖÃƴд¼ì²éÆ÷(_S)"
+msgstr "/ƴд(_S)/ÅäÖÃƴд¼ì²éÆ÷(_S)"
 
-#: src/compose.c:614 src/mainwindow.c:448 src/messageview.c:154
-#: src/summaryview.c:449
+#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
+#: src/summaryview.c:457
 msgid "/_View"
 msgstr "/²é¿´(_V)"
 
-#: src/compose.c:615
+#: src/compose.c:623
 msgid "/_View/_To"
 msgstr "/²é¿´(_V)/ÊÕ¼þÕß(_T)"
 
-#: src/compose.c:616
+#: src/compose.c:624
 msgid "/_View/_Cc"
 msgstr "/²é¿´(_V)/³­ËÍ(_C)"
 
-#: src/compose.c:617
+#: src/compose.c:625
 msgid "/_View/_Bcc"
 msgstr "/²é¿´(_V)/ÃØÃܳ­ËÍ(_B)"
 
-#: src/compose.c:618
+#: src/compose.c:626
 msgid "/_View/_Reply to"
 msgstr "/²é¿´(_V)/»Ø¸´(_R)"
 
-#: src/compose.c:619 src/compose.c:621 src/compose.c:623 src/mainwindow.c:466
-#: src/mainwindow.c:469 src/mainwindow.c:498 src/mainwindow.c:522
-#: src/mainwindow.c:604 src/mainwindow.c:608 src/messageview.c:236
+#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
+#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
+#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
 msgid "/_View/---"
 msgstr "/ÏÔʾ(_V)/---"
 
-#: src/compose.c:620
+#: src/compose.c:628
 msgid "/_View/_Followup to"
 msgstr "/ÏÔʾ(_V)/»ØÓ¦ÎÄÕÂ(_F)"
 
-#: src/compose.c:622
+#: src/compose.c:630
 msgid "/_View/R_uler"
 msgstr "/ÏÔʾ(_V)/±ê³ß(_u)"
 
-#: src/compose.c:624
+#: src/compose.c:632
 msgid "/_View/_Attachment"
 msgstr "/ÏÔʾ(_V)/¸½¼Ó(_A)"
 
-#: src/compose.c:626 src/mainwindow.c:611 src/messageview.c:240
+#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
 msgid "/_Message"
 msgstr "/Óʼþ(_M)"
 
-#: src/compose.c:627
+#: src/compose.c:635
 msgid "/_Message/_Send"
 msgstr "/Óʼþ(_M)/Ëͳö(_S)"
 
-#: src/compose.c:629
+#: src/compose.c:637
 msgid "/_Message/Send _later"
-msgstr "/Óʼþ(_M)/´ý»áËͳö(_l)"
+msgstr "/Óʼþ(_M)/ÉÔºóËͳö(_l)"
 
-#: src/compose.c:631 src/compose.c:637 src/compose.c:642 src/compose.c:644
-#: src/compose.c:648 src/compose.c:654 src/compose.c:661 src/mainwindow.c:616
-#: src/mainwindow.c:618 src/mainwindow.c:628 src/mainwindow.c:631
-#: src/mainwindow.c:633 src/mainwindow.c:638 src/messageview.c:243
-#: src/messageview.c:251 src/messageview.c:256
+#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
+#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
+#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
+#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
+#: src/messageview.c:253 src/messageview.c:258
 msgid "/_Message/---"
 msgstr "/Óʼþ(_M)/---"
 
-#: src/compose.c:632
+#: src/compose.c:640
 msgid "/_Message/Save to _draft folder"
-msgstr "/Óʼþ(_M)/±£´æÖÁ²Ý¸å×ÊÁϼÐ(_d)"
+msgstr "/Óʼþ(_M)/±£´æÖÁ²Ý¸å¼Ð(_d)"
 
-#: src/compose.c:634
+#: src/compose.c:642
 msgid "/_Message/Save and _keep editing"
 msgstr "/Óʼþ(_M)/±£´æ²¢¼ÌÐø±à¼­(_k)"
 
-#: src/compose.c:638
+#: src/compose.c:646
 msgid "/_Message/_To"
 msgstr "/Óʼþ(_M)/ÊÕ¼þÕß(_T)"
 
-#: src/compose.c:639
+#: src/compose.c:647
 msgid "/_Message/_Cc"
 msgstr "/Óʼþ(_M)/¸±±¾³­ËÍ(_C)"
 
-#: src/compose.c:640
+#: src/compose.c:648
 msgid "/_Message/_Bcc"
 msgstr "/Óʼþ(_M)/ÃØÃܳ­ËÍ(_B)"
 
-#: src/compose.c:641
+#: src/compose.c:649
 msgid "/_Message/_Reply to"
 msgstr "/Óʼþ(_M)/»Ø¸´¸ø(_y)"
 
-#: src/compose.c:643
+#: src/compose.c:651
 msgid "/_Message/_Followup to"
 msgstr "/Óʼþ(_M)/»ØÓ¦ÎÄÕÂ(_F)"
 
-#: src/compose.c:645
+#: src/compose.c:653
 msgid "/_Message/_Attach"
 msgstr "/Óʼþ(_M)/¸½¼Ó(_A)"
 
-#: src/compose.c:649
+#: src/compose.c:657
 msgid "/_Message/Si_gn"
 msgstr "/Óʼþ(_M)/Ç©Ãû(_g)"
 
-#: src/compose.c:650
+#: src/compose.c:658
 msgid "/_Message/_Encrypt"
 msgstr "/Óʼþ(_M)/¼ÓÃÜ(_E)"
 
-#: src/compose.c:651
+#: src/compose.c:659
 msgid "/_Message/Mode/MIME"
 msgstr "/Óʼþ(_M)/ģʽ/MIME"
 
-#: src/compose.c:652
+#: src/compose.c:660
 msgid "/_Message/Mode/Inline"
 msgstr "/Óʼþ(_M)/ģʽ/Inline"
 
-#: src/compose.c:655
+#: src/compose.c:663
 msgid "/_Message/_Priority"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò(_P)"
 
-#: src/compose.c:656
+#: src/compose.c:664
 msgid "/_Message/Priority/_Highest"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îÓÅÏÈ(_H)"
 
-#: src/compose.c:657
+#: src/compose.c:665
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÓÅÏÈ(_g)"
 
-#: src/compose.c:658
+#: src/compose.c:666
 msgid "/_Message/Priority/_Normal"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÆÕͨ(_N)"
 
-#: src/compose.c:659
+#: src/compose.c:667
 msgid "/_Message/Priority/Lo_w"
-msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/»º¼þ(_w)"
+msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/µÍ(_w)"
 
-#: src/compose.c:660
+#: src/compose.c:668
 msgid "/_Message/Priority/_Lowest"
-msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×¼þ(_L)"
+msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îµÍ(_L)"
 
-#: src/compose.c:662
+#: src/compose.c:670
 msgid "/_Message/_Request Return Receipt"
 msgstr "/Óʼþ(_M)/ÒªÇó»Øº¯Æ¾Ö¤(_R)"
 
-#: src/compose.c:663
+#: src/compose.c:671
 msgid "/_Message/Remo_ve references"
-msgstr "/Óʼþ(_M)/ɾ³ýÒýÑÔ(_V)"
+msgstr "/Óʼþ(_M)/ɾ³ýÒýÎÄ(_V)"
 
-#: src/compose.c:664 src/mainwindow.c:648 src/messageview.c:259
+#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
 msgid "/_Tools"
 msgstr "¹¤¾ß(_T)"
 
-#: src/compose.c:665
+#: src/compose.c:673
 msgid "/_Tools/Show _ruler"
 msgstr "/¹¤¾ß(_T)/ÏÔʾ±ê³ß(_r)"
 
-#: src/compose.c:666 src/messageview.c:260
+#: src/compose.c:674 src/messageview.c:262
 msgid "/_Tools/_Address book"
 msgstr "/¹¤¾ß(_T)/ͨѶ¼(_A)"
 
-#: src/compose.c:667
+#: src/compose.c:675
 msgid "/_Tools/_Template"
-msgstr "/¹¤¾ß(_T)/Ì×ÓÃÐżþÄ£°å(_T)"
+msgstr "/¹¤¾ß(_T)/Ì×ÓÃÓʼþÄ£°å(_T)"
 
-#: src/compose.c:668 src/mainwindow.c:669 src/messageview.c:275
+#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
 msgid "/_Tools/Actio_ns"
 msgstr "/¹¤¾ß(_T)/Ö´Ðж¯×÷(_n)"
 
-#: src/compose.c:1414
+#: src/compose.c:1435
 msgid "Reply-To:"
 msgstr "»Ø¸´£º"
 
-#: src/compose.c:1417 src/compose.c:4476 src/compose.c:5188
-#: src/headerview.c:56
+#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "ÐÂÎÅȺ×飺"
 
-#: src/compose.c:1420
+#: src/compose.c:1441
 msgid "Followup-To:"
 msgstr "»ØÓ¦ÎÄÕ£º"
 
-#: src/compose.c:1715
+#: src/compose.c:1741
 msgid "Quote mark format error."
-msgstr "ÒýÑÔ¸ñʽ´íÎó¡£"
+msgstr "ÒýÎĸñʽ´íÎó¡£"
 
-#: src/compose.c:1731
+#: src/compose.c:1757
 msgid "Message reply/forward format error."
-msgstr "»Ø¸´/ת·¢Ðżþ¸ñʽ´íÎó¡£"
+msgstr "»Ø¸´/ת·¢Óʼþ¸ñʽ´íÎó¡£"
 
-#: src/compose.c:2059
+#: src/compose.c:2099
 #, c-format
 msgid "File %s is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 
-#: src/compose.c:2063
+#: src/compose.c:2103
 #, c-format
 msgid "Can't read %s."
 msgstr "ÎÞ·¨¶ÁÈ¡ %s¡£"
 
-#: src/compose.c:2101
+#: src/compose.c:2141
 #, c-format
 msgid "Message: %s"
-msgstr "Ðżþ£º%s"
+msgstr "Óʼþ£º%s"
+
+#: src/compose.c:2229
+msgid "Encrypted message"
+msgstr "¼ÓÃÜÓʼþ"
+
+#: src/compose.c:2230
+msgid ""
+"Cannot re-edit an encrypted message. \n"
+"Discard encrypted part?"
+msgstr ""
+"²»ÄÜÖØб༭¼ÓÃÜÓʼþ.\n"
+"¶ªÆú¼ÓÃܲ¿·ÖÂð?"
 
-#: src/compose.c:2796
+#: src/compose.c:2891
 msgid " [Edited]"
-msgstr "[ÒÑÐÞ¸Ä]"
+msgstr " [ÒÑÐÞ¸Ä] "
 
-#: src/compose.c:2798
+#: src/compose.c:2893
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ÐÂÓʼþ%s"
 
-#: src/compose.c:2801
+#: src/compose.c:2896
 #, c-format
 msgid "Compose message%s"
 msgstr "ÐÂÓʼþ%s"
 
-#: src/compose.c:2825 src/compose.c:3074
+#: src/compose.c:2920 src/compose.c:3169
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1232,128 +1424,128 @@ msgstr ""
 "ÄúÑ¡ÓõÄÕʺŲ¢·ÇÒ»¸öµç×ÓÓʼþÕʺţ¬¿ÉÄÜÊÇÓÃÀ´ÔÚÐÂÎÅȺ×éÉÏ·¢±íÎÄÕÂÓõġ£\n"
 "Òª·¢ËÍÓʼþÇëÑ¡Ôñµç×ÓÓʼþÕʺš£"
 
-#: src/compose.c:2972
+#: src/compose.c:3067
 msgid "Recipient is not specified."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 
-#: src/compose.c:2980 src/messageview.c:492 src/prefs_account.c:767
-#: src/prefs_common.c:1023 src/toolbar.c:366 src/toolbar.c:413
+#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
+#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
 msgid "Send"
 msgstr "·¢ËÍ"
 
-#: src/compose.c:2981
+#: src/compose.c:3076
 msgid "Subject is empty. Send it anyway?"
 msgstr "ûÓбêÌ⡣ȷ¶¨ÒªËͳö£¿"
 
-#: src/compose.c:3002
+#: src/compose.c:3097
 msgid "Could not queue message for sending"
 msgstr "ÎÞ·¨ËͳöÔÝ´æ×ÊÁÏ"
 
-#: src/compose.c:3007
+#: src/compose.c:3102
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgstr ""
-"ÐżþÕýÔÚÔÝ´æ×ÊÁϼÐÖе«ÎÞ·¨´«ËÍ¡£\n"
-"ÇëʹÓÃÖ÷´°¿Ú \"¼ÆËÍÔÝ´æÐżþ\" ÊÔÒ»´Î¡£"
+"ÓʼþÕýÔÚ´ý·¢ËÍÓʼþ¼ÐÖе«ÎÞ·¨´«ËÍ¡£\n"
+"ÇëʹÓÃÖ÷´°¿Ú \"Ëͳö´ý·¢ËÍÓʼþ\" ÔÙÊÔÒ»´Î¡£"
 
-#: src/compose.c:3090 src/procmsg.c:1229 src/send_message.c:235
+#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "·¢±íÎÄÕÂÖÁ %s ʱ·¢Éú´íÎó¡£"
 
-#: src/compose.c:3104
+#: src/compose.c:3199
 msgid "Queueing"
-msgstr "ËͽøÔÝ´æ×ÊÁϼÐ"
+msgstr "´æÈë´ý·¢ËÍÓʼþ¼Ð"
 
-#: src/compose.c:3105
+#: src/compose.c:3200
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgstr ""
 "ËÍÐÅʱ·¢Éú´íÎó¡£\n"
-"Òª°ÑÐżþ·Å½øÔÝ´æ×ÊÁϼÐÖÐÂð£¿"
+"Òª°ÑÓʼþ·Å½ø´ý·¢ËÍÓʼþ¼ÐÖÐÂð£¿"
 
-#: src/compose.c:3111
+#: src/compose.c:3206
 msgid "Can't queue the message."
-msgstr "ÎÞ·¨·Å½øÔÝ´æ×ÊÁϼС£"
+msgstr "ÎÞ·¨·Å½ø´ý·¢ËÍÓʼþ¼Ð¡£"
 
-#: src/compose.c:3114 src/send_message.c:586 src/send_message.c:605
+#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
 msgid "Error occurred while sending the message."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 
-#: src/compose.c:3127
+#: src/compose.c:3222
 msgid "Can't save the message to Sent."
-msgstr "ÎÞ·¨½«ÐżþËÍÖÁ¼Ä¼þ¼ÐÖС£"
+msgstr "ÎÞ·¨½«ÓʼþËÍÖÁ¼Ä¼þ¼ÐÖС£"
 
-#: src/compose.c:3358
+#: src/compose.c:3467
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "ÎÞ·¨ÕÒµ½ËùÖ¸¶¨µÄ key id '%s'"
 
-#: src/compose.c:3464
+#: src/compose.c:3573
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 "%s to %s.\n"
 "Send it anyway?"
 msgstr ""
-"ÎÞ·¨×ª»»ÐżþµÄ±àÂëÉèÖÃÓÉ %s ³É %s ¡£\n"
+"ÎÞ·¨×ª»»ÓʼþµÄ±àÂëÉèÖÃÓÉ %s ³É %s ¡£\n"
 "ÈÔ¾ÉÒª´«ËÍÂð£¿"
 
-#: src/compose.c:3728
+#: src/compose.c:3836
 msgid "No account for sending mails available!"
 msgstr "ûÓз¢ÐÅËùÐèµÄÕʺţ¡"
 
-#: src/compose.c:3738
+#: src/compose.c:3846
 msgid "No account for posting news available!"
 msgstr "ûÓÐÕÅÌùnewsËùÐèµÄÕʺţ¡"
 
-#: src/compose.c:4556 src/headerview.c:54 src/summary_search.c:149
+#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
 msgid "From:"
-msgstr "·¢ÐÅÕß¡Ã"
+msgstr "·¢ÐÅÕß:"
 
-#: src/compose.c:4660 src/compose.c:4830 src/compose.c:5708
+#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
 msgid "MIME type"
 msgstr "MIME ÀàÐÍ"
 
-#: src/compose.c:4661 src/compose.c:4831 src/mimeview.c:198
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:469
+#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
 msgid "Size"
-msgstr "Îļþ´óС"
+msgstr "´óС"
 
-#: src/compose.c:4725
+#: src/compose.c:4828
 msgid "Save Message to "
-msgstr "½«Ðżþ±£´æÖÁ"
+msgstr "½«Óʼþ±£´æÖÁ"
 
-#: src/compose.c:4745
+#: src/compose.c:4848 src/prefs_filtering_action.c:420
 msgid "Select ..."
 msgstr "Ñ¡Ôñ..."
 
-#: src/compose.c:4881 src/prefs_account.c:1355 src/prefs_customheader.c:188
+#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "ÓʼþÍ·"
 
-#: src/compose.c:4883
+#: src/compose.c:4986
 msgid "Attachments"
 msgstr "¸½¼þ"
 
-#: src/compose.c:4885
+#: src/compose.c:4988
 msgid "Others"
 msgstr "ÆäËû"
 
-#: src/compose.c:4900 src/headerview.c:57 src/prefs_template.c:177
-#: src/summary_search.c:163
+#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Ö÷Ì⣺"
 
-#: src/compose.c:5135 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4194
+#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
 msgid "None"
 msgstr "ûÓÐÄÚÈÝ"
 
-#: src/compose.c:5144
+#: src/compose.c:5247
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
@@ -1362,31 +1554,31 @@ msgstr ""
 "ÎÞ·¨Æô¶¯Æ´Ð´¼ì²éÆ÷\n"
 "%s"
 
-#: src/compose.c:5603
+#: src/compose.c:5706
 msgid "Invalid MIME type."
 msgstr "²»ÕýÈ·µÄMIMEÀàÐÍ¡£"
 
-#: src/compose.c:5621
+#: src/compose.c:5724
 msgid "File doesn't exist or is empty."
 msgstr "ÎļþÊǿյĻò²»´æÔÚ¡£"
 
-#: src/compose.c:5690
+#: src/compose.c:5793
 msgid "Properties"
 msgstr "ÊôÐÔ"
 
-#: src/compose.c:5735
+#: src/compose.c:5838
 msgid "Encoding"
 msgstr "±àÂë"
 
-#: src/compose.c:5766
+#: src/compose.c:5869
 msgid "Path"
 msgstr "·¾¶"
 
-#: src/compose.c:5767 src/prefs_toolbar.c:808
+#: src/compose.c:5870 src/prefs_toolbar.c:808
 msgid "File name"
 msgstr "ÎļþÃû"
 
-#: src/compose.c:5944
+#: src/compose.c:6047
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1395,50 +1587,64 @@ msgid ""
 msgstr ""
 "ÍⲿµÄ±à¼­Æ÷ÈÔÔÚÔË×÷¡£\n"
 "Ç¿ÖƹرճÌÐòÂð£¿\n"
-"³ÌÐò×æid¡Ã %d"
+"³ÌÐò×æid: %d"
 
-#: src/compose.c:6253 src/inc.c:166 src/inc.c:268 src/toolbar.c:2046
+#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
 msgid "Offline warning"
-msgstr "ÀëÏß¾¯¸æ"
+msgstr "ÍÑ»ú¾¯¸æ"
 
-#: src/compose.c:6254 src/inc.c:167 src/inc.c:269 src/toolbar.c:2047
+#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
 msgid "You're working offline. Override?"
-msgstr "ÄúÕýÀëÏß¹¤×÷ÖС£ÊÇ·ñ¸ü¸Ä£¿"
+msgstr "ÄúÕýÔÚÍÑ»ú¹¤×÷¡£ÊÇ·ñ¸ü¸Ä£¿"
 
-#: src/compose.c:6372 src/compose.c:6393
+#: src/compose.c:6475 src/compose.c:6496
 msgid "Select file"
 msgstr "Ñ¡ÔñÎļþ"
 
-#: src/compose.c:6436
+#: src/compose.c:6510
+#, c-format
+msgid "File '%s' could not be read."
+msgstr "ÎÞ·¨¶ÁÈ¡Îļþ '%s'¡£"
+
+#: src/compose.c:6512
+#, c-format
+msgid ""
+"File '%s' contained invalid characters\n"
+"for the current encoding, insertion may be incorrect."
+msgstr ""
+"Îļþ '%s' °üº¬²»ÊôÓÚµ±Ç°±àÂ뼯µÄÎÞЧ×Ö·û\n"
+"²åÈ벿·Ö¿ÉÄܲ»ÕýÈ·."
+
+#: src/compose.c:6551
 msgid "Discard message"
 msgstr "ɾµôѶϢ"
 
-#: src/compose.c:6437
+#: src/compose.c:6552
 msgid "This message has been modified. discard it?"
 msgstr "ÕâÏîѶϢÒѱ»¸ü¸Ä£¬ÊÇ·ñɾ³ý£¿"
 
-#: src/compose.c:6438
+#: src/compose.c:6553
 msgid "Discard"
 msgstr "ɾ³ý"
 
-#: src/compose.c:6438
+#: src/compose.c:6553
 msgid "to Draft"
-msgstr "µ½´ý·¢ËÍÓʼþ¼Ð"
+msgstr "´æΪ²Ý¸å"
 
-#: src/compose.c:6473
+#: src/compose.c:6588
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "ÊÇ·ñʹÓÃÔ­À´µÄÑù±¾'%s'?"
 
-#: src/compose.c:6475
+#: src/compose.c:6590
 msgid "Apply template"
 msgstr "ʹÓÃÑù±¾"
 
-#: src/compose.c:6476
+#: src/compose.c:6591
 msgid "Replace"
 msgstr "Ìæ»»"
 
-#: src/compose.c:6476 src/toolbar.c:417
+#: src/compose.c:6591 src/toolbar.c:425
 msgid "Insert"
 msgstr "²åÈë"
 
@@ -1458,7 +1664,7 @@ msgid ""
 "Please file a bug report and include the information below."
 msgstr ""
 "%s\n"
-"ÇëÌîд³ý´í±¨¸æ²¢¸½ÉÏÒÔÏÂѶϢ¡£"
+"ÇëÌîдBUG·´À¡±¨¸æ²¢¸½ÉÏÒÔÏÂѶϢ¡£"
 
 #: src/crash.c:207
 msgid "Debug log"
@@ -1470,7 +1676,7 @@ msgstr "
 
 #: src/crash.c:252
 msgid "Create bug report"
-msgstr "²úÉú³ý´í±¨¸æ"
+msgstr "´´½¨BUG±¨¸æ"
 
 #: src/crash.c:301
 msgid "Save crash information"
@@ -1536,7 +1742,7 @@ msgid "Modify"
 msgstr "ÐÞ¸Ä"
 
 #: src/editaddress.c:725 src/editaddress.c:859 src/message_search.c:134
-#: src/summary_search.c:207
+#: src/summary_search.c:210
 msgid "Clear"
 msgstr "Çå³ý"
 
@@ -1574,7 +1780,7 @@ msgid " Check File "
 msgstr "¼ì²éÎļþ"
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1572
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
 msgid "File"
 msgstr "Îļþ"
 
@@ -1624,20 +1830,20 @@ msgstr "
 
 #: src/editgroup.c:503
 msgid "Edit folder"
-msgstr "Ôö¼ÓеÄÎļþ¼Ð"
+msgstr "Ôö¼ÓеÄÓʼþ¼Ð"
 
 #: src/editgroup.c:503
 msgid "Input the new name of folder:"
-msgstr "ÇëÊäÈëÎļþ¼ÐµÄÐÂÃû×Ö£º"
+msgstr "ÇëÊäÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 
-#: src/editgroup.c:506 src/folderview.c:1890 src/folderview.c:1940
-#: src/folderview.c:2208
+#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
+#: src/folderview.c:2215
 msgid "New folder"
-msgstr "ÐÂÎļþ¼Ð"
+msgstr "ÐÂÓʼþ¼Ð"
 
-#: src/editgroup.c:507 src/folderview.c:1891 src/folderview.c:1941
+#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
 msgid "Input the name of new folder:"
-msgstr " Çëµ¼ÈëÎļþ¼ÐµÄÐÂÃû×Ö£º"
+msgstr " Çëµ¼ÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 
 #: src/editjpilot.c:189
 msgid "File does not appear to be JPilot format."
@@ -1651,9 +1857,9 @@ msgstr "ѡ
 msgid "Edit JPilot Entry"
 msgstr "±à¼­JPilotÌõÄ¿"
 
-#: src/editjpilot.c:314 src/editldap.c:440 src/editvcard.c:229
+#: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2153
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr "..."
@@ -1666,107 +1872,213 @@ msgstr "
 msgid "Add New JPilot Entry"
 msgstr "Ôö¼ÓеÄJPilotÏîÄ¿"
 
-#: src/editldap.c:147
+#: src/editldap_basedn.c:141
+msgid "Edit LDAP - Select Search Base"
+msgstr "±à¼­LDAP - Ñ¡ÔñËÑÑ°×ÊÁÏ¿â"
+
+#: src/editldap_basedn.c:161 src/editldap.c:411
+msgid "Hostname"
+msgstr "Ö÷»úÃû"
+
+#: src/editldap_basedn.c:171 src/editldap.c:430 src/ssl_manager.c:106
+msgid "Port"
+msgstr "¶Ë¿Ú"
+
+#: src/editldap_basedn.c:181 src/editldap.c:459
+msgid "Search Base"
+msgstr "ËÑÑ°Base"
+
+#: src/editldap_basedn.c:202
+msgid "Available Search Base(s)"
+msgstr "¿ÉʹÓõÄËÑÑ°×ÊÁÏ¿â"
+
+#: src/editldap_basedn.c:291
+msgid "Could not read Search Base(s) from server - please set manually"
+msgstr "ÎÞ·¨´Ó·þÎñÆ÷ÖжÁÈ¡ËѲé×ÊÁÏ¿â - ÇëÊÖ¶¯ÉèÖÃ"
+
+#: src/editldap_basedn.c:295 src/editldap.c:266
+msgid "Could not connect to server"
+msgstr "ÎÞ·¨Á¬½Ó·þÎñÆ÷"
+
+#: src/editldap.c:148
 msgid "A Name must be supplied."
 msgstr "ÇëÎñ±ØÌṩһ¸öÃû×Ö¡£"
 
-#: src/editldap.c:159
+#: src/editldap.c:160
 msgid "A Hostname must be supplied for the server."
 msgstr "ÇëÌṩ·þÎñÆ÷µÄÍøÓòÃû³Æ¡£"
 
-#: src/editldap.c:172
+#: src/editldap.c:173
 msgid "At least one LDAP search attribute should be supplied."
 msgstr "ÇëÌṩÆðÂëÒ»ÏîLDAPËÑÑ°ÌõÄ¿¡£"
 
-#: src/editldap.c:262
+#: src/editldap.c:263
 msgid "Connected successfully to server"
 msgstr "³É¹¦Á¬½Ó·þÎñÆ÷"
 
-#: src/editldap.c:265 src/editldap_basedn.c:295
-msgid "Could not connect to server"
-msgstr "ÎÞ·¨Á¬½Ó·þÎñÆ÷"
-
-#: src/editldap.c:313 src/editldap.c:824
+#: src/editldap.c:314 src/editldap.c:964
 msgid "Edit LDAP Server"
 msgstr "±à¼­LDAP·þÎñÆ÷"
 
-#: src/editldap.c:404 src/editldap_basedn.c:161
-msgid "Hostname"
-msgstr "Ö÷»úÃû"
+#: src/editldap.c:406
+msgid "A name that you wish to call the server."
+msgstr "Äú¶Ô·þÎñÆ÷Ïë¸øµÄ³Æºô¡£"
 
-#: src/editldap.c:414 src/editldap_basedn.c:171 src/ssl_manager.c:106
-msgid "Port"
-msgstr "¶Ë¿Ú"
+#: src/editldap.c:421
+msgid ""
+"This is the hostname of the server. For example, \"ldap.mydomain.com\" may "
+"be appropriate for the \"mydomain.com\" organization. An IP address may also "
+"be used. You may specify \"localhost\" if running an LDAP server on the same "
+"computer as Sylpheed."
+msgstr ""
+"LDAP·þÎñÆ÷µÄ»úÆ÷Ãû¡£ÀýÈç\"ldap.mydomain.com\"ºÜ¿ÉÄܾÍÊÇ»ú¹¹\"mydomain.com\"µÄ"
+"LDAP·þÎñÆ÷Ãû³Æ¡£Ò²¿ÉÒÔÌîÈëIPµØÖ·¡£Èç¹ûLDAP·þÎñÓëSylpheedÔÚͬһ̨»úÆ÷ÉÏÔËÐУ¬"
+"Ôò¿ÉÒÔÌîÈë\"localhost\"¡£"
+
+#: src/editldap.c:445
+msgid "The port number that the server listens on. Port 389 is the default."
+msgstr "·þÎñÆ÷¼àÌýµÄ¶Ë¿ÚºÅ¡£È±Ê¡¶Ë¿ÚºÅΪ389"
 
-#: src/editldap.c:427
+#: src/editldap.c:449
 msgid " Check Server "
 msgstr "¼ì²é·þÎñÆ÷"
 
-#: src/editldap.c:432 src/editldap_basedn.c:181
-msgid "Search Base"
-msgstr "ËÑÑ°Base"
+#: src/editldap.c:454
+msgid "Press this button to test the connection to the server."
+msgstr "µã»÷´Ë°´Å¥²âÊÔµ½·þÎñÆ÷µÄÁ¬½Ó¡£"
 
-#: src/editldap.c:488
-#, fuzzy
+#: src/editldap.c:469
+msgid ""
+"This specifies the name of the directory to be searched on the server. "
+"Examples include:\n"
+"  dc=sylpheed,dc=org\n"
+"  ou=people,dc=domainname,dc=com\n"
+"  o=Organization Name,c=Country\n"
+msgstr ""
+"Ö¸¶¨ÒªÔÚ·þÎñÆ÷ÉÏËÑË÷µÄĿ¼Ãû³Æ¡£ÀýÈç:  dc=sylpheed,dc=org\n"
+"  ou=people,dc=domainname,dc=com\n"
+"  o=Organization Name,c=Country\n"
+
+#: src/editldap.c:482
+msgid ""
+"Press this button to lookup the name of available directory names on the "
+"server."
+msgstr "µã»÷´Ë°´Å¥¼ìË÷·þÎñÆ÷ÉÏ¿É·ÃÎʵÄĿ¼Ãû³Æ¡£"
+
+#: src/editldap.c:533
 msgid "Search Attributes"
-msgstr "Óû§ÐÔÖÊ"
+msgstr "ËÑË÷ÊôÐÔ"
 
-#: src/editldap.c:496
+#: src/editldap.c:543
+msgid ""
+"A list of LDAP attribute names that should be searched when attempting to "
+"find a name or address."
+msgstr "Ϊ²éÕÒÃû³ÆºÍµØÖ·ÐèÒªËÑË÷µÄLDAPÊôÐÔÃû³ÆÁÐ±í¡£"
+
+#: src/editldap.c:547
 msgid " Defaults "
-msgstr "Ô¤ÉèÖµ"
+msgstr " ȱʡֵ "
+
+#: src/editldap.c:552
+msgid ""
+"This resets the attribute names to a default value that should find most "
+"names and addresses during a name or address search process."
+msgstr "ÖØÖÃÊôÐÔÃû³Æ¡£È±Ê¡ÖµÄܹ»ÔÚËÑË÷Öз¢ÏÖ¾ø´ó¶àÊýÃû³ÆºÍµØÖ·¡£"
 
-#: src/editldap.c:501
+#: src/editldap.c:559
 msgid "Max Query Age (secs)"
 msgstr "ѯÎÊʱ¼äÉÏÏÞ(Ãë)"
 
-#: src/editldap.c:518
+#: src/editldap.c:575
+msgid ""
+"This defines the maximum period of time (in seconds) that an address search "
+"result is valid for address completion purposes. Search results are stored "
+"in a cache until this period of time has passed and then retired. This will "
+"improve the response time when attempting to search for the same name or "
+"address on subsequent address completion requests. The cache will be "
+"searched in preference to performing a new server search request. The "
+"default value of 600 seconds (10 minutes), should be sufficient for most "
+"servers. A larger value will reduce the search time for subsequent searches. "
+"This is useful for servers that have slow response times at the expense of "
+"more memory to cache results."
+msgstr ""
+
+#: src/editldap.c:593
 msgid "Include server in dynamic search"
 msgstr "½«·þÎñÆ÷°üº¬ÔÚ¶¯Ì¬ËÑÑ°ÖÐ"
 
-#: src/editldap.c:565
+#: src/editldap.c:599
+msgid ""
+"Check this option to include this server for dynamic searches when using "
+"address completion."
+msgstr "ÒªÔÚ×Ô¶¯Íê³ÉµØַʱ¶¯Ì¬ËÑË÷·þÎñÆ÷£¬ÇëÑ¡ÖдËÑ¡Ïî¡£"
+
+#: src/editldap.c:606
+msgid "Match names 'containing' search term"
+msgstr ""
+
+#: src/editldap.c:612
+msgid ""
+"Searches for names and addresses can be performed either using \"begins-with"
+"\" or \"contains\" search term. Check this option to perform a \"contains\" "
+"search; this type of search usually takes longer to complete. Note that for "
+"performance reasons, address completion uses \"begins-with\" for all "
+"searches against other address interfaces."
+msgstr ""
+
+#: src/editldap.c:667
 msgid "Bind DN"
-msgstr "½áºÏÍøÓòÃû³Æ"
+msgstr "Bind DN"
 
-#: src/editldap.c:575
+#: src/editldap.c:677
+msgid ""
+"The LDAP user account name to be used to connect to the server. This is "
+"usually only used for protected servers. This name is typically formatted "
+"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"performing a search."
+msgstr ""
+
+#: src/editldap.c:685
 msgid "Bind Password"
-msgstr "½áºÏÃÜÂë"
+msgstr "°ó¶¨ÃÜÂë"
+
+#: src/editldap.c:695
+msgid "The password to be used when connecting as the \"Bind DN\" user."
+msgstr "ÓÃ\"Bind DN\"Óû§Á¬½ÓʱµÄÃÜÂë"
 
-#: src/editldap.c:585
+#: src/editldap.c:701
 msgid "Timeout (secs)"
 msgstr "ʱ¼äµ½(Ãë)"
 
-#: src/editldap.c:600
+#: src/editldap.c:716
+msgid "The timeout period in seconds."
+msgstr "³¬Ê±Ê±¼ä£¬µ¥Î»ÎªÃë¡£"
+
+#: src/editldap.c:720
 msgid "Maximum Entries"
 msgstr "ÌõÄ¿ÉÏÏÞ"
 
-#: src/editldap.c:625 src/prefs_account.c:763
+#: src/editldap.c:735
+msgid ""
+"The maximum number of entries that should be returned in the search result."
+msgstr ""
+
+#: src/editldap.c:751 src/prefs_account.c:764
 msgid "Basic"
 msgstr "»ù±¾ÉèÖÃ"
 
-#: src/editldap.c:626 src/message_search.c:133 src/summary_search.c:206
+#: src/editldap.c:752 src/message_search.c:133 src/summary_search.c:209
 msgid "Search"
 msgstr "ËÑÑ°"
 
-#: src/editldap.c:627 src/summaryview.c:644
+#: src/editldap.c:753 src/summaryview.c:653
 msgid "Extended"
 msgstr "À©Õ¹"
 
-#: src/editldap.c:829
+#: src/editldap.c:969
 msgid "Add New LDAP Server"
 msgstr "Ôö¼ÓеÄLDAP·þÎñÆ÷"
 
-#: src/editldap_basedn.c:141
-msgid "Edit LDAP - Select Search Base"
-msgstr "±à¼­LDAP - Ñ¡ÔñËÑÑ°×ÊÁÏ¿â"
-
-#: src/editldap_basedn.c:202
-msgid "Available Search Base(s)"
-msgstr "¿ÉʹÓõÄËÑÑ°×ÊÁÏ¿â"
-
-#: src/editldap_basedn.c:291
-msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "ÎÞ·¨´Ó·þÎñÆ÷ÖжÁÈ¡ËѲé×ÊÁÏ¿â - ÇëÊÖ¶¯ÉèÖÃ"
-
 #: src/editvcard.c:96
 msgid "File does not appear to be vCard format."
 msgstr "Îļþ²»ÊÇvCard¸ñʽ¡£"
@@ -1785,7 +2097,7 @@ msgstr "
 
 #: src/exphtmldlg.c:111
 msgid "Please specify output directory and file to create."
-msgstr "ÇëÖ¸Ã÷ËùÒª²úÉúµÄÎļþ¼Ð»÷Îļþ¡£"
+msgstr "ÇëÖ¸Ã÷ËùÒª²úÉúµÄĿ¼ÒÔ¼°Îļþ¡£"
 
 #: src/exphtmldlg.c:114
 msgid "Select stylesheet and formatting."
@@ -1837,11 +2149,11 @@ msgstr "HTML
 msgid "Stylesheet"
 msgstr "ÐÎʽ±í"
 
-#: src/exphtmldlg.c:509 src/prefs_common.c:3468 src/prefs_common.c:3750
+#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
 msgid "Default"
-msgstr "Ô¤Éèֵ"
+msgstr "ȱʡֵ"
 
-#: src/exphtmldlg.c:515
+#: src/exphtmldlg.c:515 src/sgpgme.c:94
 msgid "Full"
 msgstr "ÍêÕûÉèÖÃ"
 
@@ -1902,7 +2214,7 @@ msgid "Prev"
 msgstr "Ç°Ò»¸ö"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
-#: src/toolbar.c:376 src/toolbar.c:467
+#: src/toolbar.c:384 src/toolbar.c:475
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
@@ -1916,7 +2228,7 @@ msgstr "
 
 #: src/expldifdlg.c:110
 msgid "Please specify output directory and LDIF filename to create."
-msgstr "ÇëÖ¸Ã÷ËùÒª²úÉúµÄÎļþ¼ÐºÍLDIFÎļþÃû¡£"
+msgstr "ÇëÖ¸Ã÷ËùÒª²úÉúµÄÓʼþ¼ÐºÍLDIFÎļþÃû¡£"
 
 #: src/expldifdlg.c:113
 msgid "Specify parameters to format distinguished name."
@@ -1951,18 +2263,16 @@ msgid ""
 msgstr ""
 
 #: src/expldifdlg.c:264
-#, fuzzy
 msgid "Error creating LDIF file"
-msgstr "¶ÁÈ¡Îļþ´íÎó"
+msgstr "´´½¨LDIFÎļþ³ö´í"
 
 #: src/expldifdlg.c:373
 msgid "Select LDIF Output File"
 msgstr "Ñ¡ÔñLDIFÊä³öÎļþ"
 
 #: src/expldifdlg.c:447
-#, fuzzy
 msgid "LDIF Output File"
-msgstr "HTMLÊä³öÎÊÎļþ"
+msgstr "LDIFÊä³öÎļþ"
 
 #: src/expldifdlg.c:508
 msgid "Suffix"
@@ -2039,9 +2349,8 @@ msgid ""
 msgstr ""
 
 #: src/expldifdlg.c:710
-#, fuzzy
 msgid "Export Address Book to LDIF File"
-msgstr "½«Í¨Ñ¶Â¼Êä³ö³ÉHTMLÎļþ"
+msgstr "½«Í¨Ñ¶Â¼Êä³ö³ÉLDIFÎļþ"
 
 #: src/expldifdlg.c:777
 #, fuzzy
@@ -2054,7 +2363,7 @@ msgstr "
 
 #: src/export.c:147
 msgid "Specify target folder and mbox file."
-msgstr "ÇëÖ¸Ã÷Îļþ¼Ð¼°mboxÎļþ¡£"
+msgstr "ÇëÖ¸Ã÷Óʼþ¼Ð¼°mboxÎļþ¡£"
 
 #: src/export.c:157
 msgid "Source dir:"
@@ -2065,9 +2374,9 @@ msgid "Exporting file:"
 msgstr "Êä³öÎļþ£º"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1229
 msgid " Select... "
-msgstr "Ñ¡Ôñ..."
+msgstr " Ñ¡Ôñ... "
 
 #: src/export.c:220
 msgid "Select exporting file"
@@ -2085,335 +2394,336 @@ msgstr "
 msgid "Sylpheed Address Book"
 msgstr "Sylpheed ͨѶ¼"
 
-#: src/exporthtml.c:1113 src/exportldif.c:592
+#: src/exporthtml.c:1113 src/exportldif.c:590
 msgid "Name already exists but is not a directory."
-msgstr "Õâ¸öÃû×ÖÒѾ­ÓÐÁ˵«²»ÊÇÒ»¸öĿ¼Ãû³Æ¡£"
+msgstr "Õâ¸öÃû×ÖÒѾ­´æÔÚµ«²»ÊÇÒ»¸öĿ¼Ãû³Æ¡£"
 
-#: src/exporthtml.c:1116 src/exportldif.c:595
+#: src/exporthtml.c:1116 src/exportldif.c:593
 msgid "No permissions to create directory."
-msgstr "ÄúûÓÐÖÆÔìĿ¼µÄȨÏÞ¡£"
+msgstr "ÄúûÓд´½¨Ä¿Â¼µÄȨÏÞ¡£"
 
-#: src/exporthtml.c:1119 src/exportldif.c:598
+#: src/exporthtml.c:1119 src/exportldif.c:596
 msgid "Name is too long."
 msgstr "Ãû×ÖÌ«³¤¡£"
 
-#: src/exporthtml.c:1122 src/exportldif.c:601
+#: src/exporthtml.c:1122 src/exportldif.c:599
 msgid "Not specified."
 msgstr "²»È·¶¨¡£"
 
-#: src/folder.c:854
+#: src/folder.c:1011
 msgid "Inbox"
 msgstr "ÊÕÐżÐ"
 
-#: src/folder.c:858
+#: src/folder.c:1015
 msgid "Sent"
 msgstr "ÒÑ·¢ËÍ"
 
-#: src/folder.c:862
+#: src/folder.c:1019
 msgid "Queue"
 msgstr "´ý·¢ËÍ"
 
-#: src/folder.c:866
+#: src/folder.c:1023
 msgid "Trash"
 msgstr "À¬»øÍ°"
 
-#: src/folder.c:870
+#: src/folder.c:1027
 msgid "Drafts"
 msgstr "²Ý¸å"
 
-#: src/folder.c:1083
+#: src/folder.c:1240
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "´¦ÀíÖÐ(%s)...\n"
 
-#: src/folder.c:1870
+#: src/folder.c:2028
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "½«%s ÒƵ½%s...\n"
 
 #: src/foldersel.c:148
 msgid "Select folder"
-msgstr "Ñ¡ÔñĿ¼"
+msgstr "Ñ¡ÔñÓʼþ¼Ð"
 
-#: src/folderview.c:285 src/folderview.c:301 src/folderview.c:322
+#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
 msgid "/Create _new folder..."
-msgstr "/´´½¨ÐÂÎļþ¼Ð(_n)..."
+msgstr "/´´½¨ÐÂÓʼþ¼Ð(_n)..."
 
-#: src/folderview.c:286 src/folderview.c:302 src/folderview.c:323
+#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
 msgid "/_Rename folder..."
-msgstr "/ÖØÐÂÃüÃû..."
+msgstr "/ÖØÃüÃûÓʼþ¼Ð(_R)..."
 
-#: src/folderview.c:287 src/folderview.c:303 src/folderview.c:324
+#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
 msgid "/M_ove folder..."
-msgstr "Òƶ¯Ŀ¼..."
+msgstr "Òƶ¯Óʼþ¼Ð(_o)..."
 
-#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:325
+#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
 msgid "/_Delete folder"
-msgstr "/ɾ³ýĿ¼(_D)"
+msgstr "/ɾ³ýÓʼþ¼Ð(_D)"
 
-#: src/folderview.c:290 src/folderview.c:310
+#: src/folderview.c:289 src/folderview.c:310
 msgid "/Remove _mailbox"
-msgstr "Çå³ýÊÕÐżÐ(_m)"
+msgstr "Çå³ýÐÅÏä(_m)"
 
-#: src/folderview.c:293 src/folderview.c:314 src/folderview.c:335
-#: src/folderview.c:354
+#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
+#: src/folderview.c:352
 msgid "/_Processing..."
-msgstr "/´¦ÀíÖÐ(_P)..."
+msgstr "/´¦Àí(_P)..."
 
-#: src/folderview.c:294
+#: src/folderview.c:293
 msgid "/_Scoring..."
-msgstr "/¼ÇµãÖÐ(_S)..."
+msgstr "/ͳ¼Æ»ý·Ö(_S)..."
 
-#: src/folderview.c:299 src/folderview.c:320 src/folderview.c:341
+#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
 msgid "/Mark all _read"
-msgstr "/±ê¼ÇËùÓÐΪÒѶÁ(_r)"
+msgstr "/±ê¼ÇËùÓÐÓʼþΪÒѶÁ(_r)"
 
-#: src/folderview.c:306 src/folderview.c:327 src/folderview.c:347
+#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
 msgid "/_Check for new messages"
 msgstr "/¼ì²éÐÂÓʼþ(_C)"
 
-#: src/folderview.c:308 src/folderview.c:329
+#: src/folderview.c:308 src/folderview.c:328
 msgid "/R_ebuild folder tree"
-msgstr "/ÖØн¨Á¢Îļþ¼ÐÊ÷(_e)"
+msgstr "/ÖØн¨Á¢Óʼþ¼ÐÊ÷(_e)"
 
-#: src/folderview.c:312 src/folderview.c:333 src/folderview.c:352
+#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
 msgid "/_Search folder..."
-msgstr "/ÔÚÎļþ¼ÐÖвéÕÒ(_S)..."
-
-#: src/folderview.c:315 src/folderview.c:336 src/folderview.c:355
-msgid "/S_coring..."
-msgstr "/¼ÇµãÖÐ(_c)..."
+msgstr "/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 
-#: src/folderview.c:331
+#: src/folderview.c:330
 msgid "/Remove _IMAP4 account"
 msgstr "/Çå³ýIMAP4ÕʺÅ(_I)"
 
-#: src/folderview.c:343
+#: src/folderview.c:341
 msgid "/_Subscribe to newsgroup..."
 msgstr "/¶©ÔÄÐÂÎÅȺ×é (_S)..."
 
-#: src/folderview.c:345
+#: src/folderview.c:343
 msgid "/_Remove newsgroup"
 msgstr "/Çå³ýÐÂÎÅȺ×é(_R)"
 
-#: src/folderview.c:350
+#: src/folderview.c:348
 msgid "/Remove _news account"
 msgstr "/Çå³ýÕʺÅ(_n)"
 
-#: src/folderview.c:384
+#: src/folderview.c:385
 msgid "New"
 msgstr "ÐÂÓʼþ"
 
-#: src/folderview.c:385
+#: src/folderview.c:386
 msgid "Unread"
 msgstr "δ¶Á"
 
-#: src/folderview.c:386
+#: src/folderview.c:387
 msgid "#"
 msgstr "££"
 
-#: src/folderview.c:636
+#: src/folderview.c:630
 msgid "Setting folder info..."
-msgstr "ÉèÖÃÎļþ¼Ð×ÊÁÏ..."
+msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 
-#: src/folderview.c:796 src/mainwindow.c:2777 src/setup.c:79
+#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
-msgstr "ɨÃèÎļþ¼Ð%s%c%s..."
+msgstr "ɨÃèÓʼþ¼Ð%s%c%s..."
 
-#: src/folderview.c:800 src/mainwindow.c:2782 src/setup.c:84
+#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
-msgstr " ɨÃèÎļþ¼Ð %s ..."
+msgstr " ɨÃèÓʼþ¼Ð %s ..."
 
-#: src/folderview.c:841
+#: src/folderview.c:835
 msgid "Rebuilding folder tree..."
-msgstr " ÖØн¨Á¢Îļþ¼ÐÊ÷ ..."
+msgstr " ÖØн¨Á¢Óʼþ¼ÐÊ÷ ..."
 
-#: src/folderview.c:923
+#: src/folderview.c:918
 msgid "Checking for new messages in all folders..."
-msgstr "¼ì²éËùÓÐÎļþ¼ÐÖеÄÐÂÓʼþ..."
+msgstr "¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ..."
 
-#: src/folderview.c:1693
+#: src/folderview.c:1696
 #, c-format
 msgid "Opening Folder %s..."
-msgstr "´ò¿ªÎļþ¼Ð%s..."
+msgstr "´ò¿ªÓʼþ¼Ð%s..."
 
-#: src/folderview.c:1705
+#: src/folderview.c:1708
 msgid "Folder could not be opened."
-msgstr "ÎÞ·¨´ò¿ªÎļþ¼Ð¡£"
+msgstr "ÎÞ·¨´ò¿ªÓʼþ¼Ð¡£"
 
-#: src/folderview.c:1892 src/folderview.c:1942 src/folderview.c:2212
+#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
 msgid "NewFolder"
-msgstr "ÐÂÎļþ¼Ð"
+msgstr "ÐÂÓʼþ¼Ð"
 
-#: src/folderview.c:1897 src/folderview.c:1989 src/folderview.c:2217
+#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
 #, c-format
 msgid "`%c' can't be included in folder name."
-msgstr "ÎÞ·¨Ê¹ÓÃ'%c'×÷ΪÎļþ¼ÐÃû³Æ¡£"
+msgstr "ÎÞ·¨Ê¹ÓÃ'%c'×÷ΪÓʼþ¼ÐÃû³Æ¡£"
 
-#: src/folderview.c:1910 src/folderview.c:1947 src/folderview.c:1999
-#: src/folderview.c:2069 src/folderview.c:2229
+#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
+#: src/folderview.c:2075 src/folderview.c:2236
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "'%s'Îļþ¼ÐÒÑ´æÔÚ¡£"
+msgstr "'%s'Óʼþ¼ÐÒÑ´æÔÚ¡£"
 
-#: src/folderview.c:1917 src/folderview.c:2236
+#: src/folderview.c:1920 src/folderview.c:2243
 #, c-format
 msgid "Can't create the folder `%s'."
-msgstr "ÎÞ·¨ÖÆÔìĿ¼'%s'¡£"
+msgstr "ÎÞ·¨´´½¨Óʼþ¼Ð'%s'¡£"
 
-#: src/folderview.c:1982 src/folderview.c:2059
+#: src/folderview.c:1987 src/folderview.c:2065
 #, c-format
 msgid "Input new name for `%s':"
-msgstr "µ¼Èë'%s'µÄÐÂÃû×Ö£º"
+msgstr "ÊäÈë'%s'µÄÐÂÃû×Ö£º"
 
-#: src/folderview.c:1983 src/folderview.c:2061
+#: src/folderview.c:1988 src/folderview.c:2067
 msgid "Rename folder"
-msgstr "ÖØÐÂÃüÃûÎļþ¼Ð"
+msgstr "ÖØÐÂÃüÃûÓʼþ¼Ð"
 
-#: src/folderview.c:2119
+#: src/folderview.c:2126
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 "Do you really want to delete?"
 msgstr ""
-"ÔÚ'%s'֮ϵÄÎļþ¼Ð»÷Ðżþ½«±»É¾³ý¡£\n"
+"ÔÚ'%s'֮ϵÄÓʼþ¼ÐÒÔ¼°ÆäÖÐËùÓеÄÓʼþ½«±»É¾³ý¡£\n"
 "È·¶¨É¾³ý£¿"
 
-#: src/folderview.c:2121
+#: src/folderview.c:2128
 msgid "Delete folder"
-msgstr "ɾ³ýÎļþ¼Ð"
+msgstr "ɾ³ýÓʼþ¼Ð"
 
-#: src/folderview.c:2138
+#: src/folderview.c:2145
 #, c-format
 msgid "Can't remove the folder `%s'."
-msgstr "ÎÞ·¨É¾³ýÎļþ¼Ð'%s'"
+msgstr "ÎÞ·¨É¾³ýÓʼþ¼Ð'%s'"
 
-#: src/folderview.c:2174
+#: src/folderview.c:2181
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"È·¶¨É¾³ýÊÕ¼þ¼Ð'%s'£¿\n"
-"(ÆäÖеÄÐżþ²»»áÖÁÓ²µúÖÐɾ³ý)"
+"È·¶¨É¾³ýÓÊÏä'%s'£¿\n"
+"(ÆäÖеÄÓʼþ²»»áÖÁÓ²µúÖÐɾ³ý)"
 
-#: src/folderview.c:2176
+#: src/folderview.c:2183
 msgid "Remove mailbox"
-msgstr "Çå³ýÊÕ¼þ¼Ð"
+msgstr "ɾ³ýÓÊÏä"
 
-#: src/folderview.c:2209
+#: src/folderview.c:2216
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 " append `/' at the end of the name)"
 msgstr ""
-"µ¼ÈëÐÂÎļþ¼ÐµÄÃû×Ö£º\n"
-"(ÇëÔÚÐÂÃû×ֵĺóÃæ¼ÓÉÏ'/',\n"
-"Èç¹ûÏëÒ»²¢ÖÆÔìÏÂÒ»²ãÎļþ¼Ð)"
+"µ¼ÈëÐÂÓʼþ¼ÐµÄÃû×Ö£º\n"
+"(Èç¹ûÏëÒ»²¢´´½¨×ÓÓʼþ¼Ð£¬\n"
+"ÇëÔÚÐÂÃû×ֵĺóÃæ¼ÓÉÏ'/')"
 
-#: src/folderview.c:2266
+#: src/folderview.c:2273
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "È·¶¨É¾³ýIMAP4µÄÕʺÅ'%s'£¿"
 
-#: src/folderview.c:2267
+#: src/folderview.c:2274
 msgid "Delete IMAP4 account"
 msgstr "Çå³ýIMAP4ÕʺÅ"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2408
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "È·¶¨Çå³ýÐÂÎÅȺ×é'%s'£¿"
 
-#: src/folderview.c:2402
+#: src/folderview.c:2409
 msgid "Delete newsgroup"
 msgstr "Çå³ýÐÂÎÅȺ×é"
 
-#: src/folderview.c:2440
+#: src/folderview.c:2446
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "È·¶¨É¾³ýÐÂÎÅȺ×éÕʺÅ'%s'£¿"
 
-#: src/folderview.c:2441
+#: src/folderview.c:2447
 msgid "Delete news account"
 msgstr "ɾ³ýÐÂÎÅȺÕʺÅ"
 
-#: src/folderview.c:2549
+#: src/folderview.c:2543
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "½«%s ÒƵ½%s..."
 
-#: src/folderview.c:2578
+#: src/folderview.c:2572
 msgid "Source and destination are the same."
 msgstr "ÎļþÀ´Ô´ºÍÄ¿µÄÏàͬ¡£"
 
-#: src/folderview.c:2581
+#: src/folderview.c:2575
 msgid "Can't move a folder to one of its children."
-msgstr "ÎÞ·¨½«ÉÏÒ»²ãÎļþ¼ÐÒ»µ½Æ丽ÊôÎļþ¼ÐÖС£"
+msgstr "ÎÞ·¨½«ÉÏÒ»²ãÓʼþ¼ÐÒƵ½Æä×ÓÓʼþ¼ÐÖС£"
 
-#: src/folderview.c:2584
+#: src/folderview.c:2578
 msgid "Folder moving cannot be done between different mailboxes."
-msgstr "²»Äܽ«²»Í¬ÊÕ¼þ¼ÐµÄÎļþ¼ÐÏ໥Òƶ¯¡£"
+msgstr "Óʼþ¼Ð²»ÄÜ¿çÓÊÏäÒƶ¯¡£"
 
-#: src/folderview.c:2587
+#: src/folderview.c:2581
 msgid "Move failed!"
 msgstr "Òƶ¯Ê§°Ü£¡"
 
-#: src/grouplistdialog.c:173
+#: src/folderview.c:2625 src/summaryview.c:4050
+#, fuzzy
+msgid "Processing configuration"
+msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
+
+#: src/grouplistdialog.c:176
 msgid "Newsgroup subscription"
 msgstr "¶©ÔÄÐÂÎÅȺ×é"
 
-#: src/grouplistdialog.c:189
+#: src/grouplistdialog.c:192
 msgid "Select newsgroups for subscription:"
 msgstr "Ñ¡ÔñÒª¶©ÔĵÄÐÂÎÅȺ×飺"
 
-#: src/grouplistdialog.c:195
+#: src/grouplistdialog.c:198
 msgid "Find groups:"
-msgstr "ѰÕÒÐÂÎÅȺ×飺"
+msgstr "²éÕÒÐÂÎÅȺ×飺"
 
-#: src/grouplistdialog.c:203
+#: src/grouplistdialog.c:206
 msgid " Search "
-msgstr "Ñ°ÕÒ"
+msgstr " ËÑË÷ "
 
-#: src/grouplistdialog.c:215
+#: src/grouplistdialog.c:218
 msgid "Newsgroup name"
 msgstr "ÐÂÎÅȺ×éÃû³Æ"
 
-#: src/grouplistdialog.c:216
+#: src/grouplistdialog.c:219
 msgid "Messages"
-msgstr "Ðżþ"
+msgstr "Óʼþ"
 
-#: src/grouplistdialog.c:217
+#: src/grouplistdialog.c:220
 msgid "Type"
 msgstr "ÀàÐÍ"
 
-#: src/grouplistdialog.c:243
+#: src/grouplistdialog.c:246
 msgid "Refresh"
 msgstr "Ë¢ÐÂ"
 
-#: src/grouplistdialog.c:347
+#: src/grouplistdialog.c:350
 msgid "moderated"
 msgstr "ÓйÜÀíµÄ"
 
-#: src/grouplistdialog.c:349
+#: src/grouplistdialog.c:352
 msgid "readonly"
 msgstr "Ö»¶Á"
 
-#: src/grouplistdialog.c:351
+#: src/grouplistdialog.c:354
 msgid "unknown"
 msgstr "δ֪"
 
-#: src/grouplistdialog.c:398
+#: src/grouplistdialog.c:401
 msgid "Can't retrieve newsgroup list."
-msgstr "ÎÞ·¨½«ÐÂÎÅȺ×éĿ¼ȡ»Ø¡£"
+msgstr "ÎÞ·¨È¡»ØÐÂÎÅȺ×éÁÐ±í¡£"
 
-#: src/grouplistdialog.c:441 src/summaryview.c:1157
+#: src/grouplistdialog.c:444 src/summaryview.c:1178
 msgid "Done."
 msgstr "Íê³É¡£"
 
-#: src/grouplistdialog.c:477
+#: src/grouplistdialog.c:480
 #, c-format
 msgid "%d newsgroups received (%s read)"
 msgstr "ÒѽÓÊÕ%dÐÂÎÅȺ×é(ÒѶÁ%s)"
@@ -2452,10 +2762,10 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
-#"±¾³ÌÐòΪÃâ·ÑÈíÌ壻Äã¿ÉÒÔÈÎÒâ´«²¥»òÊÇÐÞ¸ÄËü£¬µ«Ðè×ñÑ­×ÔÓÉÈí¼þ»ù½ð»á·¢²¼µÄGNUͨ"
-#"ÓÃÐí¿ÉЭÒé(¿ÉÒÔÊǵڶþ°æ»òÕ߸ü¸ß°æ±¾)ÖÐÁгöµÄÌõ¿î¡£\n"
-#"\n"
 
+# "±¾³ÌÐòΪÃâ·ÑÈíÌ壻Äã¿ÉÒÔÈÎÒâ´«²¥»òÊÇÐÞ¸ÄËü£¬µ«Ðè×ñÑ­×ÔÓÉÈí¼þ»ù½ð»á·¢²¼µÄGNUͨ"
+# "ÓÃÐí¿ÉЭÒé(¿ÉÒÔÊǵڶþ°æ»òÕ߸ü¸ß°æ±¾)ÖÐÁгöµÄÌõ¿î¡£\n"
+# "\n"
 #: src/gtk/about.c:220
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
@@ -2474,11 +2784,11 @@ msgstr ""
 
 #: src/gtk/colorlabel.c:46
 msgid "Orange"
-msgstr "³È"
+msgstr "³Èɫ"
 
 #: src/gtk/colorlabel.c:47
 msgid "Red"
-msgstr "ºì"
+msgstr "ºìɫ"
 
 #: src/gtk/colorlabel.c:48
 msgid "Pink"
@@ -2490,48 +2800,157 @@ msgstr "
 
 #: src/gtk/colorlabel.c:50
 msgid "Blue"
-msgstr "˦"
+msgstr "À¶ɫ"
 
 #: src/gtk/colorlabel.c:51
 msgid "Green"
-msgstr "ÂÌ"
+msgstr "ÂÌɫ"
 
 #: src/gtk/colorlabel.c:52
 msgid "Brown"
-msgstr "×Ø"
+msgstr "×ØÉ«"
+
+#: src/gtk/gtkaspell.c:558
+msgid "No dictionary selected."
+msgstr "ûÓÐÑ¡ÔñÈκÎ×ֵ䡣"
+
+#: src/gtk/gtkaspell.c:777 src/gtk/gtkaspell.c:1679 src/gtk/gtkaspell.c:1949
+msgid "Normal Mode"
+msgstr "Ò»°ãģʽ"
+
+#: src/gtk/gtkaspell.c:779 src/gtk/gtkaspell.c:1684 src/gtk/gtkaspell.c:1960
+msgid "Bad Spellers Mode"
+msgstr "Æ´´í×Öģʽ"
+
+#: src/gtk/gtkaspell.c:818
+msgid "Unknown suggestion mode."
+msgstr "δ֪µÄ½¨Òéģʽ¡£"
+
+#: src/gtk/gtkaspell.c:1051
+msgid "No misspelled word found."
+msgstr "ûÓз¢ÏÖ´í×Ö¡£"
+
+#: src/gtk/gtkaspell.c:1385
+msgid "Replace unknown word"
+msgstr "Ì滻δ֪µÄ×Ö"
+
+#: src/gtk/gtkaspell.c:1395
+#, c-format
+msgid "Replace \"%s\" with: "
+msgstr "½«\"%s\"Ìæ»»³É£º"
+
+#: src/gtk/gtkaspell.c:1415
+msgid ""
+"Holding down MOD1 key while pressing Enter\n"
+"will learn from mistake.\n"
+msgstr ""
+
+#: src/gtk/gtkaspell.c:1674 src/gtk/gtkaspell.c:1938
+msgid "Fast Mode"
+msgstr "¿ìËÙģʽ"
+
+#: src/gtk/gtkaspell.c:1786
+#, c-format
+msgid "\"%s\" unknown in %s"
+msgstr "%sÖеÄ\"%s\"δ֪"
+
+#: src/gtk/gtkaspell.c:1799
+msgid "Accept in this session"
+msgstr "½ÓÊÜÕâÒ»´Î"
+
+#: src/gtk/gtkaspell.c:1809
+msgid "Add to personal dictionary"
+msgstr "¼ÓÈë¸öÈ˵Ä×Öµä"
+
+#: src/gtk/gtkaspell.c:1819
+msgid "Replace with..."
+msgstr "¸ü»»³É..."
+
+#: src/gtk/gtkaspell.c:1829
+#, c-format
+msgid "Check with %s"
+msgstr "ÓÃ%s¼ì²é"
+
+#: src/gtk/gtkaspell.c:1848
+msgid "(no suggestions)"
+msgstr "(ûÓн¨Òé)"
+
+#: src/gtk/gtkaspell.c:1859 src/gtk/gtkaspell.c:2012
+msgid "More..."
+msgstr "¸ü¶à..."
+
+#: src/gtk/gtkaspell.c:1914
+#, c-format
+msgid "Dictionary: %s"
+msgstr "×ֵ䣺%s"
+
+#: src/gtk/gtkaspell.c:1927
+#, c-format
+msgid "Use alternate (%s)"
+msgstr "ÓÃÁíÒ»¸ö(%s)"
+
+#: src/gtk/gtkaspell.c:1975 src/prefs_spelling.c:172
+msgid "Check while typing"
+msgstr "¼üÈëʱʵʱ¼ì²é"
+
+#: src/gtk/gtkaspell.c:1991
+msgid "Change dictionary"
+msgstr "Çл»×Öµä"
+
+#: src/gtk/gtkaspell.c:2141
+#, c-format
+msgid ""
+"The spell checker could not change dictionary.\n"
+"%s"
+msgstr ""
+"ƴд¼ì²éÆ÷Çл»×Öµäʧ°Ü\n"
+"%s"
 
 #: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
 msgid "Abcdef"
 msgstr ""
 
+#: src/gtk/logwindow.c:61
+msgid "Protocol log"
+msgstr "ЭÒéÈÕÖ¾"
+
 #: src/gtk/pluginwindow.c:114
 msgid "Select Plugin to load"
-msgstr "Ñ¡ÔñÔØÈëµÄPlugin"
+msgstr "Ñ¡ÔñÒª¼ÓÔصIJå¼þ"
 
 #: src/gtk/pluginwindow.c:150 src/gtk/pluginwindow.c:176
 msgid "Plugins"
 msgstr "²å¼þ"
 
-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2938
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
 msgid "Description"
 msgstr "ÃèÊö"
 
 #: src/gtk/pluginwindow.c:214
 msgid "Load Plugin"
-msgstr "¼ÓÔØPlugin"
+msgstr "¼ÓÔزå¼þ"
 
 #: src/gtk/pluginwindow.c:219
 msgid "Unload Plugin"
-msgstr "жÔØPlugin"
+msgstr "жÔزå¼þ"
 
-#: src/gtk/prefswindow.c:215
+#: src/gtk/prefswindow.c:214
 msgid "Page Index"
-msgstr "Ò³ÃæĿ¼"
+msgstr "Ò³Ãæ"
 
-#: src/gtk/prefswindow.c:321 src/prefs_gtk.c:451
+#: src/gtk/prefswindow.c:320 src/prefs_gtk.c:453
 msgid "Apply"
 msgstr "Ó¦ÓÃ"
 
+#: src/gtk/progressdialog.c:52 src/prefs_filtering_action.c:344
+msgid "Account"
+msgstr "ÕʺÅ"
+
+#: src/gtk/progressdialog.c:53 src/gtk/sslcertwindow.c:121
+#: src/prefs_summary_column.c:68
+msgid "Status"
+msgstr "״̬"
+
 #: src/gtk/sslcertwindow.c:114 src/gtk/sslcertwindow.c:268
 #: src/gtk/sslcertwindow.c:321
 msgid "correct"
@@ -2545,11 +2964,6 @@ msgstr "
 msgid "Signer"
 msgstr "¸èÕß"
 
-#: src/gtk/sslcertwindow.c:121 src/prefs_summary_column.c:68
-#: src/progressdialog.c:53
-msgid "Status"
-msgstr "״̬"
-
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgid "Name: "
 msgstr "Ãû×Ö"
@@ -2622,252 +3036,158 @@ msgstr "
 msgid "Changed SSL Certificate"
 msgstr "¸ü¸ÄSSLÈÏÖ¤"
 
-#: src/gtk/gtkaspell.c:558
-msgid "No dictionary selected."
-msgstr "ûÓÐÑ¡ÔñÈκÎ×ֵ䡣"
-
-#: src/gtk/gtkaspell.c:777 src/gtk/gtkaspell.c:1679 src/gtk/gtkaspell.c:1949
-msgid "Normal Mode"
-msgstr "Ò»°ãģʽ"
-
-#: src/gtk/gtkaspell.c:779 src/gtk/gtkaspell.c:1684 src/gtk/gtkaspell.c:1960
-msgid "Bad Spellers Mode"
-msgstr "Æ´´í×Öģʽ"
-
-#: src/gtk/gtkaspell.c:818
-msgid "Unknown suggestion mode."
-msgstr "δ֪µÄ½¨Òéģʽ¡£"
-
-#: src/gtk/gtkaspell.c:1051
-msgid "No misspelled word found."
-msgstr "ûÓз¢ÏÖ´í×Ö¡£"
-
-#: src/gtk/gtkaspell.c:1385
-msgid "Replace unknown word"
-msgstr "Ì滻δ֪µÄ×Ö"
-
-#: src/gtk/gtkaspell.c:1395
-#, c-format
-msgid "Replace \"%s\" with: "
-msgstr "½«\"%s\"Ìæ»»³É£º"
-
-#: src/gtk/gtkaspell.c:1415
-msgid ""
-"Holding down MOD1 key while pressing Enter\n"
-"will learn from mistake.\n"
-msgstr ""
-
-#: src/gtk/gtkaspell.c:1674 src/gtk/gtkaspell.c:1938
-msgid "Fast Mode"
-msgstr "¿ìËÙģʽ"
-
-#: src/gtk/gtkaspell.c:1786
-#, c-format
-msgid "\"%s\" unknown in %s"
-msgstr "%sÖеÄ\"%s\"δ֪"
-
-#: src/gtk/gtkaspell.c:1799
-msgid "Accept in this session"
-msgstr "½ÓÊÜÕâÒ»´Î"
-
-#: src/gtk/gtkaspell.c:1809
-msgid "Add to personal dictionary"
-msgstr "¼ÓÈë¸öÈ˵Ä×Öµä"
-
-#: src/gtk/gtkaspell.c:1819
-msgid "Replace with..."
-msgstr "¸ü»»³É..."
-
-#: src/gtk/gtkaspell.c:1829
-#, c-format
-msgid "Check with %s"
-msgstr "ÓÃ%s¼ì²é"
-
-#: src/gtk/gtkaspell.c:1848
-msgid "(no suggestions)"
-msgstr "(ûÓн¨Òé)"
-
-#: src/gtk/gtkaspell.c:1859 src/gtk/gtkaspell.c:2012
-msgid "More..."
-msgstr "¸ü¶à..."
-
-#: src/gtk/gtkaspell.c:1914
-#, c-format
-msgid "Dictionary: %s"
-msgstr "×ֵ䣺%s"
-
-#: src/gtk/gtkaspell.c:1927
-#, c-format
-msgid "Use alternate (%s)"
-msgstr "ÓÃÁíÒ»¸ö(%s)"
-
-#: src/gtk/gtkaspell.c:1975 src/prefs_spelling.c:172
-msgid "Check while typing"
-msgstr "±ßµ¼Èë±ß¼ì²é"
-
-#: src/gtk/gtkaspell.c:1991
-msgid "Change dictionary"
-msgstr "»»×Öµä"
-
-#: src/gtk/gtkaspell.c:2141
-#, c-format
-msgid ""
-"The spell checker could not change dictionary.\n"
-"%s"
-msgstr ""
-"ƴд¼ì²éÆ÷Çл»×Öµäʧ°Ü\n"
-"%s"
-
-#: src/headerview.c:181 src/summaryview.c:2370
+#: src/headerview.c:181 src/summaryview.c:2398
 msgid "(No From)"
-msgstr "(ûÓмƼþÕß)"
+msgstr "(ûÓмļþÕß)"
 
-#: src/headerview.c:202 src/summaryview.c:2412 src/summaryview.c:2415
+#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
 msgid "(No Subject)"
 msgstr "(ûÓÐÖ÷Ìâ)"
 
-#: src/imap.c:643
+#: src/imap.c:669
 #, c-format
 msgid "Connecting %s failed"
 msgstr "Á¬½Ó %s ʧ°Ü"
 
-#: src/imap.c:648
+#: src/imap.c:674
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Óë %s µÄIMAP4Á¬½ÓÒѾ­¶Ï¿ª¡£ÕýÔÚÖØÐÂÁ¬½Ó...\n"
 
-#: src/imap.c:688
+#: src/imap.c:714
 msgid "creating tunneled IMAP4 connection\n"
 msgstr "¿ªÊ¼ËíµÀʽIMAP4Á¬½Ó\n"
 
-#: src/imap.c:701
+#: src/imap.c:727
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ÕýÔÚ´´½¨µ½ %s:%d µÄIMAP4Á¬½Ó...\n"
 
-#: src/imap.c:740
+#: src/imap.c:766
 msgid "Can't start TLS session.\n"
 msgstr "ÎÞ·¨Æô¶¯TLS¡£\n"
 
-#: src/imap.c:1070
+#: src/imap.c:1100
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:1076 src/imap.c:1114
+#: src/imap.c:1114 src/imap.c:1154
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:1108
-#, fuzzy
+#: src/imap.c:1148
 msgid "can't set deleted flags: 1:*\n"
-msgstr "ÎÞ·¨Ñ¡ÔñÎļþ¼Ð£º%s\n"
+msgstr "ÎÞ·¨ÉèÖÃÒÑɾ³ý±ê¼Ç£º1:*\n"
 
-#: src/imap.c:1150
+#: src/imap.c:1190
 msgid "can't close folder\n"
-msgstr "ÎÞ·¨¹Ø±ÕÎļþ¼Ð£º%s\n"
+msgstr "ÎÞ·¨¹Ø±ÕÓʼþ¼Ð£º%s\n"
+
+#: src/imap.c:1242
+#, c-format
+msgid "root folder %s does not exist\n"
+msgstr "¸ùĿ¼ %s ²»´æÔÚ\n"
 
-#: src/imap.c:1349
+#: src/imap.c:1415 src/imap.c:1423
 msgid "error occurred while getting LIST.\n"
 msgstr "È¡µÃLISTʱ·¢Éú´íÎó¡£\n"
 
-#: src/imap.c:1581
+#: src/imap.c:1651
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ÎÞ·¨´´½¨ÊÕÐżУºLISTʧ°Ü\n"
 
-#: src/imap.c:1603
+#: src/imap.c:1673
 msgid "can't create mailbox\n"
 msgstr "ÎÞ·¨Æô¶¯ÊÕÐżÐ\n"
 
-#: src/imap.c:1671
+#: src/imap.c:1742
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
-msgstr "ÎÞ·¨½«ÊÕÐżÐÖØÐÂÃüÃû£º´Ó%sµ½%s\n"
+msgstr "ÎÞ·¨½«ÐÅÏä%s ÖØÐÂÃüÃûΪ %s\n"
 
-#: src/imap.c:1733
+#: src/imap.c:1804
 msgid "can't delete mailbox\n"
 msgstr "ÎÞ·¨É¾³ýÐżÐ\n"
 
-#: src/imap.c:1771
+#: src/imap.c:1842
 msgid "can't get envelope\n"
 msgstr "ûÓÐÐÅ·â\n"
 
-#: src/imap.c:1779
+#: src/imap.c:1850
 msgid "error occurred while getting envelope.\n"
 msgstr "ÄÃÐÅ·âʱ·¢Éú´íÎó¡£\n"
 
-#: src/imap.c:1801
+#: src/imap.c:1872
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ÎÞ·¨·ÖÎöÐŷ⣺%s\n"
 
-#: src/imap.c:1857
+#: src/imap.c:1928
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "ÎÞ·¨Óë%s½¨Á¢IMAP4ÁªÏµ\n"
 
-#: src/imap.c:1879
+#: src/imap.c:1950
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½ÓIMAP4·þÎñÆ÷£º%s:%d\n"
 
-#: src/imap.c:1886
+#: src/imap.c:1957
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr " ÎÞ·¨Óë %s:%d ½¨Á¢IMAP4ÁªÏµ\n"
 
-#: src/imap.c:1976
+#: src/imap.c:2047
 msgid "can't get namespace\n"
-msgstr ""
+msgstr "ÎÞ·¨È¡µÃÃüÃû¿Õ¼ä\n"
 
-#: src/imap.c:2408
+#: src/imap.c:2480
 #, c-format
 msgid "can't select folder: %s\n"
-msgstr "ÎÞ·¨Ñ¡ÔñÎļþ¼Ð£º%s\n"
+msgstr "ÎÞ·¨Ñ¡ÔñÓʼþ¼Ð£º%s\n"
 
-#: src/imap.c:2548
-#, fuzzy
+#: src/imap.c:2620
 msgid "IMAP4 authentication failed.\n"
-msgstr "ÊÚȨʧ°Ü¡£"
+msgstr "IMAP4¼øȨʧ°Ü¡£\n"
 
-#: src/imap.c:2565
+#: src/imap.c:2637
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4µÇ¼ʧ°Ü¡£\n"
 
-#: src/imap.c:2877
+#: src/imap.c:2953
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ÎÞ·¨½«%s¸½ÔÚ%sÖ®ºó\n"
 
-#: src/imap.c:2884
+#: src/imap.c:2960
 msgid "(sending file...)"
-msgstr "(ËÍÐÅÖÐ...)"
+msgstr "(ÕýÔÚ·¢ËÍ...)"
 
-#: src/imap.c:2912
+#: src/imap.c:3002
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ÎÞ·¨½«Óʼþ¸½ÔÚ%sÖ®ºó\n"
 
-#: src/imap.c:2949
-#, fuzzy, c-format
+#: src/imap.c:3084
+#, c-format
 msgid "can't copy %s to %s\n"
-msgstr "ÎÞ·¨½«%d¿½±´³É%s\n"
+msgstr "ÎÞ·¨½«%s¿½±´µ½%s\n"
 
-#: src/imap.c:3012
-#, fuzzy, c-format
+#: src/imap.c:3134
+#, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºSTORE %s %s\n"
 
-#: src/imap.c:3026
+#: src/imap.c:3151
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºEXPUNGE\n"
 
-#: src/imap.c:3039
-#, fuzzy
+#: src/imap.c:3164
 msgid "error while imap command: CLOSE\n"
-msgstr "imapÖ¸Áîʧ°Ü£ºEXPUNGE\n"
+msgstr "imapÖ¸Áîʧ°Ü£ºCLOSE\n"
 
-#: src/imap.c:3294
+#: src/imap.c:3419
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconvÎÞ·¨½«UTF-7ת»»³É%s\n"
@@ -2878,7 +3198,7 @@ msgstr "
 
 #: src/import.c:149
 msgid "Specify target mbox file and destination folder."
-msgstr ""
+msgstr "ÇëÖ¸¶¨mboxÎļþºÍÄ¿±êÓʼþ¼Ð"
 
 #: src/import.c:159
 msgid "Importing file:"
@@ -2886,7 +3206,7 @@ msgstr "
 
 #: src/import.c:164
 msgid "Destination dir:"
-msgstr "×îÖÕĿ¼£º"
+msgstr "Ä¿±êĿ¼£º"
 
 #: src/import.c:222
 msgid "Select importing file"
@@ -2898,7 +3218,7 @@ msgstr "
 
 #: src/importldif.c:192
 msgid "Select and rename LDIF field names to import."
-msgstr ""
+msgstr "Ñ¡Ôñ²¢ÖØÃüÃûÒªµ¼ÈëµÄLDIF×Ö¶ÎÃû¡£"
 
 #: src/importldif.c:195
 msgid "File imported."
@@ -2914,7 +3234,7 @@ msgstr "
 
 #: src/importldif.c:470
 msgid "Error reading LDIF fields."
-msgstr ""
+msgstr "¶ÁÈ¡LDIF×Ö¶Îʧ°Ü"
 
 #: src/importldif.c:493
 msgid "LDIF file imported successfully."
@@ -2928,7 +3248,7 @@ msgstr "ѡ
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
-msgstr ""
+msgstr "Ö¸¶¨µØÖ·²¾µÄÃû³Æ, ¸ÃµØÖ·²¾ÓÃÓë´æ·Å´ÓLDIFÎļþÖе¼ÈëµÄÊý¾Ý¡£"
 
 #: src/importldif.c:707
 msgid "File Name"
@@ -2936,25 +3256,23 @@ msgstr "
 
 #: src/importldif.c:718
 msgid "The full file specification of the LDIF file to import."
-msgstr ""
+msgstr "½«Òªµ¼ÈëµÄLDIFÎļþµÄλÖÃ"
 
 #: src/importldif.c:727
-#, fuzzy
 msgid "Select the LDIF file to import."
-msgstr "ÇëÑ¡Ôñµ¼ÈëµÄÎļþ¡£"
+msgstr "ÇëÑ¡ÔñÒªµ¼ÈëµÄLDIFÎļþ¡£"
 
 #: src/importldif.c:764
 msgid "R"
 msgstr ""
 
-#: src/importldif.c:765 src/summaryview.c:464
+#: src/importldif.c:765 src/summaryview.c:472
 msgid "S"
 msgstr "S"
 
 #: src/importldif.c:766
-#, fuzzy
 msgid "LDIF Field Name"
-msgstr "ÎļþÃû³Æ"
+msgstr "LDIF×Ö¶ÎÃû"
 
 #: src/importldif.c:767
 msgid "Attribute Name"
@@ -2988,27 +3306,24 @@ msgid ""
 msgstr ""
 
 #: src/importldif.c:880
-#, fuzzy
 msgid "Select for Import"
-msgstr "Ñ¡ÔñĿ¼"
+msgstr "Ñ¡Ôñµ¼ÈëÏî"
 
 #: src/importldif.c:886
 msgid "Select the LDIF field for import into the address book."
-msgstr ""
+msgstr "Ñ¡ÔñÒªµ¼Èëµ½µØÖ·²¾µÄLDIF×Ö¶Î"
 
 #: src/importldif.c:889
-#, fuzzy
 msgid " Modify "
-msgstr "ÐÞ¸Ä"
+msgstr " ÐÞ¸Ä "
 
 #: src/importldif.c:895
 msgid "This button will update the list above with the data supplied."
 msgstr ""
 
 #: src/importldif.c:968
-#, fuzzy
 msgid "Records Imported :"
-msgstr "¼Ç¼£º"
+msgstr "Òѵ¼ÈëµÄ¼Ç¼£º"
 
 #: src/importldif.c:999
 msgid "Import LDIF file into Address Book"
@@ -3043,163 +3358,163 @@ msgstr "ѡ
 msgid "Import Pine file into Address Book"
 msgstr "½«PineÎļþµ¼ÈëÖÁͨѶ¼ÖÐ"
 
-#: src/inc.c:351
+#: src/inc.c:334
 msgid "Retrieving new messages"
-msgstr "È¡»ØÐÂÐżþ"
+msgstr "È¡»ØÐÂÓʼþ"
 
-#: src/inc.c:396
+#: src/inc.c:379
 msgid "Standby"
 msgstr "´ýÃü"
 
-#: src/inc.c:521 src/inc.c:576
+#: src/inc.c:504 src/inc.c:559
 msgid "Cancelled"
 msgstr "È¡Ïû"
 
-#: src/inc.c:532
+#: src/inc.c:515
 msgid "Retrieving"
-msgstr "È¡»ØÖÐ"
+msgstr "ÕýÔÚÊÕÈ¡"
 
-#: src/inc.c:548
+#: src/inc.c:531
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
-msgstr "Íê³É(È¡»Ø%d¸öÐżþ(%s))"
+msgstr "Íê³É(È¡»Ø%d¸öÓʼþ(%s))"
 
-#: src/inc.c:552
+#: src/inc.c:535
 msgid "Done (no new messages)"
-msgstr "Íê³É(ûÓÐÐÂÐżþ)"
+msgstr "Íê³É(ûÓÐÐÂÓʼþ)"
 
-#: src/inc.c:558
+#: src/inc.c:541
 msgid "Connection failed"
 msgstr "Á¬½Óʧ°Ü"
 
-#: src/inc.c:562
+#: src/inc.c:545
 msgid "Auth failed"
 msgstr "ÊÚȨʧ°Ü"
 
-#: src/inc.c:566 src/prefs_summary_column.c:76
+#: src/inc.c:549 src/prefs_summary_column.c:76
 msgid "Locked"
-msgstr "ËøËÀ"
+msgstr "ÒÑËø¶¨"
 
-#: src/inc.c:589
+#: src/inc.c:572
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "ÔÚ%sÉϵÄ%sÊÚȨʧ°Ü"
 
-#: src/inc.c:659
+#: src/inc.c:642
 #, c-format
 msgid "Finished (%d new message(s))"
-msgstr "Íê³É (%d¸öÐÂÐżþ)"
+msgstr "Íê³É (%d¸öÐÂÓʼþ)"
 
-#: src/inc.c:662
+#: src/inc.c:645
 msgid "Finished (no new messages)"
-msgstr "Íê³É (ûÓÐÐÂÐżþ)"
+msgstr "Íê³É (ûÓÐÐÂÓʼþ)"
 
-#: src/inc.c:671
+#: src/inc.c:654
 msgid "Some errors occurred while getting mail."
-msgstr "ȡÐżþʱ·¢Éú´íÎó¡£"
+msgstr "ȡÓʼþʱ·¢Éú´íÎó¡£"
 
-#: src/inc.c:712
+#: src/inc.c:695
 #, c-format
 msgid "%s: Retrieving new messages"
-msgstr "%s:ÕýÔÚÈ¡»ØÐżþ"
+msgstr "%s:ÕýÔÚÊÕÈ¡Óʼþ"
 
-#: src/inc.c:731
-#, fuzzy, c-format
+#: src/inc.c:714
+#, c-format
 msgid "Connecting to POP3 server: %s..."
-msgstr "Á¬½áµ½POP3·þÎñÆ÷£º%s..."
+msgstr "ÕýÔÚÁ¬½ÓPOP3·þÎñÆ÷£º%s..."
 
-#: src/inc.c:738
+#: src/inc.c:721
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d\n"
 
-#: src/inc.c:745
+#: src/inc.c:728
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr " ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d"
 
-#: src/inc.c:811 src/send_message.c:467
+#: src/inc.c:794 src/send_message.c:461
 msgid "Authenticating..."
-msgstr "ÊÚȨÖÐ..."
+msgstr "ÕýÔÚÊÚȨ..."
 
-#: src/inc.c:812
-#, fuzzy, c-format
+#: src/inc.c:795
+#, c-format
 msgid "Retrieving messages from %s..."
-msgstr "È¡»ØÐÂÐżþ"
+msgstr "ÕýÔÚ´Ó%sÊÕÈ¡Óʼþ..."
 
-#: src/inc.c:817
+#: src/inc.c:800
 msgid "Getting the number of new messages (STAT)..."
-msgstr "»ñÈ¡ÐÂÐżþÊýÄ¿ÖÐ(STAT)..."
+msgstr "»ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(STAT)..."
 
-#: src/inc.c:821
+#: src/inc.c:804
 msgid "Getting the number of new messages (LAST)..."
-msgstr " »ñÈ¡ÐÂÐżþÊýÄ¿ÖÐ(LAST)..."
+msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(LAST)..."
 
-#: src/inc.c:825
+#: src/inc.c:808
 msgid "Getting the number of new messages (UIDL)..."
-msgstr " »ñÈ¡ÐÂÐżþÊýÄ¿ÖÐ(UIDL)..."
+msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(UIDL)..."
 
-#: src/inc.c:829
+#: src/inc.c:812
 msgid "Getting the size of messages (LIST)..."
 msgstr "»ñÈ¡Óʼþ´óСÖÐ(LIST)..."
 
-#: src/inc.c:846
+#: src/inc.c:829
 #, c-format
 msgid "Deleting message %d"
-msgstr "ɾ³ýÐżþ%d"
+msgstr "ɾ³ýÓʼþ%d"
 
-#: src/inc.c:852 src/send_message.c:485
+#: src/inc.c:835 src/send_message.c:479
 msgid "Quitting"
 msgstr "ÕýÔÚÍ˳ö"
 
-#: src/inc.c:889
+#: src/inc.c:872
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
-msgstr "È¡»ØÐżþ(%d/%d)(%s/%s)"
+msgstr "È¡»ØÓʼþ(%d/%d)(%s/%s)"
 
-#: src/inc.c:918
-#, fuzzy, c-format
+#: src/inc.c:901
+#, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
-msgstr "Íê³É(È¡»Ø%d¸öÐżþ(%s))"
+msgstr "ÕýÔÚÊÕÈ¡Óʼþ(¹²%d¸ö£¬ÒÑÊÕµ½%s¸ö)"
 
-#: src/inc.c:980
+#: src/inc.c:963
 msgid "Connection failed."
 msgstr "Á¬½Óʧ°Ü"
 
-#: src/inc.c:986
+#: src/inc.c:969
 msgid "Error occurred while processing mail."
-msgstr " ´¦ÀíÐżþʱ·¢Éú´íÎó¡£"
+msgstr " ´¦ÀíÓʼþʱ·¢Éú´íÎó¡£"
 
-#: src/inc.c:991
+#: src/inc.c:974
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
-"´¦ÀíÐżþʱ·¢Éú´íÎó£º\n"
+"´¦ÀíÓʼþʱ·¢Éú´íÎó£º\n"
 "%s"
 
-#: src/inc.c:997
+#: src/inc.c:980
 msgid "No disk space left."
 msgstr "Ó²µúÎ޿ռ䡣"
 
-#: src/inc.c:1002
+#: src/inc.c:985
 msgid "Can't write file."
 msgstr "ÎÞ·¨Ð´ÈëÎļþ¡£"
 
-#: src/inc.c:1007
+#: src/inc.c:990
 msgid "Socket error."
 msgstr "Socket´íÎó¡£"
 
-#: src/inc.c:1013 src/send_message.c:608
+#: src/inc.c:996 src/send_message.c:602
 msgid "Connection closed by the remote host."
-msgstr ""
+msgstr "Á¬½Ó±»Ô¶³ÌÖ÷»ú¹Ø±Õ¡£"
 
-#: src/inc.c:1019
+#: src/inc.c:1002
 msgid "Mailbox is locked."
-msgstr " ÓÊÏäÒѾ­±»Ëø£¬ÎÞ·¨´ò¿ª¡£"
+msgstr "ÓÊÏäÒѾ­±»Ëø£¬ÎÞ·¨´ò¿ª¡£"
 
-#: src/inc.c:1023
+#: src/inc.c:1006
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3208,11 +3523,11 @@ msgstr ""
 "ÓÊÏäÎÞ·¨´ò¿ª£º\n"
 "%s"
 
-#: src/inc.c:1029 src/send_message.c:595
+#: src/inc.c:1012 src/send_message.c:589
 msgid "Authentication failed."
 msgstr "ÊÚȨʧ°Ü¡£"
 
-#: src/inc.c:1034 src/send_message.c:598
+#: src/inc.c:1017 src/send_message.c:592
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3221,929 +3536,956 @@ msgstr ""
 "ÊÚȨʧ°Ü£º\n"
 "%s"
 
-#: src/inc.c:1069
+#: src/inc.c:1052
 msgid "Incorporation cancelled\n"
-msgstr "°üÈëʧ°Ü\n"
+msgstr "ºÏ²¢²Ù×÷±»È¡Ïû\n"
 
 #: src/inputdialog.c:152
 #, c-format
 msgid "Input password for %s on %s:"
-msgstr "µ¼Èë%sÔÚ%sÉϵÄÃÜÂ룺"
+msgstr "ÇëÊäÈë%sÔÚ%sÉϵÄÃÜÂ룺"
 
 #: src/inputdialog.c:154
 msgid "Input password"
-msgstr "µ¼ÈëÃÜÂë"
-
-#: src/logwindow.c:61
-msgid "Protocol log"
-msgstr "Э¶¨¼Ç¼"
+msgstr "ÊäÈëÃÜÂë"
 
 #: src/ldif.c:838
-#, fuzzy
 msgid "Nick Name"
 msgstr "´ÂºÅ"
 
-#: src/main.c:145 src/main.c:154
+#: src/main.c:143 src/main.c:152
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 "Can't create folder."
 msgstr ""
 "'%s'ÒÑ´æÔÚ¡£\n"
-"ÎÞ·¨ÖÆÔìĿ¼¼Ð¡£"
+"ÎÞ·¨´´½¨Ä¿Â¼¼Ð¡£"
 
-#: src/main.c:214
+#: src/main.c:212
 msgid "g_thread is not supported by glib.\n"
-msgstr "glib²»Ö§Ô®g_thread¡£\n"
-
-#: src/main.c:264
-msgid ""
-"GnuPG is not installed properly, or needs to be upgraded.\n"
-"OpenPGP support disabled."
-msgstr ""
-"GnuPGµÄ°²×°²»Õý³££¬»òÐèÒªÉý¼¶¡£\n"
-"OpenPGP֧ԮȡÏû¡£"
+msgstr "glib²»Ö§³Ög_thread¡£\n"
 
-#: src/main.c:465
+#: src/main.c:514
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr "Ó÷¨£º%s[Ñ¡Ïî]...\n"
+msgstr "Ó÷¨£º %s[Ñ¡Ïî]...\n"
 
-#: src/main.c:468
+#: src/main.c:517
 msgid "  --compose [address]    open composition window"
-msgstr " --compose [µç×ÓÓʼþµØÖ·] ´ò¿ªÐ´ÐÅ´°¿Ú"
+msgstr "  --compose [µØÖ·]       ´ò¿ªÐ´ÐÅ´°¿Ú"
 
-#: src/main.c:469
+#: src/main.c:518
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 " --attach Îļþ1 [Îļþ2]...\n"
-"              ½«Ìض¨µÄÎļþÒÔдÐÅ´°¿Ú´ò¿ª"
+"                         ½«Ìض¨µÄÎļþÒÔдÐÅ´°¿Ú´ò¿ª"
 
-#: src/main.c:472
+#: src/main.c:521
 msgid "  --receive              receive new messages"
-msgstr " --receive ½ÓÊÕÐÂÓʼþ"
+msgstr "  --receive              ½ÓÊÕÐÂÓʼþ"
 
-#: src/main.c:473
+#: src/main.c:522
 msgid "  --receive-all          receive new messages of all accounts"
-msgstr " --receive-all  ½ÓÊÕËùÓÐ ÕʺŵÄÐÂÓʼþ"
+msgstr "  --receive-all          ½ÓÊÕËùÓÐ ÕʺŵÄÐÂÓʼþ"
 
-#: src/main.c:474
+#: src/main.c:523
 msgid "  --send                 send all queued messages"
-msgstr " --send ·¢ËÍËùÓдý·¢ËÍÓʼþ"
+msgstr "  --send                 ·¢ËÍËùÓдý·¢ËÍÓʼþ"
 
-#: src/main.c:475
-#, fuzzy
+#: src/main.c:524
 msgid "  --status [folder]...   show the total number of messages"
-msgstr " --status ÏÔʾËùÓÐÐżþµÄÊýÄ¿"
+msgstr "  --status               ÏÔʾËùÓÐÓʼþµÄÊýÄ¿"
 
-#: src/main.c:476
-#, fuzzy
+#: src/main.c:525
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
-msgstr " --status ÏÔʾËùÓÐÐżþµÄÊýÄ¿"
+msgstr ""
+"  --status-full [Óʼþ¼Ð]...\n"
+"                         ÏÔʾËùÓÐÓʼþ¼ÐµÄ״̬"
 
-#: src/main.c:478
+#: src/main.c:527
 msgid "  --online               switch to online mode"
-msgstr " --online Çл»ÖÃÉÏÏß״̬"
+msgstr "  --online               Çл»µ½Áª»úģʽ"
 
-#: src/main.c:479
+#: src/main.c:528
 msgid "  --offline              switch to offline mode"
-msgstr " --offline Çл»ÖÃÏÂÏß״̬"
+msgstr "  --offline              Çл»µ½ÍÑ»ú״̬"
 
-#: src/main.c:480
+#: src/main.c:529
 msgid "  --debug                debug mode"
-msgstr " --debug ³ý´í״̬"
+msgstr "  --debug                µ÷ÊÔģʽ"
 
-#: src/main.c:481
+#: src/main.c:530
 msgid "  --help                 display this help and exit"
-msgstr " --help  ÏÔʾ±¾ËµÃ÷²¢½áÊø³ÌÐò"
+msgstr "  --help                 ÏÔʾ±¾ËµÃ÷²¢½áÊø³ÌÐò"
 
-#: src/main.c:482
+#: src/main.c:531
 msgid "  --version              output version information and exit"
-msgstr " --version ÏÔʾ°æ±¾ÄÚÈݲ¢½áÊø³ÌÐò"
+msgstr "  --version              ÏÔʾ°æ±¾ÄÚÈݲ¢½áÊø³ÌÐò"
 
-#: src/main.c:483
-#, fuzzy
+#: src/main.c:532
 msgid "  --config-dir           output configuration directory"
-msgstr " --version ÏÔʾ°æ±¾ÄÚÈݲ¢½áÊø³ÌÐò"
+msgstr "  --config-dir           ÏÔʾÅäÖÃÊý¾ÝĿ¼"
 
-#: src/main.c:527 src/summaryview.c:5148
+#: src/main.c:569 src/summaryview.c:5198
 #, c-format
 msgid "Processing (%s)..."
-msgstr "´¦ÀíÖÐ(%s)..."
+msgstr "ÕýÔÚ´¦Àí(%s)..."
 
-#: src/main.c:530
+#: src/main.c:572
 msgid "top level folder"
-msgstr "×îÉÏÒ»²ãÎļþ¼Ð"
+msgstr "×îÉÏÒ»²ãÓʼþ¼Ð"
 
-#: src/main.c:596
+#: src/main.c:637
 msgid "Composing message exists."
 msgstr "Ëù±à¼­µÄÎļþÒѾ­´æÔÚ¡£"
 
-#: src/main.c:597
+#: src/main.c:638
 msgid "Draft them"
-msgstr "д²Ý¸å"
+msgstr "±£´æΪ²Ý¸å"
 
-#: src/main.c:597
+#: src/main.c:638
 msgid "Discard them"
 msgstr "¶ªÆú"
 
-#: src/main.c:597
+#: src/main.c:638
 msgid "Don't quit"
 msgstr "²»Í˳ö"
 
-#: src/main.c:611
+#: src/main.c:652
 msgid "Queued messages"
-msgstr "´ý·¢Ë͵ÄÐżþ"
+msgstr "´ý·¢Ë͵ÄÓʼþ"
 
-#: src/main.c:612
+#: src/main.c:653
 msgid "Some unsent messages are queued. Exit now?"
-msgstr "´ý·¢ËÍÓʼþ¼ÐÄÚÉÐÓÐÐżþ¡£ÒªÍ˳öÂð£¿"
+msgstr "´ý·¢ËÍÓʼþ¼ÐÄÚÉÐÓÐÓʼþ¡£ÒªÍ˳öÂð£¿"
 
-#: src/main.c:917
+#: src/main.c:898
 msgid "Some errors occurred while sending queued messages."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 
-#: src/mainwindow.c:418
+#: src/mainwindow.c:426
 msgid "/_File/_Folder"
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)"
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)"
 
-#: src/mainwindow.c:419
+#: src/mainwindow.c:427
 msgid "/_File/_Folder/Create _new folder..."
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)/н¨Îļþ¼Ð(_n)..."
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/н¨Óʼþ¼Ð(_n)..."
 
-#: src/mainwindow.c:421
+#: src/mainwindow.c:429
 msgid "/_File/_Folder/_Rename folder..."
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)/ÖØÐÂÃüÃûÎļþ¼Ð(_R)..."
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ÖØÐÂÃüÃûÓʼþ¼Ð(_R)..."
 
-#: src/mainwindow.c:422
+#: src/mainwindow.c:430
 msgid "/_File/_Folder/_Delete folder"
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)/ɾ³ýÎļþ¼Ð(_D)"
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ɾ³ýÓʼþ¼Ð(_D)"
 
-#: src/mainwindow.c:423
+#: src/mainwindow.c:431
 msgid "/_File/_Folder/---"
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)/---"
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/---"
 
-#: src/mainwindow.c:424
+#: src/mainwindow.c:432
 msgid "/_File/_Folder/_Check for new messages in all folders"
-msgstr "/Îļþ(_F)/Îļþ¼Ð(_F)/¼ì²éËùÓÐÎļþ¼ÐÖеÄÐÂÓʼþ(_C)"
+msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ(_C)"
 
-#: src/mainwindow.c:426
+#: src/mainwindow.c:434
 msgid "/_File/_Add mailbox"
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)..."
 
-#: src/mainwindow.c:427
+#: src/mainwindow.c:435
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)/MH¸ñʽ..."
 
-#: src/mainwindow.c:428
-msgid "/_File/_Add mailbox/mbox..."
-msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)/mbox¸ñʽ..."
-
-#: src/mainwindow.c:429
+#: src/mainwindow.c:436
 msgid "/_File/_Import mbox file..."
 msgstr "/Îļþ(_F)/µ¼ÈëmboxµÄÎļþ(_I)... "
 
-#: src/mainwindow.c:430
+#: src/mainwindow.c:437
 msgid "/_File/_Export to mbox file..."
-msgstr "/Îļþ(_F)/ÒÔmbox¸ñʽµ¼³öÎļþ¼Ð..."
+msgstr "/Îļþ(_F)/ÒÔmbox¸ñʽµ¼³öÓʼþ¼Ð..."
 
-#: src/mainwindow.c:431
+#: src/mainwindow.c:438
 msgid "/_File/Empty _trash"
 msgstr "/Îļþ(_F)/Çå¿ÕÀ¬»øÍ°(_t)"
 
-#: src/mainwindow.c:432
-msgid "/_File/_Work offline"
-msgstr "/Îļþ(_F)/ÀëÏß¹¤×÷(_W)"
-
-#: src/mainwindow.c:434 src/messageview.c:142
+#: src/mainwindow.c:440 src/messageview.c:144
 msgid "/_File/_Save as..."
 msgstr "/Îļþ(_F)/±£´æΪ(_S)..."
 
-#: src/mainwindow.c:435 src/messageview.c:143
+#: src/mainwindow.c:441 src/messageview.c:145
 msgid "/_File/_Print..."
 msgstr "/Îļþ(_F)/´òÓ¡(_P)..."
 
-#: src/mainwindow.c:438
+#: src/mainwindow.c:443
+msgid "/_File/_Work offline"
+msgstr "/Îļþ(_F)/ÍÑ»ú¹¤×÷(_W)"
+
+#: src/mainwindow.c:446
 msgid "/_File/E_xit"
 msgstr "/Îļþ(_F)/Í˳ö(_x)"
 
-#: src/mainwindow.c:443
+#: src/mainwindow.c:451
 msgid "/_Edit/Select _thread"
 msgstr "/±à¼­(_E)/Ñ¡ÔñÏßË÷(_T)"
 
-#: src/mainwindow.c:445 src/messageview.c:151
+#: src/mainwindow.c:453 src/messageview.c:153
 msgid "/_Edit/_Find in current message..."
-msgstr " ±à¼­(_E)/ÔÚÐżþÖÐËÑÑ°(_F)..."
+msgstr " ±à¼­(_E)/ÔÚÓʼþÖÐËÑÑ°(_F)..."
 
-#: src/mainwindow.c:447
+#: src/mainwindow.c:455
 msgid "/_Edit/_Search folder..."
-msgstr "±à¼­(_E)/ÔÚÎļþ¼ÐÖвéÕÒ(_S)..."
+msgstr "±à¼­(_E)/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 
-#: src/mainwindow.c:449
+#: src/mainwindow.c:457
 msgid "/_View/Show or hi_de"
 msgstr "²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)"
 
-#: src/mainwindow.c:450
+#: src/mainwindow.c:458
 msgid "/_View/Show or hi_de/_Folder tree"
-msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/Îļþ¼ÐÊ÷(_F)"
+msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/Óʼþ¼ÐÊ÷(_F)"
 
-#: src/mainwindow.c:452
+#: src/mainwindow.c:460
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/ÔĶÁÓʼþ(_M)"
 
-#: src/mainwindow.c:454
+#: src/mainwindow.c:462
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)"
 
-#: src/mainwindow.c:456
+#: src/mainwindow.c:464
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ»òÎÄ×Ö(_a)"
 
-#: src/mainwindow.c:458
+#: src/mainwindow.c:466
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ(_I)"
 
-#: src/mainwindow.c:460
+#: src/mainwindow.c:468
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ÎÄ×Ö(_T)"
 
-#: src/mainwindow.c:462
+#: src/mainwindow.c:470
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ûÓÐ(_N)"
 
-#: src/mainwindow.c:464
+#: src/mainwindow.c:472
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/Òþ²Ø¹¤¾ßÀ¸(_b)"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:475
 msgid "/_View/Separate f_older tree"
-msgstr "/²é¿´(_V)/·Ö¿ªÎļþÊ÷(_o)"
+msgstr "/²é¿´(_V)/Óõ¥¶À´°¿ÚÏÔʾÓʼþ¼ÐÊ÷(_o)"
 
-#: src/mainwindow.c:468
+#: src/mainwindow.c:476
 msgid "/_View/Separate m_essage view"
-msgstr "/ ²é¿´(_V)/ÔÚд°¿ÚÖжÁÐżþ(_e)"
+msgstr "/ ²é¿´(_V)/Óõ¥¶À´°¿ÚÖÐÏÔʾÓʼþÄÚÈÝ(_e)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:478
 msgid "/_View/_Sort"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:479
 msgid "/_View/_Sort/by _number"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)/°´Ë³Ðò(_n)"
 
-#: src/mainwindow.c:472
+#: src/mainwindow.c:480
 msgid "/_View/_Sort/by s_ize"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´´óС(_i)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:481
 msgid "/_View/_Sort/by _date"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÈÕÆÚ(_d)"
 
-#: src/mainwindow.c:474
+#: src/mainwindow.c:482
 msgid "/_View/_Sort/by _from"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¼ÄÐÅÕß(_f)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:483
 msgid "/_View/_Sort/by _recipient"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÊÕÐÅÕß(_r)"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:484
 msgid "/_View/_Sort/by _subject"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷Ìâ(_s)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:485
 msgid "/_View/_Sort/by _color label"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÑÕÉ«±êÇ©(_l)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:487
 msgid "/_View/_Sort/by _mark"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´±ê¼Ç(_m)"
 
-#: src/mainwindow.c:480
+#: src/mainwindow.c:488
 msgid "/_View/_Sort/by _status"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´×´Ì¬(_s)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:489
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¸½¼þ(_t)"
 
-#: src/mainwindow.c:483
+#: src/mainwindow.c:491
 msgid "/_View/_Sort/by score"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´µÃ·Ö"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:492
 msgid "/_View/_Sort/by locked"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ëøס״̬"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:493
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/²»ÅÅÐò(_o)"
 
-#: src/mainwindow.c:486 src/mainwindow.c:489
+#: src/mainwindow.c:494 src/mainwindow.c:497
 msgid "/_View/_Sort/---"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/---"
 
-#: src/mainwindow.c:487
+#: src/mainwindow.c:495
 msgid "/_View/_Sort/Ascending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/ÉýÐò"
 
-#: src/mainwindow.c:488
+#: src/mainwindow.c:496
 msgid "/_View/_Sort/Descending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/½µÐò"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:498
 msgid "/_View/_Sort/_Attract by subject"
-msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷ÌâÎüÒý(_A)"
+msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷ÌâÅÅÁÐ(_A)"
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:500
 msgid "/_View/Th_read view"
 msgstr "/²é¿´(_V)/°´ÏßË÷²é¿´(_R)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:501
 msgid "/_View/E_xpand all threads"
 msgstr "/²é¿´(_V)/Õ¹¿ªËùÓÐÏßË÷(_X)"
 
-#: src/mainwindow.c:494
+#: src/mainwindow.c:502
 msgid "/_View/Co_llapse all threads"
 msgstr "/²é¿´(_V)/ÕÛµþËùÓÐÏßË÷(_L)"
 
-#: src/mainwindow.c:495
+#: src/mainwindow.c:503
 msgid "/_View/_Hide read messages"
-msgstr "/²é¿´(_V)/Òþ²ØÒѶÁÐżþ(_H) "
+msgstr "/²é¿´(_V)/Òþ²ØÒѶÁÓʼþ(_H) "
 
-#: src/mainwindow.c:496
+#: src/mainwindow.c:504
 msgid "/_View/Set displayed _items..."
-msgstr "/²é¿´(_V)/ÉèÖÃÏÔʾÏîÄ¿(_i)..."
+msgstr "/²é¿´(_V)/ÉèÖÃÏÔʾÁÐ(_i)..."
 
-#: src/mainwindow.c:499
+#: src/mainwindow.c:507
 msgid "/_View/_Go to"
 msgstr "/²é¿´(_V)/תµ½(_G)"
 
-#: src/mainwindow.c:500
+#: src/mainwindow.c:508
 msgid "/_View/_Go to/_Prev message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·â(_P)"
 
-#: src/mainwindow.c:501
+#: src/mainwindow.c:509
 msgid "/_View/_Go to/_Next message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·â(_N)"
 
-#: src/mainwindow.c:502 src/mainwindow.c:507 src/mainwindow.c:510
-#: src/mainwindow.c:515 src/mainwindow.c:520
+#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
+#: src/mainwindow.c:523 src/mainwindow.c:528
 msgid "/_View/_Go to/---"
 msgstr "/²é¿´(_V)/תµ½(_G)/---"
 
-#: src/mainwindow.c:503
+#: src/mainwindow.c:511
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·âδ¶ÁÐÅ(_r)"
 
-#: src/mainwindow.c:505
+#: src/mainwindow.c:513
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âδ¶ÁÐÅ(_e)"
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:516
 msgid "/_View/_Go to/Prev ne_w message"
-msgstr "/²é¿´(_V)/תµ½(_G)/Ç°Ò»·âÐÂÐżþ(_w)"
+msgstr "/²é¿´(_V)/תµ½(_G)/Ç°Ò»·âÐÂÓʼþ(_w)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:517
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âÐÂÐÅ(_x)"
 
-#: src/mainwindow.c:511
+#: src/mainwindow.c:519
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±ê¼ÇÓʼþ(_M)"
 
-#: src/mainwindow.c:513
+#: src/mainwindow.c:521
 msgid "/_View/_Go to/Next m_arked message"
-msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±ê¼ÇÐżþ(_a)"
+msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±ê¼ÇÓʼþ(_a)"
 
-#: src/mainwindow.c:516
+#: src/mainwindow.c:524
 msgid "/_View/_Go to/Prev _labeled message"
-msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±êÇ©Ðżþ(_l)"
+msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±êÇ©Óʼþ(_l)"
 
-#: src/mainwindow.c:518
+#: src/mainwindow.c:526
 msgid "/_View/_Go to/Next la_beled message"
-msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±êÇ©Ðżþ(_b)"
+msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±êÇ©Óʼþ(_b)"
 
-#: src/mainwindow.c:521
+#: src/mainwindow.c:529
 msgid "/_View/_Go to/Other _folder..."
-msgstr "/²é¿´(_V)/תµ½(_G)/ÆäËûÎļþ¼Ð(_f)"
+msgstr "/²é¿´(_V)/תµ½(_G)/ÆäËûÓʼþ¼Ð(_f)"
 
-#: src/mainwindow.c:525 src/mainwindow.c:532 src/messageview.c:157
+#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
 msgid "/_View/_Code set/---"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/---"
 
-#: src/mainwindow.c:529 src/messageview.c:161
+#: src/mainwindow.c:537 src/messageview.c:163
 msgid "/_View/_Code set"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)"
 
-#: src/mainwindow.c:530 src/messageview.c:162
+#: src/mainwindow.c:538 src/messageview.c:164
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/×Ô¶¯Õì²â(_A)"
 
-#: src/mainwindow.c:533 src/messageview.c:165
+#: src/mainwindow.c:541 src/messageview.c:167
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/7bit ascii (US-ASCII)(_ I)"
 
-#: src/mainwindow.c:537 src/messageview.c:169
+#: src/mainwindow.c:545 src/messageview.c:171
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Unicode (UTF-8)(_U)"
 
-#: src/mainwindow.c:541 src/messageview.c:173
+#: src/mainwindow.c:549 src/messageview.c:175
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-1)(_1)"
 
-#: src/mainwindow.c:543 src/messageview.c:175
+#: src/mainwindow.c:551 src/messageview.c:177
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-15)"
 
-#: src/mainwindow.c:547 src/messageview.c:179
+#: src/mainwindow.c:555 src/messageview.c:181
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-2)(_2) "
 
-#: src/mainwindow.c:550 src/messageview.c:182
+#: src/mainwindow.c:558 src/messageview.c:184
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-13)(_B)"
 
-#: src/mainwindow.c:552 src/messageview.c:184
+#: src/mainwindow.c:560 src/messageview.c:186
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-4)(_4) "
 
-#: src/mainwindow.c:555 src/messageview.c:187
+#: src/mainwindow.c:563 src/messageview.c:189
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ï£À° (ISO-8859-7)(_7)"
 
-#: src/mainwindow.c:558 src/messageview.c:190
+#: src/mainwindow.c:566 src/messageview.c:192
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÍÁ¶úÆä (ISO-8859-9)(_9)"
 
-#: src/mainwindow.c:561 src/messageview.c:193
+#: src/mainwindow.c:569 src/messageview.c:195
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(ISO-8859-5)(_5)"
 
-#: src/mainwindow.c:563 src/messageview.c:195
+#: src/mainwindow.c:571 src/messageview.c:197
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(KOI8-R) (_R)"
 
-#: src/mainwindow.c:565 src/messageview.c:197
+#: src/mainwindow.c:573 src/messageview.c:199
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(Windows-1251)"
 
-#: src/mainwindow.c:569 src/messageview.c:201
+#: src/mainwindow.c:577 src/messageview.c:203
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022-JP)(_J)"
 
-#: src/mainwindow.c:572 src/messageview.c:204
+#: src/mainwindow.c:580 src/messageview.c:206
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022- JP-2)"
 
-#: src/mainwindow.c:575 src/messageview.c:207
+#: src/mainwindow.c:583 src/messageview.c:209
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (EUC-JP)(_E)"
 
-#: src/mainwindow.c:577 src/messageview.c:209
+#: src/mainwindow.c:585 src/messageview.c:211
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (Shift__JIS)(_S)"
 
-#: src/mainwindow.c:581 src/messageview.c:213
+#: src/mainwindow.c:589 src/messageview.c:215
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/¼òÌåÖÐÎÄ(GB2312)(_G)"
 
-#: src/mainwindow.c:583 src/messageview.c:215
+#: src/mainwindow.c:591 src/messageview.c:217
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(Big5)(_B) "
 
-#: src/mainwindow.c:585 src/messageview.c:217
+#: src/mainwindow.c:593 src/messageview.c:219
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(EUC-TW)(_T)"
 
-#: src/mainwindow.c:587 src/messageview.c:219
+#: src/mainwindow.c:595 src/messageview.c:221
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÖÐÎÄ(ISO-2022-CN)(_C) "
 
-#: src/mainwindow.c:590 src/messageview.c:222
+#: src/mainwindow.c:598 src/messageview.c:224
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ(EUC-KR)(_K) "
 
-#: src/mainwindow.c:592 src/messageview.c:224
+#: src/mainwindow.c:600 src/messageview.c:226
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ (ISO-2022-KR)"
 
-#: src/mainwindow.c:595 src/messageview.c:227
+#: src/mainwindow.c:603 src/messageview.c:229
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(TIS-620)"
 
-#: src/mainwindow.c:597 src/messageview.c:229
+#: src/mainwindow.c:605 src/messageview.c:231
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(Windows-874)"
 
-#: src/mainwindow.c:605 src/summaryview.c:450
+#: src/mainwindow.c:613 src/summaryview.c:458
 msgid "/_View/Open in new _window"
 msgstr "/²é¿´(_V)/ÔÚд°¿ÚÖдò¿ª(_w)"
 
-#: src/mainwindow.c:606 src/messageview.c:237
+#: src/mainwindow.c:614 src/messageview.c:239
 msgid "/_View/Mess_age source"
-msgstr "/²é¿´(_V)/ÐżþÔ´Îļþ(_a)"
+msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_a)"
 
-#: src/mainwindow.c:607
+#: src/mainwindow.c:615
 msgid "/_View/Show all _headers"
-msgstr "/²é¿´(_V)/ÏÔʾËùÓбêÌâͷ(_H)"
+msgstr "/²é¿´(_V)/ÏÔʾËùÓÐÐÅÏ¢ͷ(_H)"
 
-#: src/mainwindow.c:609
+#: src/mainwindow.c:617
 msgid "/_View/_Update summary"
-msgstr "/²é¿´(_V)/¸üÐÂͳ¼ÆÊý¾Ý(_U)"
+msgstr "/²é¿´(_V)/¸üÐÂÓʼþÕªÒª(_U)"
 
-#: src/mainwindow.c:612
+#: src/mainwindow.c:620
 msgid "/_Message/Get new ma_il"
 msgstr "/Óʼþ(_M)/ÊÕÐÂÓʼþ(_i)"
 
-#: src/mainwindow.c:613
+#: src/mainwindow.c:621
 msgid "/_Message/Get from _all accounts"
 msgstr "/Óʼþ(_M)/ÊÕËùÓÐÕʺŵÄÓʼþ(_a)"
 
-#: src/mainwindow.c:615
+#: src/mainwindow.c:623
 msgid "/_Message/Cancel receivin_g"
 msgstr "/Óʼþ(_M)/È¡ÏûÊÕÐÅ(_g)"
 
-#: src/mainwindow.c:617
+#: src/mainwindow.c:625
 msgid "/_Message/_Send queued messages"
-msgstr "/Óʼþ(_M)/Ëͳö´ý·¢ËÍÐżþ(_S)"
+msgstr "/Óʼþ(_M)/Ëͳö´ý·¢ËÍÓʼþ(_S)"
 
-#: src/mainwindow.c:619
+#: src/mainwindow.c:627
 msgid "/_Message/Compose a_n email message"
 msgstr "/Óʼþ(_M)/дÐÅ(_n)"
 
-#: src/mainwindow.c:620
+#: src/mainwindow.c:628
 msgid "/_Message/Compose a news message"
 msgstr "/Óʼþ(_M)/дÐÂÎÅȺÁôÑÔ"
 
-#: src/mainwindow.c:621 src/messageview.c:244
+#: src/mainwindow.c:629 src/messageview.c:246
 msgid "/_Message/_Reply"
 msgstr "/Óʼþ(_M)/»ØÐÅ(_R)"
 
-#: src/mainwindow.c:622
+#: src/mainwindow.c:630
 msgid "/_Message/Repl_y to"
 msgstr "/Óʼþ(_M)/»ØПø(_y)"
 
-#: src/mainwindow.c:623 src/messageview.c:245
+#: src/mainwindow.c:631 src/messageview.c:247
 msgid "/_Message/Repl_y to/_all"
-msgstr "/Óʼþ(_M)/ »ØПø(_y)/È«²¿ÈË(_a)"
+msgstr "/Óʼþ(_M)/»ØПø(_y)/È«²¿ÈË(_a)"
 
-#: src/mainwindow.c:624 src/messageview.c:247
+#: src/mainwindow.c:632 src/messageview.c:249
 msgid "/_Message/Repl_y to/_sender"
-msgstr "/Óʼþ(_M)/ »ØПø(_y)/¼ÄÐÅÈË(_s)"
+msgstr "/Óʼþ(_M)/»ØПø(_y)/¼ÄÐÅÈË(_s)"
 
-#: src/mainwindow.c:625 src/messageview.c:249
+#: src/mainwindow.c:633 src/messageview.c:251
 msgid "/_Message/Repl_y to/mailing _list"
-msgstr "/Óʼþ(_M)/ »ØПø(_y)/ÓʼþÁбí(_l)"
+msgstr "/Óʼþ(_M)/»ØПø(_y)/ÓʼþÁбí(_l)"
 
-#: src/mainwindow.c:627
+#: src/mainwindow.c:635
 msgid "/_Message/Follow-up and reply to"
-msgstr ""
+msgstr "/Óʼþ(_M)/Follow-up and reply to"
 
-#: src/mainwindow.c:629 src/messageview.c:252
+#: src/mainwindow.c:637 src/messageview.c:254
 msgid "/_Message/_Forward"
-msgstr "/Óʼþ(_M)/ ת·¢(_F)"
+msgstr "/Óʼþ(_M)/ת·¢(_F)"
 
-#: src/mainwindow.c:630
+#: src/mainwindow.c:638
 msgid "/_Message/Redirect"
-msgstr "/Óʼþ(_M)/ Redirect"
+msgstr "/Óʼþ(_M)/Öض¨Ïò"
 
-#: src/mainwindow.c:632 src/messageview.c:257
+#: src/mainwindow.c:640 src/messageview.c:259
 msgid "/_Message/Re-_edit"
-msgstr "/Óʼþ(_M)/ ÖØб༭(_e)"
+msgstr "/Óʼþ(_M)/ÖØб༭(_e)"
 
-#: src/mainwindow.c:634
+#: src/mainwindow.c:642
 msgid "/_Message/M_ove..."
 msgstr "/Óʼþ(_M)/ Òƶ¯(_o)"
 
-#: src/mainwindow.c:635
+#: src/mainwindow.c:643
 msgid "/_Message/_Copy..."
 msgstr "/Óʼþ(_M)/ ¸´ÖÆ(_C)"
 
-#: src/mainwindow.c:636
+#: src/mainwindow.c:644
 msgid "/_Message/_Delete"
 msgstr "/Óʼþ(_M)/ ɾ³ý(_D) "
 
-#: src/mainwindow.c:637
+#: src/mainwindow.c:645
 msgid "/_Message/Cancel a news message"
 msgstr "/Óʼþ(_M)/ È¡ÏûÐÂÓʼþ"
 
-#: src/mainwindow.c:639
+#: src/mainwindow.c:647
 msgid "/_Message/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)"
 
-#: src/mainwindow.c:640
+#: src/mainwindow.c:648
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ±ê¼Ç(_M) "
 
-#: src/mainwindow.c:641
+#: src/mainwindow.c:649
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ²»±ê¼Ç(_U)"
 
-#: src/mainwindow.c:642
+#: src/mainwindow.c:650
 msgid "/_Message/_Mark/---"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/---"
 
-#: src/mainwindow.c:643
+#: src/mainwindow.c:651
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
-#: src/mainwindow.c:644
+#: src/mainwindow.c:652
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 
-#: src/mainwindow.c:646
+#: src/mainwindow.c:654
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇËùÓÐΪÒѶÁ(_r)"
 
-#: src/mainwindow.c:649
+#: src/mainwindow.c:657
 msgid "/_Tools/_Address book..."
 msgstr "/¹¤¾ß(_T)/ͨѶ²¾(_A)..."
 
-#: src/mainwindow.c:650 src/messageview.c:261
+#: src/mainwindow.c:658 src/messageview.c:263
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/¹¤¾ß(_T)/¼ÓÈëͨѶ²¾ÖÐ(_k)"
 
-#: src/mainwindow.c:652
+#: src/mainwindow.c:660
 msgid "/_Tools/_Harvest addresses"
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)"
 
-#: src/mainwindow.c:653
+#: src/mainwindow.c:661
 msgid "/_Tools/_Harvest addresses/from _Folder..."
-msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÎļþ¼Ð(_F)"
+msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ¼Ð(_F)"
 
-#: src/mainwindow.c:655
+#: src/mainwindow.c:663
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ(_M)"
 
-#: src/mainwindow.c:658
+#: src/mainwindow.c:666
 msgid "/_Tools/_Filter messages"
-msgstr "/¹¤¾ß(_T)/¹ýÂËÐżþ(_F)"
+msgstr "/¹¤¾ß(_T)/¹ýÂËÓʼþ(_F)"
 
-#: src/mainwindow.c:659 src/messageview.c:264
+#: src/mainwindow.c:667 src/messageview.c:266
 msgid "/_Tools/_Create filter rule"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
 
-#: src/mainwindow.c:660 src/messageview.c:266
+#: src/mainwindow.c:668 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
 
-#: src/mainwindow.c:662 src/messageview.c:268
+#: src/mainwindow.c:670 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
 
-#: src/mainwindow.c:664 src/messageview.c:270
+#: src/mainwindow.c:672 src/messageview.c:272
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
 
-#: src/mainwindow.c:666 src/messageview.c:272
+#: src/mainwindow.c:674 src/messageview.c:274
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 
-#: src/mainwindow.c:671
+#: src/mainwindow.c:676
+msgid "/_Tools/_Create processing rule"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
+
+#: src/mainwindow.c:677
+msgid "/_Tools/_Create processing rule/_Automatically"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
+
+#: src/mainwindow.c:679
+msgid "/_Tools/_Create processing rule/by _From"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
+
+#: src/mainwindow.c:681
+msgid "/_Tools/_Create processing rule/by _To"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
+
+#: src/mainwindow.c:683
+msgid "/_Tools/_Create processing rule/by _Subject"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
+
+#: src/mainwindow.c:688
 msgid "/_Tools/Delete du_plicated messages"
-msgstr "/¹¤¾ß(_T)/ɾ³ýÖظ´Ðżþ(_p)"
+msgstr "/¹¤¾ß(_T)/ɾ³ýÖظ´Óʼþ(_p)"
 
-#: src/mainwindow.c:674
+#: src/mainwindow.c:691
 msgid "/_Tools/E_xecute"
 msgstr "/¹¤¾ß(_T)/Ö´ÐÐ(_x)"
 
-#: src/mainwindow.c:677
+#: src/mainwindow.c:694
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/¹¤¾ß(_T)/SSLÈÏÖ¤(_f)"
 
-#: src/mainwindow.c:681
+#: src/mainwindow.c:698
 msgid "/_Tools/_Log window"
 msgstr "/¹¤¾ß(_T)/ÈÕÖ¾´°¿Ú(_L)"
 
-#: src/mainwindow.c:683
+#: src/mainwindow.c:700
 msgid "/_Configuration"
-msgstr "/ϵͳÉèÖÃ(_C)"
+msgstr "/ÉèÖÃ(_C)"
 
-#: src/mainwindow.c:684
+#: src/mainwindow.c:701
 msgid "/_Configuration/C_hange current account"
-msgstr "/ϵͳÉèÖÃ(_C)/¸ü¸ÄÄ¿Ç°ÕʺÅ(_h)"
+msgstr "/ÉèÖÃ(_C)/¸ü¸ÄÄ¿Ç°ÕʺÅ(_h)"
 
-#: src/mainwindow.c:686
+#: src/mainwindow.c:703
 msgid "/_Configuration/_Preferences for current account..."
-msgstr "/ϵͳÉèÖÃ(_C)/Ä¿Ç°ÕʺŵÄÆ«ºÃÉèÖÃ(_P)"
+msgstr "/ÉèÖÃ(_C)/Ä¿Ç°ÕʺŵÄÆ«ºÃÉèÖÃ(_P)..."
 
-#: src/mainwindow.c:688
+#: src/mainwindow.c:705
 msgid "/_Configuration/Create _new account..."
-msgstr "/ϵͳÉèÖÃ(_C)/²úÉúÐÂÕʺÅ(_n)"
+msgstr "/ÉèÖÃ(_C)/´´½¨ÐÂÕʺÅ(_n)..."
 
-#: src/mainwindow.c:690
+#: src/mainwindow.c:707
 msgid "/_Configuration/_Edit accounts..."
-msgstr "/ϵͳÉèÖÃ(_C)/±à¼­ÕʺÅ(_E)"
+msgstr "/ÉèÖÃ(_C)/±à¼­ÕʺÅ(_E)..."
 
-#: src/mainwindow.c:692
+#: src/mainwindow.c:709
 msgid "/_Configuration/---"
-msgstr "/ϵͳÉèÖÃ(_C)/---"
+msgstr "/ÉèÖÃ(_C)/---"
 
-#: src/mainwindow.c:693
+#: src/mainwindow.c:710
 msgid "/_Configuration/_Common preferences..."
-msgstr "/ϵͳÉèÖÃ(_C)/Ò»°ãÆ«ºÃ(_C)"
+msgstr "/ÉèÖÃ(_C)/Ò»°ãÆ«ºÃ(_C)..."
 
-#: src/mainwindow.c:695
-msgid "/_Configuration/_Scoring..."
-msgstr "/ϵͳÉèÖÃ(_C)/¼Æ·Ö(_S)"
+#: src/mainwindow.c:712
+msgid "/_Configuration/Pre-processing..."
+msgstr "/ÉèÖÃ(_C)/Ç°´¦Àí..."
 
-#: src/mainwindow.c:697
+#: src/mainwindow.c:714
+msgid "/_Configuration/Post-processing..."
+msgstr "/ÉèÖÃ(_C)/ºó´¦Àí..."
+
+#: src/mainwindow.c:716
 msgid "/_Configuration/_Filtering..."
-msgstr "/ϵͳÉèÖÃ(_C)/¹ýÂË(_F)"
+msgstr "/ÉèÖÃ(_C)/¹ýÂË(_F)..."
 
-#: src/mainwindow.c:699
+#: src/mainwindow.c:718
 msgid "/_Configuration/_Templates..."
-msgstr "/ϵͳÉèÖÃ(_C)/Ä£°å(_T)"
+msgstr "/ÉèÖÃ(_C)/Ä£°å(_T)..."
 
-#: src/mainwindow.c:700
+#: src/mainwindow.c:719
 msgid "/_Configuration/_Actions..."
-msgstr "/ϵͳÉèÖÃ(_C)/¶¯×÷(_A)"
+msgstr "/ÉèÖÃ(_C)/¶¯×÷(_A)..."
 
-#: src/mainwindow.c:701
+#: src/mainwindow.c:720
 msgid "/_Configuration/_Other Preferences..."
-msgstr "/ϵͳÉèÖÃ(_C)/ÆäËûÆ«ºÃ(_O)"
+msgstr "/ÉèÖÃ(_C)/ÆäËûÆ«ºÃ(_O)..."
 
-#: src/mainwindow.c:702
+#: src/mainwindow.c:721
 msgid "/_Configuration/Plugins..."
-msgstr "/ϵͳÉèÖÃ(_C)/²å¼þ..."
+msgstr "/ÉèÖÃ(_C)/²å¼þ..."
 
-#: src/mainwindow.c:705
+#: src/mainwindow.c:724
 msgid "/_Help/_Manual (Local)"
-msgstr "/ÇóÖú(_H)/ÏßÉÏÊÖ²á(_M)(Local)"
+msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(±¾µØ)"
 
-#: src/mainwindow.c:706
+#: src/mainwindow.c:725
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
-msgstr "/ÇóÖú(_H)/ÏßÉÏÊÖ²á(_M)(SylpheedÊÖ²áÍøÒ³)"
+msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(SylpheedÊÖ²áÍøÒ³)"
 
-#: src/mainwindow.c:708
+#: src/mainwindow.c:727
 msgid "/_Help/_FAQ (Local)"
-msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F)(Local)"
+msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F)(±¾µØ)"
 
-#: src/mainwindow.c:709
+#: src/mainwindow.c:728
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F) (SylpheedÊÖ²áÍøÒ³)"
 
-#: src/mainwindow.c:711
+#: src/mainwindow.c:730
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Help/_Claws °æ±¾³£¼ûÎÊÌâ"
 
-#: src/mainwindow.c:713
+#: src/mainwindow.c:732
 msgid "/_Help/---"
 msgstr "/ÇóÖú(_H)/---"
 
-#: src/mainwindow.c:832
-msgid "Go offline"
-msgstr "ÀëÏß"
+#: src/mainwindow.c:851
+msgid "You are online. Click the icon to go offline"
+msgstr "Ä¿Ç°ÔÚÏß¡£µã»÷ͼ±êתµ½ÀëÏßģʽ¡£"
 
-#: src/mainwindow.c:836
-msgid "Go online"
-msgstr "ÉÏÏß"
+#: src/mainwindow.c:855
+msgid "You are offline. Click the icon to go online"
+msgstr "Ä¿Ç°ÀëÏß¡£µã»÷ͼ±êתµ½ÔÚÏß״̬¡£"
 
-#: src/mainwindow.c:852
+#: src/mainwindow.c:872
 msgid "Select account"
 msgstr "Ñ¡ÔñÕʺÅ"
 
-#: src/mainwindow.c:1176 src/mainwindow.c:1193 src/prefs_folder_item.c:378
+#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
 msgid "Untitled"
 msgstr "δÃüÃû"
 
-#: src/mainwindow.c:1194
+#: src/mainwindow.c:1222
 msgid "none"
-msgstr ""
+msgstr "ÎÞ"
 
-#: src/mainwindow.c:1434
+#: src/mainwindow.c:1462
 msgid "Empty trash"
 msgstr "Çå¿ÕÀ¬»øÏä"
 
-#: src/mainwindow.c:1435
+#: src/mainwindow.c:1463
 msgid "Empty all messages in trash?"
 msgstr "Çå¿ÕÀ¬»øÏäÄÚËùÓÐÓʼþ£¿"
 
-#: src/mainwindow.c:1453
+#: src/mainwindow.c:1481
 msgid "Add mailbox"
 msgstr "Ìí¼ÓÓÊÏä"
 
-#: src/mainwindow.c:1454
+#: src/mainwindow.c:1482
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
+"ÇëÊäÈëÓÊÏäλÖá£\n"
+"Èç¹ûÖ¸¶¨ÒÑ´æÔÚµÄÓÊÏ䣬Ëü½«»á×Ô¶¯±»É¨Ãè¡£"
 
-#: src/mainwindow.c:1460 src/mainwindow.c:1497
+#: src/mainwindow.c:1488
 #, c-format
 msgid "The mailbox `%s' already exists."
-msgstr ""
+msgstr "ÓÊÏä `%s' ÒѾ­´æÔÚ¡£"
 
-#: src/mainwindow.c:1465 src/setup.c:57
+#: src/mainwindow.c:1493 src/setup.c:58
 msgid "Mailbox"
-msgstr ""
+msgstr "ÓÊÏä"
 
-#: src/mainwindow.c:1470 src/setup.c:61
+#: src/mainwindow.c:1498 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
+"´´½¨ÓÊÏäʧ°Ü¡£\n"
+"Ò²ÐíijЩÎļþÒѾ­´æÔÚ£¬»òÕßÄãûÓÐ×ã¹»µÄдȨÏÞ¡£"
 
-#: src/mainwindow.c:1490
-msgid "Add mbox mailbox"
-msgstr "Ìí¼Ómbox¸ñʽÓʼþ"
-
-#: src/mainwindow.c:1491
-msgid "Input the location of mailbox."
-msgstr ""
-
-#: src/mainwindow.c:1507
-msgid "Creation of the mailbox failed."
-msgstr ""
-
-#: src/mainwindow.c:1823
+#: src/mainwindow.c:1817
 msgid "Sylpheed - Folder View"
-msgstr ""
+msgstr "Sylpheed - Óʼþ¼Ð"
 
-#: src/mainwindow.c:1844 src/messageview.c:380
+#: src/mainwindow.c:1838 src/messageview.c:378
 msgid "Sylpheed - Message View"
-msgstr ""
+msgstr "Sylpheed - Óʼþ"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2222
 msgid "Exit"
 msgstr "Í˳ö"
 
-#: src/mainwindow.c:2217
+#: src/mainwindow.c:2222
 msgid "Exit this program?"
 msgstr "Í˳ö±¾³ÌÐò"
 
-#: src/matcher.c:1212 src/matcher.c:1213 src/matcher.c:1214 src/matcher.c:1215
-#: src/matcher.c:1216 src/matcher.c:1217 src/matcher.c:1218 src/matcher.c:1219
+#: src/mainwindow.c:2716 src/summaryview.c:4046
+msgid "Processing rules to apply before folder rules"
+msgstr "ÔÚÓʼþ¼Ð¹æÔòÇ°Ó¦ÓõĹæÔò"
+
+#: src/mainwindow.c:2724
+msgid "Processing rules to apply after folder rules"
+msgstr "ÔÚÓʼþ¼Ð¹æÔòºóÓ¦ÓõĹæÔò"
+
+#: src/mainwindow.c:2732 src/summaryview.c:4055
+msgid "Filtering configuration"
+msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
+
+#: src/matcher.c:1178 src/matcher.c:1179 src/matcher.c:1180 src/matcher.c:1181
+#: src/matcher.c:1182 src/matcher.c:1183 src/matcher.c:1184 src/matcher.c:1185
 msgid "(none)"
-msgstr ""
+msgstr "(ÎÞ)"
 
 #: src/message_search.c:88
 msgid "Find in current message"
-msgstr ""
+msgstr "ÔÚµ±Ç°ÓʼþÖвéÕÒ"
 
 #: src/message_search.c:106
 msgid "Find text:"
-msgstr ""
+msgstr "²éÕÒÎÄ×Ö"
 
-#: src/message_search.c:121 src/prefs_matcher.c:539 src/summary_search.c:182
+#: src/message_search.c:121 src/prefs_matcher.c:539 src/summary_search.c:183
 msgid "Case sensitive"
-msgstr ""
+msgstr "´óСдÃô¸Ð"
 
-#: src/message_search.c:127 src/summary_search.c:188
+#: src/message_search.c:127 src/summary_search.c:189
 msgid "Backward search"
-msgstr ""
+msgstr "·´ÏòËÑË÷"
 
-#: src/message_search.c:183 src/summary_search.c:313
+#: src/message_search.c:183 src/summary_search.c:317
 msgid "Search failed"
-msgstr ""
+msgstr "²éÕÒʧ°Ü"
 
-#: src/message_search.c:184 src/summary_search.c:314
+#: src/message_search.c:184 src/summary_search.c:318
 msgid "Search string not found."
-msgstr ""
+msgstr "δÕÒµ½Ö¸¶¨×Ö·û´®"
 
 #: src/message_search.c:191
 msgid "Beginning of message reached; continue from end?"
-msgstr ""
+msgstr "Òѵ½´ïÓʼþ¶¥²¿£¬ÊÇ·ñÈƵ½Î²²¿¼ÌÐø²éÕÒ£¿"
 
 #: src/message_search.c:194
 msgid "End of message reached; continue from beginning?"
-msgstr ""
+msgstr "Òѵ½´ïÓʼþĩ⣬ÊÇ·ñÖØпªÊ¼²éÕÒ£¿"
 
-#: src/message_search.c:197 src/summary_search.c:323
+#: src/message_search.c:197 src/summary_search.c:327
 msgid "Search finished"
-msgstr ""
+msgstr "²éÕÒÍê³É"
 
-#: src/messageview.c:238
-#, fuzzy
+#: src/messageview.c:240
 msgid "/_View/Show all _header"
-msgstr "/²é¿´(_V)/ÏÔʾËùÓбêÌâͷ(_H)"
+msgstr "/²é¿´(_V)/ÏÔʾËùÓÐÐÅÏ¢ͷ(_H)"
 
-#: src/messageview.c:241
+#: src/messageview.c:243
 msgid "/_Message/Compose _new message"
 msgstr "/Óʼþ(_M)/׫дÐÂÓʼþ(_N)"
 
-#: src/messageview.c:253
+#: src/messageview.c:255
 msgid "/_Message/For_ward as attachment"
 msgstr "/Óʼþ(_M)/ÒÔ¸½¼ÓÎļþÐÎʽת·¢(_A)"
 
-#: src/messageview.c:255
-#, fuzzy
+#: src/messageview.c:257
 msgid "/_Message/Redirec_t"
-msgstr "/Óʼþ(_M)/ Redirect"
+msgstr "/Óʼþ(_M)/Öض¨Ïò(_t)"
+
+#: src/messageview.c:276
+msgid "/_Tools/Create processing rule/_Automatically"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
+
+#: src/messageview.c:278
+#, fuzzy
+msgid "/_Tools/Create processing rule/by _From"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
+
+#: src/messageview.c:280
+#, fuzzy
+msgid "/_Tools/Create processing rule/by _To"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
+
+#: src/messageview.c:282
+#, fuzzy
+msgid "/_Tools/Create processing rule/by _Subject"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 
-#: src/messageview.c:477
+#: src/messageview.c:476
 msgid "<No Return-Path found>"
-msgstr ""
+msgstr "<δÕÒµ½»ØÐŵØÖ·>"
 
-#: src/messageview.c:485
+#: src/messageview.c:484
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
@@ -4152,187 +4494,214 @@ msgid ""
 "Return path: %s\n"
 "It is advised to not to send the return receipt."
 msgstr ""
+"½«ÒªËͳöµÄ»ØÖ´ÖеÄ֪ͨµØÖ·ÓëÓʼþÖеķµ»Ø·¾¶²¢²»Ò»ÖÂ:\n"
+" ֪ͨµØÖ·: %s\n"
+" Return path: %s\n"
+"½¨Òé²»·¢ËÍ´Ë»ØÖ´¡£"
 
-#: src/messageview.c:493
+#: src/messageview.c:492
 msgid "+Don't Send"
-msgstr ""
+msgstr "+²»Ëͳö"
 
-#: src/messageview.c:503
+#: src/messageview.c:502
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 "officially addressed to you.\n"
 "Receipt notification cancelled."
 msgstr ""
+"¸ÃÓʼþÒªÇó·µ»ØÓʼþÊÕµ½Í¨Öª¡£\n"
+"µ«ÄúµÄÓʼþµØÖ·²¢Î´ÔÚÀ´ÐŵÄ'ÊÕ¼þÈË'ºÍ'³­ËÍ'Öб»Ö¸¶¨¡£\n"
+"ÒÑÈ¡Ïû»ØÖ´¡£"
 
-#: src/messageview.c:893 src/mimeview.c:986 src/mimeview.c:1074
-#: src/summaryview.c:3420
+#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3448
 msgid "Save as"
-msgstr ""
+msgstr "±£´æΪ"
 
-#: src/messageview.c:898 src/mimeview.c:1016 src/mimeview.c:1080
-#: src/summaryview.c:3425
+#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3453
 msgid "Overwrite"
-msgstr ""
+msgstr "¸²¸Ç"
 
-#: src/messageview.c:899
-#, fuzzy
+#: src/messageview.c:907
 msgid "Overwrite existing file?"
-msgstr "¸½¼Ó»ò¸²¸ÇÎļþ£¿"
+msgstr "¸½¼ÓÒÑÓÐÎļþ£¿"
 
-#: src/messageview.c:906 src/summaryview.c:3433 src/summaryview.c:3437
-#: src/summaryview.c:3454
+#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
+#: src/summaryview.c:3482
 #, c-format
 msgid "Can't save the file `%s'."
-msgstr ""
+msgstr "ÎÞ·¨±£´æ´ËÎļþ '%s'¡£"
 
-#: src/messageview.c:972
+#: src/messageview.c:979
 msgid "This message asks for a return receipt"
-msgstr ""
+msgstr "¸ÃÓʼþÒªÇ󷵻ػØÖ´"
 
-#: src/messageview.c:973
+#: src/messageview.c:980
 msgid "Send receipt"
-msgstr ""
+msgstr "·¢ËÍ»ØÖ´"
 
-#: src/messageview.c:1026
+#: src/messageview.c:1033
 msgid "Return Receipt Notification"
-msgstr ""
+msgstr "·µ»Ø»ØÖ´"
 
-#: src/messageview.c:1027
+#: src/messageview.c:1034
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 "notification:"
 msgstr ""
+"¸ÃÓʼþ·¢Ë͵½ÁËÄúµÄ¶à¸öÕʺÅÖС£\n"
+"ÇëÑ¡ÔñÓÃÒÔ·¢ËÍ»ØÖ´µÄÕʺÅ: "
 
-#: src/messageview.c:1031
+#: src/messageview.c:1038
 msgid "Send Notification"
-msgstr ""
+msgstr "·¢ËÍ֪ͨ"
 
-#: src/messageview.c:1031
+#: src/messageview.c:1038
 msgid "+Cancel"
 msgstr "+È¡Ïû"
 
-#: src/messageview.c:1089 src/prefs_common.c:2581 src/summaryview.c:3472
-#: src/toolbar.c:168
+#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
+#: src/toolbar.c:171
 msgid "Print"
 msgstr "´òÓ¡"
 
-#: src/messageview.c:1090 src/summaryview.c:3473
+#: src/messageview.c:1093 src/summaryview.c:3501
 #, c-format
 msgid ""
 "Enter the print command line:\n"
 "(`%s' will be replaced with file name)"
 msgstr ""
+"ÇëÊäÈëÓÃÓÚ´òÓ¡µÄÃüÁîÐÐ:\n"
+"(`%s' ½«±»Ì滻ΪÎļþÃû)"
 
-#: src/messageview.c:1096 src/summaryview.c:3479
+#: src/messageview.c:1099 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 "`%s'"
 msgstr ""
+"´òÓ¡ÃüÁîÐÐÎÞЧ:\n"
+"`%s'"
 
-#: src/mimeview.c:150
+#: src/mh.c:360
+#, fuzzy, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "ÎÞ·¨½«%s¿½±´µ½%s\n"
+
+#: src/mimeview.c:149
 msgid "/_Open"
-msgstr ""
+msgstr "/´ò¿ª(_O)"
 
-#: src/mimeview.c:151
+#: src/mimeview.c:150
 msgid "/Open _with..."
-msgstr ""
+msgstr "/´ò¿ª·½Ê½(_w)..."
 
-#: src/mimeview.c:152
+#: src/mimeview.c:151
 msgid "/_Display as text"
-msgstr ""
+msgstr "/ÒÔÎı¾·½Ê½ÏÔʾ(_D)"
 
-#: src/mimeview.c:153 src/summaryview.c:455
+#: src/mimeview.c:152 src/summaryview.c:463
 msgid "/_Save as..."
-msgstr ""
+msgstr "/Áí´æΪ(_S)..."
 
-#: src/mimeview.c:154
+#: src/mimeview.c:153
 msgid "/Save _all..."
-msgstr ""
+msgstr "/È«²¿±£´æ(_a)..."
 
-#: src/mimeview.c:157
-msgid "/_Check signature"
-msgstr ""
-
-#: src/mimeview.c:197
+#: src/mimeview.c:192
 msgid "MIME Type"
-msgstr ""
+msgstr "MIMEÀàÐÍ"
 
-#: src/mimeview.c:365
-#, fuzzy
-msgid "Right-click here to verify the signature"
-msgstr "ûÓй«¹²ÃÜÔ¿¹©¼ì²éÇ©Ãû"
+#: src/mimeview.c:636
+msgid "Check"
+msgstr "¼ì²é"
 
-#: src/mimeview.c:962 src/mimeview.c:1023 src/mimeview.c:1088
-#: src/mimeview.c:1113 src/mimeview.c:1143
+#: src/mimeview.c:641 src/mimeview.c:646 src/mimeview.c:651
+msgid "Full info"
+msgstr "È«Ãû"
+
+#: src/mimeview.c:656
+msgid "Check again"
+msgstr "Ôٴμì²é"
+
+#: src/mimeview.c:946 src/mimeview.c:1025 src/mimeview.c:1090
+#: src/mimeview.c:1115 src/mimeview.c:1145
 msgid "Can't save the part of multipart message."
-msgstr ""
+msgstr "ÎÞ·¨±£´æ¸´ºÏÓʼþµÄÕâÒ»²¿·Ö"
 
-#: src/mimeview.c:1014 src/mimeview.c:1078
+#: src/mimeview.c:973
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "`%s'²»ÊÇÒ»¸öĿ¼¡£"
+
+#: src/mimeview.c:1016 src/mimeview.c:1080
 #, c-format
 msgid "Overwrite existing file '%s'?"
-msgstr ""
+msgstr "¸²¸ÇÒÑÓÐÎļþ '%s' Âð£¿"
 
-#: src/mimeview.c:1153
+#: src/mimeview.c:1155
 msgid "Open with"
-msgstr ""
+msgstr "´ò¿ª·½Ê½"
 
-#: src/mimeview.c:1154
+#: src/mimeview.c:1156
 #, c-format
 msgid ""
 "Enter the command line to open file:\n"
 "(`%s' will be replaced with file name)"
 msgstr ""
+"ÇëÊäÈëÓÃÓÚ´ò¿ªÎļþµÄÃüÁîÐÐ:\n"
+"(`%s' ½«±»Ì滻ΪÎļþÃû)"
 
-#: src/news.c:205
+#: src/news.c:226
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
-msgstr ""
+msgstr "ÕýÔÚÓë %s ½¨Á¢NNTPÁ¬½Ó:%d ...\n"
 
-#: src/news.c:783
+#: src/news.c:807
 #, c-format
 msgid "can't set group: %s\n"
-msgstr ""
+msgstr "ÎÞ·¨ÉèÖÃȺ×é: %s\n"
 
-#: src/news.c:793
+#: src/news.c:817
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
-#: src/news.c:814
+#: src/news.c:838
 #, c-format
 msgid "error occurred while getting %s.\n"
-msgstr ""
+msgstr "ÌáÈ¡ %s ʱ·¢Éú´íÎó.\n"
 
-#: src/news.c:831
+#: src/news.c:855
 #, c-format
 msgid "getting xover %d in %s...\n"
-msgstr ""
+msgstr "ÕýÔÚÌáÈ¡xover %dÓÚ %s...\n"
 
-#: src/news.c:834 src/news.c:903
+#: src/news.c:858 src/news.c:927
 msgid "can't get xover\n"
-msgstr ""
+msgstr "ÎÞ·¨È¡µÃxover\n"
 
-#: src/news.c:839 src/news.c:909
+#: src/news.c:863 src/news.c:933
 msgid "error occurred while getting xover.\n"
-msgstr ""
+msgstr "ÌáÈ¡xoverʱ·¢Éú´íÎó¡£\n"
 
-#: src/news.c:845 src/news.c:922
+#: src/news.c:869 src/news.c:946
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 
-#: src/news.c:859 src/news.c:873 src/news.c:940 src/news.c:970
+#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
 msgid "can't get xhdr\n"
-msgstr ""
+msgstr "ÎÞ·¨È¡µÃxhdr\n"
 
-#: src/news.c:864 src/news.c:878 src/news.c:948 src/news.c:978
+#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
 msgid "error occurred while getting xhdr.\n"
-msgstr ""
+msgstr "ÌáÈ¡xhdrʱ·¢Éú´íÎó¡£\n"
 
-#: src/news.c:900
+#: src/news.c:924
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
@@ -4358,532 +4727,862 @@ msgstr ""
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
-msgstr ""
+msgstr "ÎÞЧµÄpassphrase! ÖØÊÔ...\n"
 
-#: src/pop.c:151
-msgid "Required APOP timestamp not found in greeting\n"
+#: src/plugins/clamav/clamav_plugin.c:224
+msgid "Clam AntiVirus"
 msgstr ""
 
-#: src/pop.c:158
-msgid "Timestamp syntax error in greeting\n"
+#: src/plugins/clamav/clamav_plugin.c:229
+#, fuzzy
+msgid ""
+"This plugin uses Clam AntiVirus to scan all messages that are received from "
+"an IMAP, LOCAL or POP account.\n"
+"\n"
+"When a message attachment is found to contain a virus it can be deleted or "
+"saved in a specially designated folder.\n"
+"\n"
+"This plugin only contains the actual function for scanning and deleting or "
+"moving the message. You probably want to load the Gtk+ User Interface plugin "
+"too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
+"±¾²å¼þµ÷ÓÃClam AntiVirusɨÃè´ÓPOPÕÊ»§ÊÕÈ¡µÄËùÓÐÓʼþ¸½¼þ¡£\n"
+"µ±Óʼþ¸½¼þ±»·¢ÏÖº¬Óв¡¶¾Ê±£¬Ëü»á±»É¾³ý»òÕß´æÈëÒ»¸öÌØÊâµÄÓʼþ¼Ð¡£\n"
+"\n"
+"±¾²å¼þ½ö°üº¬ÓʼþµÄɨÃ衢ɾ³ý/Òƶ¯¹¦ÄÜ¡£Èç¹ûÒª½øÐвÎÊýÅäÖã¬Äú»¹ÐèÒª¼ÓÔØÏàÓ¦µÄ"
+"Óû§½çÃæ²å¼þ(clamav_plugin_gtk)¡£\n"
 
-#: src/pop.c:184 src/pop.c:211
-msgid "POP3 protocol error\n"
-msgstr ""
+#: src/plugins/clamav/clamav_plugin_gtk.c:93
+msgid "Enable virus scanning"
+msgstr "ÆôÓò¡¶¾É¨Ãè"
 
-#: src/pop.c:628
-#, c-format
-msgid "POP3: Deleting expired message %d\n"
-msgstr ""
+#: src/plugins/clamav/clamav_plugin_gtk.c:107
+msgid "Scan archive contents"
+msgstr "ɨÃèѹËõ°üÄÚÈÝ"
 
-#: src/pop.c:636
-#, c-format
-msgid "POP3: Skipping message %d (%d bytes)\n"
-msgstr ""
+#: src/plugins/clamav/clamav_plugin_gtk.c:120
+msgid "Maximum attachment size"
+msgstr "×î´ó¸½¼þ´óС"
 
-#: src/pop.c:667
-msgid "mailbox is locked\n"
-msgstr ""
+#: src/plugins/clamav/clamav_plugin_gtk.c:138
+msgid "MB"
+msgstr "MB"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:142
+msgid "Save infected messages"
+msgstr "±£´æÊܸÐȾµÄÓʼþ"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:155
+msgid "Save folder"
+msgstr "±£´æλÖÃ"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:169
+#: src/plugins/clamav/clamav_plugin_gtk.c:178
+msgid "Leave empty to use the default trash folder"
+msgstr "²»ÉèÖÃʱ½«È±Ê¡Ê¹ÓÃÀ¬»øÍ°"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:240
+msgid "Filtering/Clam AntiVirus"
+msgstr "¹ýÂË/Clam AntiVirus"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:261
+msgid "Clam AntiVirus GTK"
+msgstr "Clam AntiVirus GTK"
+
+#: src/plugins/clamav/clamav_plugin_gtk.c:266
+msgid ""
+"This plugin provides a Preferences page for the Clam AntiVirus plugin.\n"
+"\n"
+"You will find the options in the Other Preferences window under Filtering/"
+"Clam AntiVirus.\n"
+"\n"
+"With this plugin you can enable the scanning, enable archive content "
+"scanning, set the maximum size of an attachment to be checked, (if the "
+"attachment is larger it will not be checked), configure whether infected "
+"mail should be received (default: Yes) and select the folder where infected "
+"mail will be saved.\n"
+msgstr ""
+"±¾²å¼þΪClam AntiVirusÌṩÉèÖýçÃæ¡£\n"
+"\n"
+"Äú¿ÉÒÔÔÚ'ÆäËûÆ«ºÃ'´°¿ÚµÄ'¹ýÂË/Clam AntiVirus'ÏÂÕÒµ½ÅäÖÃÑ¡Ïî¡£\n"
+"ͨ¹ý±¾²å¼þ£¬Äú¿ÉÒÔÆôÓûò½ûÓÃÒ»°ãɨÃ衢ѹËõ°üɨÃ裬¿ÉÒÔÉèÖÃÐèÒª¼ì²éµÄ×î´ó¸½¼þ"
+"³ß´ç£¬ÅäÖÃÊÇ·ñÊÕÈ¡ÊܸÐȾµÄÓʼþ(ȱʡÉèÖÃÊÇÊÕÈ¡)ÒÔ¼°±£´æÊܸÐȾÓʼþµÄ±£´æÄ¿"
+"¼¡£\n"
+
+#: src/plugins/demo/demo.c:71
+msgid "Demo"
+msgstr "ÑÝʾ"
+
+#: src/plugins/demo/demo.c:76
+msgid ""
+"This Plugin is only a demo of how to write plugins for Sylpheed. It installs "
+"a hook for new log output and writes it to stdout.\n"
+"\n"
+"It is not really useful"
+msgstr ""
+"±¾²å¼þ½öÓÃÓÚÑÝʾÈçºÎ±àдSylpheed²å¼þ¡£Ëü½«ÎªÈÕÖ¾Êä³ö°²×°Ò»¸ö¹³×ÓÒÔ½«ÈÕ־дµ½"
+"±ê×¼Êä³ö¡£\n"
+"\n"
+"ËüûÓÐʲôʵ¼ÊÓÃ;"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:106
+msgid "Do not load remote links in mails"
+msgstr "½ûÖ¹·ÃÎÊÓʼþÖеÄÔ¶³ÌÁ´½Ó"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:112
+msgid "Equivalent to Dillo's '--local' option"
+msgstr "µÈ¼ÛÓÚDilloµÄ'--local'Ñ¡Ïî"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:114
+msgid "You can still load remote links by reloading the page"
+msgstr "ÄúÈÔÈ»¿ÉÒÔͨ¹ýÖØÐÂÔØÈë¸ÃÒ³µÄ·½Ê½·ÃÎÊÔ¶³ÌÁ´½Ó"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:121
+msgid "Full window mode (hide controls)"
+msgstr "È«´°¿Úģʽ(Òþ²Ø¹¤¾ßÌõ)"
+
+#: src/plugins/dillo_viewer/dillo_prefs.c:127
+msgid "Equivalent to Dillo's '--fullwindow' option"
+msgstr "µÈ¼ÛÓÚDilloµÄ'--fullwindow'Ñ¡Ïî"
+
+#: src/plugins/dillo_viewer/dillo_viewer.c:195
+msgid "Dillo HTML Viewer"
+msgstr "DilloÍøÒ³²é¿´Æ÷"
+
+#: src/plugins/dillo_viewer/dillo_viewer.c:200
+msgid "This plugin renders HTML mail using the Dillo web browser."
+msgstr "±¾²å¼þÄÚǶDilloÍøÒ³ä¯ÀÀÆ÷À´ÏÔʾHTMLÓʼþ"
+
+#: src/plugins/image_viewer/plugin.c:58
+msgid "Image Viewer"
+msgstr "ͼƬ²é¿´Æ÷"
+
+#: src/plugins/image_viewer/plugin.c:63
+msgid "This plugin uses either gdk-pixbuf or imlib to display attached images."
+msgstr "±¾²å¼þʹÓÃgdk-pixbuf¿â»òÕßimlib¿âÏÔʾÓʼþÖеÄͼƬ"
+
+#: src/plugins/image_viewer/viewer.c:337
+msgid "Filename:"
+msgstr "ÎļþÃû"
+
+#: src/plugins/image_viewer/viewer.c:344
+msgid "Filesize:"
+msgstr "Îļþ´óС :"
+
+#: src/plugins/image_viewer/viewer.c:365
+msgid "Load Image"
+msgstr "¼ÓÔØͼƬ"
+
+#: src/plugins/image_viewer/viewer.c:371
+msgid "Content-Type:"
+msgstr ""
+
+#: src/plugins/image_viewer/viewerprefs.c:78
+msgid "Automatically display attached images"
+msgstr "×Ô¶¯ÏÔʾÓʼþÖеÄͼƬ"
+
+#: src/plugins/image_viewer/viewerprefs.c:85
+msgid ""
+"Resize attached images by default\n"
+"(Clicking image toggles scaling)"
+msgstr ""
+"ȱʡ½«Ëõ·Å¸½¼þÀïµÄͼƬ\n"
+"(µã»÷ͼƬÇл»Ëõ·Å״̬)"
+
+#: src/plugins/mathml_viewer/mathml_viewer.c:163
+msgid "MathML Viewer"
+msgstr ""
+
+#: src/plugins/mathml_viewer/mathml_viewer.c:168
+msgid ""
+"This plugin uses the GtkMathView widget to render MathML attachments "
+"(Content-Type: text/mathml)"
+msgstr ""
+"±¾²å¼þʹÓÃGtkMathView¿Ø¼þÏÔʾMathMLÀàÐ͵ĸ½¼þ(Content-Type: text/mathml)"
+
+#: src/plugins/spamassassin/spamassassin.c:309
+msgid "SpamAssassin"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin.c:314
+#, fuzzy
+msgid ""
+"This plugin checks all messages that are received from an IMAP, LOCAL or POP "
+"account for spam using a SpamAssassin server. You will need a SpamAssassin "
+"Server (spamd) running somewhere.\n"
+"\n"
+"When a message is identified as spam it can be deleted or saved into a "
+"special folder.\n"
+"\n"
+"This plugin only contains the actual function for filtering and deleting or "
+"moving the message. You probably want to load a User Interface plugin too, "
+"otherwise you will have to manually write the plugin configuration.\n"
+msgstr ""
+"±¾²å¼þÓÃSpamAssassin·þÎñÆ÷¼ì²éËùÓдÓPOPÕʺÅÊÕµ½µÄÓʼþÀÒÔÅжÏÀ´ÐÅÊÇ·ñÊÇÀ¬»ø"
+"Óʼþ¡£ÄãÐèÒªÒ»¸öÔÚij´¦ÔËÐеÄSpamAssassin·þÎñÆ÷(spamd)¡£\n"
+"\n"
+"Èç¹ûÒ»¸öÓʼþ±»ÅжÏΪÀ¬»øÓʼþ£¬Ëü½«»á±»É¾³ý»òÕß±£´æµ½Ò»¸öÌØÊâÓʼþ¼Ð¡£\n"
+"\n"
+"±¾²å¼þÖ»°üº¬ÓʼþµÄɾ³ýºÍÒƶ¯¹¦ÄÜ¡£ÄúÐèÒª¼ÓÔØSpamAssassinµÄ½çÃæ²å¼þÀ´½øÐÐÅä"
+"Ö㬷ñÔòÄúÐèÒªÊÖ¹¤Ìîд²å¼þµÄÅäÖÃÊý¾Ý¡£\n"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:76
+msgid "Disabled"
+msgstr "ÒѽûÓÃ"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:77
+msgid "Localhost"
+msgstr "±¾»ú"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:78
+msgid "TCP"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:79
+msgid "Unix Socket"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:176
+msgid "Transport"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:183
+msgid "spamd "
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:220
+msgid "Hostname or IP address of spamd server"
+msgstr "spamd·þÎñµÄÖ÷»úÃû»òÕßIPµØÖ·"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:223
+msgid ":"
+msgstr ":"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:233
+msgid "Port of spamd server"
+msgstr "spamd·þÎñÆ÷¶Ë¿Ú"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:240
+msgid "Path of Unix socket"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:243
+msgid "Timeout"
+msgstr "³¬Ê±Ê±¼ä"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:263
+msgid ""
+"Time that is allowed for checking. If the check takes longer the check will "
+"be aborted and the message will be handled as not spam."
+msgstr ""
+"ÔÊÐíÀ¬»øÓʼþ¼ì²éµÄ×î´óʱÏÞ¡£³¬¹ý´Ëʱ¼äºó½«Í˳ö¼ì²é£¬Óʼþ½«²»±»ÈÏΪÊÇÀ¬»øÓÊ"
+"¼þ¡£"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:267
+msgid "s"
+msgstr ""
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:274
+msgid "Save Spam"
+msgstr "±£´æÀ¬»øÓʼþ"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:288
+msgid "Save mails that where identified as spam to a folder"
+msgstr "½«±»ÈÏΪÊÇÀ¬»øÓʼþµÄ±£´æµ½Ä³Óʼþ¼Ð"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:304
+msgid "Maximum size a message is allowed to have to be checked"
+msgstr "ÔÊÐí±»¼ì²éµÄ×î´óÓʼþ³ß´ç"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:308
+msgid "kB"
+msgstr "kB"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:315
+msgid "Save Folder"
+msgstr "±£´æλÖÃ"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:330
+msgid ""
+"Folder that will be used to save spam. Leave empty to use the default trash "
+"folder"
+msgstr "ÓÃÓÚ±£´æÀ¬»øÓʼþµÄÓʼþ¼Ð¡£Èç¹ûҪʹÓÃȱʡµÄÀ¬»øÏ䣬¿ÉÒÔ²»Ìî"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:333
+msgid "..."
+msgstr "..."
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:339
+msgid "Maximum Size"
+msgstr "×î´ó³ß´ç"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:453
+msgid "Filtering/SpamAssassin"
+msgstr "¹ýÂË/SpamAssassin"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:474
+msgid "SpamAssassin GTK"
+msgstr "SpamAssassin GTK"
+
+#: src/plugins/spamassassin/spamassassin_gtk.c:479
+msgid ""
+"This plugin provides a Preferences page for the SpamAssassin plugin.\n"
+"\n"
+"You will find the options in the Other Preferences window under Filtering/"
+"SpamAssassin.\n"
+"\n"
+"With this plugin you can enable the filtering, change the SpamAssassin "
+"server host and port, set the maximum size of messages to be checked, (if "
+"the message is larger it will not be checked), configure whether spam mail "
+"should be received (default: Yes) and select the folder where spam mail will "
+"be saved.\n"
+msgstr ""
+"±¾²å¼þΪSpamAssassin²å¼þÌṩѡÏîÉèÖýçÃæ¡£\n"
+"\n"
+"Äú¿ÉÒÔÔÚ'ÆäËûÆ«ºÃ'½çÃæµÄ'¹ýÂË/SpamAssassin'ÕÒµ½ÕâЩѡÏî¡£\n"
+"\n"
+"ͨ¹ý±¾²å¼þÄú¿ÉÒÔÆô¶¯À¬»øÓʼþ¹ýÂË£¬ÐÞ¸ÄSpamAssassinµÄ·þÎñÆ÷¶Ë¿Ú£¬"
+"ÉèÖÃÔÊÐí½øÐмì²éµÄ×î´óÓʼþ³ß´ç(³¬¹ý´Ë³ß´ç½«²»±»¼ì²é)£¬"
+"»¹¿ÉÒÔÉèÖÃÊÇ·ñ½ÓÊÕÕâЩÓʼþ(ȱʡ:ÊÇ)ÒÔ¼°±£´æÕâЩÓʼþµÄÓʼþ¼Ð¡£\n"
+
+#: src/plugins/trayicon/trayicon.c:217
+msgid "Trayicon"
+msgstr ""
+
+#: src/plugins/trayicon/trayicon.c:222
+msgid ""
+"This plugin places a mailbox icon in the system tray that indicates if you "
+"have new or unread mail.\n"
+"\n"
+"The mailbox is empty if you have no unread mail, otherwise it contains a "
+"letter. A tooltip shows new, unread and total number of messages."
+msgstr ""
+"±¾²å¼þ½«ÔÚÄãÓÐÐÂÓʼþ»òÕßδ¶ÁÓʼþʱ£¬ÔÚϵͳ֪ͨÀ¸·ÅÖÃÒ»¸öÓÊÏäͼ±ê¡£\n"
+"\n"
+"Èç¹ûÄãûÓÐδ¶ÁµÄÓʼþ£¬¸Ãͼ±ê½«ÊÇÒ»¸ö¿ÕÓÊÏ䣬·ñÔòÔòÊǺ¬ÓÐÓʼþͼÑù¡£ÌáʾÐÅÏ¢½«"
+"Äܹ»ÏÔʾÐÂÓʼþ¡¢Î´¶ÁÓʼþµÄÊýÁ¿ºÍÓʼþ×ÜÊý."
+
+#: src/pop.c:151
+msgid "Required APOP timestamp not found in greeting\n"
+msgstr "δÕÒµ½ÎÕÊÖÐÅÏ¢ÖÐÐèÒªµÄAPOPʱ¼ä´Á\n"
+
+#: src/pop.c:158
+msgid "Timestamp syntax error in greeting\n"
+msgstr "ÎÕÊÖÐÅÏ¢ÖÐʱ¼ä´Á¸ñʽ´íÎó\n"
+
+#: src/pop.c:184 src/pop.c:211
+msgid "POP3 protocol error\n"
+msgstr "POP3ЭÒé´íÎó\n"
+
+#: src/pop.c:628
+#, c-format
+msgid "POP3: Deleting expired message %d\n"
+msgstr "POP3: ɾ³ý¹ýÆÚÓʼþ %d\n"
+
+#: src/pop.c:636
+#, c-format
+msgid "POP3: Skipping message %d (%d bytes)\n"
+msgstr "POP3: Ìø¹ý¾ÉÓʼþ %d (%d×Ö½Ú)\n"
+
+#: src/pop.c:667
+msgid "mailbox is locked\n"
+msgstr "ÓÊÏäÒѱ»Ëøס\n"
 
 #: src/pop.c:670
 msgid "session timeout\n"
-msgstr ""
+msgstr "»Ø»°³¬Ê±\n"
 
 #: src/pop.c:688
 msgid "command not supported\n"
-msgstr ""
+msgstr "ÃüÁî²»±»Ö§³Ö\n"
 
 #: src/pop.c:692
-#, fuzzy
 msgid "error occurred on POP3 session\n"
-msgstr "Á¬½ÓSMTP´íÎó\n"
-
-#: src/prefs_gtk.c:775
-msgid "Preferences"
-msgstr "Æ«ºÃÉèÖÃ"
+msgstr "POP3»á»°ÖгöÏÖ´íÎó\n"
 
-#: src/prefs_account.c:691
+#: src/prefs_account.c:692
 #, c-format
 msgid "Account%d"
-msgstr ""
+msgstr "ÕʺÅ%d"
 
-#: src/prefs_account.c:710
+#: src/prefs_account.c:711
 msgid "Preferences for new account"
-msgstr ""
+msgstr "ÉèÖÃÐÂÕʺÅ"
 
-#: src/prefs_account.c:715
+#: src/prefs_account.c:716
 msgid "Account preferences"
-msgstr ""
+msgstr "ÕʺÅÉèÖÃ"
 
-#: src/prefs_account.c:765 src/prefs_common.c:1021
+#: src/prefs_account.c:766 src/prefs_common.c:968
 msgid "Receive"
 msgstr "½ÓÊÕ"
 
-#: src/prefs_account.c:769 src/prefs_common.c:1025 src/prefs_folder_item.c:546
+#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
 msgid "Compose"
 msgstr "׫д"
 
-#: src/prefs_account.c:772 src/prefs_common.c:1034
+#: src/prefs_account.c:773 src/prefs_common.c:981
 msgid "Privacy"
-msgstr ""
+msgstr "Òþ˽"
 
-#: src/prefs_account.c:776
+#: src/prefs_account.c:777
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
-#: src/prefs_account.c:779
+#: src/prefs_account.c:780
 msgid "Advanced"
 msgstr "¸ß¼¶"
 
-#: src/prefs_account.c:858
+#: src/prefs_account.c:859
 msgid "Name of account"
 msgstr "ÕʺÅÃû³Æ"
 
-#: src/prefs_account.c:867
+#: src/prefs_account.c:868
 msgid "Set as default"
 msgstr "ÉèΪȱʡÕʺÅ"
 
-#: src/prefs_account.c:871
+#: src/prefs_account.c:872
 msgid "Personal information"
 msgstr "¸öÈË×ÊÁÏ"
 
-#: src/prefs_account.c:880
+#: src/prefs_account.c:881
 msgid "Full name"
 msgstr "È«Ãû"
 
-#: src/prefs_account.c:886
+#: src/prefs_account.c:887
 msgid "Mail address"
 msgstr "ÓʼþµØÖ·"
 
-#: src/prefs_account.c:892
+#: src/prefs_account.c:893
 msgid "Organization"
 msgstr "×éÖ¯"
 
-#: src/prefs_account.c:916
+#: src/prefs_account.c:917
 msgid "Server information"
 msgstr "·þÎñÆ÷ÐÅÏ¢"
 
-#: src/prefs_account.c:937
+#: src/prefs_account.c:938
 msgid "POP3 (normal)"
 msgstr "POP3 (ÆÕͨ)"
 
-#: src/prefs_account.c:939
+#: src/prefs_account.c:940
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP¼øȨ)"
 
-#: src/prefs_account.c:941 src/prefs_account.c:1271 src/prefs_account.c:1865
+#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
 msgid "IMAP4"
-msgstr ""
+msgstr "IMAP4"
 
-#: src/prefs_account.c:943
+#: src/prefs_account.c:944
 msgid "News (NNTP)"
-msgstr ""
+msgstr "News (NNTP)"
 
-#: src/prefs_account.c:945
+#: src/prefs_account.c:946
 msgid "None (local)"
 msgstr "ÎÞ (±¾µØ)"
 
-#: src/prefs_account.c:965
+#: src/prefs_account.c:966
 msgid "This server requires authentication"
 msgstr "·þÎñÆ÷ÐèÒª¼øȨ"
 
-#: src/prefs_account.c:972
+#: src/prefs_account.c:973
 msgid "Authenticate on connect"
 msgstr "Á¬½Óʱ¼øȨ"
 
-#: src/prefs_account.c:1017
+#: src/prefs_account.c:1018
 msgid "News server"
 msgstr "ÐÂÎÅ·þÎñÆ÷"
 
-#: src/prefs_account.c:1023
+#: src/prefs_account.c:1024
 msgid "Server for receiving"
 msgstr "½ÓÊÕ·þÎñÆ÷"
 
-#: src/prefs_account.c:1029
-msgid "Local mailbox file"
-msgstr "±¾µØÓÊÏäÎļþ"
+#: src/prefs_account.c:1030
+msgid "Local mailbox"
+msgstr "±¾µØÓÊÏä"
 
-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1037
 msgid "SMTP server (send)"
 msgstr "SMTP ·þÎñÆ÷(·¢ËÍ)"
 
-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1045
 msgid "Use mail command rather than SMTP server"
-msgstr ""
+msgstr "ʹÓÃmailÃüÁî¶ø²»ÊÇSMTP·þÎñÆ÷"
 
-#: src/prefs_account.c:1053
+#: src/prefs_account.c:1054
 msgid "command to send mails"
-msgstr ""
+msgstr "·¢ËÍÓʼþµÄÃüÁî"
 
-#: src/prefs_account.c:1060 src/prefs_account.c:1434
+#: src/prefs_account.c:1061 src/prefs_account.c:1435
 msgid "User ID"
 msgstr "Óû§ID"
 
-#: src/prefs_account.c:1066 src/prefs_account.c:1443
+#: src/prefs_account.c:1067 src/prefs_account.c:1444
 msgid "Password"
 msgstr "ÃÜÂë"
 
-#: src/prefs_account.c:1142 src/prefs_account.c:1848
+#: src/prefs_account.c:1143 src/prefs_account.c:1849
 msgid "POP3"
-msgstr ""
+msgstr "POP3"
 
-#: src/prefs_account.c:1150
+#: src/prefs_account.c:1151
 msgid "Remove messages on server when received"
 msgstr "ÊÕµ½Óʼþºó´Ó·þÎñÆ÷ÉÏɾ³ý"
 
-#: src/prefs_account.c:1161
+#: src/prefs_account.c:1162
 msgid "Remove after"
-msgstr "ÔÚ"
+msgstr "ɾ³ýÓÚ"
 
-#: src/prefs_account.c:1170
+#: src/prefs_account.c:1171
 msgid "days"
-msgstr "ÈÕºóɾ³ý"
+msgstr "Ììºó"
 
-#: src/prefs_account.c:1187
+#: src/prefs_account.c:1188
 msgid "(0 days: remove immediately)"
-msgstr "(0 ÈÕ: Á¢¼´É¾³ý)"
+msgstr "(0 Ìì: Á¢¼´É¾³ý)"
 
-#: src/prefs_account.c:1194
+#: src/prefs_account.c:1195
 msgid "Download all messages on server"
 msgstr "ÏÂÔØ·þÎñÆ÷ÉÏËùÓÐÓʼþ"
 
-#: src/prefs_account.c:1200
+#: src/prefs_account.c:1201
 msgid "Receive size limit"
 msgstr "Óʼþ´óСÏÞÖÆ"
 
-#: src/prefs_account.c:1207
+#: src/prefs_account.c:1208
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1220
 msgid "Default inbox"
-msgstr "ȱʡÓʼþÏä"
+msgstr "ȱʡÊÕ¼þ¼Ð"
 
-#: src/prefs_account.c:1242
+#: src/prefs_account.c:1243
 msgid "(Unfiltered messages will be stored in this folder)"
-msgstr "δ±»¹ýÂ˵ÄÓʼþ½«·ÅÈë¸ÃÎļþ¼Ð"
+msgstr "(δ±»¹ýÂ˵ÄÓʼþ½«·ÅÈë¸ÃÓʼþ¼Ð)"
 
-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1248
 msgid "Maximum number of articles to download"
 msgstr "ÓʼþÏÂÔØ×î´óÊýÁ¿"
 
-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1267
 msgid "unlimited if 0 is specified"
 msgstr "Èç¹ûÉèΪ0Ϊ²»×÷ÏÞÖÆ"
 
-#: src/prefs_account.c:1282 src/prefs_account.c:1405
+#: src/prefs_account.c:1283 src/prefs_account.c:1406
 msgid "Authentication method"
 msgstr "¼øȨ·½Ê½"
 
-#: src/prefs_account.c:1292 src/prefs_account.c:1415 src/prefs_common.c:1459
+#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
 msgid "Automatic"
 msgstr "×Ô¶¯"
 
-#: src/prefs_account.c:1299
+#: src/prefs_account.c:1300
 msgid "Filter messages on receiving"
 msgstr "½ÓÊÕÓʼþʱ½øÐйýÂË"
 
-#: src/prefs_account.c:1303
+#: src/prefs_account.c:1304
 msgid "`Get all' checks for new messages on this account"
 msgstr "`È¡»ØËùÓÐÓʼþ'°üº¬±¾ÕÊ»§µÄÐÂÓʼþ"
 
-#: src/prefs_account.c:1362
+#: src/prefs_account.c:1363
 msgid "Add Date"
 msgstr "Ìí¼ÓÈÕÆÚ"
 
-#: src/prefs_account.c:1363
-msgid "Generate Message-ID"
+#: src/prefs_account.c:1364
+msgid "Generate Message-Id"
 msgstr "Éú³ÉMessage-ID"
 
-#: src/prefs_account.c:1370
+#: src/prefs_account.c:1371
 msgid "Add user-defined header"
 msgstr "Ìí¼Ó×Ô¶¨ÒåÏûϢͷ"
 
-#: src/prefs_account.c:1372 src/prefs_common.c:2117 src/prefs_common.c:2142
+#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
 msgid " Edit... "
 msgstr " ±à¼­... "
 
-#: src/prefs_account.c:1382
+#: src/prefs_account.c:1383
 msgid "Authentication"
 msgstr "¼øȨ"
 
-#: src/prefs_account.c:1390
+#: src/prefs_account.c:1391
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP¼øȨ (SMTP AUTH)"
 
-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1466
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
-msgstr "Èç¹ûÄã²»ÉèÖÃÕ⼸Ï½«²ÉÓýÓÊÕÓʼþµÄÓû§IDºÍ¿ÚÁî"
+msgstr "Èç¹ûÄã²»ÉèÖÃÕ⼸Ï½«²ÉÓýÓÊÕÓʼþµÄÓû§IDºÍ¿ÚÁî¡£"
 
-#: src/prefs_account.c:1474
+#: src/prefs_account.c:1475
 msgid "Authenticate with POP3 before sending"
 msgstr "·¢ËÍ֮ǰ²ÉÓÃPOP3½øÐмøȨ"
 
-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1490
 msgid "POP authentication timeout: "
 msgstr "POP¼øȨ³¬Ê±ÏÞÖÆ"
 
-#: src/prefs_account.c:1498
+#: src/prefs_account.c:1499
 msgid "minutes"
 msgstr "·ÖÖÓ"
 
-#: src/prefs_account.c:1545 src/prefs_account.c:1590 src/toolbar.c:419
+#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
 msgid "Signature"
 msgstr "Ç©Ãû"
 
-#: src/prefs_account.c:1553
+#: src/prefs_account.c:1554
 msgid "Insert signature automatically"
 msgstr "×Ô¶¯²åÈëÇ©Ãû"
 
-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1559
 msgid "Signature separator"
 msgstr "Ç©Ãû·Ö¸ô·û"
 
-#: src/prefs_account.c:1580
+#: src/prefs_account.c:1581
 msgid "Command output"
 msgstr "ÃüÁîÊä³ö"
 
-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1599
 msgid "Automatically set the following addresses"
 msgstr "×Ô¶¯ÉèÖÃÈçϵØÖ·"
 
-#: src/prefs_account.c:1607 src/prefs_matcher.c:143 src/prefs_matcher.c:1709
-#: src/quote_fmt.c:49
+#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "»ØÐŵØÖ·"
 
-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1621
 msgid "Bcc"
 msgstr "³­Ë͵ØÖ·"
 
-#: src/prefs_account.c:1633
+#: src/prefs_account.c:1634
 msgid "Reply-To"
 msgstr "»ØÐŵØÖ·"
 
-#: src/prefs_account.c:1688
+#: src/prefs_account.c:1689
 msgid "Encrypt message by default"
 msgstr "ȱʡÇé¿ö϶ÔÏûÏ¢½øÐмÓÃÜ"
 
-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1691
 msgid "Sign message by default"
 msgstr "ȱʡÇé¿öÏÂÌí¼ÓÇ©Ãû"
 
-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1693
 msgid "Default mode"
 msgstr "ȱʡģʽ"
 
-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1701
 msgid "Use PGP/MIME"
-msgstr ""
+msgstr "²ÉÓÃPGP/MIME"
 
-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1710
 msgid "Use Inline"
-msgstr ""
+msgstr "²ÉÓÃInline"
 
-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1720
 msgid "Sign key"
 msgstr ""
 
-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1728
 msgid "Use default GnuPG key"
-msgstr ""
+msgstr "ʹÓÃȱʡ GnuPG ÃÜÔ¿"
 
-#: src/prefs_account.c:1736
+#: src/prefs_account.c:1737
 msgid "Select key by your email address"
-msgstr ""
+msgstr "°´ÓʼþµØÖ·Ñ¡ÔñÃÜÔ¿"
 
-#: src/prefs_account.c:1745
+#: src/prefs_account.c:1746
 msgid "Specify key manually"
-msgstr ""
+msgstr "ÊÖ¹¤Ö¸¶¨ÃÜÔ¿"
 
-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1762
 msgid "User or key ID:"
 msgstr ""
 
-#: src/prefs_account.c:1856 src/prefs_account.c:1873 src/prefs_account.c:1889
+#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
 msgid "Don't use SSL"
 msgstr "²»²ÉÓÃSSL"
 
-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1860
 msgid "Use SSL for POP3 connection"
 msgstr "ÓÃSSL½øÐÐPOP3Á¬½Ó"
 
-#: src/prefs_account.c:1862 src/prefs_account.c:1879 src/prefs_account.c:1913
+#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
 msgid "Use STARTTLS command to start SSL session"
 msgstr "ÓÃSTARTTLSÃüÁʼSSL»á»°"
 
-#: src/prefs_account.c:1876
+#: src/prefs_account.c:1877
 msgid "Use SSL for IMAP4 connection"
 msgstr "ÓÃSSL½øÐÐIMAPÁ¬½Ó"
 
-#: src/prefs_account.c:1882
+#: src/prefs_account.c:1883
 msgid "NNTP"
 msgstr ""
 
-#: src/prefs_account.c:1897
+#: src/prefs_account.c:1898
 msgid "Use SSL for NNTP connection"
 msgstr "ÓÃSSL½øÐÐNNTPÁ¬½Ó"
 
-#: src/prefs_account.c:1899
+#: src/prefs_account.c:1900
 msgid "Send (SMTP)"
 msgstr "·¢ËÍ (SMTP)"
 
-#: src/prefs_account.c:1907
+#: src/prefs_account.c:1908
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "²»²ÉÓÃSSL (Èç¹û±ØÒªµÄ»°½«Æô¶¯STARTTLS)"
 
-#: src/prefs_account.c:1910
+#: src/prefs_account.c:1911
 msgid "Use SSL for SMTP connection"
 msgstr "ÓÃSSL½øÐÐSMTPÁ¬½Ó"
 
-#: src/prefs_account.c:1921
+#: src/prefs_account.c:1922
 msgid "Use non-blocking SSL"
 msgstr "²ÉÓ÷Ç×èÈûʽSSL"
 
-#: src/prefs_account.c:1933
+#: src/prefs_account.c:1934
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Èç¹ûÄãÔÚSSLÁ¬½ÓÉÏÅöµ½ÎÊÌâÇë´ò¿ª±¾Ïî)"
 
-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2058
 msgid "Specify SMTP port"
 msgstr "Ö¸¶¨SMTP¶Ë¿Ú"
 
-#: src/prefs_account.c:2063
+#: src/prefs_account.c:2064
 msgid "Specify POP3 port"
 msgstr "Ö¸¶¨POP3¶Ë¿Ú"
 
-#: src/prefs_account.c:2069
+#: src/prefs_account.c:2070
 msgid "Specify IMAP4 port"
 msgstr "Ö¸¶¨IMAP4¶Ë¿Ú"
 
-#: src/prefs_account.c:2075
+#: src/prefs_account.c:2076
 msgid "Specify NNTP port"
 msgstr "Ö¸¶¨NNTP¶Ë¿Ú"
 
-#: src/prefs_account.c:2080
+#: src/prefs_account.c:2081
 msgid "Specify domain name"
 msgstr "Ö¸¶¨ÓòÃû"
 
-#: src/prefs_account.c:2090
+#: src/prefs_account.c:2091
 msgid "Use command to communicate with server"
 msgstr "ÓÃÈçÏÂÃüÁîÓë·þÎñÆ÷ͨѶ"
 
-#: src/prefs_account.c:2098
+#: src/prefs_account.c:2099
 msgid "Mark cross-posted messages as read and color:"
-msgstr ""
+msgstr "½«½»²æͶµÝ(cross-posted)µÄÓʼþ±íʾΪÒѶÁºÍ²ÊÉ«:"
 
-#: src/prefs_account.c:2112
+#: src/prefs_account.c:2113
 msgid "IMAP server directory"
-msgstr ""
+msgstr "IMAP·þÎñÆ÷Ŀ¼"
 
-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2167
 msgid "Put sent messages in"
 msgstr "½«ÒÑ·¢ËÍÓʼþ´æ·Åµ½"
 
-#: src/prefs_account.c:2168
+#: src/prefs_account.c:2169
 msgid "Put draft messages in"
 msgstr "½«Óʼþ²Ý¸å´æ·Åµ½"
 
-#: src/prefs_account.c:2170
+#: src/prefs_account.c:2171
 msgid "Put deleted messages in"
 msgstr "½«ÒÑɾ³ýµÄÓʼþ´æ·Åµ½"
 
-#: src/prefs_account.c:2234
+#: src/prefs_account.c:2235
 msgid "Account name is not entered."
 msgstr "δÊäÈëÕÊ»§Ãû³Æ"
 
-#: src/prefs_account.c:2238
+#: src/prefs_account.c:2239
 msgid "Mail address is not entered."
 msgstr "δÊäÈëÓʼþµØÖ·"
 
-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2244
 msgid "SMTP server is not entered."
 msgstr "δÊäÈëSMTP·þÎñÆ÷"
 
-#: src/prefs_account.c:2248
+#: src/prefs_account.c:2249
 msgid "User ID is not entered."
 msgstr "δÊäÈëÓû§ID"
 
-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2254
 msgid "POP3 server is not entered."
 msgstr "δÊäÈëPOP3·þÎñÆ÷"
 
-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2259
 msgid "IMAP4 server is not entered."
 msgstr "δÊäÈëIMAP4·þÎñÆ÷"
 
-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2264
 msgid "NNTP server is not entered."
-msgstr ""
+msgstr "ÉÐδÊäÈëNNTP·þÎñÆ÷"
 
-#: src/prefs_account.c:2269
+#: src/prefs_account.c:2270
 msgid "local mailbox filename is not entered."
-msgstr "δÊäÈë±¾µØÓÊÏäÃû³Æ"
+msgstr "ÉÐδÊäÈë±¾µØÓÊÏäÃû³Æ"
 
-#: src/prefs_account.c:2275
+#: src/prefs_account.c:2276
 msgid "mail command is not entered."
-msgstr ""
+msgstr "ÉÐδÊäÈëÓʼþÃüÁî"
 
-#: src/prefs_account.c:2359
+#: src/prefs_account.c:2360
 msgid ""
 "Its not recommended to use the old style Inline\n"
 "mode for GnuPG messages. It doesn't comply with\n"
 "RFC 3156 - MIME Security with OpenPGP."
 msgstr ""
+"²¢²»ÍƼö¶ÔGnuPGÓʼþ²ÉÓþɷç¸ñµÄInlineģʽ¡£\n"
+"ËüÓëRFC 3156 (MIME Security with OpenPGP)²¢²»¼æÈÝ¡£"
 
 #: src/prefs_actions.c:167
 msgid "Actions configuration"
-msgstr ""
+msgstr "¶¯×÷ÅäÖÃ"
 
 #: src/prefs_actions.c:189
 msgid "Menu name:"
-msgstr ""
+msgstr "²Ëµ¥ÏîÃû³Æ:"
 
 #: src/prefs_actions.c:198
 msgid "Command line:"
-msgstr ""
+msgstr "ÃüÁîÐÐ:"
 
 #: src/prefs_actions.c:227
-#, fuzzy
 msgid " Replace "
-msgstr "Ìæ»»"
+msgstr " Ìæ»» "
 
 #: src/prefs_actions.c:240
 msgid " Syntax help "
-msgstr ""
+msgstr " Óï·¨°ïÖú "
 
 #: src/prefs_actions.c:259
 msgid "Current actions"
-msgstr ""
+msgstr "µ±Ç°¶¯×÷"
 
-#: src/prefs_actions.c:382 src/prefs_filtering.c:591 src/prefs_filtering.c:651
-#: src/prefs_filtering.c:673 src/prefs_matcher.c:687 src/prefs_matcher.c:777
-#: src/prefs_scoring.c:444 src/prefs_scoring.c:475 src/prefs_template.c:309
+#: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
+#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
-msgstr ""
+msgstr "(н¨)"
 
 #: src/prefs_actions.c:428
 msgid "Menu name is not set."
-msgstr ""
+msgstr "δָ¶¨²Ëµ¥ÏîÃû³Æ"
 
 #: src/prefs_actions.c:433
 msgid "Colon ':' is not allowed in the menu name."
-msgstr ""
+msgstr "²Ëµ¥ÏîÃû³Æ²»ÔÊÐí°üº¬Ã°ºÅ':'"
 
 #: src/prefs_actions.c:443
 msgid "Menu name is too long."
-msgstr ""
+msgstr "²Ëµ¥ÏîÃû³ÆÌ«³¤"
 
 #: src/prefs_actions.c:452
 msgid "Command line not set."
-msgstr ""
+msgstr "δָ¶¨ÃüÁîÐÐ"
 
 #: src/prefs_actions.c:457
 msgid "Menu name and command are too long."
-msgstr ""
+msgstr "²Ëµ¥Ïî»òÕßÃüÁîÌ«³¤"
 
 #: src/prefs_actions.c:462
 #, c-format
@@ -4892,194 +5591,185 @@ msgid ""
 "%s\n"
 "has a syntax error."
 msgstr ""
+"ÃüÁî\n"
+"%s\n"
+"´æÔÚÓï·¨´íÎó¡£"
 
 #: src/prefs_actions.c:523
 msgid "Delete action"
-msgstr ""
+msgstr "ɾ³ý¶¯×÷"
 
 #: src/prefs_actions.c:524
 msgid "Do you really want to delete this action?"
-msgstr ""
+msgstr "ÄãÕæµÄҪɾ³ý´Ë¶¯×÷Âë? "
 
-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:639
 msgid "MENU NAME:"
-msgstr ""
+msgstr "²Ëµ¥ÏîÃû³Æ:"
 
-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:640
 msgid "Use / in menu name to make submenus."
-msgstr ""
+msgstr "²Ëµ¥ÏîÃû³ÆÖпÉÒÔÓÃбÏß(/)±êʶ×Ӳ˵¥Ïî"
 
-#: src/prefs_actions.c:641
+#: src/prefs_actions.c:642
 msgid "COMMAND LINE:"
-msgstr ""
+msgstr "ÃüÁîÐÐ"
 
-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:643
 msgid "Begin with:"
-msgstr ""
+msgstr "¿ªÊ¼·ûºÅ:"
 
-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:644
 msgid "to send message body or selection to command's standard input"
-msgstr ""
+msgstr "½«ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 
-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:645
 msgid "to send user provided text to command's standard input"
-msgstr ""
+msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 
-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:646
 msgid "to send user provided hidden text to command's standard input"
-msgstr ""
+msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë(ÊäÈëʱ²»ÏÔʾÃ÷ÎÄ)"
 
-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:647
 msgid "End with:"
-msgstr ""
+msgstr "½áÊø·ûºÅ:"
 
-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:648
 msgid "to replace message body or selection with command's standard output"
-msgstr ""
+msgstr "ÒÔÃüÁîµÄ±ê×¼Êä³öÌæ»»µ±Ç°ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö"
 
-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:649
 msgid "to insert command's standard output without replacing old text"
-msgstr ""
+msgstr "²åÈëÃüÁîµÄ±ê×¼Êä³öÄÚÈÝ"
 
-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:650
 msgid "to run command asynchronously"
-msgstr ""
+msgstr "Òì²½ÔËÐÐÃüÁî"
 
-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:651
 msgid "Use:"
-msgstr ""
+msgstr "ʹÓÃ:"
 
-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:652
 msgid "for the file of the selected message in RFC822/2822 format "
-msgstr ""
+msgstr "±»Ñ¡ÖÐÓʼþÎļþ(RFC822/2822¸ñʽ)"
 
-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:653
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
-msgstr ""
+msgstr "±»Ñ¡ÖеĶà¸öÓʼþÎļþ(RFC822/2822¸ñʽ)"
 
-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:654
 msgid "for the file of the selected decoded message MIME part"
-msgstr ""
+msgstr "±»Ñ¡ÖеÄMIME part(½âÂëºó)"
 
-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:655
 msgid "for a user provided argument"
-msgstr ""
+msgstr "Óû§ÌṩµÄ²ÎÊý"
 
-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:656
 msgid "for a user provided hidden argument (e.g. password)"
-msgstr ""
+msgstr "Óû§ÌṩµÄÒþ²Ø²ÎÊý(ÀýÈç: ÃÜÂë)"
 
-#: src/prefs_actions.c:656
-#, fuzzy
+#: src/prefs_actions.c:657
 msgid "for the text selection"
-msgstr "Ñ¡×Ö"
+msgstr "Ñ¡ÖеÄÎÄ×Ö"
+
+#: src/prefs_actions.c:658
+msgid "apply filtering actions between {} to selected messages"
+msgstr "¶ÔÑ¡ÖеÄÓʼþÖ´ÐÐ{}ÖеĹýÂ˶¯×÷"
 
-#: src/prefs_actions.c:664 src/prefs_matcher.c:1724 src/quote_fmt.c:75
+#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/quote_fmt.c:75
 msgid "Description of symbols"
-msgstr ""
+msgstr "·ûºÅÃèÊö"
 
-#: src/prefs_common.c:1004
+#: src/prefs_common.c:951
 msgid "Common Preferences"
-msgstr ""
+msgstr "Ò»°ãÆ«ºÃ"
 
-#: src/prefs_common.c:1027
+#: src/prefs_common.c:974
 msgid "Quote"
-msgstr "ÒýÓÃ"
+msgstr "ÒýÎÄ"
 
-#: src/prefs_common.c:1029
+#: src/prefs_common.c:976
 msgid "Display"
 msgstr "ÏÔʾ"
 
-#: src/prefs_common.c:1031
+#: src/prefs_common.c:978
 msgid "Message"
 msgstr "Óʼþ"
 
-#: src/prefs_common.c:1039 src/select-keys.c:333
+#: src/prefs_common.c:986 src/select-keys.c:333
 msgid "Other"
 msgstr "ÆäËü"
 
-#: src/prefs_common.c:1091 src/prefs_common.c:1316
+#: src/prefs_common.c:1032
 msgid "External program"
 msgstr "Íⲿ³ÌÐò"
 
-#: src/prefs_common.c:1100
+#: src/prefs_common.c:1041
 msgid "Use external program for incorporation"
-msgstr ""
+msgstr "ʹÓÃÍⲿ³ÌÐòºÏ²¢Óʼþ"
 
-#: src/prefs_common.c:1107 src/prefs_common.c:1331
+#: src/prefs_common.c:1048
 msgid "Command"
 msgstr "ÃüÁî"
 
-#: src/prefs_common.c:1121
-msgid "Local spool"
-msgstr "±¾µØ»º³åÇø"
-
-#: src/prefs_common.c:1132
-msgid "Incorporate from spool"
-msgstr ""
-
-#: src/prefs_common.c:1134
-msgid "Filter on incorporation"
-msgstr ""
-
-#: src/prefs_common.c:1142
-msgid "Spool directory"
-msgstr ""
-
-#: src/prefs_common.c:1160
+#: src/prefs_common.c:1072
 msgid "Auto-check new mail"
 msgstr "×Ô¶¯¼ì²éÐÂÓʼþ"
 
-#: src/prefs_common.c:1162
+#: src/prefs_common.c:1074
 msgid "every"
 msgstr "ÿ"
 
-#: src/prefs_common.c:1174
+#: src/prefs_common.c:1086
 msgid "minute(s)"
 msgstr "·ÖÖÓ"
 
-#: src/prefs_common.c:1183
+#: src/prefs_common.c:1095
 msgid "Check new mail on startup"
 msgstr "Æô¶¯Ê±¼ì²éÐÂÓʼþ"
 
-#: src/prefs_common.c:1185
+#: src/prefs_common.c:1097
 msgid "Update all local folders after incorporation"
-msgstr ""
+msgstr "ºÏ²¢Óʼþºó¸üÐÂËùÓб¾µØÓʼþ¼Ð"
 
-#: src/prefs_common.c:1193
+#: src/prefs_common.c:1105
 msgid "Show receive dialog"
 msgstr "ÏÔʾÊÕÓʼþ½ø¶È¶Ô»°¿ò"
 
-#: src/prefs_common.c:1203 src/prefs_common.c:1367 src/prefs_common.c:2445
+#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
 msgid "Always"
 msgstr "×ÜÏÔʾ"
 
-#: src/prefs_common.c:1204
+#: src/prefs_common.c:1116
 msgid "Only on manual receiving"
 msgstr "½öÊÖ¹¤ÊÕȡʱÏÔʾ"
 
-#: src/prefs_common.c:1206 src/prefs_common.c:1368
+#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
 msgid "Never"
 msgstr "´Ó²»ÏÔʾ"
 
-#: src/prefs_common.c:1214
+#: src/prefs_common.c:1126
 msgid "Close receive dialog when finished"
 msgstr "ÊÕ¼þÍê³Éºó¹Ø±ÕÊÕ¼þ¶Ô»°¿ò"
 
-#: src/prefs_common.c:1216
+#: src/prefs_common.c:1128
 msgid "Run command when new mail arrives"
 msgstr "ÐÂÓʼþµ½´ïʱÔËÐÐÃüÁî"
 
-#: src/prefs_common.c:1226
+#: src/prefs_common.c:1138
 msgid "after autochecking"
 msgstr "×Ô¶¯¼ì²éºó"
 
-#: src/prefs_common.c:1228
+#: src/prefs_common.c:1140
 msgid "after manual checking"
 msgstr "ÊÖ¹¤¼ì²éºó"
 
-#: src/prefs_common.c:1242
+#: src/prefs_common.c:1154
 #, c-format
 msgid ""
 "Command to execute:\n"
@@ -5088,868 +5778,1014 @@ msgstr ""
 "ÒªÖ´ÐеÄÃüÁî:\n"
 "(Óà %d ±íʾÐÂÓʼþÊýÁ¿)"
 
-#: src/prefs_common.c:1324
-msgid "Use external program for sending"
-msgstr "ÓÃÍⲿ³ÌÐò·¢ËÍ"
-
-#: src/prefs_common.c:1350
+#: src/prefs_common.c:1223
 msgid "Save sent messages to Sent folder"
 msgstr "½«ÒѾ­·¢Ë͵ÄÓʼþ±£´æµ½ÒÑ·¢ËÍÓʼþ¼Ð"
 
-#: src/prefs_common.c:1352
+#: src/prefs_common.c:1225
 msgid "Queue messages that fail to send"
 msgstr "ÔÝ´æ·¢ËÍʧ°ÜµÄÓʼþµ½´ý·¢ËÍÓʼþ¼Ð"
 
-#: src/prefs_common.c:1358
+#: src/prefs_common.c:1230
 msgid "Show send dialog"
 msgstr "ÏÔʾ·¢ËͶԻ°¿ò"
 
-#: src/prefs_common.c:1376
+#: src/prefs_common.c:1248
 msgid "Outgoing codeset"
 msgstr "·¢ËÍÓʼþ×Ö·û¼¯"
 
-#: src/prefs_common.c:1385
+#: src/prefs_common.c:1257
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "Èç¹ûÑ¡ÔñÁË`×Ô¶¯'£¬µ±Ç°localeÉèÖý«±»ÓÅÏÈÑ¡ÓÃ"
 
-#: src/prefs_common.c:1397
+#: src/prefs_common.c:1269
 msgid "Automatic (Recommended)"
 msgstr "×Ô¶¯ (ÍƼö)"
 
-#: src/prefs_common.c:1398
+#: src/prefs_common.c:1270
 msgid "7bit ascii (US-ASCII)"
 msgstr ""
 
-#: src/prefs_common.c:1400
+#: src/prefs_common.c:1272
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_common.c:1402
+#: src/prefs_common.c:1274
 msgid "Western European (ISO-8859-1)"
-msgstr ""
+msgstr "Î÷Å· (ISO-8859-1)"
 
-#: src/prefs_common.c:1403
+#: src/prefs_common.c:1275
 msgid "Western European (ISO-8859-15)"
-msgstr ""
+msgstr "Î÷Å· (ISO-8859-15)"
 
-#: src/prefs_common.c:1404
+#: src/prefs_common.c:1276
 msgid "Central European (ISO-8859-2)"
-msgstr ""
+msgstr "ÖÐÅ· (ISO-8859-2)"
 
-#: src/prefs_common.c:1405
+#: src/prefs_common.c:1277
 msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgstr "²¨Â޵ĺ£ (ISO-8859-13)"
 
-#: src/prefs_common.c:1406
+#: src/prefs_common.c:1278
 msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgstr "²¨Â޵ĺ£ (ISO-8859-4)"
 
-#: src/prefs_common.c:1407
+#: src/prefs_common.c:1279
 msgid "Greek (ISO-8859-7)"
-msgstr ""
+msgstr "Ï£À° (ISO-8859-7)"
 
-#: src/prefs_common.c:1408
+#: src/prefs_common.c:1280
 msgid "Turkish (ISO-8859-9)"
-msgstr ""
+msgstr "ÍÁ¶úÆä (ISO-8859-9)"
 
-#: src/prefs_common.c:1410
+#: src/prefs_common.c:1282
 msgid "Cyrillic (ISO-8859-5)"
-msgstr ""
+msgstr "˹À­·òÓï (ISO-8859-5)"
 
-#: src/prefs_common.c:1412
+#: src/prefs_common.c:1284
 msgid "Cyrillic (KOI8-R)"
-msgstr ""
+msgstr "˹À­·òÓï (KOI8-R)"
 
-#: src/prefs_common.c:1414
+#: src/prefs_common.c:1286
 msgid "Cyrillic (Windows-1251)"
-msgstr ""
+msgstr "˹À­·òÓï (Windows-1251)"
 
-#: src/prefs_common.c:1415
+#: src/prefs_common.c:1287
 msgid "Cyrillic (KOI8-U)"
-msgstr ""
+msgstr "˹À­·òÓï (KOI8-U)"
 
-#: src/prefs_common.c:1417
+#: src/prefs_common.c:1289
 msgid "Japanese (ISO-2022-JP)"
-msgstr ""
+msgstr "ÈÕÓï (ISO-2022-JP)"
 
-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1291
 msgid "Japanese (EUC-JP)"
-msgstr ""
+msgstr "ÈÕÓï (EUC-JP)"
 
-#: src/prefs_common.c:1420
+#: src/prefs_common.c:1292
 msgid "Japanese (Shift_JIS)"
-msgstr ""
+msgstr "ÈÕÓï (Shift_JIS)"
 
-#: src/prefs_common.c:1422
+#: src/prefs_common.c:1294
 msgid "Simplified Chinese (GB2312)"
-msgstr ""
+msgstr "¼òÌåÖÐÎÄ (GB2312)"
 
-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1295
 msgid "Traditional Chinese (Big5)"
-msgstr ""
+msgstr "·±ÌåÖÐÎÄ (Big5)"
 
-#: src/prefs_common.c:1425
+#: src/prefs_common.c:1297
 msgid "Traditional Chinese (EUC-TW)"
-msgstr ""
+msgstr "·±ÌåÖÐÎÄ (EUC-TW)"
 
-#: src/prefs_common.c:1426
+#: src/prefs_common.c:1298
 msgid "Chinese (ISO-2022-CN)"
-msgstr ""
+msgstr "ÖÐÎÄ (ISO-2022-CN)"
 
-#: src/prefs_common.c:1428
+#: src/prefs_common.c:1300
 msgid "Korean (EUC-KR)"
-msgstr ""
+msgstr "³¯ÏÊÓï (EUC-KR)"
 
-#: src/prefs_common.c:1429
+#: src/prefs_common.c:1301
 msgid "Thai (TIS-620)"
-msgstr ""
+msgstr "Ì©Óï (TIS-620)"
 
-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1302
 msgid "Thai (Windows-874)"
-msgstr ""
+msgstr "Ì©Óï (Windows-874)"
 
-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1315
 msgid "Transfer encoding"
-msgstr ""
+msgstr "´«ËͱàÂë"
 
-#: src/prefs_common.c:1452
+#: src/prefs_common.c:1324
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
-msgstr ""
+msgstr "Ö¸¶¨µ±Óʼþº¬ÓзÇASCII×Ö·ûʱµÄÓʼþÄÚÈݱàÂ뷽ʽ"
 
-#: src/prefs_common.c:1543
+#: src/prefs_common.c:1411
 msgid "Automatic account selection"
 msgstr "×Ô¶¯Ñ¡ÔñÕÊ»§"
 
-#: src/prefs_common.c:1551
+#: src/prefs_common.c:1419
 msgid "when replying"
 msgstr "»ØÐÅʱ"
 
-#: src/prefs_common.c:1553
+#: src/prefs_common.c:1421
 msgid "when forwarding"
 msgstr "ת·¢Ê±"
 
-#: src/prefs_common.c:1555
+#: src/prefs_common.c:1423
 msgid "when re-editing"
 msgstr "ÖØб༭ʱ"
 
-#: src/prefs_common.c:1562
+#: src/prefs_common.c:1430
 msgid "Reply button invokes mailing list reply"
 msgstr "µã»÷»ØÐÅ°´Å¥Ê±»Ø¸´¸øÓʼþÁбí"
 
-#: src/prefs_common.c:1565
+#: src/prefs_common.c:1433
 msgid "Automatically launch the external editor"
 msgstr "×Ô¶¯Æô¶¯Íⲿ±à¼­Æ÷"
 
-#: src/prefs_common.c:1572
+#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
 msgid "Forward as attachment"
 msgstr "ÒÔ¸½¼þÐÎʽת·¢"
 
-#: src/prefs_common.c:1575
+#: src/prefs_common.c:1443
 msgid "Block cursor"
 msgstr "¿é×´Óαê"
 
-#: src/prefs_common.c:1578
+#: src/prefs_common.c:1446
 msgid "Keep the original 'From' header when redirecting"
-msgstr ""
+msgstr "Öض¨Ïòʱ±£³ÖÔ­À´µÄ·¢¼þÈË"
 
-#: src/prefs_common.c:1586
+#: src/prefs_common.c:1454
 msgid "Autosave to Drafts folder every "
 msgstr "×Ô¶¯±£´æ²Ý¸å:  ÿ"
 
-#: src/prefs_common.c:1593 src/prefs_common.c:1638
+#: src/prefs_common.c:1461 src/prefs_common.c:1506
 msgid "characters"
 msgstr "¸ö×Ö·û"
 
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1469
 msgid "Undo level"
 msgstr "¸´Ô­¼Í¼"
 
-#: src/prefs_common.c:1614
+#: src/prefs_common.c:1482
 msgid "Message wrapping"
 msgstr "×Ô¶¯»»ÐÐ"
 
-#: src/prefs_common.c:1626
+#: src/prefs_common.c:1494
 msgid "Wrap messages at"
 msgstr "ÿÐÐ×î¶à"
 
-#: src/prefs_common.c:1646
+#: src/prefs_common.c:1514
 msgid "Wrap quotation"
 msgstr "ÕÛÐÐʱÏÔʾ·ûºÅ"
 
-#: src/prefs_common.c:1648
+#: src/prefs_common.c:1516
 msgid "Wrap on input"
 msgstr "ÇиÈë¹ý³¤µÄÎÄ×ÖÐÐ"
 
-#: src/prefs_common.c:1651
+#: src/prefs_common.c:1519
 msgid "Wrap before sending"
 msgstr "¼ÄËÍ֮ǰ×Ô¶¯ÕÛÐÐ"
 
-#: src/prefs_common.c:1654
+#: src/prefs_common.c:1522
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr ""
 
-#: src/prefs_common.c:1720
+#: src/prefs_common.c:1588
 msgid "Reply will quote by default"
 msgstr "»ØÐÅʱÒýÓÃÔ­ÎÄ"
 
-#: src/prefs_common.c:1722
+#: src/prefs_common.c:1590
 msgid "Reply format"
 msgstr "»Ø¸´¸ñʽ"
 
-#: src/prefs_common.c:1737 src/prefs_common.c:1776
+#: src/prefs_common.c:1605 src/prefs_common.c:1644
 msgid "Quotation mark"
-msgstr "ÒýÑÔ·ûºÅ"
+msgstr "ÒýÎÄ·ûºÅ"
 
-#: src/prefs_common.c:1761
+#: src/prefs_common.c:1629
 msgid "Forward format"
 msgstr "ת·¢¸ñʽ"
 
-#: src/prefs_common.c:1805
+#: src/prefs_common.c:1673
 msgid " Description of symbols "
-msgstr "ÌØÊâ·ûºÅ´ú±íµÄÒâÒå"
+msgstr "ÌØÊâ·ûºÅ˵Ã÷"
 
-#: src/prefs_common.c:1813
+#: src/prefs_common.c:1681
 msgid "Quotation characters"
 msgstr "ÒýÎıêʶ"
 
-#: src/prefs_common.c:1828
+#: src/prefs_common.c:1696
 msgid "Treat these characters as quotation marks: "
 msgstr "½«ÕâЩ×Ö·û×÷ΪÒýÎıêʶ"
 
-#: src/prefs_common.c:1878
-msgid "Font"
-msgstr "×ÖÌå"
-
-#: src/prefs_common.c:1888
-msgid "Text"
-msgstr ""
-
-#: src/prefs_common.c:1907
-msgid "Small"
-msgstr "С"
-
-#: src/prefs_common.c:1926
-msgid "Normal"
-msgstr "Ò»°ã"
-
-#: src/prefs_common.c:1945
-msgid "Bold"
-msgstr "´ÖÌå"
-
-#: src/prefs_common.c:1970
+#: src/prefs_common.c:1746
 msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "½«±êÍ·Ãû³Æ·­Òë³öÀ´"
+msgstr "½«ÐÅÍ·Ãû³Æ·­Òë³öÀ´"
 
-#: src/prefs_common.c:1973
+#: src/prefs_common.c:1749
 msgid "Display unread number next to folder name"
-msgstr "ÈôÓÐδ¶ÁÐżþ£¬¾ÍÏÔʾÔÚ×ÊÁϼÐÃû³ÆºóÃæ"
+msgstr "ÔÚÓʼþ¼ÐÃû³ÆºóÏÔʾδ¶ÁÓʼþÊý"
 
-#: src/prefs_common.c:1982
+#: src/prefs_common.c:1758
 msgid "Abbreviate newsgroup names longer than"
-msgstr "ÐÂÎÅȺ×éËõд³¤¶È´óì¶"
+msgstr "ËõдÐÂÎÅȺ×éÃû³Æ£¬Èç¹ûÆ䳤¶È´óÓÚ"
 
-#: src/prefs_common.c:1997
+#: src/prefs_common.c:1773
 msgid "letters"
 msgstr "¸ö×Öĸ"
 
-#: src/prefs_common.c:2003
+#: src/prefs_common.c:1779
 msgid "Summary View"
-msgstr "ÐżþÁбí"
+msgstr "ÓʼþÁбí"
 
-#: src/prefs_common.c:2012
+#: src/prefs_common.c:1788
 msgid "Display recipient in `From' column if sender is yourself"
-msgstr "Èô·¢ÐÅÈËÊÇÄã×Ô¼º£¬¾ÍÔÚÐżþÁбíµÄÀ´Ô´ÖÐÏÔʾÊÕÐÅÈË"
+msgstr "Èô·¢ÐÅÈËÊÇÄã×Ô¼º£¬¾ÍÔÚÓʼþÁбíµÄÀ´Ô´ÖÐÏÔʾÊÕÐÅÈË"
 
-#: src/prefs_common.c:2015
+#: src/prefs_common.c:1791
 msgid "Display sender using address book"
 msgstr "ÒÔͨѶ¼ÖеÄÃû×ÖÏÔʾ·¢¼þÈË"
 
-#: src/prefs_common.c:2018
+#: src/prefs_common.c:1794
 msgid "Thread using subject in addition to standard headers"
-msgstr ""
+msgstr "½¨Á¢ÏßË÷ʱҲ²ÉÓÃÓʼþÖ÷Ì⣨³ýÁ˱ê×¼ÐÅÍ·ÖеÄÐÅÏ¢£©"
 
-#: src/prefs_common.c:2026 src/prefs_common.c:2922 src/prefs_common.c:2960
+#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
 msgid "Date format"
 msgstr "ÈÕÆÚ¸ñʽ"
 
-#: src/prefs_common.c:2048
+#: src/prefs_common.c:1824
 msgid " Set displayed items in summary... "
-msgstr "ÉèÖÃÐżþÁбíÑ¡Ïî..."
+msgstr " ÉèÖÃÓʼþÁбíÖÐÒªÏÔʾµÄÁÐ..."
 
-#: src/prefs_common.c:2112
+#: src/prefs_common.c:1885
 msgid "Enable coloration of message"
-msgstr "ÐżþÖеÄÒýÑÔÓ볬Á¬½áÏÔʾ±äÉ«"
+msgstr "²ÊÉ«ÏÔʾÓʼþÖеÄÒýÎÄÓ볬Á´½Ó"
 
-#: src/prefs_common.c:2127
+#: src/prefs_common.c:1900
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
-msgstr "½«È«ÐÎÓ¢ÎÄÓëÊý×ÖÒÔ°ëÐÎÀ´ÏÔʾ (Ö»ÊÊÓÃÈÕÎÄ)"
+msgstr "½«È«½ÇÓ¢ÎÄÓëÊý×ÖÒÔ°ë½ÇÀ´ÏÔʾ (Ö»ÊÊÓÃÈÕÎÄ)"
 
-#: src/prefs_common.c:2133
+#: src/prefs_common.c:1906
 msgid "Display header pane above message view"
-msgstr "ÔÚÏÔʾÐżþÀ¸ÉÏ·½¼ÓÈë±êÍ·ÐÅÏ¢"
+msgstr "ÔÚÓʼþÔĶÁÆ÷ÉÏ·½ÏÔʾÐÅÍ·ÐÅÏ¢Ãæ°å"
 
-#: src/prefs_common.c:2140
+#: src/prefs_common.c:1913
 msgid "Display short headers on message view"
-msgstr "ÔÚÐżþÔ¤ÀÀÖÐÏÔʾÐżþ±êͷ"
+msgstr "ÔÚÓʼþ´°¿ÚÏÔʾÓʼþµÄ¼òÒªÐÅͷ"
 
-#: src/prefs_common.c:2162
+#: src/prefs_common.c:1935
 msgid "Line space"
 msgstr "Ðмä¾à"
 
-#: src/prefs_common.c:2176 src/prefs_common.c:2216
+#: src/prefs_common.c:1949 src/prefs_common.c:1989
 msgid "pixel(s)"
-msgstr "ÏñËØ (pixels)"
+msgstr "ÏñËØ"
 
-#: src/prefs_common.c:2181
+#: src/prefs_common.c:1954
 msgid "Leave space on head"
 msgstr "ÿÐÐ×îÇ°Ãæ¿ÕÒ»¸ñ"
 
-#: src/prefs_common.c:2183
+#: src/prefs_common.c:1956
 msgid "Scroll"
 msgstr "¾íÖá"
 
-#: src/prefs_common.c:2190
+#: src/prefs_common.c:1963
 msgid "Half page"
 msgstr "Ò»´Î°ëÒ³"
 
-#: src/prefs_common.c:2196
+#: src/prefs_common.c:1969
 msgid "Smooth scroll"
 msgstr "ƽ»¬¾í¶¯"
 
-#: src/prefs_common.c:2202
+#: src/prefs_common.c:1975
 msgid "Step"
 msgstr "ÿ´Î¾í¶¯"
 
-#: src/prefs_common.c:2227
+#: src/prefs_common.c:2000
 msgid "Show attachment descriptions (rather than names)"
 msgstr "ÏÔʾ¸½¼þµÄÃèÊöÐÅÏ¢(¶ø²»ÊǸ½¼þÃû³Æ)"
 
-#: src/prefs_common.c:2274
+#: src/prefs_common.c:2046
 msgid "Automatically check signatures"
-msgstr "×Ô¶¯¼ì²éÊýλÇ©Ãû"
+msgstr "×Ô¶¯¼ì²éÊý×ÖÇ©Ãû"
 
-#: src/prefs_common.c:2277
-msgid "Show signature check result in a popup window"
-msgstr "½«ÊýλǩÃû¼ì²é½á¹ûÏÔʾÔÚÁíÒ»´°¿Ú"
-
-#: src/prefs_common.c:2280
+#: src/prefs_common.c:2049
 msgid "Store passphrase in memory temporarily"
-msgstr "½«ÃÜÂëƬÓïÔÝʱ´æÔÚÄÚ´æÖÐ"
+msgstr "½«passphraseÔÝʱ´æÔÚÄÚ´æÖÐ"
 
-#: src/prefs_common.c:2295
+#: src/prefs_common.c:2064
 msgid "Expire after"
-msgstr "ÆÚÏÞ£º"
+msgstr " ÓÐÏÞÆÚ£º"
 
-#: src/prefs_common.c:2306
-#, fuzzy
+#: src/prefs_common.c:2075
 msgid "Setting to '0' will store the passphrase for the whole session"
-msgstr "£¨ÈôÉèÖÃΪ '0' Ôò±íʾûÓÐÆÚÏÞ£©"
+msgstr "ÈôÉèÖÃΪ '0' Ôò»áÔÚÕû¸ö»Ø»°ÆÚÄÚ±£´æpassphrase"
 
-#: src/prefs_common.c:2314
+#: src/prefs_common.c:2083
 msgid "minute(s) "
 msgstr "·ÖÖÓ"
 
-#: src/prefs_common.c:2331
+#: src/prefs_common.c:2100
 msgid "Grab input while entering a passphrase"
 msgstr "µ¼Èë passphrase ʱץȡµ¼Èë"
 
-#: src/prefs_common.c:2336
+#: src/prefs_common.c:2105
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Èô GnuPG ÎÞ·¨ÔË×÷£¬ÔòÔÚÆô¶¯Ê±·¢³ö¾¯¸æ"
 
-#: src/prefs_common.c:2399
-#, fuzzy
+#: src/prefs_common.c:2166
 msgid "Always open messages in summary when selected"
-msgstr "δѡȡÎļþ¼Ð»òѶϢ¡£"
+msgstr "Ñ¡ÖÐĿ¼ʱ×Ü´ò¿ªÓʼþÁбíÀïÃæµÄÓʼþ¡£"
 
-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2170
 msgid "Open first unread message when entering a folder"
-msgstr "½øÈë×ÊÁϼÐʱֱ½ÓÌøµ½µÚÒ»·âδ¶ÁÐżþÉÏ"
+msgstr "½øÈëÓʼþ¼Ðʱֱ½ÓÌøµ½µÚÒ»·âδ¶ÁÓʼþÉÏ"
 
-#: src/prefs_common.c:2407
+#: src/prefs_common.c:2174
 msgid "Only mark message as read when opened in new window"
-msgstr "Ö»ÔÚ´ò¿ªÐÂÐżþʱ±êʾΪδ¶Á"
+msgstr "Ö»ÔÚÓÃд°¿Ú´ò¿ªÓʼþʱ±ê¼ÇΪÒѶÁ"
 
-#: src/prefs_common.c:2411
+#: src/prefs_common.c:2178
 msgid "Go to inbox after receiving new mail"
-msgstr "½ÓÊÕÍêÐÂÓʼþºóÖ±½Ó½øÈëÊÕ¼þ¼ÐÖÐ"
+msgstr "½ÓÊÕÍêÐÂÓʼþºóÖ±½Ó½øÈëÊÕ¼þ¼Ð"
 
-#: src/prefs_common.c:2421
+#: src/prefs_common.c:2188
 msgid "Execute immediately when moving or deleting messages"
-msgstr "Òƶ¯»òɾ³ýÐżþʱÁ¢¼´Ö´ÐÐ"
+msgstr "Òƶ¯»òɾ³ýÓʼþʱÁ¢¼´Ö´ÐÐ"
 
-#: src/prefs_common.c:2423
+#: src/prefs_common.c:2190
 msgid "Messages will be marked until execution if this is turned off"
 msgstr "£¨Èô´ËÑ¡Ïî¹Ø±Õ£¬Ôò±ØÐë°´Ï¡¸Ö´ÐС¹²Å»áÖ´ÐÐÒƶ¯»òɾ³ý£©"
 
-#: src/prefs_common.c:2436
+#: src/prefs_common.c:2203
 msgid "Show no-unread-message dialog"
-msgstr ""
+msgstr "ÏÔʾûÓÐδ¶ÁÓʼþ¶Ô»°¿ò"
 
-#: src/prefs_common.c:2446
+#: src/prefs_common.c:2213
 msgid "Assume 'Yes'"
-msgstr ""
+msgstr "ȱʡ»Ø´ð'ÊÇ'"
 
-#: src/prefs_common.c:2448
+#: src/prefs_common.c:2215
 msgid "Assume 'No'"
-msgstr ""
+msgstr "ȱʡ»Ø´ð'·ñ'"
 
-#: src/prefs_common.c:2457
+#: src/prefs_common.c:2224
 msgid " Set key bindings... "
-msgstr "ÉèÖüü°ó¶¨"
+msgstr " ÉèÖüü°ó¶¨... "
 
-#: src/prefs_common.c:2463
+#: src/prefs_common.c:2230
 msgid "Icon theme"
 msgstr "ͼ±êÖ÷Ìâ"
 
-#: src/prefs_common.c:2547
+#: src/prefs_common.c:2314
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "ÍⲿÃüÁî (%s ½«±»Ì滻ΪÏàÓ¦µÄÎļþÃû»òÕßURI"
+msgstr "ÍⲿÃüÁî (%s ½«±»Ì滻ΪÏàÓ¦µÄÎļþÃû»òÕßURI)"
 
-#: src/prefs_common.c:2556
+#: src/prefs_common.c:2323
 msgid "Web browser"
 msgstr "ÍøÒ³ä¯ÀÀÆ÷"
 
-#: src/prefs_common.c:2592 src/toolbar.c:421
+#: src/prefs_common.c:2359 src/toolbar.c:429
 msgid "Editor"
 msgstr "±à¼­Æ÷"
 
-#: src/prefs_common.c:2622
+#: src/prefs_common.c:2389
 msgid "Add address to destination when double-clicked"
-msgstr ""
+msgstr "Ë«»÷ʱ½«µØÖ·Ìí¼ÓΪÊÕ¼þÈË"
 
-#: src/prefs_common.c:2625
+#: src/prefs_common.c:2392
 msgid "Log Size"
 msgstr "ÈÕÖ¾´óС"
 
-#: src/prefs_common.c:2632
+#: src/prefs_common.c:2399
 msgid "Clip the log size"
 msgstr "ÏÞÖÆÈÕÖ¾Îļþ´óС"
 
-#: src/prefs_common.c:2637
+#: src/prefs_common.c:2404
 msgid "Log window length"
 msgstr "ÈÕÖ¾´°¿Ú³¤¶È"
 
-#: src/prefs_common.c:2650
+#: src/prefs_common.c:2417
 msgid "0 to stop logging in the log window"
 msgstr "0 ±íʾ½ûÖ¹ÍùÈÕÖ¾´°¿ÚдÐÅÏ¢"
 
-#: src/prefs_common.c:2659
+#: src/prefs_common.c:2426
 msgid "Security"
 msgstr "°²È«"
 
-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2433
 msgid "Ask before accepting SSL certificates"
 msgstr "½ÓÊÜSSLÈÏ֤ǰȷÈÏ"
 
-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2441
 msgid "On exit"
 msgstr "À뿪ÉèÖÃ"
 
-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2449
 msgid "Confirm on exit"
 msgstr "À뿪ʱȷÈÏ"
 
-#: src/prefs_common.c:2689
+#: src/prefs_common.c:2456
 msgid "Empty trash on exit"
 msgstr "À뿪ʱÇå¿Õɾ³ýµÄÓʼþ"
 
-#: src/prefs_common.c:2691
+#: src/prefs_common.c:2458
 msgid "Ask before emptying"
 msgstr "Çå³ýʱȷÈÏ"
 
-#: src/prefs_common.c:2695
+#: src/prefs_common.c:2462
 msgid "Warn if there are queued messages"
-msgstr "À뿪ʱÈôÓÐÉÐδËͳöÖ®Ðżþ¼´·¢³ö¾¯¸æ"
+msgstr "À뿪ʱÈôÓÐÉÐδËͳöÖ®Óʼþ¼´·¢³ö¾¯¸æ"
 
-#: src/prefs_common.c:2701
+#: src/prefs_common.c:2468
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O ³¬Ê±Ê±¼ä"
 
-#: src/prefs_common.c:2714
+#: src/prefs_common.c:2481
 msgid "seconds"
 msgstr "Ãë"
 
-#: src/prefs_common.c:2898
+#: src/prefs_common.c:2665
 msgid "the full abbreviated weekday name"
-msgstr "ÖÜÒ»¡¢Öܶþ¡¢..."
+msgstr "(ÐÇÆÚ)£ºÒ»¡¢¶þ¡¢..."
 
-#: src/prefs_common.c:2899
+#: src/prefs_common.c:2666
 msgid "the full weekday name"
 msgstr "ÐÇÆÚÒ»¡¢ÐÇÆÚ¶þ¡¢..."
 
-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2667
 msgid "the abbreviated month name"
 msgstr "1Ô¡¢2Ô¡¢..."
 
-#: src/prefs_common.c:2901
+#: src/prefs_common.c:2668
 msgid "the full month name"
 msgstr "Ò»Ô¡¢¶þÔ¡¢..."
 
-#: src/prefs_common.c:2902
+#: src/prefs_common.c:2669
 msgid "the preferred date and time for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚÓëʱ¼ä£¨±¾µØʱ¼ä£©"
 
-#: src/prefs_common.c:2903
+#: src/prefs_common.c:2670
 msgid "the century number (year/100)"
 msgstr "ÊÀ¼Í (Äê/100)"
 
-#: src/prefs_common.c:2904
+#: src/prefs_common.c:2671
 msgid "the day of the month as a decimal number"
 msgstr "½ñÌìÊǼ¸ºÅ (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2905
+#: src/prefs_common.c:2672
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ø¥ËÄʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2673
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ê®¶þʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2907
+#: src/prefs_common.c:2674
 msgid "the day of the year as a decimal number"
 msgstr "½ñÌìÊǽñÄêµÄµÚ¼¸Ìì (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2908
+#: src/prefs_common.c:2675
 msgid "the month as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ô (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2909
+#: src/prefs_common.c:2676
 msgid "the minute as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸·Ö (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2910
+#: src/prefs_common.c:2677
 msgid "either AM or PM"
 msgstr "ÉÏÎç»òÏÂÎç"
 
-#: src/prefs_common.c:2911
+#: src/prefs_common.c:2678
 msgid "the second as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ãë (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2679
 msgid "the day of the week as a decimal number"
 msgstr "ÏÖÔÚÊÇÒ»Öܵĵڼ¸Ìì (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2913
+#: src/prefs_common.c:2680
 msgid "the preferred date for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚ (±¾µØʱ¼ä)"
 
-#: src/prefs_common.c:2914
+#: src/prefs_common.c:2681
 msgid "the last two digits of a year"
 msgstr "Î÷ÔªÄê·ÝµÄÄ©Á½Î»Êý×Ö"
 
-#: src/prefs_common.c:2915
+#: src/prefs_common.c:2682
 msgid "the year as a decimal number"
 msgstr "Î÷ÔªÄê·Ý (ÒÔÊý×Ö±íʾ)"
 
-#: src/prefs_common.c:2916
+#: src/prefs_common.c:2683
 msgid "the time zone or name or abbreviation"
 msgstr "ʱÇø"
 
-#: src/prefs_common.c:2937
+#: src/prefs_common.c:2704
 msgid "Specifier"
 msgstr "ÌØÊâ·ûºÅ"
 
-#: src/prefs_common.c:2977
+#: src/prefs_common.c:2744
 msgid "Example"
 msgstr "ʾÀý"
 
-#: src/prefs_common.c:3066
+#: src/prefs_common.c:2833
 msgid "Set message colors"
-msgstr "ÉèÐżþÑÕÉ«"
+msgstr "ÉèÓʼþÑÕÉ«"
 
-#: src/prefs_common.c:3074
+#: src/prefs_common.c:2841
 msgid "Colors"
 msgstr "ÑÕÉ«"
 
-#: src/prefs_common.c:3121
+#: src/prefs_common.c:2888
 msgid "Quoted Text - First Level"
-msgstr "ÒýÑÔ - µÚÒ»²ã"
+msgstr "ÒýÎÄ - µÚÒ»²ã"
 
-#: src/prefs_common.c:3127
+#: src/prefs_common.c:2894
 msgid "Quoted Text - Second Level"
-msgstr "ÒýÑÔ - µÚ¶þ²ã"
+msgstr "ÒýÎÄ - µÚ¶þ²ã"
 
-#: src/prefs_common.c:3133
+#: src/prefs_common.c:2900
 msgid "Quoted Text - Third Level"
-msgstr "ÒýÑÔ - µÚÈþ²ã"
+msgstr "ÒýÎÄ - µÚÈþ²ã"
 
-#: src/prefs_common.c:3139
+#: src/prefs_common.c:2906
 msgid "URI link"
 msgstr "URI Á¬½á"
 
-#: src/prefs_common.c:3145
+#: src/prefs_common.c:2912
 msgid "Target folder"
-msgstr ""
+msgstr "Ä¿µÄÎļþ¼Ð"
 
-#: src/prefs_common.c:3151
+#: src/prefs_common.c:2918
 msgid "Signatures"
 msgstr "Ç©Ãû"
 
-#: src/prefs_common.c:3158
+#: src/prefs_common.c:2925
 msgid "Recycle quote colors"
-msgstr "Ñ­»·ÒýÑÔÑÕÉ«"
+msgstr "Ñ­»·ÒýÎÄÑÕÉ«"
 
-#: src/prefs_common.c:3225
+#: src/prefs_common.c:2992
 msgid "Pick color for quotation level 1"
-msgstr "Ñ¡level 1ÒýÑÔÑÕÉ«"
+msgstr "Ñ¡level 1ÒýÎÄÑÕÉ«"
 
-#: src/prefs_common.c:3228
+#: src/prefs_common.c:2995
 msgid "Pick color for quotation level 2"
-msgstr "Ñ¡level 2ÒýÑÔÑÕÉ«"
+msgstr "Ñ¡level 2ÒýÎÄÑÕÉ«"
 
-#: src/prefs_common.c:3231
+#: src/prefs_common.c:2998
 msgid "Pick color for quotation level 3"
-msgstr "Ñ¡level 3ÒýÑÔÑÕÉ«"
+msgstr "Ñ¡level 3ÒýÎÄÑÕÉ«"
 
-#: src/prefs_common.c:3234
+#: src/prefs_common.c:3001
 msgid "Pick color for URI"
 msgstr "Ñ¡URIÑÕÉ«"
 
-#: src/prefs_common.c:3237
+#: src/prefs_common.c:3004
 msgid "Pick color for target folder"
-msgstr "ѡĿ¼ÑÕÉ«"
+msgstr "ѡÓʼþ¼ÐÑÕÉ«"
 
-#: src/prefs_common.c:3240
+#: src/prefs_common.c:3007
 msgid "Pick color for signatures"
 msgstr "Ñ¡Ç©ÃûÑÕÉ«"
 
-#: src/prefs_common.c:3370
-msgid "Font selection"
-msgstr "Ñ¡×Ö"
-
-#: src/prefs_common.c:3444
+#: src/prefs_common.c:3142
 msgid "Key bindings"
-msgstr ""
+msgstr "¼ü°ó¶¨"
 
-#: src/prefs_common.c:3458
+#: src/prefs_common.c:3156
 msgid "Select preset:"
-msgstr ""
+msgstr "Ñ¡ÔñÔ¤ÉèÖµ"
 
-#: src/prefs_common.c:3471 src/prefs_common.c:3756
+#: src/prefs_common.c:3169 src/prefs_common.c:3454
 msgid "Old Sylpheed"
 msgstr "ÀÏ Sylpheed"
 
-#: src/prefs_common.c:3479
+#: src/prefs_common.c:3177
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
-msgstr ""
+msgstr "Ìáʾ: ÔÚÊó±êÒƶ¯µ½²Ëµ¥ÏîÉÏÃæʱ£¬Äã¿ÉÒÔͨ¹ý°´¼üÀ´Ð޸ĸò˵¥ÏîµÄ¿ì½Ý¼ü¡£"
 
 #: src/prefs_customheader.c:163
 msgid "Custom header configuration"
-msgstr ""
+msgstr "×Ô¶¨ÒåÐÅÍ·"
 
 #: src/prefs_customheader.c:261
 msgid "Current custom headers"
-msgstr ""
+msgstr "µ±Ç°×Ô¶¨ÒåÐÅÍ·"
 
 #: src/prefs_customheader.c:483 src/prefs_display_header.c:530
 #: src/prefs_matcher.c:1175
 msgid "Header name is not set."
-msgstr ""
+msgstr "ΪÉ趨ÐÅÍ·Ãû³Æ¡£"
 
 #: src/prefs_customheader.c:541
 msgid "Delete header"
-msgstr "ɾ³ý±êͷ"
+msgstr "ɾ³ýÐÅͷ"
 
 #: src/prefs_customheader.c:542
 msgid "Do you really want to delete this header?"
-msgstr "È·¶¨É¾³ý±êÍ·£¿"
+msgstr "È·¶¨É¾³ýÐÅÍ·£¿"
 
 #: src/prefs_display_header.c:201
 msgid "Displayed header configuration"
-msgstr ""
+msgstr "ÐÅÍ·×Ö¶ÎÏÔʾÅäÖÃ"
 
 #: src/prefs_display_header.c:225 src/prefs_matcher.c:434
 msgid "Header name"
-msgstr "±êÍ·Ãû³Æ"
+msgstr "ÐÅÍ·Ãû³Æ"
 
 #: src/prefs_display_header.c:257
 msgid "Displayed Headers"
-msgstr ""
+msgstr "ÒªÏÔʾµÄÐÅÍ·"
 
 #: src/prefs_display_header.c:315
 msgid "Hidden headers"
-msgstr ""
+msgstr "ÐèÒþ²ØµÄÐÅÍ·"
 
 #: src/prefs_display_header.c:345
 msgid "Show all unspecified headers"
-msgstr ""
+msgstr "ÏÔʾËùÓÐδָÃ÷µÄÐÅÍ·×Ö¶Î"
 
 #: src/prefs_display_header.c:540
 msgid "This header is already in the list."
-msgstr ""
+msgstr "¸Ã×Ö¶ÎÒѾ­ÔÚÁбíÖдæÔÚ¡£"
 
-#: src/prefs_filtering.c:219
-msgid "Filtering/Processing configuration"
-msgstr ""
+#: src/prefs_filtering_action.c:133
+msgid "Move"
+msgstr "Òƶ¯"
 
-#: src/prefs_filtering.c:236 src/prefs_scoring.c:219
-msgid "Condition"
-msgstr "Ìõ¼þ"
+#: src/prefs_filtering_action.c:134
+msgid "Copy"
+msgstr "¸´ÖÆ"
 
-#: src/prefs_filtering.c:250 src/prefs_filtering.c:271 src/prefs_scoring.c:234
-msgid "Define ..."
-msgstr "ÉèÖÃ ..."
+#: src/prefs_filtering_action.c:136 src/prefs_summary_column.c:67
+msgid "Mark"
+msgstr "񈬀"
+
+#: src/prefs_filtering_action.c:137
+msgid "Unmark"
+msgstr "²»ÉèÖÃ"
+
+#: src/prefs_filtering_action.c:138
+msgid "Lock"
+msgstr "Ëø¶¨"
+
+#: src/prefs_filtering_action.c:139
+msgid "Unlock"
+msgstr "½âËø"
+
+#: src/prefs_filtering_action.c:140
+msgid "Mark as read"
+msgstr "ÉèΪÒѶÁ"
+
+#: src/prefs_filtering_action.c:141
+msgid "Mark as unread"
+msgstr "ÉèΪδ¶Á"
+
+#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+msgid "Forward"
+msgstr "ת·¢"
+
+#: src/prefs_filtering_action.c:144
+msgid "Redirect"
+msgstr "ÖØÐÂÖ¸¶¨"
+
+#: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
+#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+msgid "Execute"
+msgstr "Ö´ÐÐ"
+
+#: src/prefs_filtering_action.c:146 src/prefs_filtering_action.c:400
+msgid "Color"
+msgstr "ÑÕÉ«"
+
+#: src/prefs_filtering_action.c:147
+#, fuzzy
+msgid "Change score"
+msgstr "Çл»×Öµä"
+
+#: src/prefs_filtering_action.c:148
+msgid "Set score"
+msgstr "ÉèÖûý·Ö"
+
+#: src/prefs_filtering_action.c:149
+msgid "Hide"
+msgstr "Òþ²Ø"
 
-#: src/prefs_filtering.c:257
+#: src/prefs_filtering_action.c:150
+msgid "Stop filter"
+msgstr "Í£Ö¹¹ýÂË"
+
+#: src/prefs_filtering_action.c:285
+msgid "Filtering action configuration"
+msgstr "¹ýÂ˶¯×÷ÅäÖÃ"
+
+#: src/prefs_filtering_action.c:308 src/prefs_filtering.c:244
 msgid "Action"
 msgstr "¶¯×÷"
 
-#: src/prefs_filtering.c:299 src/prefs_matcher.c:563 src/prefs_scoring.c:277
-#: src/prefs_template.c:222 src/prefs_toolbar.c:775
+#: src/prefs_filtering_action.c:385
+msgid "Destination"
+msgstr "Ä¿µÄµØ"
+
+#: src/prefs_filtering_action.c:390
+#, fuzzy
+msgid "Recipient"
+msgstr "»ØÖ´"
+
+#: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
+#: src/summaryview.c:479
+msgid "Score"
+msgstr "µÃ·Ö"
+
+#: src/prefs_filtering_action.c:427 src/prefs_matcher.c:467
+msgid "Info ..."
+msgstr "˵Ã÷ ..."
+
+#: src/prefs_filtering_action.c:455 src/prefs_filtering.c:286
+#: src/prefs_matcher.c:563 src/prefs_template.c:222 src/prefs_toolbar.c:775
 msgid "  Replace  "
 msgstr " Ìæ»» "
 
-#: src/prefs_filtering.c:325
+#: src/prefs_filtering_action.c:481
+msgid "Current action list"
+msgstr "µ±Ç°¶¯×÷Áбí"
+
+#: src/prefs_filtering_action.c:761
+msgid "Command line not set"
+msgstr "δָ¶¨ÃüÁîÐÐ"
+
+#: src/prefs_filtering_action.c:762
+msgid "Destination is not set."
+msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
+
+#: src/prefs_filtering_action.c:772
+#, fuzzy
+msgid "Recipient is not set."
+msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
+
+#: src/prefs_filtering_action.c:786
+msgid "Score is not set"
+msgstr "δָ¶¨»ý·Ö"
+
+#: src/prefs_filtering_action.c:1075
+msgid "No action was defined."
+msgstr "ûÓж¨Ò嶯×÷¡£"
+
+#: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
+#: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
+#: src/summaryview.c:474 src/summaryview.c:641
+msgid "Subject"
+msgstr "Ö÷Ìâ"
+
+#: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
+#: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
+#: src/summaryview.c:475 src/summaryview.c:645
+msgid "From"
+msgstr "·¢¼þÈË"
+
+#: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+msgid "To"
+msgstr "ÊÕ¼þÈË"
+
+#: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+msgid "Date"
+msgstr "ÈÕÆÚ"
+
+#: src/prefs_filtering_action.c:1118 src/prefs_matcher.c:1716
+#: src/quote_fmt.c:52
+msgid "Message-ID"
+msgstr ""
+
+#: src/prefs_filtering_action.c:1119 src/prefs_matcher.c:144
+#: src/prefs_matcher.c:1717 src/quote_fmt.c:50
+msgid "Newsgroups"
+msgstr "ÐÂÎÅ×é"
+
+#: src/prefs_filtering_action.c:1120 src/prefs_matcher.c:144
+#: src/prefs_matcher.c:1718 src/quote_fmt.c:51
+msgid "References"
+msgstr ""
+
+#: src/prefs_filtering_action.c:1121 src/prefs_matcher.c:1719
+msgid "Filename - should not be modified"
+msgstr "ÎļþÃû - ÇëÎð¸ü¶¯"
+
+#: src/prefs_filtering_action.c:1122 src/prefs_matcher.c:1720
+msgid "new line"
+msgstr "ÐÂÐÐ"
+
+#: src/prefs_filtering_action.c:1123 src/prefs_matcher.c:1721
+msgid "escape character for quotes"
+msgstr ""
+
+#: src/prefs_filtering_action.c:1124 src/prefs_matcher.c:1722
+msgid "quote character"
+msgstr "ÒýÎÄ×Ö·û"
+
+#: src/prefs_filtering.c:129 src/prefs_filtering.c:206
+msgid "Filtering/Processing configuration"
+msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
+
+#: src/prefs_filtering.c:223
+msgid "Condition"
+msgstr "Ìõ¼þ"
+
+#: src/prefs_filtering.c:237 src/prefs_filtering.c:258
+msgid "Define ..."
+msgstr "¶¨Òå ..."
+
+#: src/prefs_filtering.c:312
 msgid "Current filtering/processing rules"
 msgstr "µ±Ç°µÄ¹ýÂË/´¦Àí¹æÔò"
 
-#: src/prefs_filtering.c:341
+#: src/prefs_filtering.c:328
 msgid "Top"
 msgstr "Öö¥"
 
-#: src/prefs_filtering.c:363
+#: src/prefs_filtering.c:350
 msgid "Bottom"
 msgstr "Öõ×"
 
-#: src/prefs_filtering.c:717 src/prefs_filtering.c:792 src/prefs_scoring.c:555
-#: src/prefs_scoring.c:599
+#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
 msgid "Condition string is not valid."
 msgstr "ÎÞЧµÄÌõ¼þ×Ö·û´®¡£"
 
-#: src/prefs_filtering.c:751 src/prefs_filtering.c:799
+#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
 msgid "Action string is not valid."
 msgstr "ÎÞЧµÄ¶¯×÷¡£"
 
-#: src/prefs_filtering.c:779 src/prefs_scoring.c:541 src/prefs_scoring.c:585
+#: src/prefs_filtering.c:780
 msgid "Condition string is empty."
 msgstr "Ìõ¼þ×Ö·û´®Îª¿Õ¡£"
 
-#: src/prefs_filtering.c:785
+#: src/prefs_filtering.c:786
 msgid "Action string is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 
-#: src/prefs_filtering.c:852 src/prefs_scoring.c:621
+#: src/prefs_filtering.c:853
 msgid "Delete rule"
 msgstr "ɾ³ý¹æÔò"
 
-#: src/prefs_filtering.c:853 src/prefs_scoring.c:622
+#: src/prefs_filtering.c:854
 msgid "Do you really want to delete this rule?"
 msgstr "È·¶¨É¾³ýÕâÏî¹æÔò£¿"
 
-#: src/prefs_filtering.c:999 src/prefs_matcher.c:1664 src/prefs_scoring.c:758
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
 msgid "Entry not saved"
 msgstr "ÏîĿδ±£´æ"
 
-#: src/prefs_filtering.c:1000
+#: src/prefs_filtering.c:1002
 msgid "The entry was not saved. Close anyway?"
 msgstr "¸ÃÏîδ±£´æ£¬ÕæµÄÍ˳ö£¿"
 
-#: src/prefs_folder_item.c:130
+#: src/prefs_folder_item.c:133
 msgid "Simplify Subject RegExp: "
 msgstr ""
 
-#: src/prefs_folder_item.c:148
+#: src/prefs_folder_item.c:151
 msgid "Folder chmod: "
 msgstr ""
 
-#: src/prefs_folder_item.c:172
+#: src/prefs_folder_item.c:175
 msgid "Folder color: "
-msgstr "Îļþ¼ÐÑÕÉ«£º"
+msgstr "Óʼþ¼ÐÑÕÉ«£º"
+
+#: src/prefs_folder_item.c:201
+msgid "Process at startup"
+msgstr "Æô¶¯Ê±´¦Àí"
 
-#: src/prefs_folder_item.c:303
+#: src/prefs_folder_item.c:212
+msgid "Scan for new mail"
+msgstr "¼ì²éÐÂÓʼþ"
+
+#: src/prefs_folder_item.c:332
 msgid "Request Return Receipt"
-msgstr ""
+msgstr "ÒªÇó»Øº¯Æ¾Ö¤"
 
-#: src/prefs_folder_item.c:315
+#: src/prefs_folder_item.c:344
 msgid "Save copy of outgoing messages to this folder instead of Sent"
-msgstr ""
+msgstr "½«·¢³öµÄÓʼþ±£´æÒ»·Ý¿½±´µ½´ËÓʼþ¼Ð"
 
-#: src/prefs_folder_item.c:325
+#: src/prefs_folder_item.c:354
 msgid "Default To: "
-msgstr ""
+msgstr "Óʼþȱʡ´æÈë: "
 
-#: src/prefs_folder_item.c:342
+#: src/prefs_folder_item.c:371
 msgid "Send replies to: "
-msgstr ""
+msgstr "·¢Ëͻظ´¸ø: "
 
-#: src/prefs_folder_item.c:359
+#: src/prefs_folder_item.c:388
 msgid "Default account: "
-msgstr "Ô¤ÉèµÄÕʺţº"
+msgstr "ȱʡÕʺţº"
 
-#: src/prefs_folder_item.c:401
+#: src/prefs_folder_item.c:430
 msgid "Default dictionary: "
 msgstr "ȱʡ×ֵ䣺"
 
-#: src/prefs_folder_item.c:524
+#: src/prefs_folder_item.c:553
 msgid "Pick color for folder"
-msgstr "ѡÎļþ¼ÐµÄÑÕÉ«"
+msgstr "ѡÓʼþ¼ÐµÄÑÕÉ«"
 
-#: src/prefs_folder_item.c:534
+#: src/prefs_folder_item.c:563
 msgid "General"
 msgstr "Ò»°ã"
 
-#: src/prefs_folder_item.c:563
+#: src/prefs_folder_item.c:592
 msgid "Settings for folder"
-msgstr "ÉèÖÃÎļþ¼Ð×ÊÁÏ..."
+msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 
-#: src/prefs_matcher.c:142
-msgid "All messages"
-msgstr "ËùÓÐÐżþ"
+#: src/prefs_fonts.c:77
+msgid "Font selection"
+msgstr "Ñ¡Ôñ×ÖÌå"
 
-#: src/prefs_matcher.c:142 src/prefs_matcher.c:1706
-#: src/prefs_summary_column.c:70 src/quote_fmt.c:47 src/summaryview.c:466
-#: src/summaryview.c:632
-msgid "Subject"
-msgstr "Ö÷Ìâ"
+#: src/prefs_fonts.c:160
+msgid "Text"
+msgstr "Îı¾"
 
-#: src/prefs_matcher.c:143 src/prefs_matcher.c:1707
-#: src/prefs_summary_column.c:71 src/quote_fmt.c:42 src/summaryview.c:467
-#: src/summaryview.c:636
-msgid "From"
-msgstr "´Ó"
+#: src/prefs_fonts.c:183
+msgid "Small"
+msgstr "С×ÖÌå"
 
-#: src/prefs_matcher.c:143 src/prefs_matcher.c:1708 src/quote_fmt.c:48
-#: src/summaryview.c:640
-msgid "To"
-msgstr "¸ø"
+#: src/prefs_fonts.c:205
+msgid "Normal"
+msgstr "Ò»°ã"
+
+#: src/prefs_fonts.c:227
+msgid "Bold"
+msgstr "´ÖÌå"
+
+#: src/prefs_fonts.c:255
+msgid "You will need to restart for the changes to take effect"
+msgstr "×ÖÌåÉèÖÃÐèÒªÖØÐÂÆô¶¯³ÌÐò²ÅÄÜÉúЧ"
+
+#: src/prefs_fonts.c:298
+msgid "Display/Fonts"
+msgstr "ÏÔʾ/×ÖÌå"
+
+#: src/prefs_gtk.c:777
+msgid "Preferences"
+msgstr "Æ«ºÃÉèÖÃ"
+
+#: src/prefs_matcher.c:142
+msgid "All messages"
+msgstr "ËùÓÐÓʼþ"
 
 #: src/prefs_matcher.c:143
 msgid "To or Cc"
 msgstr ""
 
-#: src/prefs_matcher.c:144 src/prefs_matcher.c:1712 src/quote_fmt.c:50
-msgid "Newsgroups"
-msgstr "ÐÂÎÅ×é"
-
 #: src/prefs_matcher.c:144
 msgid "In reply to"
 msgstr "»Ø¸´"
 
-#: src/prefs_matcher.c:144 src/prefs_matcher.c:1713 src/quote_fmt.c:51
-msgid "References"
-msgstr "Æ«ºÃ"
-
 #: src/prefs_matcher.c:145
 msgid "Age greater than"
-msgstr ""
+msgstr "ÓʼþÄêÁä´óÓÚ"
 
 #: src/prefs_matcher.c:145
 msgid "Age lower than"
-msgstr ""
+msgstr "ÓʼþÄêÁäСÓÚ"
 
 #: src/prefs_matcher.c:146
 msgid "Headers part"
-msgstr "±êͷ"
+msgstr "ÐÅͷ"
 
 #: src/prefs_matcher.c:147
 msgid "Body part"
@@ -5957,72 +6793,71 @@ msgstr "
 
 #: src/prefs_matcher.c:147
 msgid "Whole message"
-msgstr "ÍêÕûÐżþ"
+msgstr "ÍêÕûÓʼþ"
 
 #: src/prefs_matcher.c:148
 msgid "Unread flag"
-msgstr ""
+msgstr "δ¶Á±ê¼Ç"
 
 #: src/prefs_matcher.c:148
 msgid "New flag"
-msgstr ""
+msgstr "ÐÂÓʼþ±ê¼Ç"
 
 #: src/prefs_matcher.c:149
 msgid "Marked flag"
-msgstr ""
+msgstr "¼ÇºÅ±ê¼Ç"
 
 #: src/prefs_matcher.c:149
 msgid "Deleted flag"
-msgstr ""
+msgstr "ÒÑɾ³ý±ê¼Ç"
 
 #: src/prefs_matcher.c:150
 msgid "Replied flag"
-msgstr ""
+msgstr "Òѻظ´±ê¼Ç"
 
 #: src/prefs_matcher.c:150
 msgid "Forwarded flag"
-msgstr ""
+msgstr "ÒÑת·¢±ê¼Ç"
 
 #: src/prefs_matcher.c:151
 msgid "Locked flag"
-msgstr ""
+msgstr "ÒÑËø¶¨±ê¼Ç"
 
 #: src/prefs_matcher.c:152
 msgid "Color label"
-msgstr ""
+msgstr "ÑÕÉ«±êÇ©"
 
-#: src/prefs_matcher.c:153 src/toolbar.c:167
+#: src/prefs_matcher.c:153 src/toolbar.c:170
 msgid "Ignore thread"
-msgstr ""
+msgstr "ºöÂÔÌÖÂÛÏßË÷"
 
 #: src/prefs_matcher.c:154
 msgid "Score greater than"
-msgstr ""
+msgstr "»ý·Ö´óÓÚ"
 
 #: src/prefs_matcher.c:154
 msgid "Score lower than"
-msgstr ""
+msgstr "»ý·ÖÉÙÓÚ"
 
 #: src/prefs_matcher.c:155
 msgid "Score equal to"
-msgstr ""
+msgstr "»ý·ÖµÈÓÚ"
 
-#: src/prefs_matcher.c:156 src/toolbar.c:165 src/toolbar.c:375
-#: src/toolbar.c:1689
-msgid "Execute"
-msgstr "Ö´ÐÐ"
+#: src/prefs_matcher.c:156
+msgid "Test"
+msgstr "²âÊÔ"
 
 #: src/prefs_matcher.c:157
 msgid "Size greater than"
-msgstr "±È½Ï´óµÄ"
+msgstr "³ß´ç´óÓÚ"
 
 #: src/prefs_matcher.c:158
 msgid "Size smaller than"
-msgstr "±È½ÏСµÄ"
+msgstr "³ß´çСÓÚ"
 
 #: src/prefs_matcher.c:159
 msgid "Size exactly"
-msgstr "Ò»ÑùµÄ´óС"
+msgstr "³ß´çµÈÓÚ"
 
 #: src/prefs_matcher.c:176
 msgid "or"
@@ -6050,15 +6885,11 @@ msgstr "
 
 #: src/prefs_matcher.c:377
 msgid "Condition configuration"
-msgstr ""
+msgstr "Ìõ¼þÉèÖÃ"
 
 #: src/prefs_matcher.c:402
 msgid "Match type"
-msgstr ""
-
-#: src/prefs_matcher.c:467
-msgid "Info ..."
-msgstr "ÐÅÏ¢ ..."
+msgstr "Æ¥ÅäÀàÐÍ"
 
 #: src/prefs_matcher.c:489
 msgid "Predicate"
@@ -6066,123 +6897,88 @@ msgstr ""
 
 #: src/prefs_matcher.c:540
 msgid "Use regexp"
-msgstr ""
+msgstr "ʹÓÃÕýÔò±í´ïʽ"
 
 #: src/prefs_matcher.c:578
 msgid "Boolean Op"
-msgstr ""
+msgstr "Âß¼­²Ù×÷·û"
 
 #: src/prefs_matcher.c:617
 msgid "Current condition rules"
-msgstr ""
+msgstr "µ±Ç°Ìõ¼þ¹æÔò"
 
 #: src/prefs_matcher.c:1155
 msgid "Value is not set."
-msgstr ""
+msgstr "ÉÐδ¸³Öµ"
 
-#: src/prefs_matcher.c:1665 src/prefs_scoring.c:759
+#: src/prefs_matcher.c:1666
 msgid ""
 "The entry was not saved\n"
 "Have you really finished?"
 msgstr ""
+"¸ÃÏîÉÐδ±£´æ\n"
+"È·¶¨ÒѾ­Íê³ÉÅäÖÃÁËÂð?"
 
-#: src/prefs_matcher.c:1710 src/prefs_summary_column.c:72 src/quote_fmt.c:41
-#: src/summaryview.c:468
-msgid "Date"
-msgstr "ÈÕÆÚ"
-
-#: src/prefs_matcher.c:1711 src/quote_fmt.c:52
-msgid "Message-ID"
-msgstr ""
-
-#: src/prefs_matcher.c:1714
-msgid "Filename - should not be modified"
-msgstr "ÎļþÃû - ÇëÎð¸ü¶¯"
-
-#: src/prefs_matcher.c:1715
-msgid "new line"
-msgstr "ÐÂÐÐ"
-
-#: src/prefs_matcher.c:1716
-msgid "escape character for quotes"
-msgstr ""
-
-#: src/prefs_matcher.c:1717
-msgid "quote character"
-msgstr ""
-
-#: src/prefs_scoring.c:203
-msgid "Scoring configuration"
-msgstr ""
-
-#: src/prefs_scoring.c:246 src/prefs_summary_column.c:75 src/summaryview.c:471
-msgid "Score"
-msgstr ""
-
-#: src/prefs_scoring.c:303
-msgid "Current scoring rules"
-msgstr ""
+#: src/prefs_matcher.c:1706
+msgid "'Test' allows you to test a message or message element"
+msgstr "'²âÊÔ'ÔÊÐíÄúʹÓÃÍⲿ³ÌÐò»òÕ߽ű¾"
 
-#: src/prefs_scoring.c:335
-msgid "Hide score"
-msgstr ""
+#: src/prefs_matcher.c:1707
+msgid "using an external program or script. The program will"
+msgstr "²âÊÔÒ»¸öÓʼþ»òÕßÓʼþÔªËØ¡£³ÌÐòÓ¦¸Ã"
 
-#: src/prefs_scoring.c:347
-msgid "Important score"
-msgstr ""
+#: src/prefs_matcher.c:1708
+msgid "return either 0 or 1"
+msgstr "·µ»Ø0»òÕß1"
 
-#: src/prefs_scoring.c:519
-msgid "Match string is not valid."
-msgstr ""
+#: src/prefs_matcher.c:1709
+msgid "The following symbols can be used:"
+msgstr "¿ÉÒÔʹÓÃÏÂÊö·ûºÅ:"
 
-#: src/prefs_scoring.c:547 src/prefs_scoring.c:591
-msgid "Score is not set."
-msgstr ""
+#: src/prefs_matcher.c:1729
+#, fuzzy
+msgid "Match Type: 'Test'"
+msgstr "Æ¥ÅäÀàÐÍ"
 
 #: src/prefs_spelling.c:95
 msgid "Select dictionaries location"
-msgstr ""
+msgstr "Ñ¡Ôñ´ÊµäλÖÃ"
 
 #: src/prefs_spelling.c:124
 msgid "Pick color for misspelled word"
-msgstr ""
+msgstr "Ϊƴд´íÎóÑ¡ÔñÑÕÉ«"
 
 #: src/prefs_spelling.c:165
 msgid "Enable spell checker"
-msgstr ""
+msgstr "ÆôÓÃÓï·¨¼ì²éÆ÷"
 
 #: src/prefs_spelling.c:180
 msgid "Enable alternate dictionary"
-msgstr ""
+msgstr "ÆôÓñ¸Ñ¡×Öµä"
 
 #: src/prefs_spelling.c:186
 msgid "Faster switching with last used dictionary"
-msgstr ""
+msgstr "¿ìËÙÇл»×îºóʹÓõÄ×Öµä"
 
 #: src/prefs_spelling.c:188
 msgid "Dictionaries path:"
-msgstr ""
+msgstr "´ÊµäλÖÃ"
 
 #: src/prefs_spelling.c:202
 msgid "Default dictionary:"
-msgstr ""
+msgstr "ȱʡ´Êµä"
 
 #: src/prefs_spelling.c:219
-#, fuzzy
 msgid "Default suggestion mode:"
-msgstr "δ֪µÄ½¨Òéģʽ¡£"
+msgstr "ȱʡµÄ½¨Òéģʽ¡£"
 
 #: src/prefs_spelling.c:236
 msgid "Misspelled word color:"
-msgstr ""
+msgstr "µ¥´Ê´æÔÚƴд´íÎóʱµÄÑÕÉ«"
 
 #: src/prefs_spelling.c:361
 msgid "Compose/Spell Checker"
-msgstr ""
-
-#: src/prefs_summary_column.c:67
-msgid "Mark"
-msgstr "ÉèÖÃ"
+msgstr "±à¼­/ƴд¼ì²éÆ÷"
 
 #: src/prefs_summary_column.c:69
 msgid "Attachment"
@@ -6190,21 +6986,23 @@ msgstr "
 
 #: src/prefs_summary_column.c:74
 msgid "Number"
-msgstr "Êý×Ö"
+msgstr "ÊýÁ¿"
 
 #: src/prefs_summary_column.c:178
 msgid "Displayed items configuration"
-msgstr "ÏÔʾÏîÄ¿µÄÉèÖÃ"
+msgstr "ÉèÖÃÏÔʾÁÐ"
 
 #: src/prefs_summary_column.c:195
 msgid ""
 "Select items to be displayed in the summary view. You can modify\n"
 "the order by using the Up / Down buttons or by dragging the items."
 msgstr ""
+"ÇëÑ¡ÔñÒªÔÚÓʼþÕªÒªÁбíÀ¸ÏÔʾµÄ×Ö¶ÎÁС£\n"
+"Äã¿ÉÒÔÓÃ[ÉÏÒÆ]/[ÏÂÒÆ]°´Å¥»òÕßÖ±½ÓÍÏÒ·À´µ÷Õû˳Ðò¡£"
 
 #: src/prefs_summary_column.c:222
 msgid "Available items"
-msgstr "¿ÉʹÓõÄÏîÄ¿"
+msgstr "¿ÉÓõÄÏîÄ¿"
 
 #: src/prefs_summary_column.c:240
 msgid "  ->  "
@@ -6220,7 +7018,7 @@ msgstr "
 
 #: src/prefs_summary_column.c:306
 msgid " Use default "
-msgstr "ʹÓÃÄÚ¶¨ֵ"
+msgstr "ʹÓÃȱʡֵ"
 
 #: src/prefs_template.c:158
 msgid "Template name"
@@ -6228,7 +7026,7 @@ msgstr "ģ
 
 #: src/prefs_template.c:235
 msgid " Symbols "
-msgstr "·ûºÅ"
+msgstr " ·ûºÅ "
 
 #: src/prefs_template.c:249
 msgid "Current templates"
@@ -6259,6 +7057,8 @@ msgid ""
 "Selected Action already set.\n"
 "Please choose another Action from List"
 msgstr ""
+"Ñ¡ÖеĶ¯×÷ÒѾ­±»Ê¹Óá£\n"
+"Çë´ÓÁбíÖÐÁíÍâÑ¡È¡Ò»¸ö"
 
 #: src/prefs_toolbar.c:127
 msgid "Main toolbar configuration"
@@ -6286,11 +7086,11 @@ msgstr "
 
 #: src/prefs_toolbar.c:737
 msgid "Event executed on click"
-msgstr "°´»¬ÊóÓÒ¼üÖ´ÐÐ"
+msgstr "µã»÷ʱִÐÐ"
 
 #: src/prefs_toolbar.c:787
 msgid " Default "
-msgstr "Ô¤ÉèÖµ"
+msgstr " ȱʡֵ "
 
 #: src/prefs_toolbar.c:794
 msgid "Displayed toolbar items"
@@ -6306,35 +7106,39 @@ msgstr "ͼ
 
 #: src/prefs_toolbar.c:810
 msgid "Mapped event"
-msgstr ""
+msgstr "¶ÔӦʼþ"
 
-#: src/prefs_toolbar.c:873
+#: src/prefs_toolbar.c:875
 msgid "Customize Toolbars/Main Window"
 msgstr "ÉèÖù¤¾ßÌõ/Ö÷´°¿Ú"
 
-#: src/prefs_toolbar.c:882
+#: src/prefs_toolbar.c:884
 msgid "Customize Toolbars/Message Window"
 msgstr "ÉèÖù¤¾ßÌõ/Óʼþ´°¿Ú"
 
-#: src/prefs_toolbar.c:891
+#: src/prefs_toolbar.c:893
 msgid "Customize Toolbars/Compose Window"
-msgstr "ÉèÖù¤¾ßÌõ/׫дÐżþ´°¿Ú"
+msgstr "ÉèÖù¤¾ßÌõ/׫дÓʼþ´°¿Ú"
+
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+msgid "No signature found"
+msgstr "δ·¢ÏÖÇ©Ãû"
 
-#: src/procmsg.c:1206
+#: src/privacy.c:154 src/privacy.c:173
+msgid "No information available"
+msgstr "ûÓÐÐÅÏ¢"
+
+#: src/procmsg.c:1126
 msgid "Could not create temporary file for news sending."
-msgstr ""
+msgstr "·¢ËÍÐÂÎŹý³ÌÖÐÎÞ·¨´´½¨ÁÙʱÎļþ¡£"
 
-#: src/procmsg.c:1217
+#: src/procmsg.c:1137
 msgid "Error when writing temporary file for news sending."
-msgstr ""
-
-#: src/progressdialog.c:52
-msgid "Account"
-msgstr "ÕʺÅ"
+msgstr "·¢ËÍÐÂÎŹý³ÌÖÐдÍùÁÙʱÎļþʱ³ö´í¡£"
 
 #: src/quote_fmt.c:40
 msgid "Customize date format (see man strftime)"
-msgstr "ÉèÖÃÈÕÆÚÏÔʾ (see man strftime)"
+msgstr "×Ô¶¨ÒåÈÕÆÚÏÔʾ¸ñʽ (Çë²é¿´strftimeµÄÊÖ²áÒ³)"
 
 #: src/quote_fmt.c:43
 msgid "Full Name of Sender"
@@ -6354,25 +7158,27 @@ msgstr "
 
 #: src/quote_fmt.c:53
 msgid "Message body"
-msgstr "ÐżþÄÚÈÝ"
+msgstr "ÓʼþÄÚÈÝ"
 
 #: src/quote_fmt.c:54
 msgid "Quoted message body"
-msgstr "ÒýÑÔ"
+msgstr "ÒýÎÄ"
 
 #: src/quote_fmt.c:55
 msgid "Message body without signature"
-msgstr "ÐżþÄÚÈÝ£¨²»º¬Ç©Ãû£©"
+msgstr "ÓʼþÄÚÈÝ£¨²»º¬Ç©Ãû£©"
 
 #: src/quote_fmt.c:56
 msgid "Quoted message body without signature"
-msgstr "ÒýÑÔ£¨²»º¬Ç©Ãû£©"
+msgstr "ÒýÎÄ£¨²»º¬Ç©Ãû£©"
 
 #: src/quote_fmt.c:58
 msgid ""
 "Insert expr if x is set\n"
 "x is one of the characters above after %"
 msgstr ""
+"Èç¹ûxÒѾ­ÉèÖã¬Ôò²åÈëexpr\n"
+"xÊÇÒÔÉÏÁгöµÄ×Ö·ûÖ®Ò»"
 
 #: src/quote_fmt.c:60
 msgid "Literal %"
@@ -6406,99 +7212,10 @@ msgstr "
 msgid "Insert program output"
 msgstr "²åÈë³ÌÐòÊä³ö"
 
-#: src/rfc2015.c:143 src/rfc2015.c:184 src/sigstatus.c:219
-msgid "Oops: Signature not verified"
-msgstr "¾¯¸æ£ºÇ©Ãûδ±»¼ì²é"
-
-#: src/rfc2015.c:146 src/rfc2015.c:187 src/sigstatus.c:222
-msgid "No signature found"
-msgstr "δ·¢ÏÖÇ©Ãû"
-
-#: src/rfc2015.c:149 src/sigstatus.c:225
-msgid "Good signature"
-msgstr "Ç©ÃûÕýÈ·"
-
-#: src/rfc2015.c:152 src/sigstatus.c:228
-msgid "Good signature but it has expired"
-msgstr "Ç©ÃûÕýÈ·µ«ÒѹýÆÚ"
-
-#: src/rfc2015.c:155 src/sigstatus.c:231
-msgid "Good signature but the key has expired"
-msgstr "Ç©ÃûÕýÈ·µ«ÃÜÔ¿¹ýÆÚ"
-
-#: src/rfc2015.c:158 src/sigstatus.c:234
-msgid "BAD signature"
-msgstr "Ç©Ãû¼ì²é´íÎó"
-
-#: src/rfc2015.c:161 src/rfc2015.c:202 src/sigstatus.c:237
-msgid "No public key to verify the signature"
-msgstr "ûÓй«¹²ÃÜÔ¿¹©¼ì²éÇ©Ãû"
-
-#: src/rfc2015.c:164 src/rfc2015.c:205 src/sigstatus.c:240
-msgid "Error verifying the signature"
-msgstr "¼ì²éÇ©Ãûʱ·¢Éú´íÎó"
-
-#: src/rfc2015.c:167 src/rfc2015.c:208
-msgid "Different results for signatures"
-msgstr "Ç©Ãû¼ì²é½á¹û´íÎó"
-
-#: src/rfc2015.c:170 src/rfc2015.c:211
-msgid "Error: Unknown status"
-msgstr "´íÎó£º Î´ÖªµÄ״̬"
-
-#: src/rfc2015.c:190
-#, c-format
-msgid "Good signature from \"%s\""
-msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·"
-
-#: src/rfc2015.c:193
-#, c-format
-msgid "Good signature from \"%s\" but it has expired"
-msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«ÒѾ­¹ýÆÚ"
-
-#: src/rfc2015.c:196
-#, c-format
-msgid "Good signature from \"%s\" but the key has expired"
-msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«ÃÜÔ¿ÒѾ­¹ýÆÚ"
-
-#: src/rfc2015.c:199
-#, c-format
-msgid "BAD signature from \"%s\""
-msgstr "À´×Ô \"%s\" µÄÇ©Ãû¼ì²é´íÎó"
-
-#: src/rfc2015.c:231
-msgid "Cannot find user ID for this key."
-msgstr "ÎÞ·¨ÔÚÕâ¸ö key ÖÐÕÒµ½Óû§´úºÅ"
-
-#: src/rfc2015.c:243
-#, c-format
-msgid "                aka \"%s\"\n"
-msgstr "               ÓÖ³ÆΪ \"%s\"\n"
-
-#: src/rfc2015.c:264
-#, c-format
-msgid "Signature expired %s"
-msgstr "¹ýÆÚÇ©Ãû %s"
-
-#: src/rfc2015.c:272
-#, c-format
-msgid "Key expired %s"
-msgstr "¹ýÆÚÃÜÔ¿ %s"
-
-#: src/rfc2015.c:298
-#, c-format
-msgid "Signature made at %s\n"
-msgstr "Ç©Ãû²úÉúÓÚ %s\n"
-
-#: src/rfc2015.c:307
-#, c-format
-msgid "Key fingerprint: %s\n"
-msgstr "ÃÜÔ¿µÄ fingerprint: %s\n"
-
 #: src/select-keys.c:103
 #, c-format
 msgid "Please select key for `%s'"
-msgstr "ÇëÑ¡Ôñ %s µÄÃÜÔ¿"
+msgstr "ÇëÑ¡Ôñ %s µÄÔ¿³×"
 
 #: src/select-keys.c:106
 #, c-format
@@ -6507,11 +7224,11 @@ msgstr "
 
 #: src/select-keys.c:273
 msgid "Select Keys"
-msgstr "Ñ¡ÔñÃÜÔ¿"
+msgstr "Ñ¡ÔñÔ¿³×"
 
 #: src/select-keys.c:300
 msgid "Key ID"
-msgstr "ÃÜԿʶ±ðÂë"
+msgstr "Ô¿³×ʶ±ðÂë"
 
 #: src/select-keys.c:303
 msgid "Val"
@@ -6533,108 +7250,195 @@ msgstr "
 msgid "Enter another user or key ID:"
 msgstr "µ¼ÈëÁíÒ»¸öÓû§´úºÅ»ò key µÄʶ±ðÂ룺"
 
-#: src/send_message.c:379
+#: src/send_message.c:373
 msgid "Connecting"
 msgstr "ÕýÔÚÁ¬½Ó"
 
-#: src/send_message.c:386
+#: src/send_message.c:380
 msgid "Doing POP before SMTP..."
 msgstr "ÔÚSMTP֮ǰ½øÐÐPOP²Ù×÷..."
 
-#: src/send_message.c:389
+#: src/send_message.c:383
 msgid "POP before SMTP"
 msgstr "ÔÚSMTP֮ǰ½øÐÐPOP"
 
-#: src/send_message.c:394
+#: src/send_message.c:388
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "Á¬½Óµ½ SMTP ·þÎñÆ÷ %s..."
 
-#: src/send_message.c:457
+#: src/send_message.c:451
 msgid "Sending HELO..."
-msgstr "Ëͳö HELO ±êͷ..."
+msgstr "Ëͳö HELO ÐÅͷ..."
 
-#: src/send_message.c:458 src/send_message.c:463 src/send_message.c:468
+#: src/send_message.c:452 src/send_message.c:457 src/send_message.c:462
 msgid "Authenticating"
 msgstr "ÕýÔÚ½øÐмøȨ"
 
-#: src/send_message.c:459 src/send_message.c:464
+#: src/send_message.c:453 src/send_message.c:458
 msgid "Sending message..."
 msgstr "ÕýÔÚ·¢ËÍÓʼþ..."
 
-#: src/send_message.c:462
+#: src/send_message.c:456
 msgid "Sending EHLO..."
-msgstr "Ëͳö EHLO ±êͷ..."
+msgstr "Ëͳö EHLO ÐÅͷ..."
 
-#: src/send_message.c:471
+#: src/send_message.c:465
 msgid "Sending MAIL FROM..."
-msgstr "Ëͳö MAIL FROM ±êͷ..."
+msgstr "Ëͳö MAIL FROM ÐÅͷ..."
 
-#: src/send_message.c:472 src/send_message.c:476 src/send_message.c:481
+#: src/send_message.c:466 src/send_message.c:470 src/send_message.c:475
 msgid "Sending"
 msgstr "ÕýÔÚ·¢ËÍ"
 
-#: src/send_message.c:475
+#: src/send_message.c:469
 msgid "Sending RCPT TO..."
-msgstr "Ëͳö RCPT TO ±êͷ..."
+msgstr "Ëͳö RCPT TO ÐÅͷ..."
 
-#: src/send_message.c:480
+#: src/send_message.c:474
 msgid "Sending DATA..."
 msgstr "ÕýÔÚ´«ËÍDATA..."
 
-#: src/send_message.c:484
+#: src/send_message.c:478
 msgid "Quitting..."
 msgstr "ÕýÔÚÍ˳ö..."
 
-#: src/send_message.c:512
+#: src/send_message.c:506
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "ÕýÔÚ·¢ËÍÓʼþ (%d / %d bytes)"
 
-#: src/send_message.c:540
+#: src/send_message.c:534
 msgid "Sending message"
 msgstr "ÕýÔÚ·¢ËÍÓʼþ"
 
-#: src/send_message.c:589
-#, fuzzy, c-format
+#: src/send_message.c:583
+#, c-format
 msgid ""
 "Error occurred while sending the message:\n"
 "%s"
-msgstr "ËͳöÐżþʱ·¢Éú´íÎó£º\n"
+msgstr ""
+"Ëͳö´ËÓʼþʱ·¢Éú´íÎó£º\n"
+"%s"
 
-#: src/setup.c:44
+#: src/setup.c:45
 msgid "Mailbox setting"
 msgstr "ÐÅÏäÉèÖÃ"
 
-#: src/setup.c:45
+#: src/setup.c:46
 msgid ""
 "First, you have to set the location of mailbox.\n"
 "You can use existing mailbox in MH format\n"
 "if you have the one.\n"
 "If you're not sure, just select OK."
 msgstr ""
-"Ê×ÏÈ£¬Äú±ØÐëÑ¡ÔñÄú´æ·ÅÐżþµÄλÖá£\n"
+"Ê×ÏÈ£¬Äú±ØÐëÑ¡ÔñÄú´æ·ÅÓʼþµÄλÖá£\n"
 "Èç¹ûÄúÒѾ­ÓÐÁËÒ»¸ö MH ¸ñʽµÄÐÅÏ䣬Äú¿ÉÒÔ\n"
 "Ö±½ÓʹÓá£\n"
 "Èç¹ûÄú²»È·¶¨ÓÐûÓУ¬ÇëÖ±½Ó°´Ï¡¸È·¶¨¡¹¡£"
 
-#: src/sigstatus.c:129
-msgid "Checking signature"
-msgstr "¼ì²éÇ©Ãû"
+#: src/sgpgme.c:88
+msgid "Undefined"
+msgstr ""
+
+#: src/sgpgme.c:92
+msgid "Marginal"
+msgstr ""
+
+#: src/sgpgme.c:96
+#, fuzzy
+msgid "Ultimate"
+msgstr "δÃüÃû"
+
+#: src/sgpgme.c:116
+#, c-format
+msgid "Valid signature by %s (Trust: %s)"
+msgstr "%sµÄÇ©ÃûÓÐЧ (ÐÅÈÎ: %s)"
+
+#: src/sgpgme.c:121
+msgid "The signature has expired"
+msgstr "Ç©ÃûÒѹýÆÚ"
+
+#: src/sgpgme.c:123
+msgid "The key that was used to sign this part has expired"
+msgstr "Õⲿ·ÖÇ©ÃûËù²ÉÓõĹ«Ô¿ÒѾ­¹ýÆÚ"
+
+#: src/sgpgme.c:125
+msgid "Not all signatures are valid"
+msgstr "²¢·ÇËùÓÐÇ©Ãû¾ùÓÐЧ"
+
+#: src/sgpgme.c:127
+msgid "This signature is invalid"
+msgstr "¸ÃÇ©ÃûÎÞЧ"
+
+#: src/sgpgme.c:129
+msgid "You have no key to verify this signature"
+msgstr "ûÓй«¹²Ô¿³×¹©¼ì²éÇ©Ãû"
+
+#: src/sgpgme.c:133
+msgid "An error occured"
+msgstr "·¢ÉúÁË´íÎó"
+
+#: src/sgpgme.c:135
+msgid "The signature has not been checked"
+msgstr "¸ÃÇ©ÃûÉÐδ±»¼ì²é"
+
+#: src/sgpgme.c:159
+#, c-format
+msgid "Signature made %s using %s key ID %s\n"
+msgstr ""
+
+#: src/sgpgme.c:168
+#, c-format
+msgid "Good signature from \"%s\"\n"
+msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·\n"
+
+#: src/sgpgme.c:173
+#, c-format
+msgid "Expired signature from \"%s\"\n"
+msgstr "À´×Ô \"%s\" µÄÇ©ÃûÒѹýÆÚ\n"
+
+#: src/sgpgme.c:178
+#, c-format
+msgid "BAD signature from \"%s\"\n"
+msgstr "À´×Ô \"%s\" µÄÇ©Ãû¼ì²é´íÎó\n"
+
+#: src/sgpgme.c:189
+#, c-format
+msgid "                aka \"%s\"\n"
+msgstr "               ÓÖ³ÆΪ \"%s\"\n"
+
+#: src/sgpgme.c:194
+#, fuzzy, c-format
+msgid "Primary key fingerprint: %s\n"
+msgstr "Ô¿³×µÄ fingerprint: %s\n"
+
+#: src/sgpgme.c:205
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "¹ýÆÚÇ©Ãû %s\n"
 
-#: src/sigstatus.c:196
+#: src/sgpgme.c:207
 #, c-format
-msgid "%s%s%s from \"%s\""
-msgstr "ÓÉ\"%s\"À´µÄ%s%s%s"
+msgid "Signature expired %s\n"
+msgstr "¹ýÆÚÇ©Ãû %s\n"
+
+#: src/sgpgme.c:280
+msgid ""
+"GnuPG is not installed properly, or needs to be upgraded.\n"
+"OpenPGP support disabled."
+msgstr ""
+"GnuPGµÄ°²×°²»Õý³££¬»òÐèÒªÉý¼¶¡£\n"
+"OpenPGPÖ§³ÖÒѱ»½ûÓá£"
 
 #: src/sourcewindow.c:66
 msgid "Source of the message"
-msgstr "ÐżþÔ´Îļþ"
+msgstr "ÓʼþÔ´Îļþ"
 
 #: src/sourcewindow.c:133
 #, c-format
 msgid "%s - Source"
-msgstr "%s - ÐżþÔ´Îļþ"
+msgstr "%s - ÓʼþÔ´Îļþ"
 
 #: src/ssl_manager.c:82
 msgid "Saved SSL Certificates"
@@ -6656,533 +7460,562 @@ msgstr "ȷ
 msgid "(Subject cleared by RegExp)"
 msgstr "£¨Ö÷Ìâ±»RegExpÇå³ýÁË£©"
 
-#: src/summary_search.c:100
+#: src/summary_search.c:101
 msgid "Search messages"
-msgstr "Ñ°ÕÒÐżþ"
+msgstr "Ñ°ÕÒÓʼþ"
 
-#: src/summary_search.c:170
+#: src/summary_search.c:171
 msgid "Body:"
 msgstr "ÕýÎÄ:"
 
-#: src/summary_search.c:194
+#: src/summary_search.c:195
 msgid "Select all matched"
 msgstr "×Ô¶¯Ñ¡ÔñËùÓÐÕÒµ½µÄÓʼþ"
 
-#: src/summary_search.c:200
+#: src/summary_search.c:203
 msgid "AND search"
-msgstr ""
+msgstr "Ðë·ûºÏÉÏÊöËùÓÐÌõ¼þ"
 
-#: src/summary_search.c:319
+#: src/summary_search.c:323
 msgid "Beginning of list reached; continue from end?"
 msgstr "ËÑÑ°Òѵ½¶¥¶Ë¡£Òª´Ó½áβ¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summary_search.c:321
+#: src/summary_search.c:325
 msgid "End of list reached; continue from beginning?"
 msgstr "ËÑÑ°Òѵ½½áβ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:404
+#: src/summaryview.c:403
 msgid "/_Reply"
 msgstr "/»Ø¸´(_R)"
 
-#: src/summaryview.c:405
+#: src/summaryview.c:404
 msgid "/Repl_y to"
 msgstr "/»Ø¸´¸ø(_y)"
 
-#: src/summaryview.c:406
+#: src/summaryview.c:405
 msgid "/Repl_y to/_all"
 msgstr "/»Ø¸´¸ø(_y)/ËùÓÐÊÕ¼þÈË(_a)"
 
-#: src/summaryview.c:407
+#: src/summaryview.c:406
 msgid "/Repl_y to/_sender"
 msgstr "/»Ø¸´¸ø(_y)/Ô­×÷Õß(_s)"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:407
 msgid "/Repl_y to/mailing _list"
 msgstr "/»Ø¸´¸ø(_y)/ÓʼþÁбí (_l)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:409
 msgid "/Follow-up and reply to"
 msgstr "/»ØÓ¦ÎÄÕÂ"
 
-#: src/summaryview.c:412
+#: src/summaryview.c:411
 msgid "/_Forward"
 msgstr "ת·¢(_F)"
 
-#: src/summaryview.c:413
+#: src/summaryview.c:412
 msgid "/Redirect"
 msgstr "/Öض¨Ïò"
 
-#: src/summaryview.c:415
+#: src/summaryview.c:414
 msgid "/Re-_edit"
 msgstr "/ÖØб༭(_e)"
 
-#: src/summaryview.c:417
+#: src/summaryview.c:416
 msgid "/M_ove..."
-msgstr "/Òƶ¯...(_o)"
+msgstr "/Òƶ¯(_o)..."
 
-#: src/summaryview.c:418
+#: src/summaryview.c:417
 msgid "/_Copy..."
-msgstr "/¸´ÖÆ...(_C)"
+msgstr "/¸´ÖÆ(_C)..."
 
-#: src/summaryview.c:420
+#: src/summaryview.c:419
 msgid "/Cancel a news message"
-msgstr "/È¡ÏûÐÂÐżþ"
+msgstr "/È¡ÏûÐÂÎÅ×éÓʼþ"
 
-#: src/summaryview.c:421
+#: src/summaryview.c:420
 msgid "/E_xecute"
 msgstr "Ö´ÐÐ(_x)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/񈬀(_M)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/񈬀(_M)/񈬀(_M)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
-msgstr "/±ê¼Ç(_M)/·´±ê¼Ç(_U)"
+msgstr "/±ê¼Ç(_M)/È¥³ý±ê¼Ç(_U)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/񈬀(_M)/---"
 
-#: src/summaryview.c:427
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:428
 msgid "/_Mark/Mark all read"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇÈ«²¿ÎªÒѶÁ"
 
-#: src/summaryview.c:430
+#: src/summaryview.c:429
 msgid "/_Mark/Ignore thread"
-msgstr "/±ê¼Ç(_M)/ºöÂÔÐżþÏßË÷"
+msgstr "/±ê¼Ç(_M)/ºöÂÔÓʼþÏßË÷"
 
-#: src/summaryview.c:431
+#: src/summaryview.c:430
 msgid "/_Mark/Unignore thread"
-msgstr "/±ê¼Ç(_M)/²»ºöÂÔÐżþÏßË÷"
+msgstr "/±ê¼Ç(_M)/²»ºöÂÔÓʼþÏßË÷"
 
-#: src/summaryview.c:432
+#: src/summaryview.c:431
 msgid "/_Mark/Lock"
 msgstr "/±ê¼Ç(_M)/Ëøס"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:432
 msgid "/_Mark/Unlock"
 msgstr "/±ê¼Ç(_M)/½âËø"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:433
 msgid "/Color la_bel"
 msgstr "/²ÊÉ«±ê¼Ç(_b)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k"
 msgstr "½«¼ÄÐÅÈ˼ÓÈëͨѶ¼ÖÐ(_k)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
-msgstr "/²úÉúÐżþ¹ýÂ˹æÔò(_i)"
+msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
-msgstr "/²úÉúÐżþ¹ýÂ˹æÔò(_i)/×Ô¶¯²úÉú"
+msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/×Ô¶¯²úÉú"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
-msgstr "/²úÉúÐżþ¹ýÂ˹æÔò(_i)/°´À´Ô´(_F)"
+msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´À´Ô´(_F)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
-msgstr "/²úÉúÐżþ¹ýÂ˹æÔò(_i)/°´ÊÕÐÅÈË(_T)"
+msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´ÊÕÐÅÈË(_T)"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
-msgstr "/²úÉúÐżþ¹ýÂ˹æÔò(_i)/°´±êÌâ(_S)"
+msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´±êÌâ(_S)"
+
+#: src/summaryview.c:447
+msgid "/Create processing rule"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò"
+
+#: src/summaryview.c:448
+#, fuzzy
+msgid "/Create processing rule/_Automatically"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/×Ô¶¯²úÉú"
+
+#: src/summaryview.c:450
+msgid "/Create processing rule/by _From"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´À´Ô´(_F)"
 
 #: src/summaryview.c:452
+msgid "/Create processing rule/by _To"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´ÊÕÐÅÈË(_T)"
+
+#: src/summaryview.c:454
+msgid "/Create processing rule/by _Subject"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´±êÌâ(_S)"
+
+#: src/summaryview.c:460
 msgid "/_View/_Source"
-msgstr "/²é¿´(_V)/ÐżþÔ´Îļþ(_S)"
+msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_S)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:461
 msgid "/_View/All _header"
-msgstr "/²é¿´(_V)/ËùÓеıêͷ(_h)"
+msgstr "/²é¿´(_V)/ËùÓеÄÐÅͷ(_h)"
 
-#: src/summaryview.c:456
+#: src/summaryview.c:464
 msgid "/_Print..."
 msgstr "/´òÓ¡(_P)"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:466
 msgid "/Select _all"
 msgstr "/Ñ¡È¡È«²¿(_a)"
 
-#: src/summaryview.c:459
+#: src/summaryview.c:467
 msgid "/Select t_hread"
 msgstr "/Ñ¡È¡ÏßË÷(_t)"
 
-#: src/summaryview.c:463
+#: src/summaryview.c:471
 msgid "M"
 msgstr "M"
 
-#: src/summaryview.c:470
+#: src/summaryview.c:478
 msgid "No."
 msgstr "No."
 
-#: src/summaryview.c:472
+#: src/summaryview.c:480
 msgid "L"
 msgstr "L"
 
-#: src/summaryview.c:481
+#: src/summaryview.c:489
 msgid "all messages"
-msgstr "ËùÓÐÐżþ"
+msgstr "ËùÓÐÓʼþ"
+
+#: src/summaryview.c:490
+msgid "messages whose age is greater than #"
+msgstr "±È#¾ÉµÄÓʼþ"
 
-#: src/summaryview.c:482 src/summaryview.c:483
-msgid "messages whose age is greather than #"
-msgstr "±È#»¹¾ÉµÄÐżþ"
+#: src/summaryview.c:491
+msgid "messages whose age is less than #"
+msgstr "±È#еÄÓʼþ"
 
-#: src/summaryview.c:484
+#: src/summaryview.c:492
 msgid "messages which contain S in the message body"
-msgstr "ÔÚÎļþÖ÷ÌåÖаüº¬SµÄÐżþ"
+msgstr "ÔÚÎļþÖ÷ÌåÖаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:485
+#: src/summaryview.c:493
 msgid "messages which contain S in the whole message"
-msgstr "ÕûƪÎÄÕÂÖаüº¬SµÄÐżþ"
+msgstr "ÕûƪÎÄÕÂÖаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:486
+#: src/summaryview.c:494
 msgid "messages carbon-copied to S"
 msgstr ""
 
-#: src/summaryview.c:487
+#: src/summaryview.c:495
 msgid "message is either to: or cc: to S"
-msgstr "¼Ä¸ø»òÊǸ±±¾³­Ë͸øSµÄÐżþ"
+msgstr "¼Ä¸ø»òÊǸ±±¾³­Ë͸øSµÄÓʼþ"
 
-#: src/summaryview.c:488
+#: src/summaryview.c:496
 msgid "deleted messages"
-msgstr "ɾ³ýµÄÐżþ"
+msgstr "ÒÑɾ³ýµÄÓʼþ"
 
-#: src/summaryview.c:489
+#: src/summaryview.c:497
 msgid "messages which contain S in the Sender field"
-msgstr "ÔÚËÍÐÅÀ¸Öаüº¬SµÄÐżþ"
+msgstr "ÔÚËÍÐÅÀ¸Öаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:490
+#: src/summaryview.c:498
 msgid "true if execute \"S\" succeeds"
-msgstr ""
+msgstr "Èç¹ûÖ´ÐÐ \"S\"³É¹¦"
 
-#: src/summaryview.c:491
+#: src/summaryview.c:499
 msgid "messages originating from user S"
-msgstr "ÓÉSËù·¢³öµÄÐÅ"
+msgstr "ÓÉSËù·¢³öµÄÓʼþ"
 
-#: src/summaryview.c:492
+#: src/summaryview.c:500
 msgid "forwarded messages"
-msgstr "ת·¢µÄÐÅ"
+msgstr "ÒÑת·¢µÄÓʼþ"
 
-#: src/summaryview.c:493
+#: src/summaryview.c:501
 msgid "messages which contain header S"
-msgstr "ÔÚ±êÍ·Öаüº¬SµÄÐżþ"
+msgstr "ÔÚÐÅÍ·Öаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:494
+#: src/summaryview.c:502
 msgid "messages which contain S in Message-Id header"
-msgstr "ÔÚÐżþ±êÍ·Öаüº¬SµÄÐżþ"
+msgstr "ÔÚÓʼþÐÅÍ·Öаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:495
+#: src/summaryview.c:503
 msgid "messages which contain S in inreplyto header"
-msgstr "Ôڻظ´±êÍ·Öаüº¬SµÄÐżþ"
+msgstr "Ôڻظ´ÐÅÍ·Öаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:504
 msgid "locked messages"
-msgstr "ÒÑËø¶¨µÄÐżþ"
+msgstr "ÒÑËø¶¨µÄÓʼþ"
 
-#: src/summaryview.c:497
+#: src/summaryview.c:505
 msgid "messages which are in newsgroup S"
-msgstr "ÔÚÐÂÎÅȺ×éSÖеÄÐżþ"
+msgstr "ÔÚÐÂÎÅȺ×éSÖеÄÓʼþ"
 
-#: src/summaryview.c:498
+#: src/summaryview.c:506
 msgid "new messages"
-msgstr "ÐÂÐÅ"
+msgstr "ÐÂÓʼþ"
 
-#: src/summaryview.c:499
+#: src/summaryview.c:507
 msgid "old messages"
-msgstr "¾ÉÐÅ"
+msgstr "¾ÉÓʼþ"
 
-#: src/summaryview.c:500
+#: src/summaryview.c:508
 msgid "messages which have been replied to"
-msgstr "Òѻظ´µÄÐżþ"
+msgstr "Òѻظ´µÄÓʼþ"
 
-#: src/summaryview.c:501
+#: src/summaryview.c:509
 msgid "read messages"
-msgstr "¶ÁÐÅ"
+msgstr "ÒѶÁÓʼþ"
 
-#: src/summaryview.c:502
+#: src/summaryview.c:510
 msgid "messages which contain S in subject"
-msgstr "Ö÷ÌâÖаüº¬SµÄÐżþ"
+msgstr "Ö÷ÌâÖаüº¬SµÄÓʼþ"
 
-#: src/summaryview.c:503
+#: src/summaryview.c:511
 msgid "messages whose score is equal to #"
-msgstr "µÃ·ÖÓë#Ò»Ñù¸ßµÄÐżþ"
+msgstr "µÃ·ÖÓë#Ò»Ñù¸ßµÄÓʼþ"
 
-#: src/summaryview.c:504
+#: src/summaryview.c:512
 msgid "messages whose score is greater than #"
-msgstr "µÃ·Ö½Ï#¸ßµÄÐżþ"
+msgstr "µÃ·Ö½Ï#¸ßµÄÓʼþ"
 
-#: src/summaryview.c:505
+#: src/summaryview.c:513
 msgid "messages whose score is lower than #"
-msgstr "µÃ·Ö½Ï#µÍµÄÐżþ"
+msgstr "µÃ·Ö½Ï#µÍµÄÓʼþ"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:514
 msgid "messages whose size is equal to #"
-msgstr "ÎļþÓë#Ò»Ñù´óµÄÐżþ"
+msgstr "ÎļþÓë#Ò»Ñù´óµÄÓʼþ"
 
-#: src/summaryview.c:507
+#: src/summaryview.c:515
 msgid "messages whose size is greater than #"
-msgstr "Îļþ±È#´óµÄÐżþ"
+msgstr "Îļþ±È#´óµÄÓʼþ"
 
-#: src/summaryview.c:508
+#: src/summaryview.c:516
 msgid "messages whose size is smaller than #"
-msgstr "Îļþ±È#СµÄÐżþ"
+msgstr "Îļþ±È#СµÄÓʼþ"
 
-#: src/summaryview.c:509
+#: src/summaryview.c:517
 msgid "messages which have been sent to S"
-msgstr "ÒѾ­Ë͸øSµÄÐżþ"
+msgstr "ÒѾ­Ë͸øSµÄÓʼþ"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:518
 msgid "marked messages"
-msgstr "Òѱê¼ÇµÄÐżþ"
+msgstr "Òѱê¼ÇµÄÓʼþ"
 
-#: src/summaryview.c:511
+#: src/summaryview.c:519
 msgid "unread messages"
-msgstr "δ¶ÁÐżþ"
+msgstr "δ¶ÁÓʼþ"
 
-#: src/summaryview.c:512
+#: src/summaryview.c:520
 msgid "messages which contain S in References header"
-msgstr "ÔÚReferencesÐÅϢͷÀﺬÓÐSµÄÐżþ"
+msgstr "ÔÚReferencesÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 
-#: src/summaryview.c:513
+#: src/summaryview.c:521
+msgid "messages returning 0 when passed to command"
+msgstr ""
+
+#: src/summaryview.c:522
 msgid "messages which contain S in X-Label header"
-msgstr "ÔÚX-LabelÐÅϢͷÀﺬÓÐSµÄÐżþ"
+msgstr "ÔÚX-LabelÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 
-#: src/summaryview.c:515
+#: src/summaryview.c:524
 msgid "logical AND operator"
 msgstr "Âß¼­ÔËËãAND"
 
-#: src/summaryview.c:516
+#: src/summaryview.c:525
 msgid "logical OR operator"
 msgstr "Âß¼­ÔËËãOR"
 
-#: src/summaryview.c:517
+#: src/summaryview.c:526
 msgid "logical NOT operator"
 msgstr "Âß¼­ÔËËãNOT"
 
-#: src/summaryview.c:518
+#: src/summaryview.c:527
 msgid "case sensitive search"
 msgstr "Çø·Ö´óСдµÄËÑÑ°"
 
-#: src/summaryview.c:525
+#: src/summaryview.c:534
 msgid "Extended Search symbols"
-msgstr ""
+msgstr "ÓÃÓÚÀ©Õ¹ËÑË÷µÄ·ûºÅ"
 
-#: src/summaryview.c:575
+#: src/summaryview.c:584
 msgid "Toggle quick-search bar"
 msgstr "Çл»¿ìËÙËÑË÷Ìõ"
 
-#: src/summaryview.c:659
+#: src/summaryview.c:668
 msgid "Extended Symbols"
 msgstr "À©Õ¹·ûºÅ"
 
-#: src/summaryview.c:915
+#: src/summaryview.c:933
 msgid "Process mark"
-msgstr "Ðżþ±ê¼Ç"
+msgstr "Óʼþ±ê¼Ç"
 
-#: src/summaryview.c:916
+#: src/summaryview.c:934
 msgid "Some marks are left. Process it?"
-msgstr "ijЩÐżþÒѱ»±ê¼Ç¡£Òª¼ÌÐøÂð£¿"
+msgstr "ijЩÓʼþÒѱ»±ê¼Ç¡£Òª¼ÌÐøÂð£¿"
 
-#: src/summaryview.c:960
+#: src/summaryview.c:977
 #, c-format
 msgid "Scanning folder (%s)..."
-msgstr "ɨÃè×ÊÁϼÐ(%s)..."
+msgstr "ɨÃèÓʼþ¼Ð(%s)..."
 
-#: src/summaryview.c:1377 src/summaryview.c:1421
+#: src/summaryview.c:1400 src/summaryview.c:1444
 msgid "No more unread messages"
-msgstr "ûÓÐÆäËûÐÂÐżþ"
+msgstr "ûÓÐÆäËûÐÂÓʼþ"
 
-#: src/summaryview.c:1378
+#: src/summaryview.c:1401
 msgid "No unread message found. Search from the end?"
-msgstr "ûÓÐÕÒµ½ÐÂÐżþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1390 src/summaryview.c:1434
+#: src/summaryview.c:1413 src/summaryview.c:1457
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
-#: src/summaryview.c:1398
+#: src/summaryview.c:1421
 msgid "No unread messages."
-msgstr "ûÓÐδ¶ÁÐżþ¡£"
+msgstr "ûÓÐδ¶ÁÓʼþ¡£"
 
-#: src/summaryview.c:1422
+#: src/summaryview.c:1445
 msgid "No unread message found. Go to next folder?"
-msgstr "ûÓÐÐÂÐżþ¡£Òªµ½ÏÂÒ»¸ö×ÊÁϼÐÂð£¿"
+msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 
-#: src/summaryview.c:1464 src/summaryview.c:1488
+#: src/summaryview.c:1487 src/summaryview.c:1511
 msgid "No more new messages"
-msgstr "ûÓÐÆäËûÐÂÐżþ"
+msgstr "ûÓÐÆäËûÐÂÓʼþ"
 
-#: src/summaryview.c:1465
+#: src/summaryview.c:1488
 msgid "No new message found. Search from the end?"
-msgstr "ûÓÐÕÒµ½ÐÂÐżþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1474
+#: src/summaryview.c:1497
 msgid "No new messages."
-msgstr "ûÓÐÐÂÐżþ"
+msgstr "ûÓÐÐÂÓʼþ"
 
-#: src/summaryview.c:1489
+#: src/summaryview.c:1512
 msgid "No new message found. Go to next folder?"
-msgstr "ûÓÐÐÂÐżþ¡£Òªµ½ÏÂÒ»¸ö×ÊÁϼÐÂð£¿"
+msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 
-#: src/summaryview.c:1491
+#: src/summaryview.c:1514
 msgid "Search again"
 msgstr "ÔÙ´ÎËÑÑ°"
 
-#: src/summaryview.c:1520 src/summaryview.c:1545
+#: src/summaryview.c:1543 src/summaryview.c:1568
 msgid "No more marked messages"
-msgstr "ûÓÐÆäËûÒѱê¼ÇÐżþ"
+msgstr "ûÓÐÆäËûÒѱê¼ÇÓʼþ"
 
-#: src/summaryview.c:1521
+#: src/summaryview.c:1544
 msgid "No marked message found. Search from the end?"
-msgstr "ûÓÐÕÒµ½Òѱê¼ÇÐżþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1530 src/summaryview.c:1555
+#: src/summaryview.c:1553 src/summaryview.c:1578
 msgid "No marked messages."
-msgstr "ûÓÐÒѱê¼ÇÐżþ"
+msgstr "ûÓÐÒѱê¼ÇÓʼþ"
 
-#: src/summaryview.c:1546
+#: src/summaryview.c:1569
 msgid "No marked message found. Search from the beginning?"
-msgstr "ûÓÐÕÒµ½Òѱê¼ÇÐżþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1570 src/summaryview.c:1595
+#: src/summaryview.c:1593 src/summaryview.c:1618
 msgid "No more labeled messages"
-msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Ðżþ"
+msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 
-#: src/summaryview.c:1571
+#: src/summaryview.c:1594
 msgid "No labeled message found. Search from the end?"
-msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Ðżþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1580 src/summaryview.c:1605
+#: src/summaryview.c:1603 src/summaryview.c:1628
 msgid "No labeled messages."
-msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Ðżþ"
+msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 
-#: src/summaryview.c:1596
+#: src/summaryview.c:1619
 msgid "No labeled message found. Search from the beginning?"
-msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Ðżþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
+msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
-#: src/summaryview.c:1809
+#: src/summaryview.c:1832
 msgid "Attracting messages by subject..."
-msgstr "Õ¹¿ªÐżþÖÐ..."
+msgstr "ÕýÔÚ°´Ö÷ÌâÅÅÁÐÓʼþÓʼþ..."
 
-#: src/summaryview.c:1955
+#: src/summaryview.c:1979
 #, c-format
 msgid "%d deleted"
-msgstr "%d ÒÑɾ³ý"
+msgstr "%d ·âÒÑɾ³ý"
 
-#: src/summaryview.c:1959
+#: src/summaryview.c:1983
 #, c-format
 msgid "%s%d moved"
-msgstr "%s%d ÒÑÒƶ¯"
+msgstr "%s%d ·âÒÑÒƶ¯"
 
-#: src/summaryview.c:1960 src/summaryview.c:1967
+#: src/summaryview.c:1984 src/summaryview.c:1991
 msgid ", "
 msgstr "£¬"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1989
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ÒѸ´ÖÆ"
 
-#: src/summaryview.c:1980
+#: src/summaryview.c:2004
 msgid " item selected"
 msgstr "·âÒÑÑ¡Ôñ"
 
-#: src/summaryview.c:1982
+#: src/summaryview.c:2006
 msgid " items selected"
 msgstr "·âÒÑÑ¡Ôñ"
 
-#: src/summaryview.c:1998
+#: src/summaryview.c:2022
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ·âδ¶Á£¬%d ·âÒѶÁ£¬¹² %d ·â (%s)"
 
-#: src/summaryview.c:2168
+#: src/summaryview.c:2196
 msgid "Sorting summary..."
-msgstr "ÐżþÅÅÐòÖÐ..."
+msgstr "ÕýÔÚ¶ÔÓʼþ½øÐÐÅÅÐò..."
 
-#: src/summaryview.c:2238
+#: src/summaryview.c:2266
 msgid "Setting summary from message data..."
-msgstr "²úÉúÐżþÁбíÖÐ..."
+msgstr "ÕýÔÚ¸ù¾ÝÓʼþÊý¾ÝÌáÈ¡ÕªÒªÐÅÏ¢..."
 
-#: src/summaryview.c:2367
+#: src/summaryview.c:2395
 msgid "(No Date)"
 msgstr "(ûÓÐÈÕÆÚ)"
 
-#: src/summaryview.c:2991
+#: src/summaryview.c:3022
 msgid "You're not the author of the article\n"
 msgstr "Äú²»ÊÇÕâ·âÐŵÄ×÷Õß\n"
 
-#: src/summaryview.c:3081
+#: src/summaryview.c:3109
 msgid "Delete message(s)"
-msgstr "ɾ³ýÐżþ"
+msgstr "ɾ³ýÓʼþ"
 
-#: src/summaryview.c:3082
+#: src/summaryview.c:3110
 msgid "Do you really want to delete message(s) from the trash?"
-msgstr "ÄúÈ·¶¨Òª´Óɾ³ýµÄÓʼþ×ÊÁϼÐÖÐɾ³ýÕâ·âÐżþÂð£¿"
+msgstr "ÄúÈ·¶¨Òª´ÓÀ¬»øÍ°ÖÐɾ³ýÕâ·âÓʼþÂð£¿"
 
-#: src/summaryview.c:3124
+#: src/summaryview.c:3152
 msgid "Deleting duplicated messages..."
-msgstr "ɾ³ýÖظ²µÄÐżþ..."
+msgstr "ɾ³ýÖظ²µÄÓʼþ..."
 
-#: src/summaryview.c:3238
+#: src/summaryview.c:3266
 msgid "Destination is same as current folder."
-msgstr "Ä¿±ê×ÊÁϼÐÓ뵱ǰ×ÊÁϼÐÏàͬ"
+msgstr "Ä¿±êÓʼþ¼ÐÓ뵱ǰÓʼþ¼ÐÏàͬ"
 
-#: src/summaryview.c:3315
+#: src/summaryview.c:3343
 msgid "Destination to copy is same as current folder."
-msgstr "Ä¿±ê×ÊÁϼÐÓëÀ´Ô´×ÊÁϼÐÏàͬ"
+msgstr "Ä¿±êÓʼþ¼ÐÓëÀ´Ô´Óʼþ¼ÐÏàͬ"
 
-#: src/summaryview.c:3365
+#: src/summaryview.c:3393
 msgid "Selecting all messages..."
-msgstr "Ñ¡ÔñËùÓÐÐżþ..."
+msgstr "Ñ¡ÔñËùÓÐÓʼþ..."
 
-#: src/summaryview.c:3423
+#: src/summaryview.c:3451
 msgid "Append or Overwrite"
 msgstr "¸½¼Ó»ò¸²¸Ç"
 
-#: src/summaryview.c:3424
+#: src/summaryview.c:3452
 msgid "Append or overwrite existing file?"
 msgstr "¸½¼Ó»ò¸²¸ÇÎļþ£¿"
 
-#: src/summaryview.c:3425
+#: src/summaryview.c:3453
 msgid "Append"
 msgstr "¸½¼Ó"
 
-#: src/summaryview.c:3716
+#: src/summaryview.c:3744
 msgid "Building threads..."
-msgstr "Éú³ÉÐżþÏßË÷ÖÐ..."
+msgstr "ÕýÔÚ½¨Á¢ÓʼþÏßË÷..."
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3842
 msgid "Unthreading..."
-msgstr "ÕýÔÚ½â³ýÐżþÏßË÷ÖÐ..."
+msgstr "ÕýÔÚ½â³ýÓʼþÏßË÷..."
 
-#: src/summaryview.c:3947
+#: src/summaryview.c:3975
 msgid "No filter rules defined."
-msgstr "ûÓйýÂËÐżþµÄ¹æÔò¡£"
+msgstr "ûÓйýÂËÓʼþµÄ¹æÔò¡£"
 
-#: src/summaryview.c:3956
+#: src/summaryview.c:3984
 msgid "Filtering..."
-msgstr "ÕýÔÚ¹ýÂËÐżþ..."
+msgstr "ÕýÔÚ¹ýÂËÓʼþ..."
 
-#: src/summaryview.c:5280
+#: src/summaryview.c:5330
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
@@ -7191,493 +8024,339 @@ msgstr ""
 "ÕýÔò±í´ïʽ(regexp)´íÎó:\n"
 "%s"
 
-#: src/toolbar.c:154 src/toolbar.c:1543
+#: src/textview.c:570
+msgid "This message can't be displayed.\n"
+msgstr "ÎÞ·¨ÏÔʾ¸ÃÓʼþ.\n"
+
+#: src/textview.c:587
+msgid "The following can be performed on this part by "
+msgstr "¿É¶Ô±»²¿·ÖÖ´ÐÐÒÔϲÙ×÷"
+
+#: src/textview.c:588
+msgid "right-clicking the icon or list item:\n"
+msgstr "(ÓÒ¼üµã»÷ͼ±ê»òÕßÁбíÏî´ò¿ª²Ù×÷²Ëµ¥):\n"
+
+#: src/textview.c:590
+msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
+msgstr "    Ñ¡Ôñ'Áí´æΪ...'½øÐб£´æ (¿ì½Ý¼ü: 'y')\n"
+
+#: src/textview.c:591
+msgid "    To display as text select 'Display as text' "
+msgstr "    Ñ¡Ôñ'ÒÔÎı¾·½Ê½ÏÔʾ'¿ÉÒÔÒÔÎı¾·½Ê½²é¿´"
+
+#: src/textview.c:592
+msgid "(Shortcut key: 't')\n"
+msgstr "(¿ì½Ý¼ü: 't')\n"
+
+#: src/textview.c:593
+msgid "    To open with an external program select 'Open' "
+msgstr "    ÒªÓÃÍⲿ³ÌÐò´ò¿ªÇëÑ¡Ôñ'´ò¿ª'"
+
+#: src/textview.c:594
+msgid "(Shortcut key: 'l'),\n"
+msgstr "(¿ì½Ý¼ü: 'l'), \n"
+
+#: src/textview.c:595
+msgid "    (alternately double-click, or click the middle "
+msgstr "    (Ò²¿ÉÒÔË«»÷»òÕßµã»÷),"
+
+#: src/textview.c:596
+msgid "mouse button),\n"
+msgstr "Êó±êÖмü\n"
+
+#: src/textview.c:597
+msgid "    or 'Open with...' (Shortcut key: 'o')\n"
+msgstr "    »òÕß'ÓÃ...´ò¿ª' (¿ì½Ý¼ü: 'o')\n"
+
+#: src/textview.c:1859
+#, c-format
+msgid ""
+"The real URL (%s) is different from\n"
+"the apparent URL (%s).  \n"
+"Open it anyway?"
+msgstr ""
+"ÕæʵURL (%s) ÓëÏÔʾµÄURL (%s) ²»Í¬¡£\n"
+"ÕæµÄÒª´ò¿ªÂð?"
+
+#: src/toolbar.c:157 src/toolbar.c:1559
 msgid "Receive Mail on all Accounts"
 msgstr "ÊÕËùÓÐÕʺŵÄÐÅ"
 
-#: src/toolbar.c:155 src/toolbar.c:1549
+#: src/toolbar.c:158 src/toolbar.c:1565
 msgid "Receive Mail on current Account"
 msgstr "ÓÃÄ¿Ç°µÄÕʺÅÊÕÐÅ"
 
-#: src/toolbar.c:156 src/toolbar.c:1555
+#: src/toolbar.c:159 src/toolbar.c:1571
 msgid "Send Queued Message(s)"
-msgstr "Ëͳö´ý·¢ËÍÐżþ"
+msgstr "Ëͳö´ý·¢ËÍÓʼþ"
 
-#: src/toolbar.c:157 src/toolbar.c:1568
+#: src/toolbar.c:160 src/toolbar.c:1584
 msgid "Compose Email"
 msgstr "дÐÅ"
 
-#: src/toolbar.c:158 src/toolbar.c:1572
+#: src/toolbar.c:161 src/toolbar.c:1588
 msgid "Compose News"
 msgstr "׫дÎÄÕÂ"
 
-#: src/toolbar.c:159 src/toolbar.c:1578
+#: src/toolbar.c:162 src/toolbar.c:1594
 msgid "Reply to Message"
 msgstr "»ØÓ¦Ô­ÎÄ"
 
-#: src/toolbar.c:160 src/toolbar.c:1599
+#: src/toolbar.c:163 src/toolbar.c:1615
 msgid "Reply to Sender"
 msgstr "»Ø¸´¸ø·¢ÐÅÕß"
 
-#: src/toolbar.c:161 src/toolbar.c:1620
+#: src/toolbar.c:164 src/toolbar.c:1636
 msgid "Reply to All"
 msgstr "»Ø¸øËùÓÐÈË"
 
-#: src/toolbar.c:162 src/toolbar.c:1641
+#: src/toolbar.c:165 src/toolbar.c:1657
 msgid "Reply to Mailing-list"
 msgstr "»Ø¸´ÖÁÓʼþÁбí"
 
-#: src/toolbar.c:163 src/toolbar.c:1662
+#: src/toolbar.c:166 src/toolbar.c:1678
 msgid "Forward Message"
-msgstr "ת·¢Ðżþ"
+msgstr "ת·¢Óʼþ"
 
-#: src/toolbar.c:164 src/toolbar.c:1683
+#: src/toolbar.c:167 src/toolbar.c:1699
 msgid "Delete Message"
-msgstr "ɾ³ýÐżþ"
+msgstr "ɾ³ýÓʼþ"
 
-#: src/toolbar.c:166 src/toolbar.c:1695
+#: src/toolbar.c:169 src/toolbar.c:1711
 msgid "Goto Next Message"
 msgstr "ÏÂÒ»¸ö"
 
-#: src/toolbar.c:170 src/toolbar.c:1703
+#: src/toolbar.c:173 src/toolbar.c:1719
 msgid "Send Message"
 msgstr "ËÍÐÅ"
 
-#: src/toolbar.c:171 src/toolbar.c:1709
+#: src/toolbar.c:174 src/toolbar.c:1725
 msgid "Put into queue folder and send later"
 msgstr "·ÅÈë´ý·¢ËÍÓʼþ¼ÐÉÔºóÔÙËÍ"
 
-#: src/toolbar.c:172 src/toolbar.c:1715
+#: src/toolbar.c:175 src/toolbar.c:1731
 msgid "Save to draft folder"
-msgstr "´æÈë²Ý¸åÎļþ¼Ð"
+msgstr "´æÈë²Ý¸åÓʼþ¼Ð"
 
-#: src/toolbar.c:173 src/toolbar.c:1721
+#: src/toolbar.c:176 src/toolbar.c:1737
 msgid "Insert file"
 msgstr "²åÈëÎļþ"
 
-#: src/toolbar.c:174 src/toolbar.c:1727
+#: src/toolbar.c:177 src/toolbar.c:1743
 msgid "Attach file"
 msgstr "¸½¼ÓÎļþ"
 
-#: src/toolbar.c:175 src/toolbar.c:1733
+#: src/toolbar.c:178 src/toolbar.c:1749
 msgid "Insert signature"
 msgstr "²åÈëÇ©Ãû"
 
-#: src/toolbar.c:176 src/toolbar.c:1739
+#: src/toolbar.c:179 src/toolbar.c:1755
 msgid "Edit with external editor"
 msgstr "ÒÔÍⲿ±à¼­Æ÷±à¼­"
 
-#: src/toolbar.c:177 src/toolbar.c:1745
+#: src/toolbar.c:180 src/toolbar.c:1761
 msgid "Wrap all long lines"
 msgstr "×Ô¶¯¶Ï¾ä"
 
-#: src/toolbar.c:180
+#: src/toolbar.c:183 src/toolbar.c:1774
+msgid "Check spelling"
+msgstr "ÕýÔÚ¼ì²éƴд"
+
+#: src/toolbar.c:185
 msgid "Sylpheed Actions Feature"
 msgstr "Sylpheed ¶¯×÷ÌØÐÔ"
 
-#: src/toolbar.c:200
+#: src/toolbar.c:205
 msgid "/Reply with _quote"
 msgstr "/»ØÐÅʱÒýÓÃÔ­ÎÄ(_q)"
 
-#: src/toolbar.c:201
+#: src/toolbar.c:206
 msgid "/_Reply without quote"
 msgstr "/»ØÐÅʱ²»ÒýÓÃÔ­ÎÄ(_R)"
 
-#: src/toolbar.c:205
+#: src/toolbar.c:210
 msgid "/Reply to all with _quote"
 msgstr "/»ØПøËùÓÐÈËʱÒýÓÃÔ­ÎÄ(_q)"
 
-#: src/toolbar.c:206
+#: src/toolbar.c:211
 msgid "/_Reply to all without quote"
 msgstr "/»ØПøËùÓÐÈËʱ²»ÒýÓÃÔ­ÎÄ(_R)"
 
-#: src/toolbar.c:210
+#: src/toolbar.c:215
 msgid "/Reply to list with _quote"
 msgstr "/»ØПøÁбíÇÒÒýÓÃÔ­ÎÄ(_q)"
 
-#: src/toolbar.c:211
+#: src/toolbar.c:216
 msgid "/_Reply to list without quote"
 msgstr "/»ØÐŵ½ÁÐ±í²»ÒýÓÃÔ­ÎÄ(_R)"
 
-#: src/toolbar.c:215
+#: src/toolbar.c:220
 msgid "/Reply to sender with _quote"
 msgstr "/»ØÐÅʱÒýÓÃÔ­ÎÄ(_q)"
 
-#: src/toolbar.c:216
+#: src/toolbar.c:221
 msgid "/_Reply to sender without quote"
 msgstr "/»ØÐÅʱ²»ÒýÓÃÔ­ÎÄ(_R)"
 
-#: src/toolbar.c:220
+#: src/toolbar.c:225
 msgid "/_Forward message (inline style)"
-msgstr "/ת·¢Ðżþ (inline style)"
+msgstr "/ת·¢Óʼþ (inline style)"
 
-#: src/toolbar.c:221
+#: src/toolbar.c:226
 msgid "/Forward message as _attachment"
 msgstr "/½«ÓʼþÒÔ¸½¼ÓÎļþÐÎʽת·¢(_a)"
 
-#: src/toolbar.c:363
+#: src/toolbar.c:371
 msgid "Get"
-msgstr "ȡÐÅ"
+msgstr "ÊÕÐÅ"
 
-#: src/toolbar.c:364
+#: src/toolbar.c:372
 msgid "Get All"
-msgstr "È¡»ØËùÓÐÐżþ"
+msgstr "È«²¿ÊÕÈ¡"
 
-#: src/toolbar.c:367
+#: src/toolbar.c:375
 msgid "Email"
 msgstr "µç×ÓÓʼþ"
 
-#: src/toolbar.c:369 src/toolbar.c:461
+#: src/toolbar.c:377 src/toolbar.c:469
 msgid "Reply"
 msgstr "»Ø¸´"
 
-#: src/toolbar.c:370 src/toolbar.c:462
+#: src/toolbar.c:378 src/toolbar.c:470
 msgid "All"
 msgstr "È«²¿"
 
-#: src/toolbar.c:371 src/toolbar.c:463
+#: src/toolbar.c:379 src/toolbar.c:471
 msgid "Sender"
 msgstr "ËͼþÕß"
 
-#: src/toolbar.c:372 src/toolbar.c:464
-msgid "Forward"
-msgstr "ת·¢"
-
-#: src/toolbar.c:414
+#: src/toolbar.c:422
 msgid "Send later"
 msgstr "ÉÔºóÔÙËÍ"
 
-#: src/toolbar.c:415
+#: src/toolbar.c:423
 msgid "Draft"
 msgstr "²Ý¸å"
 
-#: src/toolbar.c:418
+#: src/toolbar.c:426
 msgid "Attach"
 msgstr "¸½¼ÓÎļþ"
 
-#: src/toolbar.c:422
+#: src/toolbar.c:430
 msgid "Linewrap"
 msgstr "×Ô¶¯»»ÐÐ"
 
-#: src/toolbar.c:1560
+#: src/toolbar.c:1576
 msgid "News"
 msgstr "ÐÂÎÅȺ×é"
 
-#: src/plugins/demo/demo.c:71
-msgid "Demo"
-msgstr "ÑÝʾ"
-
-#: src/plugins/demo/demo.c:76
-msgid ""
-"This Plugin is only a demo of how to write plugins for Sylpheed. It installs "
-"a hook for new log output and writes it to stdout.\n"
-"\n"
-"It is not really useful"
-msgstr ""
+#~ msgid "/S_coring..."
+#~ msgstr "/ͳ¼Æ»ý·Ö(_c)..."
 
-#: src/plugins/trayicon/trayicon.c:217
-msgid "Trayicon"
-msgstr ""
+#~ msgid "Go offline"
+#~ msgstr "ÍÑ»ú"
 
-#: src/plugins/trayicon/trayicon.c:222
-msgid ""
-"This plugin places a mailbox icon in the system tray that indicates if you "
-"have new or unread mail.\n"
-"\n"
-"The mailbox is empty if you have no unread mail, otherwise it contains a "
-"letter. A tooltip shows new, unread and total number of messages."
-msgstr ""
-"±¾²å¼þ½«ÔÚÄãÓÐÐÂÓʼþ»òÕßδ¶ÁÓʼþʱ£¬ÔÚϵͳ֪ͨÀ¸·ÅÖÃÒ»¸öÓÊÏäͼ±ê¡£\n"
-"\n"
-"Èç¹ûÄãûÓÐδ¶ÁµÄÓʼþ£¬¸Ãͼ±ê½«ÊÇÒ»¸ö¿ÕÓÊÏ䣬·ñÔòÔòÊǺ¬ÓÐÐżþͼÑù¡£ÌáʾÐÅÏ¢½«"
-"Äܹ»ÏÔʾÐÂÓʼþ¡¢Î´¶ÁÓʼþµÄÊýÁ¿ºÍÓʼþ×ÜÊý."
+#~ msgid "Go online"
+#~ msgstr "Áª»ú"
 
-#: src/plugins/mathml_viewer/mathml_viewer.c:163
-msgid "MathML Viewer"
-msgstr ""
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "½«Êý×ÖÇ©Ãû¼ì²é½á¹ûÏÔʾÔÚÁíÒ»´°¿Ú"
 
-#: src/plugins/mathml_viewer/mathml_viewer.c:168
-msgid ""
-"This plugin uses the GtkMathView widget to render MathML attachments "
-"(Content-Type: text/mathml)"
-msgstr ""
+#~ msgid "Current scoring rules"
+#~ msgstr "µ±Ç°»ý·Ö¹æÔò"
 
-#: src/plugins/image_viewer/viewerprefs.c:78
-msgid "Automatically display attached images"
-msgstr "×Ô¶¯ÏÔʾÓʼþÖеÄͼƬ"
+#~ msgid "Important score"
+#~ msgstr "µ½´Ë»ý·Öºó±ê¼ÇΪÖØÒªÓʼþ"
 
-#: src/plugins/image_viewer/viewerprefs.c:85
-msgid "Resize attached images"
-msgstr ""
+#~ msgid "Match string is not valid."
+#~ msgstr "Ìõ¼þ±í´ïʽÎÞЧ"
 
-#: src/plugins/image_viewer/viewer.c:316
-msgid "Filename:"
-msgstr "ÎļþÃû"
+#~ msgid "Checking signature"
+#~ msgstr "¼ì²éÇ©Ãû"
 
-#: src/plugins/image_viewer/viewer.c:323
-msgid "Filesize:"
-msgstr "Îļþ´óС :"
+#~ msgid "%s%s%s from \"%s\""
+#~ msgstr "ÓÉ\"%s\"À´µÄ%s%s%s"
 
-#: src/plugins/image_viewer/viewer.c:344
-msgid "Load Image"
-msgstr "¼ÓÔØͼƬ"
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "¾¯¸æ£ºÇ©Ãûδ±»¼ì²é"
 
-#: src/plugins/image_viewer/viewer.c:350
-msgid "Content-Type:"
-msgstr ""
+#~ msgid "Good signature"
+#~ msgstr "Ç©ÃûÕýÈ·"
 
-#: src/plugins/image_viewer/plugin.c:56
-msgid "Image Viewer"
-msgstr "ͼƬ²é¿´Æ÷"
+#~ msgid "Good signature but it has expired"
+#~ msgstr "Ç©ÃûÕýÈ·µ«ÒѹýÆÚ"
 
-#: src/plugins/image_viewer/plugin.c:61
-msgid "This plugin uses either gdk-pixbuf or imlib to display attached images."
-msgstr "±¾²å¼þʹÓÃgdk-pixbuf¿â»òÕßimlib¿âÏÔʾÓʼþÖеÄͼƬ"
+#~ msgid "Good signature but the key has expired"
+#~ msgstr "Ç©ÃûÕýÈ·µ«Ô¿³×¹ýÆÚ"
 
-#: src/plugins/dillo_viewer/dillo_viewer.c:195
-msgid "Dillo HTML Viewer"
-msgstr "DilloÍøÒ³²é¿´Æ÷"
-
-#: src/plugins/dillo_viewer/dillo_viewer.c:200
-msgid "This plugin renders HTML mail using the Dillo web browser."
-msgstr "±¾²å¼þÄÚǶDilloÍøÒ³ä¯ÀÀÆ÷À´ÏÔʾHTMLÓʼþ"
-
-#: src/plugins/dillo_viewer/dillo_prefs.c:106
-msgid "Do not load remote links in mails"
-msgstr "½ûÖ¹·ÃÎÊÓʼþÖеÄÔ¶³ÌÁ´½Ó"
-
-#: src/plugins/dillo_viewer/dillo_prefs.c:112
-msgid "Equivalent to Dillo's '--local' option"
-msgstr "µÈ¼ÛÓÚDilloµÄ'--local'Ñ¡Ïî"
-
-#: src/plugins/dillo_viewer/dillo_prefs.c:114
-msgid "You can still load remote links by reloading the page"
-msgstr "ÄúÈÔÈ»¿ÉÒÔͨ¹ýÖØÐÂÔØÈë¸ÃÒ³µÄ·½Ê½·ÃÎÊÔ¶³ÌÁ´½Ó"
-
-#: src/plugins/dillo_viewer/dillo_prefs.c:122
-msgid "Full window mode (hide controls)"
-msgstr "È«´°¿Úģʽ(Òþ²Ø¹¤¾ßÌõ)"
-
-#: src/plugins/dillo_viewer/dillo_prefs.c:128
-msgid "Equivalent to Dillo's '--fullwindow' option"
-msgstr "µÈ¼ÛÓÚDilloµÄ'--fullwindow'Ñ¡Ïî"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:93
-msgid "Enable virus scanning"
-msgstr ""
+#~ msgid "BAD signature"
+#~ msgstr "Ç©Ãû¼ì²é´íÎó"
 
-#: src/plugins/clamav/clamav_plugin_gtk.c:107
-msgid "Scan archive contents"
-msgstr ""
+#~ msgid "No public key to verify the signature"
+#~ msgstr "ûÓй«¹²Ô¿³×¹©¼ì²éÇ©Ãû"
 
-#: src/plugins/clamav/clamav_plugin_gtk.c:120
-msgid "Maximum attachment size"
-msgstr ""
+#~ msgid "Error verifying the signature"
+#~ msgstr "¼ì²éÇ©Ãûʱ·¢Éú´íÎó"
 
-#: src/plugins/clamav/clamav_plugin_gtk.c:138
 #, fuzzy
-msgid "MB"
-msgstr "MB"
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:142
-msgid "Save infected messages"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:155
-msgid "Save folder"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:169
-#: src/plugins/clamav/clamav_plugin_gtk.c:178
-msgid "Leave empty to use the default trash folder"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:240
-msgid "Filtering/Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:261
-msgid "Clam AntiVirus GTK"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin_gtk.c:266
-msgid ""
-"This plugin provides a Preferences page for the Clam AntiVirus plugin.\n"
-"\n"
-"You will find the options in the Other Preferences window under Filtering/"
-"Clam AntiVirus.\n"
-"\n"
-"With this plugin you can enable the scanning, enable archive content "
-"scanning, set the maximum size of an attachment to be checked, (if the "
-"attachment is larger it will not be checked), configure whether infected "
-"mail should be received (default: Yes) and select the folder where infected "
-"mail will be saved.\n"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:234
-msgid "Clam AntiVirus"
-msgstr ""
-
-#: src/plugins/clamav/clamav_plugin.c:239
-msgid ""
-"This plugin uses Clam AntiVirus to scan all message attachments that are "
-"received from a POP account.\n"
-"\n"
-"When a message attachment is found to contain a virus it can be deleted or "
-"saved in a specially designated folder.\n"
-"\n"
-"This plugin only contains the actual function for scanning and deleting or "
-"moving the message. You probably want to load the Gtk+ User Interface plugin "
-"too, otherwise you will have to manually write the plugin configuration.\n"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:288
-msgid "SpamAssassin"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin.c:293
-msgid ""
-"This plugin checks all messages that are received from a POP account for "
-"spam using a SpamAssassin server. You will need a SpamAssassin Server "
-"(spamd) running somewhere.\n"
-"\n"
-"When a message is identified as spam it can be deleted or saved into a "
-"special folder.\n"
-"\n"
-"This plugin only contains the actual function for filtering and deleting or "
-"moving the message. You probably want to load a User Interface plugin too, "
-"otherwise you will have to manually write the plugin configuration.\n"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:113
-msgid "Enable"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:120
-msgid "spamd "
-msgstr ""
+#~ msgid "can't create root folder %s\n"
+#~ msgstr "ÎÞ·¨´´½¨Óʼþ¼Ð'%s'¡£"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:137
-msgid "Hostname or IP address of spamd server"
-msgstr ""
+#~ msgid "/_File/_Add mailbox/mbox..."
+#~ msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)/mbox¸ñʽ..."
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:140
-msgid ":"
-msgstr ""
+#~ msgid "Add mbox mailbox"
+#~ msgstr "Ìí¼Ómbox¸ñʽÓʼþ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:150
-msgid "Port of spamd server"
-msgstr ""
+#~ msgid "Input the location of mailbox."
+#~ msgstr "ÇëÊäÈëÓÊÏäλÖÃ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:160
-msgid "Enable SpamAssassin filtering"
-msgstr ""
+#~ msgid "Creation of the mailbox failed."
+#~ msgstr "´´½¨ÓÊÏäʧ°Ü"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:162
-msgid "Save Spam"
-msgstr ""
+#~ msgid "/_Check signature"
+#~ msgstr "/¼ì²éÇ©Ãû(_C)"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:176
-msgid "Save mails that where identified as spam to a folder"
-msgstr ""
+#~ msgid "Right-click here to verify the signature"
+#~ msgstr "ÓÒ»÷´Ë´¦¼ì²éÇ©Ãû"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:179
-msgid "Save Folder"
-msgstr ""
+#~ msgid "Enable"
+#~ msgstr "ÆôÓÃ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:194
-msgid ""
-"Folder that will be used to save spam. Leave empty to use the default trash "
-"folder"
-msgstr ""
+#~ msgid "Enable SpamAssassin filtering"
+#~ msgstr "ÆôÓÃÀ¬»øÓʼþ¹ýÂ˹¦ÄÜ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:197
-msgid "..."
-msgstr "..."
+#~ msgid "Different results for signatures"
+#~ msgstr "Ç©Ãû¼ì²é½á¹û´íÎó"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:203
-msgid "Maximum Size"
-msgstr ""
+#~ msgid "Error: Unknown status"
+#~ msgstr "´íÎó£º Î´ÖªµÄ״̬"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:223
-msgid "Maximum size a message is allowed to have to be checked"
-msgstr ""
+#~ msgid "Good signature from \"%s\" but it has expired"
+#~ msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«ÒѾ­¹ýÆÚ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:227
-msgid "kB"
-msgstr ""
+#~ msgid "Good signature from \"%s\" but the key has expired"
+#~ msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«Ô¿³×ÒѾ­¹ýÆÚ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:234
-msgid "Timeout"
-msgstr ""
+#~ msgid "Cannot find user ID for this key."
+#~ msgstr "ÎÞ·¨ÔÚÕâ¸ö key ÖÐÕÒµ½Óû§´úºÅ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:241
-msgid "s"
-msgstr ""
+#~ msgid "Key expired %s"
+#~ msgstr "¹ýÆÚÔ¿³× %s"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:261
-msgid ""
-"Maximum time allowed for the spam check. After the time the check will be "
-"aborted and the message delivered as none spam."
-msgstr ""
+#, fuzzy
+#~ msgid "Key ID: %s\n"
+#~ msgstr "Ô¿³×ʶ±ðÂë"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:347
-msgid "Filtering/SpamAssassin"
-msgstr ""
+#~ msgid "Use external program for sending"
+#~ msgstr "ÓÃÍⲿ³ÌÐò·¢ËÍ"
 
-#: src/plugins/spamassassin/spamassassin_gtk.c:368
-msgid "SpamAssassin GTK"
-msgstr ""
-
-#: src/plugins/spamassassin/spamassassin_gtk.c:373
-msgid ""
-"This plugin provides a Preferences page for the SpamAssassin plugin.\n"
-"\n"
-"You will find the options in the Other Preferences window under Filtering/"
-"SpamAssassin.\n"
-"\n"
-"With this plugin you can enable the filtering, change the SpamAssassin "
-"server host and port, set the maximum size of messages to be checked, (if "
-"the message is larger it will not be checked), configure whether spam mail "
-"should be received (default: Yes) and select the folder where spam mail will "
-"be saved.\n"
-msgstr ""
+#~ msgid "Font"
+#~ msgstr "×ÖÌå"
 
 #~ msgid "/_File/_Add mbox mailbox..."
 #~ msgstr "/Îļþ(_F)/Ôö¼ÓmboxÓÊÏä(_A)..."
 
-#~ msgid "Move"
-#~ msgstr "Òƶ¯"
-
-#~ msgid "Copy"
-#~ msgstr "¸´ÖÆ"
-
-#~ msgid "Unmark"
-#~ msgstr "²»ÉèÖÃ"
-
-#~ msgid "Mark as read"
-#~ msgstr "ÉèΪÒѶÁ"
-
-#~ msgid "Mark as unread"
-#~ msgstr "ÉèΪδ¶Á"
-
-#~ msgid "Redirect"
-#~ msgstr "ÖØÐÂÖ¸¶¨"
-
-#~ msgid "Color"
-#~ msgstr "ÑÕÉ«"
-
-#~ msgid "Destination"
-#~ msgstr "Ä¿µÄµØ"
-
-#, fuzzy
-#~ msgid "Recipient"
-#~ msgstr "ÃèÊö"
-
-#, fuzzy
-#~ msgid "Recipient is not set."
-#~ msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
-
 #, fuzzy
 #~ msgid "Search Criteria"
 #~ msgstr "ËÑÑ°ÌõÄ¿"
@@ -7714,7 +8393,7 @@ msgstr ""
 #~ msgstr "°Ñ%sÒƵ½%s...\n"
 
 #~ msgid "Rescanning all folder trees..."
-#~ msgstr "ÖØРɨÃèÎļþ¼ÐÊ÷..."
+#~ msgstr "ÖØРɨÃèÓʼþ¼ÐÊ÷..."
 
 #, fuzzy
 #~ msgid "Compiled plugins:%s"
@@ -7726,51 +8405,31 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Retrieving header (%d / %d)"
-#~ msgstr "È¡»ØÐżþ(%d/%d)(%s/%s)"
+#~ msgstr "È¡»ØÓʼþ(%d/%d)(%s/%s)"
 
 #, fuzzy
 #~ msgid "/_Display image"
 #~ msgstr "ÏÔʾÓû§Ãû³Æ"
 
-#, fuzzy
-#~ msgid "Can't get the part of multipart message."
-#~ msgstr "ÎÞ·¨·Å½øÔÝ´æ×ÊÁϼС£"
-
 #, fuzzy
 #~ msgid "Socket error\n"
 #~ msgstr "Socket´íÎó¡£"
 
-#, fuzzy
-#~ msgid "Could not get message file %d"
-#~ msgstr "ÎÞ·¨ËͳöÔÝ´æ×ÊÁÏ"
-
 #, fuzzy
 #~ msgid "Could not get message file."
 #~ msgstr "ÎÞ·¨¶ÁÈ¡Îļþ¡£"
 
-#, fuzzy
-#~ msgid "Could not get message part."
-#~ msgstr "ÎÞ·¨ËͳöÔÝ´æ×ÊÁÏ"
-
 #, fuzzy
 #~ msgid "No message part selected."
-#~ msgstr "δѡȡÎļþ¼Ð»òѶϢ¡£"
-
-#, fuzzy
-#~ msgid " Send "
-#~ msgstr "Ëͳö"
-
-#, fuzzy
-#~ msgid "Abort"
-#~ msgstr "¹ØÓÚ"
+#~ msgstr "δѡȡÓʼþ¼Ð»òѶϢ¡£"
 
 #, fuzzy
 #~ msgid "for message file name"
-#~ msgstr "/ת·¢Ðżþ (inline style)"
+#~ msgstr "/ת·¢Óʼþ (inline style)"
 
 #, fuzzy
 #~ msgid "Delete on Server"
-#~ msgstr "ɾ³ýÎļþ¼Ð"
+#~ msgstr "ɾ³ýÓʼþ¼Ð"
 
 #, fuzzy
 #~ msgid "Error occurred while sending the message to `%s'."
@@ -7782,11 +8441,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "/Preview _new messages"
-#~ msgstr "È¡»ØÐÂÐżþ"
+#~ msgstr "È¡»ØÐÂÓʼþ"
 
 #, fuzzy
 #~ msgid "/Preview _all messages"
-#~ msgstr "ËùÓÐÐżþ"
+#~ msgstr "ËùÓÐÓʼþ"
 
 #, fuzzy
 #~ msgid "(No date)"
@@ -7798,11 +8457,11 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "%i Messages"
-#~ msgstr "Ðżþ"
+#~ msgstr "Óʼþ"
 
 #, fuzzy
 #~ msgid "Preview mail"
-#~ msgstr "Çå³ýÊÕ¼þ¼Ð"
+#~ msgstr "Ô¤ÀÀÓʼþ"
 
 #, fuzzy
 #~ msgid "Preview old/new mail on account"
@@ -7830,7 +8489,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "0 messages"
-#~ msgstr "ËùÓÐÐżþ"
+#~ msgstr "ËùÓÐÓʼþ"
 
 #, fuzzy
 #~ msgid "Show only old messages"