more sync with sylpheed 0.5.1cvs6

[claws.git] / po / zh_CN.GB2312.po

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index fe42e3b7b4fc54b06050c3d058242b06f35c6a1a..04a79271d4206a4f93fd9e782777a34d004e66df 100644 (file)
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-17 01:56+0900\n"
+"POT-Creation-Date: 2001-06-20 17:53+0900\n"
 "PO-Revision-Date: 2000-12-21 21:49+0900\n"
 "Last-Translator: Xiangxin Luo <benluo@etang.com>\n"
 "Language-Team: Xiangxin Luo <benluo@etang.com>\n"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:86
+#: src/about.c:90
 msgid "About"
 msgstr "¹ØÓÚ"
 
-#: src/about.c:189
+#: src/about.c:199
 msgid ""
 "The portions applied from fetchmail is Copyright 1997 by Eric S. Raymond.  "
 "Portions of those are also copyrighted by Carl Harris, 1993 and 1995.  "
@@ -26,27 +26,20 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/about.c:195
-msgid ""
-"The MD5 support is copyright by RSA Data Security, Inc.  See the header "
-"comment of the md5.c module for license terms.\n"
-"\n"
-msgstr ""
-
-#: src/about.c:199
+#: src/about.c:205
 msgid ""
 "Kcc is copyright by Yasuhiro Tonooka <tonooka@msi.co.jp>, and libkcc is "
 "copyright by takeshi@SoftAgency.co.jp.\n"
 "\n"
 msgstr ""
 
-#: src/about.c:204
+#: src/about.c:210
 msgid ""
 "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>\n"
 "\n"
 msgstr ""
 
-#: src/about.c:208
+#: src/about.c:214
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -55,7 +48,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/about.c:214
+#: src/about.c:220
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -64,113 +57,119 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/about.c:220
+#: src/about.c:226
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/about.c:227 src/addressbook.c:1289 src/alertpanel.c:209
-#: src/compose.c:1460 src/compose.c:3068 src/foldersel.c:175 src/import.c:171
-#: src/inputdialog.c:155 src/main.c:286 src/mainwindow.c:1630
-#: src/mimeview.c:705 src/passphrase.c:115 src/prefs.c:467
-#: src/prefs_common.c:1988 src/prefs_common.c:2207 src/prefs_common.c:2663
-#: src/summaryview.c:2012 src/summaryview.c:2518
+#: src/about.c:233 src/addressbook.c:1293 src/alertpanel.c:232
+#: src/compose.c:1476 src/compose.c:3132 src/export.c:185 src/foldersel.c:176
+#: src/import.c:189 src/inputdialog.c:160 src/main.c:334 src/main.c:342
+#: src/mainwindow.c:1660 src/mimeview.c:716 src/passphrase.c:119
+#: src/prefs.c:467 src/prefs_common.c:1821 src/prefs_common.c:2065
+#: src/prefs_common.c:2181 src/prefs_customheader.c:162
+#: src/prefs_display_header.c:203 src/summaryview.c:2025
+#: src/summaryview.c:2541
 msgid "OK"
 msgstr "È·¶¨"
 
-#: src/account.c:97
+#: src/account.c:101
 msgid "Reading all config for each account...\n"
 msgstr "ÕýÔÚΪÿ¸öÕÊ»§¶ÁÈ¡ÅäÖÃ...\n"
 
-#: src/account.c:112
+#: src/account.c:116
 #, c-format
 msgid "Found label: %s\n"
 msgstr "ÕÒµ½±êÇ©£º%s\n"
 
-#: src/account.c:202
+#: src/account.c:208
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 
-#: src/account.c:207
+#: src/account.c:214
 msgid "Opening account edit window...\n"
 msgstr "ÕýÔÚ´ò¿ªÕÊ»§±à¼­´°¿Ú...\n"
 
-#: src/account.c:347
+#: src/account.c:361
 msgid "Creating account edit window...\n"
 msgstr "ÕýÔÚ´´½¨ÕÊ»§±à¼­´°¿Ú...\n"
 
-#: src/account.c:352
+#: src/account.c:366
 msgid "Edit accounts"
 msgstr "±à¼­ÕÊ»§"
 
-#: src/account.c:380 src/addressbook.c:318 src/addressbook.c:1285
-#: src/compose.c:2185 src/mimeview.c:135 src/select-keys.c:272
+#: src/account.c:394 src/addressbook.c:318 src/addressbook.c:1289
+#: src/compose.c:2244 src/mimeview.c:139 src/select-keys.c:301
 msgid "Name"
 msgstr "ÐÕÃû"
 
-#: src/account.c:381 src/prefs_account.c:585
+#: src/account.c:395 src/prefs_account.c:632
 msgid "Protocol"
 msgstr "ЭÒé"
 
-#: src/account.c:382
+#: src/account.c:396
 msgid "Server"
 msgstr "·þÎñÆ÷"
 
-#: src/account.c:401 src/addressbook.c:439
+#: src/account.c:415 src/addressbook.c:439 src/prefs_customheader.c:240
+#: src/prefs_display_header.c:287 src/prefs_display_header.c:342
 msgid "Add"
 msgstr "Ìí¼Ó"
 
-#: src/account.c:407
+#: src/account.c:421
 msgid "Edit"
 msgstr "±à¼­"
 
-#: src/account.c:413
+#: src/account.c:427 src/prefs_customheader.c:247
 msgid " Delete "
 msgstr "ɾ³ý"
 
-#: src/account.c:419 src/prefs_common.c:1365
+#: src/account.c:433 src/prefs_customheader.c:294
+#: src/prefs_display_header.c:306 src/prefs_filter.c:438
 msgid "Down"
 msgstr "ÍùÏÂ"
 
-#: src/account.c:425 src/prefs_common.c:1359
+#: src/account.c:439 src/prefs_customheader.c:288
+#: src/prefs_display_header.c:300 src/prefs_filter.c:432
 msgid "Up"
 msgstr "ÍùÉÏ"
 
-#: src/account.c:439
+#: src/account.c:453
 msgid " Set as usually used account "
 msgstr "É趨Ϊͨ³£Ê¹ÓõÄÕÊ»§"
 
-#: src/account.c:445 src/summary_search.c:192
+#: src/account.c:459 src/prefs_filter.c:198 src/summary_search.c:192
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: src/account.c:498
+#: src/account.c:513
 msgid "Delete account"
 msgstr "ɾ³ýÕÊ»§"
 
-#: src/account.c:499
+#: src/account.c:514
 msgid "Do you really want to delete this account?"
 msgstr "ÄãȷʵÏëҪɾ³ý¸ÃÕÊ»§Âð£¿"
 
-#: src/account.c:500 src/addressbook.c:579 src/addressbook.c:1220
-#: src/compose.c:3240 src/folderview.c:1263 src/folderview.c:1305
-#: src/folderview.c:1394 src/folderview.c:1427 src/folderview.c:1526
-#: src/folderview.c:1559 src/mainwindow.c:926 src/prefs_common.c:2473
-#: src/summary_search.c:297 src/summaryview.c:569 src/summaryview.c:809
+#: src/account.c:515 src/addressbook.c:579 src/addressbook.c:1224
+#: src/compose.c:3306 src/folderview.c:1448 src/folderview.c:1491
+#: src/folderview.c:1590 src/folderview.c:1631 src/folderview.c:1730
+#: src/folderview.c:1763 src/mainwindow.c:950 src/prefs_customheader.c:543
+#: src/prefs_filter.c:721 src/summary_search.c:297 src/summaryview.c:575
+#: src/summaryview.c:817
 msgid "Yes"
 msgstr "ÊÇ"
 
-#: src/account.c:500 src/compose.c:3240 src/folderview.c:1263
-#: src/folderview.c:1305 src/folderview.c:1394 src/folderview.c:1427
-#: src/folderview.c:1526 src/folderview.c:1559
+#: src/account.c:515 src/compose.c:3306 src/folderview.c:1448
+#: src/folderview.c:1491 src/folderview.c:1590 src/folderview.c:1631
+#: src/folderview.c:1730 src/folderview.c:1763
 msgid "+No"
 msgstr "+²»ÊÇ"
 
-#: src/addressbook.c:229 src/compose.c:373 src/mainwindow.c:324
+#: src/addressbook.c:229 src/compose.c:375 src/mainwindow.c:333
 msgid "/_File"
 msgstr "/Îļþ(_F)"
 
@@ -186,8 +185,8 @@ msgstr "/
 msgid "/_File/New _folder"
 msgstr "/Îļþ(_F)/ÐÂÎļþ¼Ð(_f)"
 
-#: src/addressbook.c:233 src/addressbook.c:236 src/compose.c:377
-#: src/mainwindow.c:334 src/mainwindow.c:337
+#: src/addressbook.c:233 src/addressbook.c:236 src/compose.c:379
+#: src/mainwindow.c:344 src/mainwindow.c:347
 msgid "/_File/---"
 msgstr "/Îļþ(_F)/---"
 
@@ -199,15 +198,15 @@ msgstr "/
 msgid "/_File/_Delete"
 msgstr "/Îļþ(_F)/ɾ³ý(_D)"
 
-#: src/addressbook.c:237 src/compose.c:378 src/mainwindow.c:338
+#: src/addressbook.c:237 src/compose.c:380 src/mainwindow.c:348
 msgid "/_File/_Close"
 msgstr "/Îļþ(_F)/¹Ø±Õ(_C)"
 
-#: src/addressbook.c:238 src/compose.c:417 src/mainwindow.c:505
+#: src/addressbook.c:238 src/compose.c:419 src/mainwindow.c:521
 msgid "/_Help"
 msgstr "/°ïÖú(_H)"
 
-#: src/addressbook.c:239 src/compose.c:418 src/mainwindow.c:510
+#: src/addressbook.c:239 src/compose.c:420 src/mainwindow.c:526
 msgid "/_Help/_About"
 msgstr "/°ïÖú(_H)/¹ØÓÚ(_A)"
 
@@ -223,20 +222,20 @@ msgstr "/
 msgid "/New _folder"
 msgstr "/ÐÂÎļþ¼Ð(_f)"
 
-#: src/addressbook.c:247 src/addressbook.c:257 src/compose.c:367
-#: src/folderview.c:200 src/folderview.c:202 src/folderview.c:211
-#: src/folderview.c:213 src/folderview.c:222 src/folderview.c:224
-#: src/summaryview.c:299 src/summaryview.c:305 src/summaryview.c:310
-#: src/summaryview.c:313
+#: src/addressbook.c:247 src/addressbook.c:257 src/compose.c:369
+#: src/folderview.c:206 src/folderview.c:208 src/folderview.c:217
+#: src/folderview.c:219 src/folderview.c:228 src/folderview.c:230
+#: src/summaryview.c:300 src/summaryview.c:307 src/summaryview.c:312
+#: src/summaryview.c:315
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:248 src/addressbook.c:258 src/compose.c:380
-#: src/mainwindow.c:341
+#: src/addressbook.c:248 src/addressbook.c:258 src/compose.c:382
+#: src/mainwindow.c:351
 msgid "/_Edit"
 msgstr "/±à¼­(_E)"
 
-#: src/addressbook.c:249 src/addressbook.c:259 src/summaryview.c:290
+#: src/addressbook.c:249 src/addressbook.c:259 src/summaryview.c:291
 msgid "/_Delete"
 msgstr "/ɾ³ý(_D)"
 
@@ -244,11 +243,11 @@ msgstr "/ɾ
 msgid "E-Mail address"
 msgstr "E-MailµØÖ·"
 
-#: src/addressbook.c:318 src/addressbook.c:1287
+#: src/addressbook.c:318 src/addressbook.c:1291
 msgid "Remarks"
 msgstr "ÖØбê¼Ç"
 
-#: src/addressbook.c:325 src/compose.c:2742
+#: src/addressbook.c:325 src/compose.c:2804
 msgid "Address book"
 msgstr "µØÖ·²¾"
 
@@ -256,8 +255,9 @@ msgstr "
 msgid "Name:"
 msgstr "ÐÕÃû£º"
 
-#: src/addressbook.c:436 src/addressbook.c:1220 src/mainwindow.c:1379
-#: src/prefs_common.c:1326
+#: src/addressbook.c:436 src/addressbook.c:1224 src/mainwindow.c:1405
+#: src/prefs_display_header.c:293 src/prefs_display_header.c:349
+#: src/prefs_filter.c:398
 msgid "Delete"
 msgstr "ɾ³ý"
 
@@ -293,262 +293,268 @@ msgstr "ɾ
 msgid "Really delete the address(es)?"
 msgstr "ȷʵҪɾ³ýµØÖ·£¿"
 
-#: src/addressbook.c:579 src/addressbook.c:1220 src/mainwindow.c:926
-#: src/prefs_common.c:2473 src/summary_search.c:297 src/summaryview.c:569
-#: src/summaryview.c:809
+#: src/addressbook.c:579 src/addressbook.c:1224 src/mainwindow.c:950
+#: src/prefs_customheader.c:543 src/prefs_filter.c:721
+#: src/summary_search.c:297 src/summaryview.c:575 src/summaryview.c:817
 msgid "No"
 msgstr "²»"
 
-#: src/addressbook.c:996 src/folderview.c:1141 src/folderview.c:1334
+#: src/addressbook.c:1000 src/folderview.c:1321 src/folderview.c:1522
 msgid "New folder"
 msgstr "ÐÂÎļþ¼Ð"
 
-#: src/addressbook.c:997 src/folderview.c:1142 src/folderview.c:1335
+#: src/addressbook.c:1001 src/folderview.c:1322
 msgid "Input the name of new folder:"
 msgstr "ÊäÈëÐÂÎļþ¼ÐµÄÃû×Ö£º"
 
-#: src/addressbook.c:998 src/folderview.c:1143 src/folderview.c:1336
+#: src/addressbook.c:1002 src/folderview.c:1323 src/folderview.c:1526
 msgid "NewFolder"
 msgstr "ÐÂÎļþ¼Ð"
 
-#: src/addressbook.c:1009 src/addressbook.c:1054 src/addressbook.c:1131
-#: src/addressbook.c:1183
+#: src/addressbook.c:1013 src/addressbook.c:1058 src/addressbook.c:1135
+#: src/addressbook.c:1187
 msgid "The name already exists."
 msgstr "¸ÃÃû×ÖÒÑ´æÔÚ¡£"
 
-#: src/addressbook.c:1041
+#: src/addressbook.c:1045
 msgid "New group"
 msgstr "ÐÂȺ×é"
 
-#: src/addressbook.c:1042
+#: src/addressbook.c:1046
 msgid "Input the name of new group:"
 msgstr "ÊäÈëÐÂȺ×éµÄÃû×Ö"
 
-#: src/addressbook.c:1043
+#: src/addressbook.c:1047
 msgid "NewGroup"
 msgstr "ÐÂȺ×é"
 
-#: src/addressbook.c:1118
+#: src/addressbook.c:1122
 msgid "Edit group"
 msgstr "±à¼­Èº×é"
 
-#: src/addressbook.c:1119
+#: src/addressbook.c:1123
 msgid "Input the new name of group:"
 msgstr "ÊäÈëȺ×éµÄÐÂÃû×Ö"
 
-#: src/addressbook.c:1169
+#: src/addressbook.c:1173
 msgid "Edit folder"
 msgstr "±à¼­Îļþ¼Ð"
 
-#: src/addressbook.c:1170
+#: src/addressbook.c:1174
 msgid "Input the new name of folder:"
 msgstr "ÊäÈëÎļþ¼ÐµÄÐÂÃû×Ö£º"
 
-#: src/addressbook.c:1219
+#: src/addressbook.c:1223
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "ȷʵҪɾ³ý `%s' ? "
 
-#: src/addressbook.c:1267
+#: src/addressbook.c:1271
 msgid "Edit address"
 msgstr "±à¼­µØÖ·"
 
-#: src/addressbook.c:1286 src/compose.c:2741 src/select-keys.c:273
+#: src/addressbook.c:1290 src/compose.c:2803 src/select-keys.c:302
 msgid "Address"
 msgstr "µØÖ·"
 
-#: src/addressbook.c:1290 src/compose.c:1460 src/compose.c:3069
-#: src/compose.c:3638 src/foldersel.c:176 src/import.c:172
-#: src/inputdialog.c:156 src/main.c:286 src/mainwindow.c:1630
-#: src/mimeview.c:705 src/passphrase.c:119 src/prefs.c:468
-#: src/prefs_common.c:2664 src/progressdialog.c:70 src/select-keys.c:289
-#: src/summaryview.c:569 src/summaryview.c:2012 src/summaryview.c:2518
+#: src/addressbook.c:1294 src/compose.c:1476 src/compose.c:3133
+#: src/compose.c:3703 src/export.c:186 src/foldersel.c:177 src/import.c:190
+#: src/inputdialog.c:161 src/main.c:334 src/main.c:342 src/mainwindow.c:1660
+#: src/mimeview.c:716 src/passphrase.c:123 src/prefs.c:468
+#: src/prefs_common.c:2182 src/prefs_customheader.c:163
+#: src/prefs_display_header.c:204 src/progressdialog.c:75
+#: src/select-keys.c:326 src/summaryview.c:575 src/summaryview.c:2025
+#: src/summaryview.c:2541
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: src/addressbook.c:1520
+#: src/addressbook.c:1524
 msgid "Reading addressbook file..."
 msgstr "¶ÁÈ¡µØÖ·²¾Îļþ..."
 
-#: src/addressbook.c:1524
+#: src/addressbook.c:1528
 #, c-format
 msgid "%s doesn't exist.\n"
 msgstr "%s ²»´æÔÚ¡£\n"
 
-#: src/addressbook.c:1546 src/addressbook.c:1839 src/imap.c:618
-#: src/mainwindow.c:660 src/mainwindow.c:1262 src/mh.c:840 src/mh.c:847
-#: src/news.c:483 src/procmsg.c:257 src/procmsg.c:321 src/summaryview.c:990
-#: src/summaryview.c:1196 src/summaryview.c:1278 src/summaryview.c:1339
-#: src/summaryview.c:1796 src/summaryview.c:2269 src/summaryview.c:2292
-#: src/summaryview.c:2313 src/summaryview.c:2406
+#: src/addressbook.c:1550 src/addressbook.c:1843 src/imap.c:869 src/imap.c:888
+#: src/mainwindow.c:676 src/mainwindow.c:1288 src/mh.c:809 src/mh.c:816
+#: src/news.c:648 src/procmsg.c:257 src/procmsg.c:321 src/summaryview.c:1003
+#: src/summaryview.c:1209 src/summaryview.c:1291 src/summaryview.c:1352
+#: src/summaryview.c:1809 src/summaryview.c:2287 src/summaryview.c:2310
+#: src/summaryview.c:2331 src/summaryview.c:2424
 msgid "done.\n"
 msgstr "Íê³É¡£\n"
 
-#: src/addressbook.c:1817
+#: src/addressbook.c:1821
 msgid "Exporting addressbook to file..."
 msgstr "µ¼³öµØÖ·²¾µ½Îļþ..."
 
-#: src/addressbook.c:1835
+#: src/addressbook.c:1839
 msgid "failed to write addressbook data.\n"
 msgstr "дµØÖ·²¾Êý¾Ýʧ°Ü¡£\n"
 
-#: src/alertpanel.c:98 src/compose.c:3240 src/main.c:284
+#: src/alertpanel.c:119 src/compose.c:3306 src/main.c:332
 msgid "Notice"
 msgstr "×¢Òâ"
 
-#: src/alertpanel.c:111
+#: src/alertpanel.c:132 src/main.c:218
 msgid "Warning"
 msgstr "¾¯¸æ"
 
-#: src/alertpanel.c:124
+#: src/alertpanel.c:145 src/inc.c:415
 msgid "Error"
 msgstr "´íÎó"
 
-#: src/alertpanel.c:160
+#: src/alertpanel.c:183
 msgid "Creating alert panel dialog...\n"
 msgstr "ÕýÔÚ´´½¨¾¯¸æÃæ°å¶Ô»°¿ò... \n"
 
+#: src/alertpanel.c:269
+msgid "Show this message next time"
+msgstr ""
+
 #: src/codeconv.c:76 src/codeconv.c:87
 msgid "can't allocate memory\n"
 msgstr "²»ÄÜ»ñµÃÄÚ´æ \n"
 
-#: src/compose.c:365
+#: src/compose.c:367
 msgid "/_Add..."
 msgstr "/Ìí¼Ó...(_A)"
 
-#: src/compose.c:366
+#: src/compose.c:368
 msgid "/_Remove"
 msgstr "/ÒÆÈ¥(_R)"
 
-#: src/compose.c:368 src/folderview.c:203 src/folderview.c:214
-#: src/folderview.c:225
+#: src/compose.c:370 src/folderview.c:209 src/folderview.c:220
+#: src/folderview.c:231
 msgid "/_Property..."
 msgstr "/ÊôÐÔ...(_P)"
 
-#: src/compose.c:374
+#: src/compose.c:376
 msgid "/_File/_Attach file"
 msgstr "/Îļþ(_F)/¸½¼ÓÎļþ(_A)"
 
-#: src/compose.c:375
+#: src/compose.c:377
 msgid "/_File/_Insert file"
 msgstr "/Îļþ(_F)/²åÈëÎļþ(_I)"
 
-#: src/compose.c:376
+#: src/compose.c:378
 msgid "/_File/Insert si_gnature"
 msgstr "/Îļþ(_F)/²åÈëÇ©Ãû(_g)"
 
-#: src/compose.c:381
+#: src/compose.c:383
 msgid "/_Edit/_Undo"
 msgstr "/±à¼­(_E)/³·Ïú(_U)"
 
-#: src/compose.c:382
+#: src/compose.c:384
 msgid "/_Edit/_Redo"
 msgstr "/±à¼­(_E)/Öظ´(_R)"
 
-#: src/compose.c:383 src/compose.c:388 src/mainwindow.c:344
+#: src/compose.c:385 src/compose.c:390 src/mainwindow.c:354
 msgid "/_Edit/---"
 msgstr "/±à¼­(_E)/---"
 
-#: src/compose.c:384
+#: src/compose.c:386
 msgid "/_Edit/Cu_t"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_t)"
 
-#: src/compose.c:385 src/mainwindow.c:342
+#: src/compose.c:387 src/mainwindow.c:352
 msgid "/_Edit/_Copy"
 msgstr "/±à¼­(_E)/¸´ÖÆ(_C)"
 
-#: src/compose.c:386
+#: src/compose.c:388
 msgid "/_Edit/_Paste"
 msgstr "/±à¼­(_E)/Õ³Ìù(_P)"
 
-#: src/compose.c:387 src/mainwindow.c:343
+#: src/compose.c:389 src/mainwindow.c:353
 msgid "/_Edit/Select _all"
 msgstr "/±à¼­(_E)/È«Ñ¡(_a)"
 
-#: src/compose.c:389
+#: src/compose.c:391
 msgid "/_Edit/Wrap long _lines"
 msgstr "/±à¼­(_E)/³¤ÐÐ×Ô¶¯»»ÐÐ(_l)"
 
-#: src/compose.c:390
+#: src/compose.c:392
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/±à¼­(_E)/ÓÃÍⲿ±à¼­Æ÷±à¼­(_x)"
 
-#: src/compose.c:393 src/mainwindow.c:431
+#: src/compose.c:395 src/mainwindow.c:444
 msgid "/_Message"
 msgstr "/Óʼþ(_M)"
 
-#: src/compose.c:394
+#: src/compose.c:396
 msgid "/_Message/_Send"
 msgstr "/Óʼþ(_M)/·¢ËÍ(_S)"
 
-#: src/compose.c:396
+#: src/compose.c:398
 msgid "/_Message/Send _later"
 msgstr "/Óʼþ(_M)/ÒÔºó·¢ËÍ(_l)"
 
-#: src/compose.c:398
+#: src/compose.c:400
 msgid "/_Message/Save to _draft folder"
 msgstr "/Óʼþ(_M)/±£´æµ½²Ý¸åÎļþ¼Ð(_d)"
 
-#: src/compose.c:400 src/compose.c:405 src/compose.c:407 src/compose.c:410
-#: src/mainwindow.c:435 src/mainwindow.c:438 src/mainwindow.c:445
-#: src/mainwindow.c:456
+#: src/compose.c:402 src/compose.c:407 src/compose.c:409 src/compose.c:412
+#: src/mainwindow.c:448 src/mainwindow.c:451 src/mainwindow.c:459
+#: src/mainwindow.c:470
 msgid "/_Message/---"
 msgstr "/Óʼþ(_M)/---"
 
-#: src/compose.c:401
+#: src/compose.c:403
 msgid "/_Message/_To"
 msgstr ""
 
-#: src/compose.c:402
+#: src/compose.c:404
 msgid "/_Message/_Cc"
 msgstr ""
 
-#: src/compose.c:403
+#: src/compose.c:405
 msgid "/_Message/_Bcc"
 msgstr "/Óʼþ(_M)/°µ³­ËÍ(_B)"
 
-#: src/compose.c:404
+#: src/compose.c:406
 msgid "/_Message/_Reply to"
 msgstr "/Óʼþ(_M)/»Ø¸´(_R)"
 
-#: src/compose.c:406
+#: src/compose.c:408
 msgid "/_Message/_Followup to"
 msgstr ""
 
-#: src/compose.c:408
+#: src/compose.c:410
 msgid "/_Message/_Attach"
 msgstr "/Óʼþ(_M)/¸½¼þ(_A)"
 
-#: src/compose.c:411
+#: src/compose.c:413
 msgid "/_Message/Si_gn"
 msgstr ""
 
-#: src/compose.c:412
+#: src/compose.c:414
 msgid "/_Message/_Encrypt"
 msgstr ""
 
-#: src/compose.c:414 src/mainwindow.c:488
+#: src/compose.c:416 src/mainwindow.c:502
 msgid "/_Tool"
 msgstr "/¹¤¾ß(_T)"
 
-#: src/compose.c:415
+#: src/compose.c:417
 msgid "/_Tool/Show _ruler"
 msgstr "/¹¤¾ß(_T)/ÏÔʾ±ê³ß(_r)"
 
-#: src/compose.c:416 src/mainwindow.c:489
+#: src/compose.c:418 src/mainwindow.c:503
 msgid "/_Tool/_Address book"
 msgstr "/¹¤¾ß(_T)/µØÖ·²¾(_A)"
 
-#: src/compose.c:486 src/compose.c:556 src/compose.c:614 src/procmsg.c:675
+#: src/compose.c:494 src/compose.c:564 src/compose.c:624 src/procmsg.c:687
 msgid "Can't get text part\n"
 msgstr "%s: ²»Äܵõ½Îı¾²¿·Ö\n"
 
-#: src/compose.c:548
+#: src/compose.c:556
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: Îļþ²»´æÔÚ\n"
 
-#: src/compose.c:560
+#: src/compose.c:568
 msgid ""
 "\n"
 "\n"
@@ -559,64 +565,64 @@ msgstr ""
 "\n"
 "¿ªÊ¼×ª·¢µÄÐżþ£º\n"
 
-#: src/compose.c:1224
+#: src/compose.c:1240
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Îļþ %s ²»´æÔÚ \n"
 
-#: src/compose.c:1228
+#: src/compose.c:1244
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "²»ÄÜ»ñµÃÎļþ %s µÄ´óС \n"
 
-#: src/compose.c:1232
+#: src/compose.c:1248
 #, c-format
 msgid "File %s is empty\n"
 msgstr "Îļþ %s ÊÇ¿ÕµÄ \n"
 
-#: src/compose.c:1253
+#: src/compose.c:1269
 #, c-format
 msgid "Message: %s"
 msgstr "Óʼþ£º%s"
 
-#: src/compose.c:1359
+#: src/compose.c:1375
 msgid " [Edited]"
 msgstr ""
 
-#: src/compose.c:1361
+#: src/compose.c:1377
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ׫дÓʼþ%s"
 
-#: src/compose.c:1364
+#: src/compose.c:1380
 #, c-format
 msgid "Compose message%s"
 msgstr "׫дÓʼþ%s"
 
-#: src/compose.c:1386 src/compose.c:3530
+#: src/compose.c:1402 src/compose.c:3596
 msgid "Recipient is not specified."
 msgstr "ÊÕÐÅÈËûָ¶¨¡£"
 
-#: src/compose.c:1404
+#: src/compose.c:1420
 msgid "can't get recipient list."
 msgstr ""
 
-#: src/compose.c:1422
+#: src/compose.c:1438
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
 
-#: src/compose.c:1443
+#: src/compose.c:1459
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr ""
 
-#: src/compose.c:1457
+#: src/compose.c:1473
 msgid "Queueing"
 msgstr "ÕýÔÚÅŶÓ"
 
-#: src/compose.c:1458
+#: src/compose.c:1474
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
@@ -624,172 +630,172 @@ msgstr ""
 "ÔÚ·¢ËÍÓʼþʱ·¢Éú´íÎó¡£\n"
 "ÊÇ·ñ½«¸ÃÓʼþ·Åµ½ÅŶÓÎļþ¼ÐÖУ¿"
 
-#: src/compose.c:1464 src/compose.c:3542
+#: src/compose.c:1480 src/compose.c:3608
 msgid "Can't queue the message."
 msgstr "¸ÃÓʼþ²»ÄÜÅŶӡ£"
 
-#: src/compose.c:1467
+#: src/compose.c:1483
 msgid "Error occurred while sending the message."
 msgstr "ÔÚ·¢ËÍÓʼþʱ·¢Éú´íÎó¡£"
 
-#: src/compose.c:1474 src/compose.c:3549
+#: src/compose.c:1490 src/compose.c:3615
 msgid "Can't save the message to outbox."
 msgstr "²»Äܽ«¸ÃÓʼþ±£´æµ½·¢¼þÏä¡£"
 
-#: src/compose.c:1500 src/compose.c:1621 src/compose.c:1707 src/utils.c:1446
+#: src/compose.c:1516 src/compose.c:1637 src/compose.c:1723 src/utils.c:1540
 msgid "can't change file mode\n"
 msgstr "²»ÄܸıäÎļþÊôÐÔ \n"
 
-#: src/compose.c:1526
+#: src/compose.c:1542
 msgid "Can't convert the codeset of the message."
 msgstr "²»Äܸıä¸ÃÓʼþµÄ×Ö·û¼¯"
 
-#: src/compose.c:1535
+#: src/compose.c:1551
 msgid "can't write headers\n"
 msgstr "²»ÄÜд±êÌâ\n"
 
-#: src/compose.c:1653
+#: src/compose.c:1669
 msgid "saving sent message...\n"
 msgstr "±£´æÒÑ·¢Ë͵ÄÓʼþ... \n"
 
-#: src/compose.c:1658
+#: src/compose.c:1674
 msgid "can't save message\n"
 msgstr "²»Äܱ£´æÓʼþ\n"
 
-#: src/compose.c:1664 src/compose.c:1772
+#: src/compose.c:1680 src/compose.c:1787
 msgid "can't open mark file\n"
 msgstr "²»ÄÜ´ò¿ª±ê¼ÇÎļþ \n"
 
-#: src/compose.c:1687
+#: src/compose.c:1703
 msgid "queueing message...\n"
 msgstr "ÕýÔÚÅŶÓÓʼþ...\n"
 
-#: src/compose.c:1762
+#: src/compose.c:1778
 msgid "can't queue the message\n"
 msgstr "¸ÃÓʼþ²»ÄÜÅŶÓ\n"
 
-#: src/compose.c:1798
+#: src/compose.c:1816
 #, c-format
 msgid "Can't open file %s\n"
 msgstr "²»ÄÜ´ò¿ªÎļþ%s\n"
 
-#: src/compose.c:2111
+#: src/compose.c:2170
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "ÒÑÉú³ÉÓʼþ±êʶºÅ£º%s\n"
 
-#: src/compose.c:2185 src/compose.c:3040
+#: src/compose.c:2244 src/compose.c:3104
 msgid "MIME type"
 msgstr "MIME ÀàÐÍ"
 
-#: src/compose.c:2185 src/mimeview.c:135 src/prefs_common.c:2658
-#: src/select-keys.c:270 src/summaryview.c:360
+#: src/compose.c:2244 src/mimeview.c:139 src/prefs_common.c:2176
+#: src/select-keys.c:299 src/summaryview.c:362
 msgid "Size"
 msgstr "´óС"
 
-#: src/compose.c:2202
+#: src/compose.c:2261
 msgid "Creating compose window...\n"
 msgstr "´´½¨×«Ð´´°¿Ú...\n"
 
-#: src/compose.c:2248 src/headerview.c:54 src/summary_search.c:145
+#: src/compose.c:2307 src/headerview.c:54 src/summary_search.c:145
 msgid "From:"
 msgstr "·¢¼þÈË£º"
 
-#: src/compose.c:2668 src/mainwindow.c:1333 src/prefs_account.c:459
-#: src/prefs_common.c:630
+#: src/compose.c:2730 src/mainwindow.c:1359 src/prefs_account.c:501
+#: src/prefs_common.c:636
 msgid "Send"
 msgstr "·¢ËÍ"
 
-#: src/compose.c:2669
+#: src/compose.c:2731
 msgid "Send message"
 msgstr "·¢ËÍÓʼþ"
 
-#: src/compose.c:2676
+#: src/compose.c:2738
 msgid "Send later"
 msgstr "ÒÔºó·¢ËÍ"
 
-#: src/compose.c:2677
+#: src/compose.c:2739
 msgid "Put into queue folder and send later"
 msgstr "·ÅÈëÅŶÓÎļþ¼ÐÒÔºó·¢ËÍ"
 
-#: src/compose.c:2684 src/folderview.c:619
+#: src/compose.c:2746 src/folderview.c:738
 msgid "Draft"
 msgstr "²Ý¸å"
 
-#: src/compose.c:2685
+#: src/compose.c:2747
 msgid "Save to draft folder"
 msgstr "±£´æµ½²Ý¸åÎļþ¼Ð"
 
-#: src/compose.c:2694
+#: src/compose.c:2756
 msgid "Insert"
 msgstr "²åÈë"
 
-#: src/compose.c:2695
+#: src/compose.c:2757
 msgid "Insert file"
 msgstr "²åÈëÎļþ"
 
-#: src/compose.c:2702
+#: src/compose.c:2764
 msgid "Attach"
 msgstr "¸½¼þ"
 
-#: src/compose.c:2703
+#: src/compose.c:2765
 msgid "Attach file"
 msgstr "¸½¼ÓÎļþ"
 
-#: src/compose.c:2712 src/prefs_common.c:1031
+#: src/compose.c:2774 src/prefs_common.c:1035
 msgid "Signature"
 msgstr "Ç©Ãû"
 
-#: src/compose.c:2713
+#: src/compose.c:2775
 msgid "Insert signature"
 msgstr "²åÈëÇ©Ãû"
 
-#: src/compose.c:2721
+#: src/compose.c:2783
 msgid "Editor"
 msgstr "±à¼­Æ÷"
 
-#: src/compose.c:2722
+#: src/compose.c:2784
 msgid "Edit with external editor"
 msgstr "ÓÃÍⲿ±à¼­Æ÷±à¼­"
 
-#: src/compose.c:2730
+#: src/compose.c:2792
 msgid "Linewrap"
 msgstr "»»ÐÐ"
 
-#: src/compose.c:2731
+#: src/compose.c:2793
 msgid "Wrap long lines"
 msgstr "³¤ÐÐ×Ô¶¯»»ÐÐ"
 
-#: src/compose.c:2936
+#: src/compose.c:3000
 msgid "Invalid MIME type."
 msgstr "ÎÞЧMIMEÀàÐÍ"
 
-#: src/compose.c:2954
+#: src/compose.c:3018
 msgid "File doesn't exist or is empty."
 msgstr "Îļþ²»´æÔÚ»òΪ¿Õ¡£"
 
-#: src/compose.c:3022
+#: src/compose.c:3086
 msgid "Property"
 msgstr "ÊôÐÔ"
 
-#: src/compose.c:3042
+#: src/compose.c:3106
 msgid "Encoding"
 msgstr "±àÂë"
 
-#: src/compose.c:3065
+#: src/compose.c:3129
 msgid "Path"
 msgstr "·¾¶"
 
-#: src/compose.c:3066
+#: src/compose.c:3130
 msgid "File name"
 msgstr "ÎļþÃû"
 
-#: src/compose.c:3211
+#: src/compose.c:3277
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Íⲿ±à¼­Æ÷ÃüÁîÐÐÎÞЧ£º`%s'\n"
 
-#: src/compose.c:3237
+#: src/compose.c:3303
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -800,176 +806,206 @@ msgstr ""
 "Ç¿ÖƽáÊø³ÌÐò£¿\n"
 "³ÌÐò×é±êʶºÅ£º%d"
 
-#: src/compose.c:3250
+#: src/compose.c:3316
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "ÒѽáÊø³ÌÐò×é±êʶºÅ£º%d"
 
-#: src/compose.c:3251
+#: src/compose.c:3317
 #, c-format
 msgid "Temporary file: %s"
 msgstr "ÁÙʱÎļþ£º%s"
 
-#: src/compose.c:3275
+#: src/compose.c:3341
 msgid "Compose: input from monitoring process\n"
 msgstr "׫д£º´Ó¼àÌý½ø³ÌÖÐÊäÈë\n"
 
 #. failed
-#: src/compose.c:3308
+#: src/compose.c:3374
 msgid "Couldn't exec external editor\n"
 msgstr "²»ÄÜÖ´ÐÐÍⲿ±à¼­Æ÷\n"
 
-#: src/compose.c:3312
+#: src/compose.c:3378
 msgid "Couldn't write to file\n"
 msgstr "²»ÄÜдÈëÎļþ\n"
 
-#: src/compose.c:3314
+#: src/compose.c:3380
 msgid "Pipe read failed\n"
 msgstr "¹ÜµÀ¶Áȡʧ°Ü\n"
 
-#: src/compose.c:3571
+#: src/compose.c:3637
 msgid "can't remove the old draft message\n"
 msgstr ""
 
-#: src/compose.c:3600 src/compose.c:3612
+#: src/compose.c:3665 src/compose.c:3677
 msgid "Select file"
 msgstr "Ñ¡ÔñÎļþ"
 
-#: src/compose.c:3636
+#: src/compose.c:3701
 msgid "Discard message"
 msgstr "¶ªÆúÎļþ"
 
-#: src/compose.c:3637
+#: src/compose.c:3702
 msgid "This message has been modified. discard it?"
 msgstr "¸ÃÓʼþÒѸü¸Ä¡£¶ªÆúËü£¿"
 
-#: src/compose.c:3638
+#: src/compose.c:3703
 msgid "Discard"
 msgstr "¶ªÆú"
 
-#: src/compose.c:3638
+#: src/compose.c:3703
 msgid "to Draft"
 msgstr "È¥²Ý¸å"
 
-#: src/foldersel.c:130
+#: src/export.c:122
+msgid "Export"
+msgstr ""
+
+#: src/export.c:144
+msgid "Specify target folder and mbox file."
+msgstr ""
+
+#: src/export.c:154
+msgid "Source dir:"
+msgstr ""
+
+#: src/export.c:159
+msgid "Exporting file:"
+msgstr ""
+
+#: src/export.c:172 src/export.c:178 src/import.c:176 src/import.c:182
+#: src/prefs_filter.c:349
+msgid " Select... "
+msgstr "Ñ¡Ôñ..."
+
+#: src/export.c:217
+msgid "Select exporting file"
+msgstr ""
+
+#: src/foldersel.c:131
 msgid "Select folder"
 msgstr "Ñ¡ÔñÎļþ¼Ð"
 
-#: src/folderview.c:197 src/folderview.c:208
+#: src/folderview.c:203 src/folderview.c:214
 msgid "/Create _new folder..."
 msgstr "/´´½¨ÐÂÎļþ¼Ð(_N)..."
 
-#: src/folderview.c:198 src/folderview.c:209
+#: src/folderview.c:204 src/folderview.c:215
 msgid "/_Rename folder..."
 msgstr "/Îļþ¼ÐÖØÃüÃû(_R)..."
 
-#: src/folderview.c:199 src/folderview.c:210
+#: src/folderview.c:205 src/folderview.c:216
 msgid "/_Delete folder"
 msgstr "/ɾ³ýÎļþ¼Ð(_D)"
 
-#: src/folderview.c:201
+#: src/folderview.c:207
 msgid "/Remove _mailbox"
 msgstr ""
 
-#: src/folderview.c:212
+#: src/folderview.c:218
 msgid "/Remove _IMAP4 server"
 msgstr ""
 
-#: src/folderview.c:219
+#: src/folderview.c:225
 msgid "/_Subscribe to newsgroup..."
 msgstr "/¶©ÔÄÐÂÎÅ×é(_S)..."
 
-#: src/folderview.c:221
+#: src/folderview.c:227
 msgid "/_Remove newsgroup"
 msgstr "/ÐÂÎÅ×éÖØÃüÃû(_R)"
 
-#: src/folderview.c:223
+#: src/folderview.c:229
 msgid "/Remove _news server"
 msgstr "ÒÆÈ¥ÐÂÎÅ×é·þÎñÆ÷(_n)"
 
-#: src/folderview.c:234
+#: src/folderview.c:240
 msgid "Folder"
 msgstr "Îļþ¼Ð"
 
-#: src/folderview.c:234
+#: src/folderview.c:240
 msgid "New"
 msgstr "н¨"
 
-#: src/folderview.c:235 src/prefs_common.c:2655
+#: src/folderview.c:241 src/prefs_common.c:2173
 msgid "Unread"
 msgstr "δ¶ÁÈ¡"
 
-#: src/folderview.c:235
+#: src/folderview.c:241
 msgid "#"
 msgstr ""
 
-#: src/folderview.c:245
+#: src/folderview.c:251
 msgid "Creating folder view...\n"
 msgstr "´´½¨Îļþ¼ÐÊÓͼ...\n"
 
-#: src/folderview.c:382
+#: src/folderview.c:395
 msgid "Setting folder info...\n"
 msgstr "ÉèÖÃÎļþ¼ÐÐÅÏ¢...\n"
 
-#: src/folderview.c:383
+#: src/folderview.c:396
 msgid "Setting folder info..."
 msgstr "ÉèÖÃÎļþ¼ÐÐÅÏ¢..."
 
-#: src/folderview.c:516 src/mainwindow.c:2042 src/setup.c:81
+#: src/folderview.c:539 src/mainwindow.c:2092 src/setup.c:81
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "ɨÃèÎļþ¼Ð %s%c%s ..."
 
-#: src/folderview.c:521 src/mainwindow.c:2047 src/setup.c:86
+#: src/folderview.c:544 src/mainwindow.c:2097 src/setup.c:86
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "ɨÃèÎļþ¼Ð %s ..."
 
-#: src/folderview.c:558
+#: src/folderview.c:581
 msgid "Updating all folders..."
 msgstr ""
 
-#: src/folderview.c:597 src/prefs_account.c:608
+#: src/folderview.c:716 src/prefs_account.c:655
 msgid "Inbox"
 msgstr "ÊÕ¼þÏä"
 
-#: src/folderview.c:602
+#: src/folderview.c:721
 msgid "Outbox"
 msgstr "·¢¼þÏä"
 
-#: src/folderview.c:607
+#: src/folderview.c:726
 msgid "Queue"
 msgstr "¶ÓÁÐ"
 
-#: src/folderview.c:612
+#: src/folderview.c:731
 msgid "Trash"
 msgstr "À¬»øÏä"
 
-#: src/folderview.c:1057
+#: src/folderview.c:1213
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Îļþ¼Ð %s Ñ¡ÔñÁË\n"
 
-#: src/folderview.c:1147 src/folderview.c:1205 src/folderview.c:1340
+#: src/folderview.c:1327 src/folderview.c:1390 src/folderview.c:1531
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "×Ö·û`%c'²»ÄÜ°üº¬ÔÚÎļþ¼ÐÃû×ÖÖС£"
 
-#: src/folderview.c:1155 src/folderview.c:1214 src/folderview.c:1348
+#: src/folderview.c:1335 src/folderview.c:1399 src/folderview.c:1539
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Îļþ¼Ð`%s'ÒÑ´æÔÚ¡£"
 
-#: src/folderview.c:1197
+#: src/folderview.c:1343 src/folderview.c:1547
+#, fuzzy, c-format
+msgid "Can't create the folder `%s'."
+msgstr "²»ÄÜÒÆÈ¥Îļþ¼Ð `%s'\n"
+
+#: src/folderview.c:1382
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Ϊ`%s'ÊäÈëÐÂÃû×Ö£º"
 
-#: src/folderview.c:1199
+#: src/folderview.c:1384
 msgid "Rename folder"
 msgstr "Îļþ¼ÐÖØÃüÃû"
 
-#: src/folderview.c:1259
+#: src/folderview.c:1444
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
@@ -978,68 +1014,75 @@ msgstr ""
 "ËùÓÐÔÚ`%s'ϵÄÎļþ¼ÐºÍÓʼþ½«±»É¾³ý¡£\n"
 "ÄãȷʵϣÍûɾ³ýÂð£¿"
 
-#: src/folderview.c:1262 src/folderview.c:1393
+#: src/folderview.c:1447 src/folderview.c:1589
 msgid "Delete folder"
 msgstr "ɾ³ýÎļþ¼Ð"
 
-#: src/folderview.c:1268
-#, c-format
-msgid "can't remove folder `%s'\n"
+#: src/folderview.c:1453 src/folderview.c:1595
+#, fuzzy, c-format
+msgid "Can't remove the folder `%s'."
 msgstr "²»ÄÜÒÆÈ¥Îļþ¼Ð `%s'\n"
 
-#: src/folderview.c:1301
+#: src/folderview.c:1487
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 "(The messages are NOT deleted from disk)"
 msgstr ""
 
-#: src/folderview.c:1304
+#: src/folderview.c:1490
 msgid "Remove folder"
 msgstr ""
 
-#: src/folderview.c:1391
+#: src/folderview.c:1523
+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 ""
+
+#: src/folderview.c:1587
 #, c-format
 msgid "Really delete folder `%s'?"
 msgstr ""
 
-#: src/folderview.c:1424
+#: src/folderview.c:1628
 #, c-format
 msgid "Really delete IMAP4 server `%s'?"
 msgstr ""
 
-#: src/folderview.c:1426
+#: src/folderview.c:1630
 msgid "Delete IMAP4 server"
 msgstr ""
 
-#: src/folderview.c:1467
+#: src/folderview.c:1671
 msgid "Subscribe newsgroup"
 msgstr "¶©ÔÄÐÂÎÅ×é"
 
-#: src/folderview.c:1468
+#: src/folderview.c:1672
 msgid "Input subscribing newsgroup:"
 msgstr "ÊäÈëÒª¶©ÔĵÄÐÂÎÅ×飺"
 
-#: src/folderview.c:1477
+#: src/folderview.c:1681
 #, c-format
 msgid "The newsgroup `%s' already exists."
 msgstr "ÐÂÎÅ×é`%s'ÒÑ´æÔÚ¡£"
 
-#: src/folderview.c:1523
+#: src/folderview.c:1727
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "ȷʵҪɾ³ýÐÂÎÅ×é `%s'£¿"
 
-#: src/folderview.c:1525
+#: src/folderview.c:1729
 msgid "Delete newsgroup"
 msgstr "ɾ³ýÐÂÎÅ×é"
 
-#: src/folderview.c:1556
+#: src/folderview.c:1760
 #, c-format
 msgid "Really delete news server `%s'?"
 msgstr "ȷʵҪɾ³ýÐÂÎÅ·þÎñÆ÷ `%s'£¿"
 
-#: src/folderview.c:1558
+#: src/folderview.c:1762
 msgid "Delete news server"
 msgstr "ɾ³ýÐÂÎÅ·þÎñÆ÷"
 
@@ -1059,11 +1102,11 @@ msgstr "
 msgid "Creating header view...\n"
 msgstr "ÕýÔÚ´´½¨±êÌâÊÓͼ...\n"
 
-#: src/headerview.c:172 src/summaryview.c:1379
+#: src/headerview.c:174 src/summaryview.c:1392
 msgid "(No From)"
 msgstr "£¨Ã»Óз¢¼þÈË£©"
 
-#: src/headerview.c:187 src/summaryview.c:1395
+#: src/headerview.c:189 src/summaryview.c:1408
 msgid "(No Subject)"
 msgstr "£¨Ã»ÓÐÖ÷Ì⣩"
 
@@ -1093,206 +1136,269 @@ msgstr "
 msgid "Can't load the image."
 msgstr "²»ÄܼÓÔظÃͼÏñ¡£"
 
-#: src/imap.c:141
+#: src/imap.c:204
 #, c-format
 msgid "IMAP4 connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "µ½ %s:%d µÄ IMAP4Á¬½ÓÒѶϿª¡£ÖØÐÂÁ¬½Ó...\n"
 
-#: src/imap.c:164
+#: src/imap.c:230
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ÕýÔÚ´´½¨µ½ %s:%d µÄ IMAP4Á¬½Ó...\n"
 
-#: src/imap.c:231 src/imap.c:419 src/imap.c:455
-#, c-format
-msgid "can't select folder: %s\n"
-msgstr ""
-
-#: src/imap.c:304
+#: src/imap.c:385
 #, c-format
 msgid "message %d has been already cached.\n"
 msgstr "Óʼþ %d ÒÑ»º´æ¹ý¡£\n"
 
-#: src/imap.c:313
+#: src/imap.c:395
 #, c-format
 msgid "getting message %d...\n"
 msgstr "ÕýÔÚÈ¡µÃÓʼþ %d...\n"
 
-#: src/imap.c:319 src/procmsg.c:575
+#: src/imap.c:401 src/procmsg.c:587
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr ""
 
-#: src/imap.c:340 src/imap.c:381 src/mh.c:170 src/mh.c:263 src/mh.c:334
-#: src/mh.c:417
+#: src/imap.c:430
+#, fuzzy, c-format
+msgid "can't append message %s\n"
+msgstr "²»Äܱ£´æÓʼþ\n"
+
+#: src/imap.c:459 src/imap.c:516 src/mh.c:188 src/mh.c:264 src/mh.c:318
+#: src/mh.c:402
 msgid "the src folder is identical to the dest.\n"
 msgstr "Ô´Îļþ¼ÐÓëÄ¿µÄÎļþ¼ÐÊÇͬһ¸ö¡£\n"
 
-#: src/imap.c:350 src/imap.c:390 src/mh.c:183 src/mh.c:266
+#: src/imap.c:469 src/imap.c:521 src/mh.c:201 src/mh.c:267
 #, c-format
 msgid "Moving message %s%c%d to %s ...\n"
 msgstr "ÕýÔÚÒƶ¯ %s%c%d µ½ %s ...\n"
 
-#: src/imap.c:426
+#: src/imap.c:473 src/imap.c:525 src/mh.c:331 src/mh.c:405
+#, c-format
+msgid "Copying message %s%c%d to %s ...\n"
+msgstr ""
+
+#: src/imap.c:593
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr ""
 
-#: src/imap.c:432 src/imap.c:468
+#: src/imap.c:600 src/imap.c:639
 msgid "can't expunge\n"
 msgstr ""
 
-#: src/imap.c:462
+#: src/imap.c:632
 #, c-format
 msgid "can't set deleted flags: 1:%d\n"
 msgstr ""
 
-#: src/imap.c:521
+#: src/imap.c:744
+msgid "can't create mailbox\n"
+msgstr ""
+
+#: src/imap.c:781
+msgid "can't delete mailbox\n"
+msgstr ""
+
+#: src/imap.c:807
 msgid "can't get envelope\n"
 msgstr "²»ÄÜ»ñµÃÐÅ·â\n"
 
-#: src/imap.c:527
+#: src/imap.c:813
 msgid "error occurred while getting envelope.\n"
 msgstr "»ñÈ¡ÐÅ·âʱ·¢Éú´íÎó¡£\n"
 
-#: src/imap.c:535
+#: src/imap.c:821
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "²»ÄܽâÎöÐŷ⣺%s\n"
 
-#: src/imap.c:565
-#, c-format
-msgid "deleting message %d...\n"
-msgstr "ÕýÔÚɾ³ýÓʼþ %d...\n"
+#: src/imap.c:849
+#, fuzzy, c-format
+msgid "Deleting cached messages %d - %d ... "
+msgstr "\tÕýÔÚɾ³ýËùÓлº´æ´íµÄÓʼþ... "
 
-#: src/imap.c:600
-msgid "\tDeleting all cached messages... "
+#: src/imap.c:882
+#, fuzzy
+msgid "Deleting all cached messages... "
 msgstr "\tÕýÔÚɾ³ýËùÓлº´æ´íµÄÓʼþ... "
 
-#: src/imap.c:628
+#: src/imap.c:896
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "²»ÄÜÁ¬½Óµ½IMAP4·þÎñÆ÷£º%s:%d\n"
 
-#: src/imap.c:653
+#: src/imap.c:929
+#, fuzzy
+msgid "can't get namespace\n"
+msgstr "²»ÄÜ»ñµÃÐÅ·â\n"
+
+#: src/imap.c:1346
+#, c-format
+msgid "can't select folder: %s\n"
+msgstr ""
+
+#: src/imap.c:1401
+#, fuzzy, c-format
+msgid "can't get the next uid of folder: %s\n"
+msgstr "ÊäÈëÎļþ¼ÐµÄÐÂÃû×Ö£º"
+
+#: src/imap.c:1423
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 ×¢²áʧ°Ü¡£\n"
 
-#: src/imap.c:794
+#: src/imap.c:1636
+#, fuzzy, c-format
+msgid "can't append %s to %s\n"
+msgstr "²»ÄÜ°ÑÓʼþ %s ¸´ÖƵ½ %s\n"
+
+#: src/imap.c:1656
 #, c-format
 msgid "can't copy %d to %s\n"
 msgstr ""
 
-#: src/imap.c:1101
+#: src/imap.c:1681
 #, c-format
 msgid "error while imap command: STORE %d:%d %s\n"
 msgstr ""
 
-#: src/imap.c:1149
+#: src/imap.c:1695
 msgid "error while imap command: EXPUNGE\n"
 msgstr ""
 
-#: src/import.c:116
+#: src/import.c:126
 msgid "Import"
 msgstr "µ¼Èë"
 
-#: src/import.c:140
+#: src/import.c:148
+msgid "Specify target mbox file and destination folder."
+msgstr ""
+
+#: src/import.c:158
 msgid "Importing file:"
 msgstr "µ¼ÈëÎļþ£º"
 
-#: src/import.c:145
+#: src/import.c:163
 msgid "Destination dir:"
 msgstr "Ä¿±êĿ¼£º"
 
-#: src/import.c:158 src/import.c:164 src/prefs_common.c:1277
-msgid " Select... "
-msgstr "Ñ¡Ôñ..."
-
-#: src/import.c:201
+#: src/import.c:221
 msgid "Select importing file"
 msgstr "Ñ¡Ôñµ¼ÈëÎļþ"
 
-#: src/inc.c:214
+#: src/inc.c:187 src/inc.c:236 src/send.c:246
+msgid "Standby"
+msgstr ""
+
+#: src/inc.c:255
 msgid "Retrieving new messages"
 msgstr "È¡µÃÐÂÓʼþ"
 
-#: src/inc.c:332
+#: src/inc.c:384 src/news.c:129
 #, c-format
 msgid "Input password for %s on %s:"
 msgstr ""
 
-#: src/inc.c:336
+#: src/inc.c:388 src/news.c:131
 msgid "Input password"
 msgstr "ÊäÈëÃÜÂë"
 
-#: src/inc.c:358
+#: src/inc.c:405
+msgid "Retrieving"
+msgstr ""
+
+#: src/inc.c:412
+msgid "Done"
+msgstr ""
+
+#: src/inc.c:421
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr ""
 
-#: src/inc.c:420
+#: src/inc.c:487
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "ÕýÔÚ´Ó %s ÕÊ»§È¡µÃÐÂÓʼþ...\n"
 
-#: src/inc.c:428
+#: src/inc.c:495
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s£ºÕýÔÚÈ¡»ØÐÂÓʼþ"
 
-#: src/inc.c:449
+#: src/inc.c:516
 #, c-format
 msgid "Connecting to POP3 server: %s ..."
 msgstr "ÕýÔÚÁ¬½ÓPOP3·þÎñÆ÷£º%s ..."
 
-#: src/inc.c:460 src/inc.c:588
+#: src/inc.c:527 src/inc.c:660
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "²»ÄÜÁ¬½ÓPOP3·þÎñÆ÷£º%s:%d\n"
 
-#: src/inc.c:463 src/inc.c:591
+#: src/inc.c:530 src/inc.c:663
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "²»ÄÜÁ¬½ÓPOP3·þÎñÆ÷£º%s:%d"
 
-#: src/inc.c:622
-msgid "Authorizing"
+#: src/inc.c:694 src/inc.c:744
+#, c-format
+msgid "Retrieving message (%d / %d) (%d / %d bytes)"
+msgstr "ÕýÔÚÈ¡»ØÓʼþ (%d / %d) (%d / %d bytes)"
+
+#: src/inc.c:719
+#, fuzzy
+msgid "Authorizing..."
 msgstr "ÕýÔÚÑéÖ¤"
 
-#: src/inc.c:631
-msgid "Getting number of new messages"
+#: src/inc.c:724
+#, fuzzy
+msgid "Getting the number of new messages (STAT)..."
 msgstr "ÕýÔÚÈ¡µÃÐÂÓʼþµÄÊýÁ¿"
 
-#: src/inc.c:636
-#, c-format
-msgid "Retrieving message (%d / %d)"
-msgstr "ÕýÔÚÈ¡»ØÓʼþ (%d / %d)"
+#: src/inc.c:729
+#, fuzzy
+msgid "Getting the number of new messages (LAST)..."
+msgstr "ÕýÔÚÈ¡µÃÐÂÓʼþµÄÊýÁ¿"
+
+#: src/inc.c:734
+#, fuzzy
+msgid "Getting the number of new messages (UIDL)..."
+msgstr "ÕýÔÚÈ¡µÃÐÂÓʼþµÄÊýÁ¿"
 
-#: src/inc.c:644
+#: src/inc.c:739
+#, fuzzy
+msgid "Getting the size of messages (LIST)..."
+msgstr "ÕýÔÚÈ¡µÃÐÂÓʼþµÄÊýÁ¿"
+
+#: src/inc.c:755
 msgid "Deleting message"
 msgstr "ɾ³ýÓʼþ"
 
-#: src/inc.c:648
+#: src/inc.c:759
 msgid "Quitting"
 msgstr "Í˳ö"
 
-#: src/inc.c:676
+#: src/inc.c:787
 msgid "a message won't be received\n"
 msgstr "ûÓÐÊÕµ½Óʼþ\n"
 
-#: src/inc.c:703
+#: src/inc.c:813
 msgid "Error occurred while processing mail."
 msgstr "ÔÚ´¦ÀíÓʼþʱ·¢Éú´íÎó¡£"
 
-#: src/inc.c:706
+#: src/inc.c:816
 msgid "No disk space left."
 msgstr "ûÓÐÊ£Óà´ÅÅ̿ռ䡣"
 
-#: src/inc.c:757
+#: src/inc.c:867
 msgid "no messages in local mailbox.\n"
 msgstr "ûÓÐÓʼþÔÚ±¾µØÓÊÏä¡£\n"
 
-#: src/inc.c:768
+#: src/inc.c:881
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "´Ó %s È¡ÐÂÓʼþµ½ %s...\n"
@@ -1306,7 +1412,7 @@ msgid "Protocol log"
 msgstr "ЭÒéÈÕÖ¾Îļþ"
 
 #. for gettext
-#: src/main.c:100
+#: src/main.c:108
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1315,894 +1421,964 @@ msgstr ""
 "Îļþ`%s'ÒÑ´æÔÚ¡£\n"
 "²»ÄÜ´´½¨Îļþ¼Ð¡£"
 
-#: src/main.c:139
+#: src/main.c:149
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib ²»Ö§³Ö g_thread¡£\n"
 
-#: src/main.c:265
+#: src/main.c:219
+msgid ""
+"GnuPG is not installed properly.\n"
+"OpenPGP support disabled."
+msgstr ""
+
+#: src/main.c:300
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/main.c:267
+#: src/main.c:303
 msgid "  --compose [address]    open composition window"
 msgstr ""
 
-#: src/main.c:268
+#: src/main.c:304
 msgid "  --receive              receive new messages"
 msgstr ""
 
-#: src/main.c:269
+#: src/main.c:305
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 
-#: src/main.c:270
+#: src/main.c:306
 msgid "  --debug                debug mode"
 msgstr ""
 
-#: src/main.c:271
+#: src/main.c:307
 msgid "  --help                 display this help and exit"
 msgstr ""
 
-#: src/main.c:285
+#: src/main.c:308
+msgid "  --version              output version information and exit"
+msgstr ""
+
+#: src/main.c:333
 msgid "Composing message exists. Really quit?"
 msgstr "ÓÐÕýÔÚ׫дµÄÓʼþ¡£È·¶¨ÒªÍ˳öÂð£¿"
 
+#: src/main.c:340
+msgid "Queued messages"
+msgstr ""
+
+#: src/main.c:341
+msgid "Some unsent messages are queued. Exit now?"
+msgstr ""
+
 #. remote command mode
-#: src/main.c:354
+#: src/main.c:412
 msgid "another Sylpheed is already running.\n"
 msgstr ""
 
-#: src/mainwindow.c:325
+#: src/mainwindow.c:334
 msgid "/_File/_Add mailbox..."
 msgstr ""
 
-#: src/mainwindow.c:326
+#: src/mainwindow.c:335
 msgid "/_File/_Update folder tree"
 msgstr "/Îļþ(_F)/¸üÐÂÎļþ¼ÐÊ÷(_U)"
 
-#: src/mainwindow.c:327
+#: src/mainwindow.c:336
 msgid "/_File/_Folder"
 msgstr ""
 
-#: src/mainwindow.c:328
+#: src/mainwindow.c:337
 msgid "/_File/_Folder/Create _new folder..."
 msgstr ""
 
-#: src/mainwindow.c:330
+#: src/mainwindow.c:339
 msgid "/_File/_Folder/_Rename folder..."
 msgstr ""
 
-#: src/mainwindow.c:331
+#: src/mainwindow.c:340
 msgid "/_File/_Folder/_Delete folder"
 msgstr ""
 
-#: src/mainwindow.c:332
+#: src/mainwindow.c:341
 msgid "/_File/_Import mbox file..."
 msgstr "/Îļþ(_F)/µ¼ÈëmboxÎļþ..."
 
-#: src/mainwindow.c:333
+#: src/mainwindow.c:342
+msgid "/_File/_Export to mbox file..."
+msgstr ""
+
+#: src/mainwindow.c:343
 msgid "/_File/Empty _trash"
 msgstr ""
 
-#: src/mainwindow.c:335
+#: src/mainwindow.c:345
 msgid "/_File/_Save as..."
 msgstr "/Îļþ(_F)/Áí´æΪ(_S)..."
 
-#: src/mainwindow.c:336
+#: src/mainwindow.c:346
 msgid "/_File/_Print..."
 msgstr "/Îļþ(_F)/´òÓ¡(_P)..."
 
-#: src/mainwindow.c:339
+#: src/mainwindow.c:349
 msgid "/_File/E_xit"
 msgstr "/Îļþ(_F)/Í˳ö(_X)"
 
-#: src/mainwindow.c:345
+#: src/mainwindow.c:355
 msgid "/_Edit/_Search"
 msgstr "/±à¼­(_E)/²éÕÒ(_S)"
 
-#: src/mainwindow.c:347
+#: src/mainwindow.c:357
 msgid "/_View"
 msgstr "/ÊÓͼ(_V)"
 
-#: src/mainwindow.c:348
+#: src/mainwindow.c:358
 msgid "/_View/_Folder tree"
 msgstr "/ÊÓͼ(_V)/Îļþ¼ÐÊ÷(_F)"
 
-#: src/mainwindow.c:349
+#: src/mainwindow.c:359
 msgid "/_View/_Message view"
 msgstr "/ÊÓͼ(_V)/ÓʼþÊÓͼ(_M)"
 
-#: src/mainwindow.c:350
+#: src/mainwindow.c:360
 msgid "/_View/_Toolbar"
 msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)"
 
-#: src/mainwindow.c:351
+#: src/mainwindow.c:361
 msgid "/_View/_Toolbar/Icon _and text"
 msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/ͼ±êºÍÎÄ×Ö(_A)"
 
-#: src/mainwindow.c:352
+#: src/mainwindow.c:362
 msgid "/_View/_Toolbar/_Icon"
 msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/ͼ±ê(_I)"
 
-#: src/mainwindow.c:353
+#: src/mainwindow.c:363
 msgid "/_View/_Toolbar/_Text"
 msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/ÎÄ×Ö(_T)"
 
-#: src/mainwindow.c:354
-msgid "/_View/_Toolbar/_Non-display"
-msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/²»ÏÔʾ(_N)"
+#: src/mainwindow.c:364
+#, fuzzy
+msgid "/_View/_Toolbar/_None"
+msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/ͼ±ê(_I)"
 
-#: src/mainwindow.c:355
+#: src/mainwindow.c:365
 msgid "/_View/_Status bar"
 msgstr "/ÊÓͼ(_V)/״̬À¸(_S)"
 
-#: src/mainwindow.c:356 src/mainwindow.c:359
+#: src/mainwindow.c:366 src/mainwindow.c:369
 msgid "/_View/---"
 msgstr "/ÊÓͼ(_V)/---"
 
-#: src/mainwindow.c:357
+#: src/mainwindow.c:367
 msgid "/_View/Separate f_older tree"
 msgstr "/ÊÓͼ(_V)/µ¥¶ÀµÄÎļþ¼ÐÊ÷(_o)"
 
-#: src/mainwindow.c:358
+#: src/mainwindow.c:368
 msgid "/_View/Separate m_essage view"
 msgstr "/ÊÓͼ(_V)/µ¥¶ÀµÄÓʼþÊÓͼ(_e)"
 
-#: src/mainwindow.c:360
+#: src/mainwindow.c:370
 msgid "/_View/_Code set"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)"
 
-#: src/mainwindow.c:361
+#: src/mainwindow.c:371
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/×Ô¶¯¼ì²â(_A)"
 
-#: src/mainwindow.c:369
+#: src/mainwindow.c:379
 msgid "/_View/_Code set/---"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/---"
 
-#: src/mainwindow.c:370
+#: src/mainwindow.c:380
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/7λ ascii (US-ASC_II)"
 
-#: src/mainwindow.c:374
+#: src/mainwindow.c:384
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/Unicode (_UTF-8)"
 
-#: src/mainwindow.c:378
+#: src/mainwindow.c:388
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/Î÷Å· (ISO-8859-_1)"
 
-#: src/mainwindow.c:382
+#: src/mainwindow.c:392
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/Î÷Å· (ISO-8859-_2)"
 
-#: src/mainwindow.c:385
+#: src/mainwindow.c:395
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/²¨ÂÞµÄÓï (ISO-8859-13)"
 
-#: src/mainwindow.c:387
+#: src/mainwindow.c:397
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/²¨ÂÞµÄÓï (ISO-8859-_4)"
 
-#: src/mainwindow.c:390
+#: src/mainwindow.c:400
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/Ï£À°Óï (ISO-8859-_7)"
 
-#: src/mainwindow.c:393
+#: src/mainwindow.c:403
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÍÁ¶úÆäÓï (ISO-8859-_9)"
 
-#: src/mainwindow.c:396
+#: src/mainwindow.c:406
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/˹À­·òÓï (ISO-8859-_5)"
 
-#: src/mainwindow.c:398
+#: src/mainwindow.c:408
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/˹À­·òÓï (KOI8-_R)"
 
-#: src/mainwindow.c:400
+#: src/mainwindow.c:410
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/˹À­·òÓï (Windows-1251)"
 
-#: src/mainwindow.c:404
+#: src/mainwindow.c:414
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÈÕÓï (ISO-2022-_JP)"
 
-#: src/mainwindow.c:407
+#: src/mainwindow.c:417
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÈÕÓï (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:410
+#: src/mainwindow.c:420
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÈÕÓï (_EUC-JP)"
 
-#: src/mainwindow.c:412
+#: src/mainwindow.c:422
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÈÕÓï (_Shift__JIS)"
 
-#: src/mainwindow.c:416
+#: src/mainwindow.c:426
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/¼òÌåÖÐÎÄ (_GB2312)"
 
-#: src/mainwindow.c:418
+#: src/mainwindow.c:428
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ (_Big5)"
 
-#: src/mainwindow.c:420
+#: src/mainwindow.c:430
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ (EUC-_TW)"
 
-#: src/mainwindow.c:422
+#: src/mainwindow.c:432
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/ÖÐÎÄ (ISO-2022-_CN)"
 
-#: src/mainwindow.c:425
+#: src/mainwindow.c:435
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/³¯ÏÊÎÄ (EUC-_KR)"
 
-#: src/mainwindow.c:427
+#: src/mainwindow.c:437
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/ÊÓͼ(_V)/×Ö·û¼¯(_C)/³¯ÏÊÎÄ (ISO-2022-KR)"
 
-#: src/mainwindow.c:432
-msgid "/_Message/Rece_ive new mail"
+#: src/mainwindow.c:445
+#, fuzzy
+msgid "/_Message/Get new ma_il"
 msgstr "/Óʼþ(_M)/½ÓÊÕÐÂÓʼþ(_i)"
 
-#: src/mainwindow.c:433
-msgid "/_Message/Receive from _all accounts"
+#: src/mainwindow.c:446
+#, fuzzy
+msgid "/_Message/Get from _all accounts"
 msgstr "/Óʼþ(_M)/½ÓÊÕËùÓÐÕÊ»§µÄÐÂÓʼþ(_a)"
 
-#: src/mainwindow.c:436
+#: src/mainwindow.c:449
 msgid "/_Message/Send queued messa_ges"
 msgstr "/Óʼþ(_M)/·¢ËͶÓÁÐÖеÄÓʼþ(_g)"
 
-#: src/mainwindow.c:439
+#: src/mainwindow.c:452
 msgid "/_Message/Compose _new message"
 msgstr "/Óʼþ(_M)/׫дÐÂÓʼþ(_n)"
 
-#: src/mainwindow.c:440
+#: src/mainwindow.c:453
 msgid "/_Message/_Reply"
 msgstr "/Óʼþ(_M)/»Ø¸´(_R)"
 
-#: src/mainwindow.c:441
+#: src/mainwindow.c:454
+#, fuzzy
+msgid "/_Message/Repl_y to sender"
+msgstr "/Óʼþ(_M)/»Ø¸´(_R)"
+
+#: src/mainwindow.c:455
 msgid "/_Message/Reply to a_ll"
 msgstr "/Óʼþ(_M)/»Ø¸´ËùÓÐÓʼþ(_l)"
 
-#: src/mainwindow.c:442
+#: src/mainwindow.c:456
 msgid "/_Message/_Forward"
 msgstr "/Óʼþ(_M)/ת·¢(_F)"
 
-#: src/mainwindow.c:443
-msgid "/_Message/Forward as an a_ttachment"
+#: src/mainwindow.c:457
+#, fuzzy
+msgid "/_Message/Forward as a_ttachment"
 msgstr "/Óʼþ(_M)/×÷Ϊ¸½¼þת·¢(_t)"
 
-#: src/mainwindow.c:446
+#: src/mainwindow.c:460
 msgid "/_Message/M_ove..."
 msgstr "/Óʼþ(_M)/ÒƵ½...(_o)"
 
-#: src/mainwindow.c:447
+#: src/mainwindow.c:461
 msgid "/_Message/_Copy..."
 msgstr ""
 
-#: src/mainwindow.c:448
+#: src/mainwindow.c:462
 msgid "/_Message/_Delete"
 msgstr "/Óʼþ(_M)/ɾ³ý(_D)"
 
-#: src/mainwindow.c:449
+#: src/mainwindow.c:463
 msgid "/_Message/_Mark"
 msgstr "/Óʼþ(_M)/±ê¼Ç(_M)"
 
-#: src/mainwindow.c:450
+#: src/mainwindow.c:464
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/±ê¼Ç(_M)"
 
-#: src/mainwindow.c:451
+#: src/mainwindow.c:465
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/È¡Ïû±ê¼Ç(_U)"
 
-#: src/mainwindow.c:452
+#: src/mainwindow.c:466
 msgid "/_Message/_Mark/---"
 msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/---"
 
-#: src/mainwindow.c:453
+#: src/mainwindow.c:467
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
-#: src/mainwindow.c:454
-msgid "/_Message/_Mark/Mark it as _being read"
-msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_b)"
+#: src/mainwindow.c:468
+#, fuzzy
+msgid "/_Message/_Mark/Mark as rea_d"
+msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
-#: src/mainwindow.c:457
+#: src/mainwindow.c:471
 msgid "/_Message/Open in new _window"
 msgstr "/Óʼþ(_M)/ÔÚд°¿Ú´ò¿ª(_w)"
 
-#: src/mainwindow.c:458
+#: src/mainwindow.c:472
 msgid "/_Message/View _source"
 msgstr ""
 
-#: src/mainwindow.c:459
+#: src/mainwindow.c:473
 msgid "/_Message/Show all _header"
 msgstr "/Óʼþ(_M)/ÏÔʾËùÓÐÍ·(_h)"
 
-#: src/mainwindow.c:460
-msgid "/_Message/Re_edit"
+#: src/mainwindow.c:474
+#, fuzzy
+msgid "/_Message/Re-_edit"
 msgstr "/Óʼþ(_M)/ÖØб༭(_e)"
 
-#: src/mainwindow.c:462
+#: src/mainwindow.c:476
 msgid "/_Summary"
 msgstr "/ժҪ(_S)"
 
-#: src/mainwindow.c:463
+#: src/mainwindow.c:477
 msgid "/_Summary/_Delete duplicated messages"
 msgstr "/ÕªÒª(_S)/ɾ³ýÖظ´Óʼþ(_D)"
 
-#: src/mainwindow.c:465
+#: src/mainwindow.c:479
 msgid "/_Summary/_Filter messages"
 msgstr "/ÕªÒª(_S)/Óʼþ¹ýÂËÆ÷(_F)"
 
-#: src/mainwindow.c:466
+#: src/mainwindow.c:480
 msgid "/_Summary/E_xecute"
 msgstr "/ÕªÒª(_S)/Ö´ÐÐ(_x)"
 
-#: src/mainwindow.c:467
+#: src/mainwindow.c:481
 msgid "/_Summary/_Update"
 msgstr "/ÕªÒª(_S)/¸üÐÂ(_U)"
 
-#: src/mainwindow.c:468 src/mainwindow.c:472 src/mainwindow.c:474
+#: src/mainwindow.c:482 src/mainwindow.c:486 src/mainwindow.c:488
 msgid "/_Summary/---"
 msgstr "/ժҪ(_S)/---"
 
-#: src/mainwindow.c:469
+#: src/mainwindow.c:483
 msgid "/_Summary/_Prev message"
 msgstr "/ÕªÒª(_S)/ÉÏÒ»ÌõÓʼþ(_P)"
 
-#: src/mainwindow.c:470
+#: src/mainwindow.c:484
 msgid "/_Summary/_Next message"
 msgstr "/ÕªÒª(_S)/ÏÂÒ»ÌõÓʼþ(_N)"
 
-#: src/mainwindow.c:471
+#: src/mainwindow.c:485
 msgid "/_Summary/N_ext unread message"
 msgstr "/ÕªÒª(_S)/ÏÂÒ»Ìõδ¶ÁÓʼþ(_e)"
 
-#: src/mainwindow.c:473
+#: src/mainwindow.c:487
 msgid "/_Summary/_Go to other folder"
 msgstr "/ÕªÒª(_S)/µ½ÁíÒ»¸öÎļþ¼Ð(_G)"
 
-#: src/mainwindow.c:475
+#: src/mainwindow.c:489
 msgid "/_Summary/_Sort"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)"
 
-#: src/mainwindow.c:476
+#: src/mainwindow.c:490
 msgid "/_Summary/_Sort/Sort by _number"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/°´ÐòºÅÅÅÐò(_n)"
 
-#: src/mainwindow.c:477
+#: src/mainwindow.c:491
 msgid "/_Summary/_Sort/Sort by s_ize"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/°´´óСÅÅÐò(_i)"
 
-#: src/mainwindow.c:478
+#: src/mainwindow.c:492
 msgid "/_Summary/_Sort/Sort by _date"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/°´ÈÕÆÚÅÅÐò(_d)"
 
-#: src/mainwindow.c:479
+#: src/mainwindow.c:493
 msgid "/_Summary/_Sort/Sort by _from"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/°´·¢ÐÅÈËÅÅÐò(_f)"
 
-#: src/mainwindow.c:480
+#: src/mainwindow.c:494
 msgid "/_Summary/_Sort/Sort by _subject"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/°´±êÌâÅÅÐò(_s)"
 
-#: src/mainwindow.c:481
+#: src/mainwindow.c:495
 msgid "/_Summary/_Sort/---"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/---"
 
-#: src/mainwindow.c:482
+#: src/mainwindow.c:496
 msgid "/_Summary/_Sort/_Attract by subject"
 msgstr "/ÕªÒª(_S)/ÅÅÐò(_S)/¹ØÐĵıêÌâ(_A)"
 
-#: src/mainwindow.c:484
+#: src/mainwindow.c:498
 msgid "/_Summary/_Thread view"
 msgstr "/ÕªÒª(_S)/ÂÛÌâÊÓͼ(_T)"
 
-#: src/mainwindow.c:485
+#: src/mainwindow.c:499
 msgid "/_Summary/Unt_hread view"
 msgstr "/ÕªÒª(_S)/È¡ÏûÂÛÌâÊÓͼ(_h)"
 
-#: src/mainwindow.c:486
+#: src/mainwindow.c:500
 msgid "/_Summary/Set display _item..."
 msgstr "/ÕªÒª(_S)/ÉèÖÃÏÔʾÏî...(_i)"
 
-#: src/mainwindow.c:490
+#: src/mainwindow.c:504
 msgid "/_Tool/_Log window"
 msgstr "/¹¤¾ß(_T)/ÈÕÖ¾´°¿Ú(_L)"
 
-#: src/mainwindow.c:492
+#: src/mainwindow.c:506
 msgid "/_Configuration"
 msgstr "/ÅäÖÃ(_C)"
 
-#: src/mainwindow.c:493
+#: src/mainwindow.c:507
 msgid "/_Configuration/_Common preferences..."
 msgstr "/ÅäÖÃ(_C)/ͨÓÃÅäÖÃ...(_C)"
 
-#: src/mainwindow.c:495
+#: src/mainwindow.c:509
+msgid "/_Configuration/_Filter setting..."
+msgstr ""
+
+#: src/mainwindow.c:511
 msgid "/_Configuration/_Preferences per account..."
 msgstr "/ÅäÖÃ(_C)/ÿ¸öÕÊ»§µÄÅäÖÃ(_P)"
 
-#: src/mainwindow.c:497
+#: src/mainwindow.c:513
 msgid "/_Configuration/---"
 msgstr "/ÅäÖÃ(_C)/---"
 
-#: src/mainwindow.c:498
+#: src/mainwindow.c:514
 msgid "/_Configuration/Create _new account..."
 msgstr "/ÅäÖÃ(_C)/´´½¨ÐÂÕÊ»§(_n)"
 
-#: src/mainwindow.c:500
+#: src/mainwindow.c:516
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/ÅäÖÃ(_C)/±à¼­ÕÊ»§...(_E)"
 
-#: src/mainwindow.c:502
+#: src/mainwindow.c:518
 msgid "/_Configuration/C_hange current account"
 msgstr "/ÅäÖÃ(_C)/¸Ä±äµ±Ç°ÕÊ»§(_h)"
 
-#: src/mainwindow.c:506
+#: src/mainwindow.c:522
 msgid "/_Help/_Manual"
 msgstr "/°ïÖú(_H)/ÊÖ²á(_M)"
 
-#: src/mainwindow.c:507
+#: src/mainwindow.c:523
 msgid "/_Help/_Manual/_English"
 msgstr "/°ïÖú(_H)/ÊÖ²á(_M)/Ó¢Óï(_E)"
 
-#: src/mainwindow.c:508
+#: src/mainwindow.c:524
 msgid "/_Help/_Manual/_Japanese"
 msgstr "/°ïÖú(_H)/ÊÖ²á(_M)/ÈÕÓï(_J)"
 
-#: src/mainwindow.c:509
+#: src/mainwindow.c:525
 msgid "/_Help/---"
 msgstr "/°ïÖú(_H)/---"
 
-#: src/mainwindow.c:538
+#: src/mainwindow.c:554
 msgid "Creating main window...\n"
 msgstr "ÕýÔÚ´´½¨Ö÷´°¿Ú...\n"
 
-#: src/mainwindow.c:657
+#: src/mainwindow.c:673
 #, c-format
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Ö÷´°¿Ú£º»ñÈ¡ %d ÑÕɫʧ°Ü\n"
 
-#: src/mainwindow.c:798 src/mainwindow.c:815
+#: src/mainwindow.c:822 src/mainwindow.c:839
 msgid "Untitled"
 msgstr "ÎÞ±êÌâ"
 
-#: src/mainwindow.c:816
+#: src/mainwindow.c:840
 msgid "none"
 msgstr "ûÓÐ"
 
-#: src/mainwindow.c:825
+#: src/mainwindow.c:849
 #, c-format
 msgid "Current account: %s"
 msgstr "µ±Ç°ÕË»§£º%s"
 
-#: src/mainwindow.c:916
+#: src/mainwindow.c:940
 #, c-format
 msgid "window position: x = %d, y = %d\n"
 msgstr "´°¿ÚλÖãºx = %d, y = %d\n"
 
-#: src/mainwindow.c:924
+#: src/mainwindow.c:948
 msgid "Empty trash"
 msgstr ""
 
-#: src/mainwindow.c:925
+#: src/mainwindow.c:949
 msgid "Empty all messages in trash?"
 msgstr ""
 
-#: src/mainwindow.c:952
+#: src/mainwindow.c:977
 msgid "Add mailbox"
 msgstr ""
 
-#: src/mainwindow.c:953
+#: src/mainwindow.c:978
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
 
-#: src/mainwindow.c:959
+#: src/mainwindow.c:984
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr ""
 
-#: src/mainwindow.c:964 src/setup.c:57
+#: src/mainwindow.c:989 src/setup.c:57
 msgid "Mailbox"
 msgstr ""
 
-#: src/mainwindow.c:970 src/setup.c:63
+#: src/mainwindow.c:995 src/setup.c:63
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 "there."
 msgstr ""
 
-#: src/mainwindow.c:1115
+#: src/mainwindow.c:1141
 msgid "Setting widgets..."
 msgstr "ÉèÖÃ widgets..."
 
-#: src/mainwindow.c:1316
+#: src/mainwindow.c:1342
 msgid "Get"
 msgstr "»ñÈ¡"
 
-#: src/mainwindow.c:1317
+#: src/mainwindow.c:1343
 msgid "Incorporate new mail"
 msgstr "ÊÕÈ¡ÐÂÓʼþ"
 
-#: src/mainwindow.c:1322
+#: src/mainwindow.c:1348
 msgid "Get all"
 msgstr "»ñÈ¡ËùÓеÄ"
 
-#: src/mainwindow.c:1323
+#: src/mainwindow.c:1349
 msgid "Incorporate new mail of all accounts"
 msgstr "ÊÕÈ¡ËùÓÐÕË»§µÄÐÂÓʼþ"
 
-#: src/mainwindow.c:1334
+#: src/mainwindow.c:1360
 msgid "Send queued message(s)"
 msgstr "·¢ËÍÒÑÅŶӵÄÓʼþ"
 
-#: src/mainwindow.c:1344 src/prefs_account.c:461 src/prefs_common.c:632
+#: src/mainwindow.c:1370 src/prefs_account.c:503 src/prefs_common.c:638
 msgid "Compose"
 msgstr "׫д"
 
-#: src/mainwindow.c:1345
+#: src/mainwindow.c:1371
 msgid "Compose new message"
 msgstr "׫дÐÂÓʼþ"
 
-#: src/mainwindow.c:1352
+#: src/mainwindow.c:1378
 msgid "Reply"
 msgstr "»ØÐÅ"
 
-#: src/mainwindow.c:1353
+#: src/mainwindow.c:1379
 msgid "Reply to the message"
 msgstr "»Ø¸´±¾Óʼþ"
 
-#: src/mainwindow.c:1360
+#: src/mainwindow.c:1386
 msgid "Reply all"
 msgstr "»Ø¸´ËùÓÐÓʼþ"
 
-#: src/mainwindow.c:1361
+#: src/mainwindow.c:1387
 msgid "Reply to all"
 msgstr "»Ø¸´ËùÓÐÓʼþ"
 
-#: src/mainwindow.c:1368
+#: src/mainwindow.c:1394
 msgid "Forward"
 msgstr "ת·¢"
 
-#: src/mainwindow.c:1369
+#: src/mainwindow.c:1395
 msgid "Forward the message"
 msgstr "ת·¢¸ÃÓʼþ"
 
-#: src/mainwindow.c:1380
+#: src/mainwindow.c:1406
 msgid "Delete the message"
 msgstr "ɾ³ý¸ÃÓʼþ"
 
-#: src/mainwindow.c:1388
+#: src/mainwindow.c:1414
 msgid "Execute"
 msgstr "Ö´ÐÐ"
 
-#: src/mainwindow.c:1389
+#: src/mainwindow.c:1415
 msgid "Execute marked process"
 msgstr "Ö´Ðбê¼ÇµÄ½ø³Ì"
 
-#: src/mainwindow.c:1399
+#: src/mainwindow.c:1423
 msgid "Next"
 msgstr ""
 
-#: src/mainwindow.c:1400
+#: src/mainwindow.c:1424
 msgid "Next unread message"
 msgstr "ÏÂÒ»¸öδ¶ÁµÄÓʼþ"
 
-#: src/mainwindow.c:1410
+#: src/mainwindow.c:1434
 msgid "Prefs"
 msgstr "Æ«ºÃ"
 
-#: src/mainwindow.c:1411
+#: src/mainwindow.c:1435
 msgid "Common preference"
 msgstr "ͨÓÃÅäÖÃ"
 
-#: src/mainwindow.c:1418
+#: src/mainwindow.c:1442 src/progressdialog.c:50
 msgid "Account"
 msgstr "ÕË»§"
 
-#: src/mainwindow.c:1419
+#: src/mainwindow.c:1443
 msgid "Account setting"
 msgstr "ÉèÖÃÕË»§"
 
-#: src/mainwindow.c:1629 src/summaryview.c:2517
+#: src/mainwindow.c:1659 src/summaryview.c:2540
 msgid "Exit"
 msgstr "Í˳ö"
 
-#: src/mainwindow.c:1629 src/summaryview.c:2517
+#: src/mainwindow.c:1659 src/summaryview.c:2540
 msgid "Exit this program?"
 msgstr "ÒªÍ˳ö±¾³ÌÐò£¿"
 
-#: src/mainwindow.c:1763
+#: src/mainwindow.c:1793
 msgid "Sending queued message failed."
 msgstr "·¢ËÍÅŶÓÓʼþʧ°Ü¡£"
 
-#: src/mainwindow.c:1880
+#: src/mainwindow.c:1924
 #, c-format
 msgid "forced charset: %s\n"
 msgstr "Ç¿ÖÆ×Ö·û¼¯£º%s\n"
 
-#: src/mbox.c:63
+#: src/mbox.c:68
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "´Ó %s »ñÈ¡Óʼþµ½ %s...\n"
 
-#: src/mbox.c:73
+#: src/mbox.c:78
 msgid "can't read mbox file.\n"
 msgstr "²»ÄܶÁ mbox Îļþ¡£\n"
 
-#: src/mbox.c:80
+#: src/mbox.c:85
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "ÎÞЧ mbox ¸ñʽ£º%s\n"
 
-#: src/mbox.c:87
+#: src/mbox.c:92
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "»ûÐ뵀 mbox: %s\n"
 
-#: src/mbox.c:104
+#: src/mbox.c:109
 msgid "can't open temporary file\n"
 msgstr "²»ÄÜ´ò¿ªÁÙʱÎļþ\n"
 
-#: src/mbox.c:154
+#: src/mbox.c:159
 #, c-format
 msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
 
-#: src/mbox.c:189
+#: src/mbox.c:194
 msgid "can't write to temporary file\n"
 msgstr "²»ÄÜдÈëÁÙʱÎļþ\n"
 
-#: src/mbox.c:221
+#: src/mbox.c:226
 #, c-format
 msgid "%d messages found.\n"
 msgstr "ÕÒµ½ %d ·âÓʼþ¡£\n"
 
-#: src/mbox.c:238
+#: src/mbox.c:243
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "²»ÄÜ´´½¨ËøÎļþ %s\n"
 
-#: src/mbox.c:239
+#: src/mbox.c:244
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "Èç¹û¿ÉÄÜÓÃ 'flock' ´úÌæ 'file'¡£\n"
 
-#: src/mbox.c:251
+#: src/mbox.c:256
 #, c-format
 msgid "can't create %s\n"
 msgstr "²»ÄÜ´´½¨ %s\n"
 
-#: src/mbox.c:257
+#: src/mbox.c:262
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "ÁíÒ»¸ö½ø³ÌÓµÓиÃÓÊÏ䣬µÈ´ý...\n"
 
-#: src/mbox.c:286
+#: src/mbox.c:291
 #, c-format
 msgid "can't lock %s\n"
 msgstr "²»ÄÜËø %s\n"
 
-#: src/mbox.c:293 src/mbox.c:340
+#: src/mbox.c:298 src/mbox.c:345
 msgid "invalid lock type\n"
 msgstr "ÎÞЧËøÀàÐÍ\n"
 
-#: src/mbox.c:326
+#: src/mbox.c:331
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "%s ²»ÄÜ¿ªËø \n"
 
-#: src/mbox.c:357
+#: src/mbox.c:362
 msgid "can't truncate mailbox to zero.\n"
 msgstr "²»ÄÜ°ÑÓÊÏäɾµ½Áã¡£\n"
 
+#: src/mbox.c:383
+#, c-format
+msgid "Exporting messages from %s into %s...\n"
+msgstr ""
+
 #: src/messageview.c:67
 msgid "Creating message view...\n"
 msgstr "´´½¨ÓʼþÊÓͼ...\n"
 
-#: src/mh.c:149
+#: src/mh.c:155
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "²»ÄÜ°ÑÓʼþ %s ¸´ÖƵ½ %s\n"
 
-#: src/mh.c:181 src/mh.c:257 src/mh.c:345 src/mh.c:411
+#: src/mh.c:199 src/mh.c:258 src/mh.c:329 src/mh.c:396
 msgid "Can't open mark file.\n"
 msgstr "²»ÄÜ´ò¿ª±ê¼ÇÎļþ¡£\n"
 
-#: src/mh.c:192 src/mh.c:275 src/mh.c:356 src/mh.c:429
+#: src/mh.c:340 src/mh.c:414
 #, c-format
 msgid "%s already exists."
 msgstr ""
 
-#: src/mh.c:347 src/mh.c:420
-#, c-format
-msgid "Copying message %s%c%d to %s ...\n"
-msgstr ""
-
-#: src/mh.c:584
+#: src/mh.c:553
 #, c-format
 msgid "Last number in dir %s = %d\n"
 msgstr "±¾Ä¿Â¼µÄ×îºóÒ»¸öºÅÂë %s = %d\n"
 
-#: src/mh.c:783
+#: src/mh.c:752
 msgid "\tSearching uncached messages... "
 msgstr "\tËÑË÷믧´æµÄÓʼþ... "
 
-#: src/mh.c:838
+#: src/mh.c:807
 #, c-format
 msgid "%d uncached message(s) found.\n"
 msgstr "·¢ÏÖ %d ¸ö믧´æµÄÓʼþ\n"
 
-#: src/mh.c:844
+#: src/mh.c:813
 msgid "\tSorting uncached messages in numerical order... "
 msgstr "\tÕýÔÚ¸ù¾Ý±àºÅÅÅÁÐ믧´æµÄÓʼþ... "
 
-#: src/mimeview.c:110
+#: src/mimeview.c:113
 msgid "/_Open"
 msgstr "/´ò¿ª(_O)"
 
-#: src/mimeview.c:111
+#: src/mimeview.c:114
+msgid "/Open _with..."
+msgstr ""
+
+#: src/mimeview.c:115
 msgid "/_Display as text"
 msgstr "/×÷ΪÎı¾ÎļþÏÔʾ(_D)"
 
-#: src/mimeview.c:112 src/summaryview.c:311
+#: src/mimeview.c:116 src/summaryview.c:313
 msgid "/_Save as..."
 msgstr "Áí´æΪ...(_S)"
 
-#: src/mimeview.c:115
+#: src/mimeview.c:119
 msgid "/_Check signature"
 msgstr ""
 
-#: src/mimeview.c:135
+#: src/mimeview.c:139
 msgid "MIME Type"
 msgstr "MIME ÀàÐÍ"
 
-#: src/mimeview.c:139
+#: src/mimeview.c:143
 msgid "Creating MIME view...\n"
 msgstr "´´½¨ MIME ÊÓͼ...\n"
 
-#: src/mimeview.c:240
+#: src/mimeview.c:244
 msgid "Select \"Check signature\" to check"
 msgstr ""
 
-#: src/mimeview.c:411
+#: src/mimeview.c:415
 msgid "Can't get the part of multipart message."
 msgstr "²»ÄÜ»ñµÃ¶à²¿·ÖÓʼþµÄÕâÒ»²¿·Ö¡£"
 
-#: src/mimeview.c:663 src/mimeview.c:711 src/mimeview.c:730
+#: src/mimeview.c:674 src/mimeview.c:722 src/mimeview.c:741 src/mimeview.c:764
 msgid "Can't save the part of multipart message."
 msgstr "²»Äܱ£´æ¶à²¿·ÖÓʼþµÄÕâÒ»²¿·Ö¡£"
 
-#: src/mimeview.c:697 src/summaryview.c:2005
+#: src/mimeview.c:708 src/summaryview.c:2018
 msgid "Save as"
 msgstr "Áí´æΪ"
 
-#: src/mimeview.c:703 src/summaryview.c:2010
+#: src/mimeview.c:714 src/summaryview.c:2023
 msgid "Overwrite"
 msgstr "¸²¸Ç"
 
-#: src/mimeview.c:704 src/summaryview.c:2011
+#: src/mimeview.c:715 src/summaryview.c:2024
 msgid "Overwrite existing file?"
 msgstr "¸²¸ÇÒÑ´æÔÚµÄÎļþ£¿"
 
-#: src/mimeview.c:773
+#: src/mimeview.c:769
+#, fuzzy
+msgid "Open with"
+msgstr "µ±Í˳öʱ"
+
+#: src/mimeview.c:770
+#, fuzzy, c-format
+msgid ""
+"Enter the command line to open file:\n"
+"(`%s' will be replaced with file name)"
+msgstr ""
+"ÊäÈë´òÓ¡ÃüÁîÐÐ:\n"
+"(ÓÃÎļþÃûÌæ´ú `%s')"
+
+#: src/mimeview.c:822
 #, c-format
 msgid "MIME viewer command line is invalid: `%s'"
 msgstr "MIME ²ì¿´Æ÷ÃüÁîÐÐÎÞЧ`%s'"
 
-#: src/news.c:75
+#: src/news.c:93
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "´´½¨µ½ %s:%d µÄNNTPÁ¬½Ó...\n"
 
-#: src/news.c:111
+#: src/news.c:176
 #, c-format
 msgid "NNTP connection to %s:%d has been disconnected. Reconnecting...\n"
 msgstr "µ½ %s:%d µÄNNTPÁ¬½ÓÒ»¶Ï¿ª¡£ÖØÐÂÁ¬½Ó...\n"
 
-#: src/news.c:182
+#: src/news.c:245
 #, c-format
 msgid "article %d has been already cached.\n"
 msgstr "ÎÄÕ %d ÒÑ»º´æ¹ý¡£\n"
 
-#: src/news.c:191
+#: src/news.c:257
+#, fuzzy, c-format
+msgid "can't select group %s\n"
+msgstr "²»ÄÜÉèÖÃ×飺%s\n"
+
+#: src/news.c:262
 #, c-format
 msgid "getting article %d...\n"
 msgstr "ÕýÔÚÈ¡µÃÎÄÕ %d...\n"
 
-#: src/news.c:196
+#: src/news.c:267
 #, c-format
 msgid "can't read article %d\n"
 msgstr "²»ÄܶÁÎÄÕ %d\n"
 
-#: src/news.c:228
+#: src/news.c:299
 msgid "can't post article.\n"
 msgstr ""
 
-#: src/news.c:252
+#: src/news.c:323
 #, c-format
 msgid "can't retrieve article %d\n"
 msgstr "²»ÄÜÕÒµ½ÎÄÕ %d\n"
 
-#: src/news.c:291
+#: src/news.c:393
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "²»ÄÜÉèÖÃ×飺%s\n"
 
-#: src/news.c:297
+#: src/news.c:400
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ÎÞЧÎÄÕ·¶Î§£º%d - %d\n"
 
-#: src/news.c:306
+#: src/news.c:409
 msgid "no new articles.\n"
 msgstr "ûÓÐÐÂÎÄÕ¡£\n"
 
-#: src/news.c:316
+#: src/news.c:422
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "ÕýÔÚ»ñµÃ%sÀïµÄxover %d - %d ...\n"
 
-#: src/news.c:319
+#: src/news.c:425
 msgid "can't get xover\n"
 msgstr "²»ÄÜ»ñµÃxover\n"
 
-#: src/news.c:325
+#: src/news.c:431
 msgid "error occurred while getting xover.\n"
 msgstr "µ±»ñµÃxoverʱ·¢Éú´íÎó¡£\n"
 
-#: src/news.c:333
+#: src/news.c:439
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ÎÞЧxoverÐУº%s\n"
 
-#: src/news.c:434
-#, c-format
-msgid "deleting article %d...\n"
-msgstr "ÕýÔÚɾ³ýÎÄÕ %d...\n"
+#: src/news.c:456 src/news.c:481
+#, fuzzy
+msgid "can't get xhdr\n"
+msgstr "²»ÄÜ»ñµÃxover\n"
+
+#: src/news.c:464 src/news.c:489
+#, fuzzy
+msgid "error occurred while getting xhdr.\n"
+msgstr "µ±»ñµÃxoverʱ·¢Éú´íÎó¡£\n"
 
-#: src/news.c:465
+#: src/news.c:613
+#, fuzzy, c-format
+msgid "Deleting cached articles 1 - %d ... "
+msgstr "\tɾ³ýËùÓлº´æ¹ýµÄÎÄÕÂ..."
+
+#: src/news.c:642
 msgid "\tDeleting all cached articles... "
 msgstr "\tɾ³ýËùÓлº´æ¹ýµÄÎÄÕÂ..."
 
-#: src/nntp.c:44
+#: src/nntp.c:52
 #, c-format
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "²»ÄÜÁ¬½ÓNNTP·þÎñÆ÷£º%s:%d\n"
 
-#: src/nntp.c:73 src/nntp.c:135
+#: src/nntp.c:106 src/nntp.c:169
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "ЭÒé´íÎó£º%s\n"
 
-#: src/nntp.c:95 src/nntp.c:141
+#: src/nntp.c:129 src/nntp.c:175
 msgid "protocol error\n"
 msgstr "ЭÒé´íÎó\n"
 
-#: src/nntp.c:174 src/nntp.c:180
+#: src/nntp.c:225 src/nntp.c:231
 msgid "Error occurred while posting\n"
 msgstr ""
 
-#: src/passphrase.c:73
+#: src/passphrase.c:77
 msgid "Passphrase"
 msgstr ""
 
-#: src/passphrase.c:228
+#: src/passphrase.c:240
 msgid "[no user id]"
 msgstr ""
 
-#: src/passphrase.c:232
+#: src/passphrase.c:244
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -2211,25 +2387,25 @@ msgid ""
 "(%.*s)\n"
 msgstr ""
 
-#: src/passphrase.c:236
+#: src/passphrase.c:248
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
 msgstr ""
 
-#: src/pop.c:98 src/pop.c:144
+#: src/pop.c:98 src/pop.c:145
 msgid "error occurred on authorization\n"
 msgstr "Ñé֤ʱ³ö´í\n"
 
-#: src/pop.c:116
+#: src/pop.c:117
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "ÔÚÎʺòÐÅÏ¢ÖÐûÓз¢ÏÖÐèÒªµÄAPOPʱ¼ä±êÇ©¡£\n"
 
-#: src/pop.c:122
+#: src/pop.c:123
 msgid "Timestamp syntax error in greeting\n"
 msgstr "ÔÚÎʺòÐÅÏ¢ÖÐʱ¼ä±êÇ©Óï·¨´í\n"
 
-#: src/pop.c:169 src/pop.c:206
+#: src/pop.c:171 src/pop.c:212
 msgid "POP3 protocol error\n"
 msgstr "POP3 ЭÒé´í\n"
 
@@ -2246,8 +2422,11 @@ msgstr "
 msgid "Finished reading configuration.\n"
 msgstr "¶ÁÈ¡ÅäÖÃÎļþÒÑÍê³É¡£\n"
 
-#: src/prefs.c:168 src/prefs.c:213 src/prefs_account.c:326
-#: src/prefs_account.c:340 src/prefs_common.c:2270 src/prefs_common.c:2294
+#: src/prefs.c:168 src/prefs.c:213 src/prefs_account.c:364
+#: src/prefs_account.c:378 src/prefs_customheader.c:391
+#: src/prefs_customheader.c:437 src/prefs_display_header.c:426
+#: src/prefs_display_header.c:451 src/prefs_filter.c:518
+#: src/prefs_filter.c:542
 msgid "failed to write configuration to file\n"
 msgstr "дÈëÅäÖÃÎļþʧ°Ü\n"
 
@@ -2259,681 +2438,720 @@ msgstr "
 msgid "Apply"
 msgstr "Ó¦ÓÃ"
 
-#: src/prefs_account.c:371
+#: src/prefs_account.c:409
 msgid "Opening account preferences window...\n"
 msgstr "ÕýÔÚ´ò¿ªÕÊ»§ÅäÖô°¿Ú...\n"
 
-#: src/prefs_account.c:396
+#: src/prefs_account.c:436
 #, c-format
 msgid "Account%d"
 msgstr "ÕÊ»§%d"
 
-#: src/prefs_account.c:409
+#: src/prefs_account.c:449
 msgid "Preferences for new account"
 msgstr "ÐÂÕÊ»§µÄÅäÖÃ"
 
-#: src/prefs_account.c:414
+#: src/prefs_account.c:454
 msgid "Preferences for each account"
 msgstr "Ϊÿһ¸öÕÊ»§µÄÅäÖÃ"
 
-#: src/prefs_account.c:435
+#: src/prefs_account.c:477
 msgid "Creating account preferences window...\n"
 msgstr "ÕýÔÚ´´½¨ÕÊ»§ÅäÖô°¿Ú...\n"
 
-#: src/prefs_account.c:455
+#: src/prefs_account.c:497
 msgid "Basic"
 msgstr "»ù±¾ÐÅÏ¢"
 
-#: src/prefs_account.c:457 src/prefs_common.c:628
+#: src/prefs_account.c:499 src/prefs_common.c:634
 msgid "Receive"
 msgstr "½ÓÊÕ"
 
-#: src/prefs_account.c:463
+#: src/prefs_account.c:506 src/prefs_common.c:645
+msgid "Privacy"
+msgstr ""
+
+#: src/prefs_account.c:509
 msgid "Advanced"
 msgstr "¸ß¼¶"
 
-#: src/prefs_account.c:516
+#: src/prefs_account.c:563
 msgid "Name of this account"
 msgstr "ÕÊ»§Ãû³Æ"
 
-#: src/prefs_account.c:525
+#: src/prefs_account.c:572
 msgid "Usually used"
 msgstr "ͨ³£Ê¹ÓÃ"
 
-#: src/prefs_account.c:529
+#: src/prefs_account.c:576
 msgid "Personal information"
 msgstr "¸öÈË×ÊÁÏ"
 
-#: src/prefs_account.c:538
+#: src/prefs_account.c:585
 msgid "Full name"
 msgstr "È«Ãû"
 
-#: src/prefs_account.c:544
+#: src/prefs_account.c:591
 msgid "Mail address"
 msgstr "ÓʼþµØÖ·"
 
-#: src/prefs_account.c:550
+#: src/prefs_account.c:597
 msgid "Organization"
 msgstr "×éÖ¯"
 
-#: src/prefs_account.c:574
+#: src/prefs_account.c:621
 msgid "Server information"
 msgstr "·þÎñÆ÷×ÊÁÏ"
 
-#: src/prefs_account.c:595
+#: src/prefs_account.c:642
 msgid "POP3 (normal)"
 msgstr "POP3 £¨ÆÕͨ£©"
 
-#: src/prefs_account.c:597
+#: src/prefs_account.c:644
 msgid "POP3 (APOP auth)"
 msgstr ""
 
-#: src/prefs_account.c:599
+#: src/prefs_account.c:646
 msgid "IMAP4"
 msgstr ""
 
-#: src/prefs_account.c:601
+#: src/prefs_account.c:648
 msgid "News (NNTP)"
 msgstr ""
 
-#: src/prefs_account.c:603
+#: src/prefs_account.c:650
 msgid "None (local)"
 msgstr "ûÓÐ(±¾µØ)"
 
-#: src/prefs_account.c:657
+#: src/prefs_account.c:672
+msgid "This server requires authentication"
+msgstr ""
+
+#: src/prefs_account.c:711
 msgid "News server"
 msgstr ""
 
-#: src/prefs_account.c:663
+#: src/prefs_account.c:717
 msgid "Server for receiving"
 msgstr "½ÓÊÕ·þÎñÆ÷"
 
-#: src/prefs_account.c:669
+#: src/prefs_account.c:723
 msgid "SMTP server (send)"
 msgstr "SMTP ·þÎñÆ÷ (·¢ËÍ)"
 
-#: src/prefs_account.c:676
+#: src/prefs_account.c:730
 msgid "User ID"
 msgstr "̞"
 
-#: src/prefs_account.c:682
+#: src/prefs_account.c:736
 msgid "Password"
 msgstr "ÃÜÂë"
 
-#: src/prefs_account.c:726
+#: src/prefs_account.c:786
 msgid "POP3"
 msgstr ""
 
-#: src/prefs_account.c:734
+#: src/prefs_account.c:794
 msgid "Remove messages on server when received"
 msgstr "Óʼþ½ÓÊÕÍêÒÔºó´Ó·þÎñÆ÷ɾ³ýÕâЩÓʼþ"
 
-#: src/prefs_account.c:736
-msgid "Receive all messages on server"
+#: src/prefs_account.c:796
+#, fuzzy
+msgid "Download all messages on server"
 msgstr "½ÓÊÕËùÓÐÔÚ·þÎñÆ÷ÉϵÄÓʼþ"
 
-#: src/prefs_account.c:738
-msgid "Receive at getting from all accounts"
-msgstr "½ÓÊÕ´ÓËùÓÐÕÊ»§ÉÏÈ¡µÃµÄÓʼþ"
+#: src/prefs_account.c:799
+msgid "`Get all' checks for new mail on this account"
+msgstr ""
 
-#: src/prefs_account.c:740
+#: src/prefs_account.c:801
 msgid "Filter messages on receiving"
 msgstr "ÔÚ½ÓÊÕÓʼþʱ¹ýÂË"
 
-#: src/prefs_account.c:777 src/prefs_common.c:1172
+#: src/prefs_account.c:838 src/prefs_customheader.c:196 src/prefs_filter.c:244
 msgid "Header"
 msgstr "ͷ"
 
-#: src/prefs_account.c:784
+#: src/prefs_account.c:845
 msgid "Add Date header field"
 msgstr "Ìí¼ÓÈÕÆÚÍ·Óò"
 
-#: src/prefs_account.c:785
+#: src/prefs_account.c:846
 msgid "Generate Message-ID"
 msgstr "Éú³ÉÓʼþʶ±ðºÅ"
 
-#: src/prefs_account.c:794
+#: src/prefs_account.c:853
 msgid "Add user-defined header"
 msgstr "Ìí¼ÓÓû§¶¨ÒåµÄÍ·"
 
-#: src/prefs_account.c:796 src/prefs_common.c:1473
+#: src/prefs_account.c:855 src/prefs_common.c:1283 src/prefs_common.c:1308
 msgid " Edit... "
 msgstr "±à¼­..."
 
-#: src/prefs_account.c:803
+#: src/prefs_account.c:865
 msgid "Automatically set following addresses"
 msgstr "×Ô¶¯ÉèÖÃÒÔϵØÖ·"
 
-#: src/prefs_account.c:812
+#: src/prefs_account.c:874
 msgid "Cc"
 msgstr "³­ËÍ"
 
-#: src/prefs_account.c:825
+#: src/prefs_account.c:887
 msgid "Bcc"
 msgstr "°µ³­ËÍ"
 
-#: src/prefs_account.c:838
+#: src/prefs_account.c:900
 msgid "Reply-To"
 msgstr "»Ö¸´¸ø"
 
-#: src/prefs_account.c:851
+#: src/prefs_account.c:913
 msgid "Authentication"
 msgstr ""
 
-#: src/prefs_account.c:859
+#: src/prefs_account.c:921
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr ""
 
-#: src/prefs_account.c:861
+#: src/prefs_account.c:923
 msgid "Authenticate with POP3 before sending"
 msgstr ""
 
-#: src/prefs_account.c:895
+#: src/prefs_account.c:957
 msgid "Signature file"
 msgstr "Ç©ÃûÎļþ"
 
-#: src/prefs_account.c:933
+#: src/prefs_account.c:986
+msgid "Sign key"
+msgstr ""
+
+#: src/prefs_account.c:994
+msgid "Use default GnuPG key"
+msgstr ""
+
+#: src/prefs_account.c:1003
+msgid "Select key by your email address"
+msgstr ""
+
+#: src/prefs_account.c:1012
+msgid "Specify key manually"
+msgstr ""
+
+#: src/prefs_account.c:1028
+msgid "User or key ID:"
+msgstr ""
+
+#: src/prefs_account.c:1073
 msgid "Specify SMTP port"
 msgstr "ÌØÊâµÄSMTP¶Ë¿Ú"
 
-#: src/prefs_account.c:945
+#: src/prefs_account.c:1085
 msgid "Specify POP3 port"
 msgstr "ÌØÊâµÄPOP3¶Ë¿Ú"
 
-#: src/prefs_account.c:957
+#: src/prefs_account.c:1097
 msgid "Specify domain name"
 msgstr "ÌØÊâÓòÃû"
 
-#: src/prefs_account.c:997
+#: src/prefs_account.c:1144
 msgid "Mail address is not entered."
 msgstr "ÓʼþµØַûÊäÈë¡£"
 
-#: src/prefs_account.c:1002
+#: src/prefs_account.c:1149
 msgid "SMTP server is not entered."
 msgstr "SMTP·þÎñÆ÷ûÊäÈë¡£"
 
-#: src/prefs_account.c:1007
+#: src/prefs_account.c:1154
 msgid "User ID is not entered."
 msgstr "Óû§ÃûûÊäÈë¡£"
 
-#: src/prefs_account.c:1012
+#: src/prefs_account.c:1159
 msgid "POP3 server is not entered."
 msgstr "POP3·þÎñÆ÷ûÊäÈë¡£"
 
-#: src/prefs_account.c:1017
+#: src/prefs_account.c:1164
 msgid "IMAP4 server is not entered."
 msgstr "IMAP4·þÎñÆ÷ûÊäÈë¡£"
 
-#: src/prefs_account.c:1022
+#: src/prefs_account.c:1169
 msgid "NNTP server is not entered."
 msgstr "NNTP·þÎñÆ÷ûÊäÈë¡£"
 
-#: src/prefs_common.c:605
+#: src/prefs_common.c:612
 msgid "Creating common preferences window...\n"
 msgstr "´´½¨Í¨ÓÃÅäÖô°¿Ú...\n"
 
-#: src/prefs_common.c:609
+#: src/prefs_common.c:616
 msgid "Common Preferences"
 msgstr "ͨÓÃÅäÖÃ"
 
-#: src/prefs_common.c:634
+#: src/prefs_common.c:640
 msgid "Display"
 msgstr "ÏÔʾ"
 
-#: src/prefs_common.c:636
-msgid "Filtering"
-msgstr "¹ýÂË"
-
-#: src/prefs_common.c:639
-msgid "Privacy"
-msgstr ""
-
 #: src/prefs_common.c:642
+msgid "Message"
+msgstr "Óʼþ"
+
+#: src/prefs_common.c:648
 msgid "Interface"
 msgstr "½çÃæ"
 
-#: src/prefs_common.c:644
+#: src/prefs_common.c:650 src/select-keys.c:324
 msgid "Other"
 msgstr "ÆäËû"
 
-#: src/prefs_common.c:684 src/prefs_common.c:844
+#: src/prefs_common.c:690 src/prefs_common.c:848
 msgid "External program"
 msgstr "Íⲿ³ÌÐò"
 
-#: src/prefs_common.c:693
+#: src/prefs_common.c:699
 msgid "Use external program for incorporation"
 msgstr "ÓÃÍⲿ³ÌÐòºÏ²¢"
 
-#: src/prefs_common.c:700 src/prefs_common.c:861
+#: src/prefs_common.c:706 src/prefs_common.c:865
 msgid "Program path"
 msgstr "³ÌÐò·¾¶"
 
-#: src/prefs_common.c:712
+#: src/prefs_common.c:718
 msgid "Local spool"
 msgstr "±¾µØ spool"
 
-#: src/prefs_common.c:723
+#: src/prefs_common.c:729
 msgid "Incorporate from spool"
 msgstr "´ÓspoolºÏ²¢"
 
-#: src/prefs_common.c:725
+#: src/prefs_common.c:731
 msgid "Filter on incorporation"
 msgstr "Ôںϲ¢ÉϵĹýÂËÆ÷"
 
-#: src/prefs_common.c:733
+#: src/prefs_common.c:739
 msgid "Spool directory"
 msgstr "Spool Ŀ¼"
 
-#: src/prefs_common.c:753
+#: src/prefs_common.c:757
 msgid "Auto-check new mail"
 msgstr "×Ô¶¯¼ì²éÐÂÓʼþ"
 
-#: src/prefs_common.c:755
+#: src/prefs_common.c:759
 msgid "each"
 msgstr "ÿһ¸ö"
 
-#: src/prefs_common.c:767
+#: src/prefs_common.c:771
 msgid "minute(s)"
 msgstr "·ÖÖÓ"
 
-#: src/prefs_common.c:776
+#: src/prefs_common.c:780
 msgid "Check new mail on startup"
 msgstr "ÔÚÆô¶¯Ê±¼à²éÓʼþ"
 
-#: src/prefs_common.c:778
+#: src/prefs_common.c:782
 msgid "News"
 msgstr "н¨"
 
-#: src/prefs_common.c:786
+#: src/prefs_common.c:790
 msgid ""
 "Maximum article number to download\n"
 "(unlimited if 0 is specified)"
 msgstr ""
 
-#: src/prefs_common.c:854
+#: src/prefs_common.c:858
 msgid "Use external program for sending"
 msgstr "ÓÃÍⲿ³ÌÐò·¢ËÍ"
 
-#: src/prefs_common.c:878
-msgid "Save sent message to outbox"
+#: src/prefs_common.c:882
+#, fuzzy
+msgid "Save sent messages to outbox"
 msgstr "½«ÒÑ·¢³öµÄÓʼþ±£´æÔÚ·¢¼þÏä"
 
-#: src/prefs_common.c:880
-msgid "Queue message that failed to send"
+#: src/prefs_common.c:884
+#, fuzzy
+msgid "Queue messages that fail to send"
 msgstr "½«·¢ËÍʧ°ÜµÄÓʼþÅŶÓ"
 
-#: src/prefs_common.c:886
+#: src/prefs_common.c:890
 msgid "Outgoing codeset"
 msgstr "ËͳöµÄ×Ö·û¼¯"
 
-#: src/prefs_common.c:901
+#: src/prefs_common.c:905
 msgid "Automatic"
 msgstr "×Ô¶¯"
 
-#: src/prefs_common.c:902
+#: src/prefs_common.c:906
 msgid "7bit ascii (US-ASCII)"
 msgstr "7λ ascii (US-ASCII) "
 
-#: src/prefs_common.c:904
+#: src/prefs_common.c:908
 msgid "Unicode (UTF-8)"
 msgstr ""
 
-#: src/prefs_common.c:906
+#: src/prefs_common.c:910
 msgid "Western European (ISO-8859-1)"
 msgstr "Î÷Å· (ISO-8859-1)"
 
-#: src/prefs_common.c:908
+#: src/prefs_common.c:912
 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ· (ISO-8859-2)"
 
-#: src/prefs_common.c:909
+#: src/prefs_common.c:913
 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨ÂÞµÄÓï (ISO-8859-13)"
 
-#: src/prefs_common.c:910
+#: src/prefs_common.c:914
 msgid "Baltic (ISO-8859-4)"
 msgstr "²¨ÂÞµÄÓï (ISO-8859-4)"
 
-#: src/prefs_common.c:911
+#: src/prefs_common.c:915
 msgid "Greek (ISO-8859-7)"
 msgstr "Ï£À°Óï (ISO-8859-7)"
 
-#: src/prefs_common.c:912
+#: src/prefs_common.c:916
 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
 
-#: src/prefs_common.c:913
+#: src/prefs_common.c:917
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "˹À­·òÓï (ISO-8859-5)"
 
-#: src/prefs_common.c:914
+#: src/prefs_common.c:918
 msgid "Cyrillic (KOI8-R)"
 msgstr "˹À­·òÓï (KOI8-R)"
 
-#: src/prefs_common.c:915
+#: src/prefs_common.c:919
 msgid "Cyrillic (Windows-1251)"
 msgstr "˹À­·òÓï (Windows-1251)"
 
-#: src/prefs_common.c:916
+#: src/prefs_common.c:920
 msgid "Cyrillic (KOI8-U)"
 msgstr "˹À­·òÓï (KOI8-U)"
 
-#: src/prefs_common.c:918
+#: src/prefs_common.c:922
 msgid "Japanese (ISO-2022-JP)"
 msgstr "ÈÕÓï (ISO-2022-JP)"
 
-#: src/prefs_common.c:920
+#: src/prefs_common.c:924
 msgid "Japanese (EUC-JP)"
 msgstr "ÈÕÓï (EUC-JP)"
 
-#: src/prefs_common.c:921
+#: src/prefs_common.c:925
 msgid "Japanese (Shift_JIS)"
 msgstr "ÈÕÓï (Shift_JIS)"
 
-#: src/prefs_common.c:924
+#: src/prefs_common.c:928
 msgid "Simplified Chinese (GB2312)"
 msgstr "¼òÌåÖÐÎÄ (GB2312)"
 
-#: src/prefs_common.c:925
+#: src/prefs_common.c:929
 msgid "Traditional Chinese (Big5)"
 msgstr "·±ÌåÖÐÎÄ (Big5)"
 
-#: src/prefs_common.c:927
+#: src/prefs_common.c:931
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "·±ÌåÖÐÎÄ (EUC-TW)"
 
-#: src/prefs_common.c:928
+#: src/prefs_common.c:932
 msgid "Chinese (ISO-2022-CN)"
 msgstr "ÖÐÎÄ (ISO-2022-CN)"
 
-#: src/prefs_common.c:930
+#: src/prefs_common.c:934
 msgid "Korean (EUC-KR)"
 msgstr "³¯ÏÊÎÄ (EUC-KR)"
 
-#: src/prefs_common.c:980
+#: src/prefs_common.c:984
 msgid "Quotation"
 msgstr "¸½¼ÓÔ­ÎÄ"
 
-#: src/prefs_common.c:988
+#: src/prefs_common.c:992
 msgid "Quote message when replying"
 msgstr "µ±»ØÐÅʱ¸½¼ÓÔ­ÎÄ"
 
-#: src/prefs_common.c:994
+#: src/prefs_common.c:998
 msgid "Quotation mark"
 msgstr "¸½¼ÓÔ­ÎĵıêÖ¾"
 
-#: src/prefs_common.c:1007
+#: src/prefs_common.c:1011
 msgid "Quotation format:"
 msgstr "¸½¼ÓÔ­Îĵĸñʽ:"
 
-#: src/prefs_common.c:1012
+#: src/prefs_common.c:1016
 msgid " Description of symbols "
 msgstr "·ûºÅµÄÃèÊö"
 
-#: src/prefs_common.c:1039
+#: src/prefs_common.c:1043
 msgid "Insert signature automatically"
 msgstr "×Ô¶¯²åÈëÇ©Ãû"
 
-#: src/prefs_common.c:1045
+#: src/prefs_common.c:1049
 msgid "Signature separator"
 msgstr "Ç©Ãû·Ö¸î·û"
 
-#: src/prefs_common.c:1063
+#: src/prefs_common.c:1067
 msgid "Wrap messages at"
 msgstr "°ü×°Óʼþ"
 
-#: src/prefs_common.c:1075
+#: src/prefs_common.c:1079
 msgid "characters"
 msgstr "×Ö·û"
 
-#: src/prefs_common.c:1083
+#: src/prefs_common.c:1087
 msgid "Wrap quotation"
 msgstr "°ü×°Ô­ÎÄ"
 
-#: src/prefs_common.c:1085
+#: src/prefs_common.c:1089
 msgid "Wrap before sending"
 msgstr "ÔÚ·¢ËÍÇ°°ü×°"
 
-#: src/prefs_common.c:1143
-msgid "Registered rules"
-msgstr "ÒÑ×¢²áµÄ¹æÔò"
-
-#: src/prefs_common.c:1156
-msgid "Operator"
-msgstr "²Ù×÷·û"
-
-#: src/prefs_common.c:1194 src/prefs_common.c:2378 src/prefs_common.c:2517
-#: src/prefs_common.c:2529
-msgid "(none)"
-msgstr "(ÎÞ)"
-
-#: src/prefs_common.c:1200
-msgid "Keyword"
-msgstr "¹Ø¼ü´Ê"
-
-#: src/prefs_common.c:1221
-msgid "Predicate"
-msgstr "ν´Ê"
-
-#: src/prefs_common.c:1233 src/prefs_common.c:1244 src/prefs_common.c:2387
-#: src/prefs_common.c:2390 src/prefs_common.c:2534 src/prefs_common.c:2537
-msgid "contains"
-msgstr "°üº¬"
-
-#: src/prefs_common.c:1233 src/prefs_common.c:1244 src/prefs_common.c:2534
-#: src/prefs_common.c:2537
-msgid "not contain"
-msgstr "ûÓаüº¬"
-
-#: src/prefs_common.c:1260
-msgid "Destination"
-msgstr "Ä¿µÄÎļþ"
+#: src/prefs_common.c:1128
+msgid "Font"
+msgstr "×ÖÌå"
 
-#: src/prefs_common.c:1284
-msgid "Use regex"
-msgstr "ʹÓÃÕý¹æ±í´ïʽ"
+#: src/prefs_common.c:1137
+msgid "Text"
+msgstr ""
 
-#: src/prefs_common.c:1288
-msgid "Don't receive"
-msgstr "²»ÄܽÓÊÜ"
+#: src/prefs_common.c:1160
+msgid "Translate header name (such as `From:', `Subject:')"
+msgstr "·­ÒëÍ·Ãû(Èç`·¢ÐÅÈË', `±êÌâ:')"
 
-#: src/prefs_common.c:1313
-msgid "Register"
-msgstr "×¢²á"
+#: src/prefs_common.c:1163
+msgid "Display unread number next to folder name"
+msgstr ""
 
-#: src/prefs_common.c:1319
-msgid " Substitute "
-msgstr "Ìæ´ú"
+#. ---- Summary ----
+#: src/prefs_common.c:1167
+msgid "Summary View"
+msgstr ""
 
-#: src/prefs_common.c:1426
-msgid "Font"
-msgstr "×ÖÌå"
+#: src/prefs_common.c:1176
+msgid "Display recipient on `From' column if sender is yourself"
+msgstr "Èç¹û·¢ÐÅÕßÊÇÄã×Ô¼º£¬ÔÚ `´Ó' ÁÐÏÔʾ½ÓÊÜÕß"
 
-#: src/prefs_common.c:1435
-msgid "Message"
-msgstr "Óʼþ"
+#: src/prefs_common.c:1178
+msgid "Enable horizontal scroll bar"
+msgstr ""
 
-#: src/prefs_common.c:1455
-msgid "Display unread number next to folder name"
+#: src/prefs_common.c:1184
+msgid "Date format"
 msgstr ""
 
-#: src/prefs_common.c:1468
+#: src/prefs_common.c:1195
+msgid ""
+"Ordinary characters placed in the format string are copied without "
+"conversion. Conversion specifiers are introduced by a % character, and are "
+"replaced as follows:\n"
+"%a: the abbreviated weekday name\n"
+"%A: the full weekday name\n"
+"%b: the abbreviated month name\n"
+"%B: the full month name\n"
+"%c: the preferred date and time for the current locale\n"
+"%C: the century number (year/100)\n"
+"%d: the day of the month as a decimal number\n"
+"%H: the hour as a decimal number using a 24-hour clock\n"
+"%I: the hour as a decimal number using a 12-hour clock\n"
+"%j: the day of the year as a decimal number\n"
+"%m: the month as a decimal number\n"
+"%M: the minute as a decimal number\n"
+"%p: either AM or PM\n"
+"%S: the second as a decimal number\n"
+"%w: the day of the week as a decimal number\n"
+"%x: the preferred date for the current locale\n"
+"%y: the last two digits of a year\n"
+"%Y: the year as a decimal number\n"
+"%Z: the time zone or name or abbreviation"
+msgstr ""
+
+#: src/prefs_common.c:1224
+msgid " Set display item of summary... "
+msgstr "ÉèÖÃÕªÒªµÄÏÔʾÌõÄ¿... "
+
+#: src/prefs_common.c:1278
 msgid "Enable coloration of message"
 msgstr "ʹÓʼþ²ÊÉ«±íʾÉúЧ"
 
-#: src/prefs_common.c:1483
+#: src/prefs_common.c:1297
 msgid "Display 2-byte alphabet and numeric with 1-byte character"
 msgstr "ÓÃ1-×Ö½Ú×Ö·ûÏÔʾ2-×Ö½Ú×ÖĸºÍÊý×Ö"
 
-#: src/prefs_common.c:1485
+#: src/prefs_common.c:1299
+msgid "Display header pane above message view"
+msgstr ""
+
+#: src/prefs_common.c:1306
 msgid "Display short headers on message view"
 msgstr "ÔÚÓʼþÊÓͼÉÏÏÔʾ¶ÌÍ·"
 
-#: src/prefs_common.c:1495
+#: src/prefs_common.c:1326
 msgid "Line space"
 msgstr "Ðмä¾à"
 
-#: src/prefs_common.c:1509
+#: src/prefs_common.c:1340 src/prefs_common.c:1380
 msgid "pixel(s)"
 msgstr ""
 
-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1345
 msgid "Leave space on head"
 msgstr "ÔÚÍ·ÉÏÁô³ö¿Õ¼ä"
 
-#: src/prefs_common.c:1524
-msgid "Translate header name (such as `From:', `Subject:')"
-msgstr "·­ÒëÍ·Ãû(Èç`·¢ÐÅÈË', `±êÌâ:')"
+#: src/prefs_common.c:1347
+msgid "Scroll"
+msgstr ""
 
-#: src/prefs_common.c:1527
-msgid "Display recipient on `From' column if sender is yourself"
-msgstr "Èç¹û·¢ÐÅÕßÊÇÄã×Ô¼º£¬ÔÚ `´Ó' ÁÐÏÔʾ½ÓÊÜÕß"
+#: src/prefs_common.c:1354
+msgid "Half page"
+msgstr ""
 
-#: src/prefs_common.c:1529
-msgid "Enable horizontal scroll bar"
+#: src/prefs_common.c:1360
+msgid "Smooth scroll"
 msgstr ""
 
-#: src/prefs_common.c:1536
-msgid " Set display item of summary... "
-msgstr "ÉèÖÃÕªÒªµÄÏÔʾÌõÄ¿... "
+#: src/prefs_common.c:1366
+msgid "Step"
+msgstr ""
 
-#: src/prefs_common.c:1585
+#: src/prefs_common.c:1427
 msgid "Encrypt message by default"
 msgstr ""
 
-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1430
 msgid "Sign message by default"
 msgstr ""
 
-#: src/prefs_common.c:1591
+#: src/prefs_common.c:1433
 msgid "Automatically check signatures"
 msgstr ""
 
-#: src/prefs_common.c:1594
+#: src/prefs_common.c:1436
+msgid "Show signature check result in a popup window"
+msgstr ""
+
+#: src/prefs_common.c:1440
 msgid "Grab input while entering a passphrase"
 msgstr ""
 
+#: src/prefs_common.c:1445
+msgid "Display warning on startup if GnuPG doesn't work"
+msgstr ""
+
 #. create default signkey box
-#: src/prefs_common.c:1601
+#: src/prefs_common.c:1452
 msgid "Default Sign Key"
 msgstr ""
 
-#: src/prefs_common.c:1703
+#: src/prefs_common.c:1554
 msgid ""
 "Emulate the behavior of mouse operation of\n"
 "Emacs-based mailer"
 msgstr "Ä£·Â Emacs ÀàÓʼþÈí¼þµÄÊó±ê²Ù×÷ÐÐΪ"
 
-#: src/prefs_common.c:1710
+#: src/prefs_common.c:1561
 msgid "Open first unread message when entering a folder"
 msgstr "ÔÚ½øÈëÎļþ¼Ðʱ´ò¿ªµÚÒ»¸öûÓжÁ¹ýµÄÓʼþ"
 
-#: src/prefs_common.c:1714
+#: src/prefs_common.c:1565
 msgid "Go to inbox after receiving new mail"
 msgstr ""
 
-#: src/prefs_common.c:1722
+#: src/prefs_common.c:1573
 msgid "Execute immediately when moving or deleting messages"
 msgstr ""
 
-#: src/prefs_common.c:1729
+#: src/prefs_common.c:1580
 msgid ""
 "(Messages will be just marked till execution\n"
 " if this is turned off)"
 msgstr ""
 
-#: src/prefs_common.c:1736
-msgid "Enable smooth scrolling on the message view"
+#: src/prefs_common.c:1587
+msgid "Add address to destination when double-clicked"
 msgstr ""
 
-#: src/prefs_common.c:1742
-msgid "Scroll step"
-msgstr ""
-
-#: src/prefs_common.c:1757
+#: src/prefs_common.c:1589
 msgid "On exit"
 msgstr "µ±Í˳öʱ"
 
-#: src/prefs_common.c:1765
+#: src/prefs_common.c:1597
 msgid "Confirm on exit"
 msgstr "µ±Í˳öʱȷÈÏ"
 
-#: src/prefs_common.c:1772
+#: src/prefs_common.c:1604
 msgid "Empty trash on exit"
 msgstr ""
 
-#: src/prefs_common.c:1774
+#: src/prefs_common.c:1606
 msgid "Ask before emptying"
 msgstr ""
 
-#: src/prefs_common.c:1814
+#: src/prefs_common.c:1610
+msgid "Warn if there are queued messages"
+msgstr ""
+
+#: src/prefs_common.c:1648
 #, c-format
 msgid "External Web browser (%s will be replaced with URI)"
 msgstr "Íⲿä¯ÀÀÆ÷£¨%s ½«±»URLÈ¡´ú£©"
 
-#: src/prefs_common.c:1821 src/prefs_common.c:1845 src/prefs_common.c:1861
+#: src/prefs_common.c:1655 src/prefs_common.c:1680 src/prefs_common.c:1696
 msgid "Command"
 msgstr "ÃüÁî"
 
-#: src/prefs_common.c:1838
+#: src/prefs_common.c:1673
 #, c-format
 msgid "Printing (%s will be replaced with file name)"
 msgstr "´òÓ¡ £¨%s ½«±»ÎļþÃûÈ¡´ú£©"
 
-#: src/prefs_common.c:1854
+#: src/prefs_common.c:1689
 #, c-format
 msgid "External editor (%s will be replaced with file name)"
 msgstr "Íⲿ±à¼­Æ÷£¨%s ½«±»ÎļþÃûÈ¡´ú£©"
 
-#: src/prefs_common.c:1915
+#: src/prefs_common.c:1752
 msgid "Set message colors"
 msgstr ""
 
-#: src/prefs_common.c:1923
+#: src/prefs_common.c:1760
 msgid "Colors"
 msgstr ""
 
-#: src/prefs_common.c:1961
+#: src/prefs_common.c:1794
 msgid "Quoted Text - First Level"
 msgstr ""
 
-#: src/prefs_common.c:1967
+#: src/prefs_common.c:1800
 msgid "Quoted Text - Second Level"
 msgstr ""
 
-#: src/prefs_common.c:1973
+#: src/prefs_common.c:1806
 msgid "Quoted Text - Third Level"
 msgstr ""
 
-#: src/prefs_common.c:1979
+#: src/prefs_common.c:1812
 msgid "URI link"
 msgstr ""
 
-#: src/prefs_common.c:1986
+#: src/prefs_common.c:1819
 msgid "Recycle quote colors"
 msgstr ""
 
-#: src/prefs_common.c:2034
+#: src/prefs_common.c:1881
 msgid "Pick color for quotation level 1"
 msgstr ""
 
-#: src/prefs_common.c:2037
+#: src/prefs_common.c:1884
 msgid "Pick color for quotation level 2"
 msgstr ""
 
-#: src/prefs_common.c:2040
+#: src/prefs_common.c:1887
 msgid "Pick color for quotation level 3"
 msgstr ""
 
-#: src/prefs_common.c:2043
+#: src/prefs_common.c:1890
 msgid "Pick color for URI"
 msgstr ""
 
-#: src/prefs_common.c:2167
+#: src/prefs_common.c:2025
 msgid "Description of symbols"
 msgstr "·ûºÅÃèÊö"
 
-#: src/prefs_common.c:2194
+#: src/prefs_common.c:2052
 #, c-format
 msgid ""
 "Date\n"
@@ -2956,69 +3174,208 @@ msgstr ""
 "Óʼþ-ID\n"
 "%"
 
-#: src/prefs_common.c:2230
-msgid "Reading filter configuration...\n"
-msgstr "ÕýÔÚ¶ÁÈ¡¹ýÂËÆ÷ÅäÖÃ...\n"
-
-#: src/prefs_common.c:2266
-msgid "Writing filter configuration...\n"
-msgstr "ÕýÔÚд¹ýÂËÆ÷ÅäÖÃ...\n"
-
-#: src/prefs_common.c:2309
-msgid "(New)"
-msgstr "( ÐÂ )"
-
-#: src/prefs_common.c:2360
-msgid "Destination is not set."
-msgstr "Ä¿µÄûÓÐÉ趨¡£"
-
-#: src/prefs_common.c:2365
-msgid "Header name is not set."
-msgstr "Í·ÃûûÉ趨¡£"
-
-#: src/prefs_common.c:2471
-msgid "Delete rule"
-msgstr "ɾ³ý¹æÔò"
-
-#: src/prefs_common.c:2472
-msgid "Do you really want to delete this rule?"
-msgstr "ÄãȷʵÏëҪɾ³ý¸Ã¹æÔòÂð£¿"
-
-#: src/prefs_common.c:2637
+#: src/prefs_common.c:2155
 msgid "Set display item"
 msgstr "É趨ÏÔʾµÄÏîÄ¿"
 
-#: src/prefs_common.c:2654
+#: src/prefs_common.c:2172
 msgid "Mark"
 msgstr "񈬀"
 
-#: src/prefs_common.c:2656
+#: src/prefs_common.c:2174
 msgid "MIME"
 msgstr ""
 
-#: src/prefs_common.c:2657
+#: src/prefs_common.c:2175
 msgid "Number"
 msgstr "ÐòºÅ"
 
-#: src/prefs_common.c:2659 src/summaryview.c:351
+#: src/prefs_common.c:2177 src/summaryview.c:353
 msgid "Date"
 msgstr "ÈÕÆÚ"
 
-#: src/prefs_common.c:2660 src/summaryview.c:352
+#: src/prefs_common.c:2178 src/summaryview.c:354
 msgid "From"
 msgstr "´Ó(From)"
 
-#: src/prefs_common.c:2661 src/summaryview.c:353
+#: src/prefs_common.c:2179 src/summaryview.c:355
 msgid "Subject"
 msgstr "±êÌâ"
 
-#: src/prefs_common.c:2714
+#: src/prefs_common.c:2232
 msgid "Font selection"
 msgstr "×ÖÌåÑ¡Ôñ"
 
-#: src/procheader.c:526
-msgid "SunMonTueWedThuFriSat"
-msgstr "ÈÕÒ»¶þÈýËÄÎåÁù"
+#: src/prefs_customheader.c:148
+msgid "Custom headers"
+msgstr ""
+
+#: src/prefs_customheader.c:150
+#, fuzzy
+msgid "Creating custom header setting window...\n"
+msgstr "´´½¨±êÌâ´°¿Ú...\n"
+
+#: src/prefs_customheader.c:168
+#, fuzzy
+msgid "Custom header setting"
+msgstr "/×÷ΪÎı¾ÎļþÏÔʾ(_D)"
+
+#: src/prefs_customheader.c:212
+msgid "Value"
+msgstr ""
+
+#: src/prefs_customheader.c:320
+#, fuzzy
+msgid "Reading custom header configuration...\n"
+msgstr "ÕýÔÚ¶ÁÈ¡¹ýÂËÆ÷ÅäÖÃ...\n"
+
+#: src/prefs_customheader.c:365
+#, fuzzy
+msgid "Writing custom header configuration...\n"
+msgstr "ÕýÔÚд¹ýÂËÆ÷ÅäÖÃ...\n"
+
+#: src/prefs_customheader.c:490 src/prefs_display_header.c:542
+#: src/prefs_filter.c:613
+msgid "Header name is not set."
+msgstr "Í·ÃûûÉ趨¡£"
+
+#: src/prefs_customheader.c:541
+#, fuzzy
+msgid "Delete header"
+msgstr "ɾ³ýÎļþ¼Ð"
+
+#: src/prefs_customheader.c:542
+#, fuzzy
+msgid "Do you really want to delete this header?"
+msgstr "ÄãȷʵÏëҪɾ³ý¸Ã¹æÔòÂð£¿"
+
+#: src/prefs_display_header.c:187
+#, fuzzy
+msgid "Creating display header setting window...\n"
+msgstr "´´½¨±êÌâ´°¿Ú...\n"
+
+#: src/prefs_display_header.c:210
+#, fuzzy
+msgid "Display header setting"
+msgstr "/×÷ΪÎı¾ÎļþÏÔʾ(_D)"
+
+#: src/prefs_display_header.c:237
+#, fuzzy
+msgid "Header name"
+msgstr "ͷ"
+
+#: src/prefs_display_header.c:269
+#, fuzzy
+msgid "Displayed Headers"
+msgstr "ÏÔʾ %s µÄ±êÌâ...\n"
+
+#: src/prefs_display_header.c:327
+#, fuzzy
+msgid "Hidden headers"
+msgstr "ͷ"
+
+#: src/prefs_display_header.c:357
+#, fuzzy
+msgid "Show all unspecified headers"
+msgstr "/ÏÔʾËùÓÐÍ·(_h)"
+
+#: src/prefs_display_header.c:382
+#, fuzzy
+msgid "Reading configuration for displaying headers...\n"
+msgstr "ÕýÔÚ¶ÁÈ¡ÅäÖÃÎļþ...\n"
+
+#: src/prefs_display_header.c:420
+#, fuzzy
+msgid "Writing configuration for displaying headers...\n"
+msgstr "ÕýÔÚд¹ýÂËÆ÷ÅäÖÃ...\n"
+
+#: src/prefs_display_header.c:552
+#, fuzzy
+msgid "This header is already in the list."
+msgstr "Îļþ¼Ð`%s'ÒÑ´æÔÚ¡£"
+
+#: src/prefs_filter.c:184
+msgid "Registered rules"
+msgstr "ÒÑ×¢²áµÄ¹æÔò"
+
+#: src/prefs_filter.c:186
+msgid "Creating filter setting window...\n"
+msgstr ""
+
+#: src/prefs_filter.c:205
+msgid "Filter setting"
+msgstr ""
+
+#: src/prefs_filter.c:228
+msgid "Operator"
+msgstr "²Ù×÷·û"
+
+#: src/prefs_filter.c:266 src/prefs_filter.c:626 src/prefs_filter.c:765
+#: src/prefs_filter.c:777
+msgid "(none)"
+msgstr "(ÎÞ)"
+
+#: src/prefs_filter.c:272
+msgid "Keyword"
+msgstr "¹Ø¼ü´Ê"
+
+#: src/prefs_filter.c:293
+msgid "Predicate"
+msgstr "ν´Ê"
+
+#: src/prefs_filter.c:305 src/prefs_filter.c:316 src/prefs_filter.c:635
+#: src/prefs_filter.c:638 src/prefs_filter.c:782 src/prefs_filter.c:785
+msgid "contains"
+msgstr "°üº¬"
+
+#: src/prefs_filter.c:305 src/prefs_filter.c:316 src/prefs_filter.c:782
+#: src/prefs_filter.c:785
+msgid "not contain"
+msgstr "ûÓаüº¬"
+
+#: src/prefs_filter.c:332
+msgid "Destination"
+msgstr "Ä¿µÄÎļþ"
+
+#: src/prefs_filter.c:356
+msgid "Use regex"
+msgstr "ʹÓÃÕý¹æ±í´ïʽ"
+
+#: src/prefs_filter.c:360
+msgid "Don't receive"
+msgstr "²»ÄܽÓÊÜ"
+
+#: src/prefs_filter.c:385
+msgid "Register"
+msgstr "×¢²á"
+
+#: src/prefs_filter.c:391
+msgid " Substitute "
+msgstr "Ìæ´ú"
+
+#: src/prefs_filter.c:478
+msgid "Reading filter configuration...\n"
+msgstr "ÕýÔÚ¶ÁÈ¡¹ýÂËÆ÷ÅäÖÃ...\n"
+
+#: src/prefs_filter.c:514
+msgid "Writing filter configuration...\n"
+msgstr "ÕýÔÚд¹ýÂËÆ÷ÅäÖÃ...\n"
+
+#: src/prefs_filter.c:557
+msgid "(New)"
+msgstr "( ÐÂ )"
+
+#: src/prefs_filter.c:608
+msgid "Destination is not set."
+msgstr "Ä¿µÄûÓÐÉ趨¡£"
+
+#: src/prefs_filter.c:719
+msgid "Delete rule"
+msgstr "ɾ³ý¹æÔò"
+
+#: src/prefs_filter.c:720
+msgid "Do you really want to delete this rule?"
+msgstr "ÄãȷʵÏëҪɾ³ý¸Ã¹æÔòÂð£¿"
 
 #: src/procmime.c:686
 msgid "Code conversion failed.\n"
@@ -3049,151 +3406,205 @@ msgstr "\t
 msgid "\t%d new message(s)\n"
 msgstr "\t%d ¸öÐÂÓʼþ\n"
 
-#: src/procmsg.c:445
+#: src/procmsg.c:457
 msgid "Mark file not found.\n"
 msgstr "û·¢ÏÖ±ê¼ÇµÄÎļþ¡£\n"
 
-#: src/procmsg.c:447
+#: src/procmsg.c:459
 #, c-format
 msgid "Mark version is different (%d != %d). Discarding it.\n"
 msgstr "±ê¼Ç°æ±¾²»Í¬£¨%d != %d£©¡£¶ªµôËü¡£\n"
 
-#: src/procmsg.c:463
+#: src/procmsg.c:475
 msgid "Can't open mark file with append mode.\n"
 msgstr "²»ÄÜÓÃÌí¼Óģʽ´ò¿ª±ê¼ÇÎļþ¡£\n"
 
-#: src/procmsg.c:468
+#: src/procmsg.c:480
 msgid "Can't open mark file with write mode.\n"
 msgstr "²»ÄÜÓÃдģʽ´ò¿ª±ê¼ÇÎļþ¡£\n"
 
-#: src/procmsg.c:651
+#: src/procmsg.c:663
 msgid "Sending queued message failed.\n"
 msgstr "·¢ËÍÅŶӵÄÓʼþʧ°Ü¡£\n"
 
-#: src/procmsg.c:708
+#: src/procmsg.c:720
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "´òÓ¡ÃüÁîÐв»´æÔÚ£º`%s'\n"
 
-#: src/progressdialog.c:48
+#: src/progressdialog.c:51
+msgid "Status"
+msgstr ""
+
+#: src/progressdialog.c:53
 msgid "Creating progress dialog...\n"
 msgstr "ÕýÔÚ´´½¨¹ý³Ì¶Ô»°¿ò...\n"
 
-#: src/recv.c:107
+#: src/recv.c:111
 msgid "error occurred while retrieving data.\n"
 msgstr "ÔÚÕÒ»ØÊý¾Ýʱ·¢Éú´íÎó¡£\n"
 
-#: src/recv.c:128 src/recv.c:169 src/recv.c:181
+#: src/recv.c:148 src/recv.c:185 src/recv.c:200
 msgid "Can't write to file.\n"
 msgstr "²»ÄÜдÎļþ¡£\n"
 
-#: src/rfc2015.c:135 src/rfc2015.c:170
+#: src/rfc2015.c:137 src/rfc2015.c:172
 msgid "Oops: Signature not verified"
 msgstr ""
 
-#: src/rfc2015.c:138 src/rfc2015.c:173
+#: src/rfc2015.c:140 src/rfc2015.c:175
 msgid "No signature found"
 msgstr ""
 
-#: src/rfc2015.c:141
+#: src/rfc2015.c:143
 msgid "Good signature"
 msgstr ""
 
-#: src/rfc2015.c:144
+#: src/rfc2015.c:146
 msgid "BAD signature"
 msgstr ""
 
-#: src/rfc2015.c:147 src/rfc2015.c:182
+#: src/rfc2015.c:149 src/rfc2015.c:184
 msgid "No public key to verify the signature"
 msgstr ""
 
-#: src/rfc2015.c:150 src/rfc2015.c:185
+#: src/rfc2015.c:152 src/rfc2015.c:187
 msgid "Error verifying the signature"
 msgstr ""
 
-#: src/rfc2015.c:153 src/rfc2015.c:188
+#: src/rfc2015.c:155 src/rfc2015.c:190
 msgid "Different results for signatures"
 msgstr ""
 
-#: src/rfc2015.c:156 src/rfc2015.c:191
+#: src/rfc2015.c:158 src/rfc2015.c:193
 msgid "Error: Unknown status"
 msgstr ""
 
-#: src/rfc2015.c:176
+#: src/rfc2015.c:178
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: src/rfc2015.c:179
+#: src/rfc2015.c:181
 #, c-format
 msgid "BAD signature  from \"%s\""
 msgstr ""
 
-#: src/rfc2015.c:211
+#: src/rfc2015.c:213
 msgid "Cannot find user ID for this key."
 msgstr ""
 
-#: src/rfc2015.c:222
+#: src/rfc2015.c:224
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr ""
 
-#: src/rfc2015.c:250
+#: src/rfc2015.c:252
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: src/rfc2015.c:259
+#: src/rfc2015.c:261
 #, c-format
 msgid "Key fingerprint: %s\n"
 msgstr ""
 
-#: src/select-keys.c:241
-msgid "Select Keys"
+#: src/select-keys.c:101
+#, c-format
+msgid "Please select key for `%s'"
+msgstr ""
+
+#: src/select-keys.c:104
+#, c-format
+msgid "Collecting info for `%s' ... %c"
 msgstr ""
 
-#: src/select-keys.c:253
-msgid "Select key for: "
+#: src/select-keys.c:272
+msgid "Select Keys"
 msgstr ""
 
-#: src/select-keys.c:271
+#: src/select-keys.c:300
 msgid "Key ID"
 msgstr ""
 
-#: src/select-keys.c:274
+#: src/select-keys.c:303
 msgid "Val"
 msgstr ""
 
-#: src/select-keys.c:288
+#: src/select-keys.c:325
 msgid "Select"
 msgstr ""
 
-#: src/send.c:146
+#: src/select-keys.c:445
+msgid "Add key"
+msgstr ""
+
+#: src/select-keys.c:446
+msgid "Enter another user or key ID\n"
+msgstr ""
+
+#: src/send.c:148
 msgid "Queued message header is broken.\n"
 msgstr "ÅŶӵÄÓʼþÍ·±»´ò¶Ï¡£\n"
 
-#: src/send.c:155
+#: src/send.c:157
 msgid "Account not found. Using current account...\n"
 msgstr ""
 
-#: src/send.c:166
+#: src/send.c:168
 msgid "Account not found.\n"
 msgstr ""
 
-#: src/send.c:197
-#, c-format
-msgid "Connecting to SMTP server: %s ...\n"
+#: src/send.c:250
+#, fuzzy, c-format
+msgid "Connecting to SMTP server: %s ..."
 msgstr "ÕýÔÚÁª½Ó SMTP ·þÎñÆ÷£º%s ...\n"
 
-#: src/send.c:239
+#: src/send.c:254
+msgid "Connecting"
+msgstr ""
+
+#: src/send.c:261
+msgid "Sending MAIL FROM..."
+msgstr ""
+
+#: src/send.c:262
+#, fuzzy
+msgid "Sending"
+msgstr "·¢ËÍ"
+
+#: src/send.c:269
+msgid "Sending RCPT TO..."
+msgstr ""
+
+#: src/send.c:276
+msgid "Sending DATA..."
+msgstr ""
+
+#: src/send.c:292
+#, fuzzy, c-format
+msgid "Sending message (%d / %d bytes)"
+msgstr "ÕýÔÚÈ¡»ØÓʼþ (%d / %d) (%d / %d bytes)"
+
+#: src/send.c:309
+#, fuzzy
+msgid "Quitting..."
+msgstr "Í˳ö"
+
+#: src/send.c:330
 #, c-format
 msgid "Can't connect to SMTP server: %s:%d\n"
 msgstr "²»ÄÜÁª½Ó SMTP ·þÎñÆ÷£º%s:%d\n"
 
-#: src/send.c:252
+#: src/send.c:341
 msgid "Error occurred while sending HELO\n"
 msgstr "ÔÚ·¢ËÍHELOʱ·¢Éú´íÎó\n"
 
+#: src/send.c:357
+#, fuzzy
+msgid "Sending message"
+msgstr "·¢ËÍÓʼþ"
+
 #: src/setup.c:43
 msgid "Mailbox setting"
 msgstr ""
@@ -3264,247 +3675,255 @@ msgstr "
 msgid "Search finished"
 msgstr "ËÑË÷½áÊø"
 
-#: src/summaryview.c:288
+#: src/summaryview.c:289
 msgid "/M_ove..."
 msgstr "/Òƶ¯...(_o)"
 
-#: src/summaryview.c:289
+#: src/summaryview.c:290
 msgid "/_Copy..."
 msgstr "/¸´ÖÆ...(_C)"
 
-#: src/summaryview.c:291
+#: src/summaryview.c:292
 msgid "/E_xecute"
 msgstr "/Ö´ÐÐ(_x)"
 
-#: src/summaryview.c:292
+#: src/summaryview.c:293
 msgid "/_Mark"
 msgstr "/񈬀(_M)"
 
-#: src/summaryview.c:293
+#: src/summaryview.c:294
 msgid "/_Mark/_Mark"
 msgstr "/񈬀(_M)/񈬀(_M)"
 
-#: src/summaryview.c:294
+#: src/summaryview.c:295
 msgid "/_Mark/_Unmark"
 msgstr "/±ê¼Ç(_M)/È¡Ïû±ê¼Ç(_U)"
 
-#: src/summaryview.c:295
+#: src/summaryview.c:296
 msgid "/_Mark/---"
 msgstr "/񈬀(_M)/---"
 
-#: src/summaryview.c:296
+#: src/summaryview.c:297
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/±ê¼Ç(_M)/±ê¼Ç³Éδ¶Á(_e)"
 
-#: src/summaryview.c:297
-msgid "/_Mark/Make it as _being read"
-msgstr "/±ê¼Ç(_M)/±ê¼Ç³ÉÒѶÁ(_M)"
+#: src/summaryview.c:298
+#, fuzzy
+msgid "/_Mark/Mark as rea_d"
+msgstr "/±ê¼Ç(_M)/±ê¼Ç³Éδ¶Á(_e)"
 
-#: src/summaryview.c:300
+#: src/summaryview.c:301
 msgid "/_Reply"
 msgstr "/»Ø¸´(_R)"
 
-#: src/summaryview.c:301
+#: src/summaryview.c:302
+#, fuzzy
+msgid "/Repl_y to sender"
+msgstr "/»Ø¸´ËùÓеÄ(_l)"
+
+#: src/summaryview.c:303
 msgid "/Reply to a_ll"
 msgstr "/»Ø¸´ËùÓеÄ(_l)"
 
-#: src/summaryview.c:302
+#: src/summaryview.c:304
 msgid "/_Forward"
 msgstr "/ת·¢(_F)"
 
-#: src/summaryview.c:303
-msgid "/Forward as an a_ttachment"
+#: src/summaryview.c:305
+#, fuzzy
+msgid "/Forward as a_ttachment"
 msgstr "×÷Ϊ¸½¼þת·¢(_t)"
 
-#: src/summaryview.c:306
+#: src/summaryview.c:308
 msgid "/Open in new _window"
 msgstr "/ÔÚд°¿ÚÖдò¿ª(_w)"
 
-#: src/summaryview.c:307
+#: src/summaryview.c:309
 msgid "/View so_urce"
 msgstr ""
 
-#: src/summaryview.c:308
+#: src/summaryview.c:310
 msgid "/Show all _header"
 msgstr "/ÏÔʾËùÓÐÍ·(_h)"
 
-#: src/summaryview.c:309
-msgid "/Re_edit"
+#: src/summaryview.c:311
+#, fuzzy
+msgid "/Re-_edit"
 msgstr "/ÖØб༭(_e)"
 
-#: src/summaryview.c:312
+#: src/summaryview.c:314
 msgid "/_Print..."
 msgstr "/´òÓ¡...(_P)"
 
-#: src/summaryview.c:314
+#: src/summaryview.c:316
 msgid "/Select _all"
 msgstr "ȫѡ(_a)"
 
-#: src/summaryview.c:320
+#: src/summaryview.c:322
 msgid "M"
 msgstr ""
 
-#: src/summaryview.c:320
+#: src/summaryview.c:322
 msgid "U"
 msgstr ""
 
-#: src/summaryview.c:335
+#: src/summaryview.c:337
 msgid "Creating summary view...\n"
 msgstr "´´½¨ÕªÒªÊÓͼ...\n"
 
-#: src/summaryview.c:350
+#: src/summaryview.c:352
 msgid "No."
 msgstr ""
 
-#: src/summaryview.c:567
+#: src/summaryview.c:573
 msgid "Process mark"
 msgstr "½ø³Ì±êÖ¾"
 
-#: src/summaryview.c:568
+#: src/summaryview.c:574
 msgid "Some marks are left. Process it?"
 msgstr "ÓÐЩ±ê¼ÇÁôÏÂÀ´ÁË¡£Ö´ÐÐÂð£¿"
 
-#: src/summaryview.c:592
+#: src/summaryview.c:599
 msgid ""
 "empty folder\n"
 "\n"
 msgstr "¿ÕÎļþ¼Ð\n"
 
-#: src/summaryview.c:604
+#: src/summaryview.c:611
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "ɨÃèÎļþ¼Ð(%s)..."
 
-#: src/summaryview.c:673
+#: src/summaryview.c:680
 msgid "done."
 msgstr "Íê³É¡£"
 
-#: src/summaryview.c:807
+#: src/summaryview.c:815
 msgid "No unread message"
 msgstr "ûÓÐδ¶ÁµÄÓʼþ"
 
-#: src/summaryview.c:808
+#: src/summaryview.c:816
 msgid "No unread message found. Go to next folder?"
 msgstr "û·¢ÏÖδ¶ÁµÄÓʼþ¡£µ½ÏÂÒ»¸öÎļþ¼Ð?"
 
-#: src/summaryview.c:944 src/summaryview.c:946
+#: src/summaryview.c:957 src/summaryview.c:959
 msgid "Attracting messages by subject..."
 msgstr "ÕýÔÚ°´±êÌâÊÕ¼¯¸ÐÐËȤµÄÓʼþ..."
 
-#: src/summaryview.c:1089
+#: src/summaryview.c:1102
 #, c-format
 msgid "%d deleted"
 msgstr "%d ¸öɾ³ý"
 
-#: src/summaryview.c:1093
+#: src/summaryview.c:1106
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ¸öÒƶ¯"
 
-#: src/summaryview.c:1094 src/summaryview.c:1101
+#: src/summaryview.c:1107 src/summaryview.c:1114
 msgid ", "
 msgstr "£¬ "
 
-#: src/summaryview.c:1099
+#: src/summaryview.c:1112
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1116
+#: src/summaryview.c:1129
 msgid " item(s) selected"
 msgstr "ÏîÑ¡ÔñÁË"
 
-#: src/summaryview.c:1127
+#: src/summaryview.c:1140
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ¸öеÄ, %d ¸öδ¶Á, ¹² %d ¸ö(%s)"
 
-#: src/summaryview.c:1133
+#: src/summaryview.c:1146
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d ¸öеÄ, %d ¸öδ¶Á, ¹² %d ¸ö"
 
-#: src/summaryview.c:1174 src/summaryview.c:1175
+#: src/summaryview.c:1187 src/summaryview.c:1188
 msgid "Sorting summary..."
 msgstr "ÕýÔÚÅÅÁÐÕªÒª..."
 
-#: src/summaryview.c:1213
+#: src/summaryview.c:1226
 msgid "\tSetting summary from message data..."
 msgstr "\tÕýÔÚ´ÓÓʼþÊý¾ÝÖÐÉèÖÃÕªÒª..."
 
-#: src/summaryview.c:1215
+#: src/summaryview.c:1228
 msgid "Setting summary from message data..."
 msgstr "ÕýÔÚ´ÓÓʼþÊý¾ÝÖÐÉèÖÃÕªÒª..."
 
-#: src/summaryview.c:1324
+#: src/summaryview.c:1337
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "ÕýÔÚдժҪ»º´æ(%s)..."
 
-#: src/summaryview.c:1376
+#: src/summaryview.c:1389
 msgid "(No Date)"
 msgstr "(ûÓÐÊý¾Ý)"
 
-#: src/summaryview.c:1641
+#: src/summaryview.c:1654
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Óʼþ %d ±»±ê¼Ç\n"
 
-#: src/summaryview.c:1670
+#: src/summaryview.c:1683
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Óʼþ %d ±»±ê¼ÇΪÒѶÁ\n"
 
-#: src/summaryview.c:1705
+#: src/summaryview.c:1718
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Óʼþ %d ±»±ê¼Ç³Éδ¶Á\n"
 
-#: src/summaryview.c:1747
+#: src/summaryview.c:1760
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Óʼþ %s/%d ÉèÖÃΪɾ³ý\n"
 
-#: src/summaryview.c:1761
+#: src/summaryview.c:1774
 msgid "Current folder is Trash."
 msgstr "µ±Ç°µÄÎļþ¼ÐÊÇÀ¬»øÏä."
 
-#: src/summaryview.c:1783 src/summaryview.c:1785
+#: src/summaryview.c:1796 src/summaryview.c:1798
 msgid "Deleting duplicated messages..."
 msgstr "ÕýÔÚɾ³ýÖظ´Îļþ..."
 
-#: src/summaryview.c:1835
+#: src/summaryview.c:1848
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Óʼþ %s/%d È¡Ïû±ê¼Ç\n"
 
-#: src/summaryview.c:1872
+#: src/summaryview.c:1885
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Óʼþ %d ÉèÖÃΪÒƵ½ %s\n"
 
-#: src/summaryview.c:1884
+#: src/summaryview.c:1897
 msgid "Destination is same as current folder."
 msgstr "Ä¿±êÓ뵱ǰÎļþ¼ÐÏàͬ."
 
-#: src/summaryview.c:1933
+#: src/summaryview.c:1946
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:1946
+#: src/summaryview.c:1959
 msgid "Destination to copy is same as current folder."
 msgstr ""
 
-#: src/summaryview.c:1978
+#: src/summaryview.c:1991
 msgid "Selecting all messages..."
 msgstr "Ñ¡ÔñËùÓÐÓʼþ..."
 
-#: src/summaryview.c:2032
+#: src/summaryview.c:2045
 msgid "Print"
 msgstr "´òÓ¡"
 
-#: src/summaryview.c:2033
+#: src/summaryview.c:2046
 #, c-format
 msgid ""
 "Enter the print command line:\n"
@@ -3513,7 +3932,7 @@ msgstr ""
 "ÊäÈë´òÓ¡ÃüÁîÐÐ:\n"
 "(ÓÃÎļþÃûÌæ´ú `%s')"
 
-#: src/summaryview.c:2039
+#: src/summaryview.c:2052
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -3522,52 +3941,62 @@ msgstr ""
 "´òÓ¡ÃüÁîÐÐÎÞЧ:\n"
 "`%s'"
 
-#: src/summaryview.c:2256 src/summaryview.c:2257
+#: src/summaryview.c:2274 src/summaryview.c:2275
 msgid "Building threads..."
 msgstr "ÕýÔÚ´´½¨ÂÛÌâ..."
 
-#: src/summaryview.c:2279 src/summaryview.c:2280
+#: src/summaryview.c:2297 src/summaryview.c:2298
 msgid "Unthreading..."
 msgstr "ÕýÔÚÈ¡ÏûÂÛÌâ..."
 
-#: src/summaryview.c:2302
+#: src/summaryview.c:2320
 msgid "Unthreading for execution..."
 msgstr "ÕýÔÚΪִÐÐÈ¡ÏûÂÛÌâ..."
 
-#: src/summaryview.c:2389
+#: src/summaryview.c:2407
 msgid "filtering..."
 msgstr "ÕýÔÚ¹ýÂË..."
 
-#: src/summaryview.c:2390
+#: src/summaryview.c:2408
 msgid "Filtering..."
 msgstr "ÕýÔÚ¹ýÂË..."
 
-#: src/summaryview.c:2494
+#: src/summaryview.c:2514
 #, c-format
 msgid "Go to %s\n"
 msgstr "µ½ %s\n"
 
-#: src/textview.c:137
+#: src/textview.c:138
 msgid "Creating text view...\n"
 msgstr "´´½¨Îı¾ÊÓͼ...\n"
 
-#: src/textview.c:372
-msgid "To save this part, pop up the context menu with\n"
+#: src/textview.c:366
+#, fuzzy
+msgid "To save this part, pop up the context menu with "
 msgstr "±£´æ¸Ã²¿·ÖÐèҪʹÓÃÉÏÏÂÎÄÃô¸ÐµÄµ¯³ö²Ëµ¥\n"
 
-#: src/textview.c:375
+#: src/textview.c:367
+#, fuzzy
+msgid "right click and select `Save as...', "
+msgstr ""
+"ÓÒ»÷²¢Ñ¡Ôñ`Áí´æΪ...', »ò°´`y'¼ü.\n"
+"\n"
+
+#: src/textview.c:368
+#, fuzzy
 msgid ""
-"right click and select `Save as...', or press `y' key.\n"
+"or press `y' key.\n"
 "\n"
 msgstr ""
-"ÓÒ»÷²¢Ñ¡Ôñ`Áí´æΪ...', »ò°´`y'¼ü.\n"
+"`ÒÔÎı¾·½Ê½ÏÔʾ', »ò°´`t'¼ü. \n"
 "\n"
 
-#: src/textview.c:379
-msgid "To display this part as a text message, select\n"
+#: src/textview.c:370
+#, fuzzy
+msgid "To display this part as a text message, select "
 msgstr "ÒÔÎı¾Óʼþ·½Ê½ÏÔʾ¸Ã²¿·Ö, Ñ¡Ôñ\n"
 
-#: src/textview.c:382
+#: src/textview.c:371
 msgid ""
 "`Display as text', or press `t' key.\n"
 "\n"
@@ -3575,41 +4004,76 @@ msgstr ""
 "`ÒÔÎı¾·½Ê½ÏÔʾ', »ò°´`t'¼ü. \n"
 "\n"
 
-#: src/textview.c:386
-msgid "To open this part with external program, select `Open',\n"
+#: src/textview.c:373
+#, fuzzy
+msgid "To open this part with external program, select "
 msgstr "ΪÁËÓÃÍⲿ³ÌÐò´ò¿ª¸Ã²¿·Ö, Ñ¡Ôñ`´ò¿ª',\n"
 
-#: src/textview.c:389
-msgid "or double-click, or click the center button, or press `l' key."
+#: src/textview.c:374
+msgid "`Open' or `Open with...', "
+msgstr ""
+
+#: src/textview.c:375
+#, fuzzy
+msgid "or double-click, or click the center button, "
 msgstr "»òË«»÷, »ò»÷Öмü, »ò°´`l'¼ü."
 
-#: src/textview.c:410
+#: src/textview.c:376
+msgid "or press `l' key."
+msgstr ""
+
+#: src/textview.c:395
 msgid "This signature has not been checked yet.\n"
 msgstr ""
 
-#: src/textview.c:413
+#: src/textview.c:396
 msgid "To check it, pop up the context menu with\n"
 msgstr ""
 
-#: src/textview.c:416
+#: src/textview.c:397
 msgid "right click and select `Check signature'.\n"
 msgstr ""
 
-#: src/utils.c:1376 src/utils.c:1453
+#: src/utils.c:1547
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "Ïò %s дÈëʧ°Ü¡£\n"
 
-#: src/utils.c:1396
-#, c-format
-msgid "File copy from %s to %s failed.\n"
-msgstr ""
+#: src/utils.c:1588
+#, fuzzy, c-format
+msgid "move_file(): file %s already exists."
+msgstr "Îļþ¼Ð`%s'ÒÑ´æÔÚ¡£"
 
-#: src/utils.c:1614
+#: src/utils.c:1729
 #, c-format
 msgid "Open URI command line is invalid: `%s'"
 msgstr "´ò¿ª URL ÃüÁîÐÐÎÞЧ£º`%s'"
 
+#~ msgid "deleting message %d...\n"
+#~ msgstr "ÕýÔÚɾ³ýÓʼþ %d...\n"
+
+#~ msgid "/_View/_Toolbar/_Non-display"
+#~ msgstr "/ÊÓͼ(_V)/¹¤¾ßÌõ(_T)/²»ÏÔʾ(_N)"
+
+#~ msgid "/_Message/_Mark/Mark it as _being read"
+#~ msgstr "/Óʼþ(_M)/±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_b)"
+
+#~ msgid "deleting article %d...\n"
+#~ msgstr "ÕýÔÚɾ³ýÎÄÕ %d...\n"
+
+#~ msgid "/_Mark/Make it as _being read"
+#~ msgstr "/±ê¼Ç(_M)/±ê¼Ç³ÉÒѶÁ(_M)"
+
+#, fuzzy
+#~ msgid "Show other headers"
+#~ msgstr "/ÏÔʾËùÓÐÍ·(_h)"
+
+#~ msgid "Receive at getting from all accounts"
+#~ msgstr "½ÓÊÕ´ÓËùÓÐÕÊ»§ÉÏÈ¡µÃµÄÓʼþ"
+
+#~ msgid "SunMonTueWedThuFriSat"
+#~ msgstr "ÈÕÒ»¶þÈýËÄÎåÁù"
+
 #~ msgid "/_Summary/Select a_ll"
 #~ msgstr "/ժҪ(_S)/ȫѡ(_l)"
 
@@ -3625,9 +4089,6 @@ msgstr "
 #~ msgid "*** Warning: code conversion failed ***\n"
 #~ msgstr "*** ¾¯¸æ: ´úÂëת»»Ê§°Ü ***\n"
 
-#~ msgid "can't set mailbox: %s\n"
-#~ msgstr "²»ÄÜÉèÖÃÓÊÏ䣺%s\n"
-
 #~ msgid "Invalid MIME type\n"
 #~ msgstr "ÎÞЧµÄMIMEÀàÐÍ \n"
 
@@ -3661,9 +4122,6 @@ msgstr "
 #~ msgid "Next unread"
 #~ msgstr "ÏÂÒ»¸öδ¶ÁµÄ"
 
-#~ msgid "Previously selected folder: %s\n"
-#~ msgstr "ÉÏÒ»¸öÑ¡Ôñ¹ýµÄÎļþ¼Ð£º%s\n"
-
 #~ msgid "New directory"
 #~ msgstr "ÐÂĿ¼"
 
@@ -3721,9 +4179,6 @@ msgstr "
 #~ msgid "Unlinking message %s in trash...\n"
 #~ msgstr "ÕýÔÚÈ¡ÏûÀ¬»øÏäÀïÓʼþ %s µÄÁ´½Ó...\n"
 
-#~ msgid "Connecting to %s ..."
-#~ msgstr "Áª½Óµ½ %s..."
-
 #~ msgid "Enable thread view on summary"
 #~ msgstr "ÔÚÕªÒªÉÏʹÂÛÌâÊÓͼÉúЧ"