[evolution] Update Simplified Chinese translations.



commit 9b150160722522a29ca7caac21c4fbdf25c753a4
Author: Tao Wang <dancefire gmail com>
Date:   Sat Aug 21 16:25:22 2010 +0800

    Update Simplified Chinese translations.

 po/zh_CN.po | 1706 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 906 insertions(+), 800 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2cf8243..9c4d26b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,15 +11,17 @@
 # Funda Wang <fundawang0zheng gmail com>, 2010.
 # Aron Xu <aronxu gnome org>, 2010.
 # du baodao <centerpoint 139 com>, 2010.
+# Tao Wang <dancefire gmail com>, 2010.
 #
+#: ../shell/main.c:533
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-07-17 10:27+0000\n"
-"PO-Revision-Date: 2010-07-18 16:29+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2010-08-19 18:09+0000\n"
+"PO-Revision-Date: 2010-08-06 11:18+1000\n"
+"Last-Translator: Tao Wang <dancefire gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -101,7 +103,7 @@ msgstr "认è¯?å?° IMAP æ??å?¡å?¨å¤±è´¥ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "å? é?¤è??系人失败"
 
@@ -242,7 +244,7 @@ msgstr "纪念�"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
 #: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:118
+#: ../shell/main.c:123
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -267,9 +269,9 @@ msgid "Contact"
 msgstr "è??系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
 msgid "Contact Editor"
 msgstr "è??系人ç¼?è¾?å?¨"
 
@@ -292,7 +294,7 @@ msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "家庭"
@@ -335,7 +337,7 @@ msgid "Notes"
 msgstr "�记"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
 #: ../calendar/gui/e-calendar-view.c:1725
@@ -363,7 +365,7 @@ msgid "Web addresses"
 msgstr "ç½?ç»?å?°å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -470,74 +472,74 @@ msgstr "��(_W)�"
 msgid "_Zip/Postal Code:"
 msgstr "����(_Z)�"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "é??è??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:352
 msgid "Error adding contact"
 msgstr "æ·»å? è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
 msgid "Error modifying contact"
 msgstr "ä¿®æ?¹è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
 msgid "Error removing contact"
 msgstr "å? é?¤è??系人å?ºé??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "è??系人ç¼?è¾?å?¨ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
 msgid "Please select an image for this contact"
 msgstr "请é??æ?©æ­¤è??系人ç??å?¾å??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
 msgid "_No image"
 msgstr "æ? å?¾å??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -545,23 +547,23 @@ msgstr ""
 "è??系人æ?°æ?®æ? æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ??ç??æ ¼å¼?æ? æ??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ??为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
 msgid "Invalid contact."
 msgstr "æ? æ??ç??è??系人ã??"
 
@@ -651,7 +653,7 @@ msgid "_Suffix:"
 msgstr "å??ç¼?(_S)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
 msgid "Contact List Editor"
 msgstr "è??系人å??表ç¼?è¾?å?¨"
 
@@ -676,24 +678,24 @@ msgstr "é??æ?©(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "è¾?å?¥ç?µå­?é?®ä»¶å?°å??æ??è??æ??è??系人æ??æ?¾å?°ä¸?é?¢ç??å??表(_T)ï¼?"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
 msgid "Contact List Members"
 msgstr "è??系人å??表æ??å??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
 msgid "_Members"
 msgstr "æ??å??(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
 msgid "Error adding list"
 msgstr "æ·»å? å??表å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
 msgid "Error modifying list"
 msgstr "ä¿®æ?¹å??表å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
 msgid "Error removing list"
 msgstr "å? é?¤å??表å?ºé??"
 
@@ -750,7 +752,7 @@ msgstr "å??并è??系人"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../modules/calendar/e-cal-shell-view-actions.c:1687
 #: ../modules/calendar/e-memo-shell-view-actions.c:768
 #: ../modules/calendar/e-task-shell-view-actions.c:967
@@ -758,12 +760,12 @@ msgid "Any field contains"
 msgstr "ä»»ä½?å??å?«æ??"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
 msgid "Email begins with"
 msgstr "�件以此�头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
 msgid "Name contains"
 msgstr "å§?å??å?«æ??"
 
@@ -789,54 +791,54 @@ msgstr "æ??索中æ?­äº?"
 msgid "Error modifying card"
 msgstr "ä¿®æ?¹å??ç??é??误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "å°?é??è??系人å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "å°?é??中è??系人å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸­ç²?è´´è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
-#: ../modules/addressbook/e-book-shell-view-actions.c:729
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å? é?¤é??中ç??è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "é??中å?¨é?¨å?¯è§?è??系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??表å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人å??表(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è¿?äº?è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¡®å®?è¦?å? é?¤è??系人(%s)å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -845,11 +847,11 @@ msgstr ""
 "æ??å¼? %d 个è??系人å°?å??æ?¶æ??å¼? %d 个æ?°çª?å?£ã??\n"
 "æ?¨ç??ç??æ?³è¦?æ?¾ç¤ºæ??æ??è??系人å??ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "��示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "æ?¾ç¤ºå?¨é?¨è??系人(_A)"
 
@@ -1226,7 +1228,7 @@ msgstr "Web ��"
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
 #: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-backend.c:116
 #: ../modules/addressbook/e-book-shell-migrate.c:138
 #: ../modules/calendar/e-cal-shell-backend.c:127
 #: ../modules/calendar/e-cal-shell-migrate.c:151
@@ -1256,7 +1258,7 @@ msgstr "Blog"
 msgid "Click to mail %s"
 msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1265,14 +1267,14 @@ msgstr ""
 "æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ­¤å?°å??簿没æ??æ ?为å?¯è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??以"
 "ä¾?è?±æ?ºä½¿ç?¨ã??请å?¨è??æ?ºæ¨¡å¼?中载å?¥æ­¤å?°å??簿以便ä¸?è½½å?¶å??容ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:81
+#: ../addressbook/gui/widgets/eab-gui-util.c:80
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr "æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??请æ£?æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨ä»¥å??æ?¨æ?¯å?¦æ??足å¤?ç??æ??é??访é?®å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:92
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1280,7 +1282,7 @@ msgstr ""
 "æ?¬ç??æ?¬ç?? Evolution 并没æ??æ?? LDAP æ?¯æ??ç¼?è¯?è¿?å?»ã??å¦?æ??æ?¨å¸?æ??å?¨ Evolution 中使ç?¨ "
 "LDAPï¼?å°±å¿?é¡»å®?è£?å?¯ç?¨äº? LDAP ç?? Evolution å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:101
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1288,11 +1290,11 @@ msgstr ""
 "æ? æ³?æ??å¼?æ­¤å?°å??ç°¿ã??è¿?å?¯è?½æ?¯ç?±äº?æ?¨è¾?å?¥äº?é??误ç?? URIï¼?ä¹?å?¯è?½æ?¯å? ä¸ºæ??å?¡å?¨å·²ç»?å?³"
 "é?­ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:109
 msgid "Detailed error message:"
 msgstr "é??误ç»?è??ä¿¡æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:134
+#: ../addressbook/gui/widgets/eab-gui-util.c:133
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1303,7 +1305,7 @@ msgstr ""
 "Evolution é??ç½®è¦?æ?¾ç¤ºç??æ?°ç?®ã??请å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??\n"
 "æ??ç´¢æ?¡ä»¶ï¼?æ??è??å?¨æ­¤å?°å??ç°¿ç??ç?®å½?æ??å?¡å?¨å??æ?°ä¸­å°?ç»?æ??é??å?¶è°?é«?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1315,49 +1317,49 @@ msgstr ""
 "中å°?æ?¶é?´é??å?¶è°?é«?ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤å?°å??ç°¿ç??å??端æ? æ³?解æ??æ­¤æ?¥è¯¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤å?°å??ç°¿ç??å??端æ??ç»?æ?§è¡?æ­¤æ?¥è¯¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "æ­¤æ?¥è¯¢æ?ªæ??å??å®?æ??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
 msgid "Select Address Book"
 msgstr "é??æ?©å?°å??ç°¿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:287
+#: ../addressbook/gui/widgets/eab-gui-util.c:286
 msgid "list"
 msgstr "å??表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:414
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "Move contact to"
 msgstr "å°?è??系人移è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:416
+#: ../addressbook/gui/widgets/eab-gui-util.c:427
 msgid "Copy contact to"
 msgstr "å°?è??系人å¤?å?¶å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:419
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contacts to"
 msgstr "å°?è??系人移è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:421
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contacts to"
 msgstr "å°?è??系人å¤?å?¶å?°"
 
@@ -1865,7 +1867,7 @@ msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?使ç?¨ã??"
 msgid "_Discard Changes"
 msgstr "丢���(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
@@ -1924,20 +1926,10 @@ msgid "_Dismiss"
 msgstr "é??è¿?(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1060
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:153
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1607
-#: ../widgets/menus/gal-define-views.ui.h:5
-msgid "_Edit"
-msgstr "ç¼?è¾?(_E)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "å??ç?¡(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
@@ -1945,12 +1937,12 @@ msgstr "å??ç?¡(_S)"
 msgid "hours"
 msgstr "å°?æ?¶"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "约��置"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
@@ -2642,7 +2634,7 @@ msgstr "��"
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:514
+#: ../widgets/misc/e-attachment-tree-view.c:530
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°"
@@ -2926,7 +2918,7 @@ msgstr "æ??é??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
 #: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "æ?¥æ??/æ?¶é?´æ ¼å¼?"
 
@@ -3337,22 +3329,22 @@ msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
 msgid "Click here to close the current window"
 msgstr "å??å?»æ­¤å¤?å?¯å?³é?­å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1453
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
 #: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??中å??容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
 #: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "å?ªå??é??中å??容"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1468
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "å? é?¤é??中å??容"
@@ -3361,8 +3353,8 @@ msgstr "å? é?¤é??中å??容"
 msgid "Click here to view help available"
 msgstr "å??å?»æ­¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??帮å?©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
-#: ../shell/e-shell-window-actions.c:1502
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
 #: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
@@ -3372,8 +3364,8 @@ msgstr "�贴�贴�"
 msgid "Click here to save the current window"
 msgstr "å??å?»æ­¤å¤?å?¯ä¿?å­?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
-#: ../shell/e-shell-window-actions.c:1572
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "é??中æ??æ??æ??å­?"
@@ -3382,14 +3374,23 @@ msgstr "é??中æ??æ??æ??å­?"
 msgid "_Classification"
 msgstr "å??ç±»(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
-#: ../shell/e-shell-window-actions.c:1614
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:152
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1608
+#: ../widgets/menus/gal-define-views.ui.h:5
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æ??件(_F)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "帮�(_H)"
 
@@ -3398,17 +3399,17 @@ msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:315
 msgid "_Options"
 msgstr "é??项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
-#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:240
+#: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "é??件(_A)..."
 
@@ -3494,7 +3495,7 @@ msgid "Recent _Documents"
 msgstr "æ??è¿?æ??æ¡£(_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:431
 msgid "Attach"
 msgstr "é??件"
 
@@ -3887,9 +3888,9 @@ msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ­¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
 msgid "Unable to open memos in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??中ç??å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
-#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2284
-#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
+#: ../em-format/em-format.c:1030 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "�件人"
@@ -4168,7 +4169,7 @@ msgstr "å·²å®?æ??"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
 #: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
 
@@ -4187,7 +4188,7 @@ msgstr "��中"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
 
@@ -4195,7 +4196,7 @@ msgstr "ä½?"
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "中"
@@ -4558,7 +4559,7 @@ msgstr "å¼?å§?æ?¥æ??"
 #: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:572
+#: ../widgets/misc/e-attachment-tree-view.c:588
 msgid "Type"
 msgstr "ç±»å??"
 
@@ -5338,7 +5339,7 @@ msgid "Member"
 msgstr "æ??å??"
 
 #: ../calendar/gui/e-memo-table.c:412
-#: ../modules/calendar/e-cal-shell-content.c:468
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -5397,7 +5398,7 @@ msgstr "%d%%"
 #: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:429
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
@@ -7744,141 +7745,141 @@ msgstr "太平æ´?/é??浦"
 msgid "Save as..."
 msgstr "��为..."
 
-#: ../composer/e-composer-actions.c:242
-#: ../widgets/misc/e-attachment-view.c:329
+#: ../composer/e-composer-actions.c:245
+#: ../widgets/misc/e-attachment-view.c:374
 msgid "Attach a file"
 msgstr "æ·»å? é??件"
 
-#: ../composer/e-composer-actions.c:247
+#: ../composer/e-composer-actions.c:250
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "��(_C)"
 
-#: ../composer/e-composer-actions.c:249
+#: ../composer/e-composer-actions.c:252
 msgid "Close the current file"
 msgstr "å?³é?­å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:254
+#: ../composer/e-composer-actions.c:257
 msgid "_Print..."
 msgstr "æ??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:261
+#: ../composer/e-composer-actions.c:264
 msgid "Print Pre_view"
 msgstr "æ??å?°é¢?è§?(_V)"
 
-#: ../composer/e-composer-actions.c:270
+#: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "ä¿?å­?å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:275
+#: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
 msgstr "��为(_A)..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "ç?¨ä¸?å??ç??æ??件å??ä¿?å­?å½?å??æ??件"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:285
 msgid "Save as _Draft"
 msgstr "å?¦å­?为è??稿(_D)"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:287
 msgid "Save as draft"
 msgstr "å?¦å­?为è??稿"
 
-#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
+#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
 msgid "S_end"
 msgstr "å??é??(_E)"
 
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:294
 msgid "Send this message"
 msgstr "å??é??è¿?å°?ä¿¡"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:299
 msgid "New _Message"
 msgstr "�建信�(_M)"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:301
 msgid "Open New Message window"
 msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:308
 msgid "Character _Encoding"
 msgstr "�符��(_E)"
 
-#: ../composer/e-composer-actions.c:322
+#: ../composer/e-composer-actions.c:325
 msgid "PGP _Encrypt"
 msgstr "PGP ��(_E)"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:327
 msgid "Encrypt this message with PGP"
 msgstr "� PGP ��该信�"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:333
 msgid "PGP _Sign"
 msgstr "PGP ç­¾å??(_S)"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:335
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç­¾å??该信æ?¯"
 
-#: ../composer/e-composer-actions.c:338
+#: ../composer/e-composer-actions.c:341
 msgid "_Prioritize Message"
 msgstr "æ ?为ä¼?å??(_P)"
 
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:343
 msgid "Set the message priority to high"
 msgstr "å°?ä¿¡æ?¯è®¾å®?为é«?ä¼?å??级"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:349
 msgid "Re_quest Read Receipt"
 msgstr "请æ±?已读å??æ?§(_Q)"
 
-#: ../composer/e-composer-actions.c:348
+#: ../composer/e-composer-actions.c:351
 msgid "Get delivery notification when your message is read"
 msgstr "å½?æ?¨ç??ä¿¡æ?¯è¢«é??读æ?¶å¾?å?°æ??é??é??ç?¥"
 
-#: ../composer/e-composer-actions.c:354
+#: ../composer/e-composer-actions.c:357
 msgid "S/MIME En_crypt"
 msgstr "S/MIME ��(_C)"
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:359
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?书å? å¯?该信æ?¯"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:365
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ç­¾å??(_N)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:367
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç­¾å??认è¯?ç­¾å??该信æ?¯"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:373
 msgid "_Bcc Field"
 msgstr "å¯?件æ??é??å??(_B)"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:375
 msgid "Toggles whether the BCC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå¯?件æ??é??å??"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:381
 msgid "_Cc Field"
 msgstr "æ??é??å??(_C)"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:383
 msgid "Toggles whether the CC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å??"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:389
 msgid "_Reply-To Field"
 msgstr "å??å¤?è?³å??(_R)"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:391
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:434
 msgid "Save Draft"
 msgstr "ä¿?å­?è??稿"
 
@@ -7896,35 +7897,35 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??表中ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:1005
+#: ../composer/e-composer-header-table.c:1002
 msgid "Fr_om:"
 msgstr "å??件人(_O)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1011
 msgid "_Reply-To:"
 msgstr "å??å¤?å?°(_R)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1015
 msgid "_To:"
 msgstr "�件人(_T)�"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1020
 msgid "_Cc:"
 msgstr "æ??é??(_C)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1025
 msgid "_Bcc:"
 msgstr "å¯?件æ??é??(_B)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Post To:"
 msgstr "æ??é??å?°(_P)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1034
 msgid "S_ubject:"
 msgstr "主�(_U)�"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1043
 msgid "Si_gnature:"
 msgstr "ç­¾å??(_G)ï¼?"
 
@@ -7936,58 +7937,58 @@ msgstr "å??å?»æ­¤å¤?以使ç?¨å?°å??ç°¿"
 msgid "Click here to select folders to post to"
 msgstr "å??å?»æ­¤å¤?以é??æ?©è¦?æ??é??å?°ç??æ??件夹"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?ä¸?次æ??ä½?"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "é??å??ä¸?次æ??ä½?"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "æ??ç´¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "æ??ç´¢å??æ?¿æ?¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:313
+#: ../composer/e-composer-private.c:317
 msgid "Save draft"
 msgstr "ä¿?å­?è??稿"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:199
+#: ../composer/e-msg-composer.c:192
 #: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "ä¸?å??æ?¾ç¤ºæ­¤ä¿¡æ?¯(_D)ã??"
 
-#: ../composer/e-msg-composer.c:1029
+#: ../composer/e-msg-composer.c:1024
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯ç­¾å??ï¼?æ?ªå¯¹æ­¤å¸?å?·è®¾ç½®ç­¾å??è¯?书"
 
-#: ../composer/e-msg-composer.c:1041
+#: ../composer/e-msg-composer.c:1036
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "æ? æ³?对å¯?å?ºç??ä¿¡æ?¯å? å¯?ï¼?æ?ªå¯¹æ­¤å¸?å?·è®¾ç½®å? å¯?è¯?书"
 
-#: ../composer/e-msg-composer.c:1465
+#: ../composer/e-msg-composer.c:1461
 msgid "Unable to reconstruct message from autosave file"
 msgstr "æ? æ³?ä»?è?ªå?¨ä¿?å­?ç??æ??件é??建信æ?¯"
 
-#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
+#: ../composer/e-msg-composer.c:1531 ../composer/e-msg-composer.c:1877
 msgid "Compose Message"
 msgstr "�建��"
 
-#: ../composer/e-msg-composer.c:3538
+#: ../composer/e-msg-composer.c:3562
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??"
 
-#: ../composer/e-msg-composer.c:4144
+#: ../composer/e-msg-composer.c:4174
 msgid "Untitled Message"
 msgstr "���信�"
 
@@ -8292,7 +8293,7 @@ msgid "Back - Receiving options"
 msgstr "å??é?? - æ?¥æ?¶é??项"
 
 #: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
+#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "�认�"
 
@@ -8338,6 +8339,8 @@ msgid ""
 "calendar name. So please confirm and re-enter the calendar name if it is not "
 "correct."
 msgstr ""
+"Yahoo æ?¥å??å?½å??为 å??å­?_å§?æ°?ã??æ??们å°?è¯?ç??ç??æ??è¿?ç§?æ?¥å??å??称ã??请确认å??å­?æ?¯å?¦æ­£ç¡®ï¼?"
+"å¦?æ??ä¸?正确ï¼?请é??æ?°è¾?å?¥æ?¥å??å??称ã??"
 
 #: ../capplet/settings/mail-account-view.c:768
 msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
@@ -8370,8 +8373,8 @@ msgstr "Evolution å¸?å?·å?©æ??"
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
 #: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1655
-#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:96
 #: ../modules/addressbook/e-book-shell-migrate.c:130
 #: ../modules/calendar/e-cal-shell-backend.c:102
 #: ../modules/calendar/e-cal-shell-migrate.c:141
@@ -8407,7 +8410,7 @@ msgstr "æ?¥å??äº?件信æ?¯"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution æ??é??é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8625,15 +8628,15 @@ msgstr "��信��"
 msgid "Log Level"
 msgstr "��级�"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ä¿¡æ?¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
-#: ../shell/e-shell-window-actions.c:1439
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "��此��"
 
@@ -8676,7 +8679,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»ç»?æ?ªæ?¥å??å?³äº?é??误ç??ä»»ä½?é¢?å¤?ç»?è??ã??"
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:731
 msgid "Autogenerated"
 msgstr "è?ªå?¨ç??æ??ç??"
 
@@ -8721,30 +8724,30 @@ msgstr "GConf é??误ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "å??ç»­æ??æ??ç??é??误é?½å?ªæ?¾ç¤ºå?¨ç»?端ã??"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1028
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "From"
 msgstr "å??件人"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1029
 #: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "å??å¤?è?³"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
-#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
-#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1031
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "æ??é??"
 
-#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
-#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
-#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1032
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "å¯?件æ??é??"
 
-#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
+#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1033
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
 #: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
@@ -8752,73 +8755,73 @@ msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
 #: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1262
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转å??ç??ä¿¡æ?¯ --------"
 
-#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
+#: ../em-format/em-format.c:1034 ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
 #: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1035 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "���"
 
-#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1036 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "头å??"
 
-#: ../em-format/em-format.c:1310
+#: ../em-format/em-format.c:1416
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1370
+#: ../em-format/em-format.c:1481
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "æ? æ³?解æ?? S/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1639 ../em-format/em-format.c:1823
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "æ? æ³?解æ?? MIME ä¿¡æ?¯ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
 
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1649
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
 
-#: ../em-format/em-format.c:1546
+#: ../em-format/em-format.c:1665
 msgid "Could not parse PGP/MIME message"
 msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯"
 
-#: ../em-format/em-format.c:1547
+#: ../em-format/em-format.c:1666
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "æ? æ³?解æ?? PGP/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:1723
+#: ../em-format/em-format.c:1848
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ??ç??ç­¾å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
+#: ../em-format/em-format.c:1858 ../em-format/em-format.c:2018
 msgid "Error verifying signature"
 msgstr "æ ¡éª?ç­¾å??é??误"
 
-#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
-#: ../em-format/em-format.c:1890
+#: ../em-format/em-format.c:1859 ../em-format/em-format.c:2006
+#: ../em-format/em-format.c:2019
 msgid "Unknown error verifying signature"
 msgstr "æ ¡éª?ç­¾å??å??ç??äº?æ?ªç?¥é??误"
 
-#: ../em-format/em-format.c:1970
+#: ../em-format/em-format.c:2106
 msgid "Could not parse PGP message: "
 msgstr "æ? æ³?解æ?? PGP ä¿¡æ?¯ï¼?"
 
-#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2112 ../plugins/caldav/caldav-browse-server.c:203
 #: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
@@ -9098,25 +9101,25 @@ msgstr "æ?¨æ??å®?ç??æ?¶é?´"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
-#: ../widgets/misc/e-attachment-paned.c:123
+#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:119
+#: ../widgets/misc/e-attachment-paned.c:124
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:586
-#: ../widgets/misc/e-attachment-paned.c:581
+#: ../mail/e-mail-attachment-bar.c:611
+#: ../widgets/misc/e-attachment-paned.c:605
 msgid "Icon View"
 msgstr "����"
 
-#: ../mail/e-mail-attachment-bar.c:587
-#: ../widgets/misc/e-attachment-paned.c:582
+#: ../mail/e-mail-attachment-bar.c:612
+#: ../widgets/misc/e-attachment-paned.c:606
 msgid "List View"
 msgstr "å??表è§?å?¾"
 
-#: ../mail/e-mail-browser.c:266
+#: ../mail/e-mail-browser.c:265
 msgid "(No Subject)"
 msgstr "(�主�)"
 
@@ -9193,26 +9196,26 @@ msgid "Name"
 msgstr "å§?å??"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:959
+#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 msgid "Inbox"
 msgstr "�件箱"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
 msgid "Outbox"
 msgstr "å??件箱"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
 msgid "Sent"
 msgstr "å·²å??ç®±"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:573
+#: ../plugins/templates/templates.c:577
 msgid "Templates"
 msgstr "模�"
 
@@ -9249,6 +9252,10 @@ msgstr ""
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
 
+#: ../mail/e-mail-notebook-view.c:563
+msgid "Please select a folder"
+msgstr "请é??æ?©ä¸?个æ??件夹"
+
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
@@ -9257,34 +9264,33 @@ msgstr "æ? æ³?å?¨â??%sâ??å??建æ?¬å?°é?®ä»¶æ??件夹ï¼?%s"
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??次询é?®"
 
-#: ../mail/e-mail-reader.c:265 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "å¤?å?¶å?°æ??件夹"
 
-#: ../mail/e-mail-reader.c:265 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "��(_O)"
 
-#: ../mail/e-mail-reader.c:639 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:687 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³æ??件夹"
 
-#: ../mail/e-mail-reader.c:639 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:687 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "移�(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:854 ../mail/e-mail-reader.c:964
-#: ../mail/e-mail-reader.c:998
-#| msgid "Do not ask me again"
+#: ../mail/e-mail-reader.c:952 ../mail/e-mail-reader.c:1068
+#: ../mail/e-mail-reader.c:1109
 msgid "_Do not ask me again."
 msgstr "ä¸?å??询é?®(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1002
+#: ../mail/e-mail-reader.c:1114
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ?»æ?¯å¿½ç?¥å¯¹äº?é?®ä»¶å??表ç??â??å??å¤?è?³â??å??(_A)ã??"
 
-#: ../mail/e-mail-reader.c:1087
+#: ../mail/e-mail-reader.c:1204
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ä¿?å­?ä¿¡æ?¯"
@@ -9295,508 +9301,551 @@ msgstr[0] "ä¿?å­?ä¿¡æ?¯"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1108
+#: ../mail/e-mail-reader.c:1225
 #: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1366
+#: ../mail/e-mail-reader.c:1490
 msgid "A_dd Sender to Address Book"
 msgstr "å°?å??件人添å? å?°å?°å??ç°¿(_D)"
 
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1492
 msgid "Add sender to address book"
 msgstr "å°?å??件人添å? å?°å?°å??ç°¿"
 
-#: ../mail/e-mail-reader.c:1373
+#: ../mail/e-mail-reader.c:1497
 msgid "Check for _Junk"
 msgstr "æ£?æ?¥å??å?¾ä¿¡æ?¯(_J)"
 
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1499
 msgid "Filter the selected messages for junk status"
 msgstr "æ??é??中ç??ä¿¡æ?¯æ ?记为å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1380
+#: ../mail/e-mail-reader.c:1504
 msgid "_Copy to Folder..."
 msgstr "å¤?å?¶å?°æ??件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1506
 msgid "Copy selected messages to another folder"
 msgstr "æ??é??中ç??ä¿¡æ?¯å¤?å?¶å?°å?¶å®?æ??件夹"
 
-#: ../mail/e-mail-reader.c:1387
+#: ../mail/e-mail-reader.c:1511
 msgid "_Delete Message"
 msgstr "��信�(_D)"
 
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1513
 msgid "Mark the selected messages for deletion"
 msgstr "为é??中信æ?¯å??å? é?¤æ ?è®°"
 
-#: ../mail/e-mail-reader.c:1394
+#: ../mail/e-mail-reader.c:1518
 msgid "Filter on Mailing _List..."
 msgstr "æ ¹æ?®é?®ä»¶å??表è¿?滤(_L)..."
 
-#: ../mail/e-mail-reader.c:1396
+#: ../mail/e-mail-reader.c:1520
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "å??建å?¯è¿?滤å¯?å¾?æ­¤é?®ä»¶å??表ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1525
 msgid "Filter on _Recipients..."
 msgstr "根��件人�滤(_R)..."
 
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1527
 msgid "Create a rule to filter messages to these recipients"
 msgstr "å??建å?¯è¿?滤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1408
+#: ../mail/e-mail-reader.c:1532
 msgid "Filter on Se_nder..."
 msgstr "æ ¹æ?®å??件人è¿?滤(_N)..."
 
-#: ../mail/e-mail-reader.c:1410
+#: ../mail/e-mail-reader.c:1534
 msgid "Create a rule to filter messages from this sender"
 msgstr "å??建å?¯è¿?滤此人å¯?æ?¥ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1415
+#: ../mail/e-mail-reader.c:1539
 msgid "Filter on _Subject..."
 msgstr "根�主��滤(_S)..."
 
-#: ../mail/e-mail-reader.c:1417
+#: ../mail/e-mail-reader.c:1541
 msgid "Create a rule to filter messages with this subject"
 msgstr "å??建å?¯è¿?滤此主é¢?ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1422
+#: ../mail/e-mail-reader.c:1546
 msgid "A_pply Filters"
 msgstr "åº?ç?¨è¿?滤è§?å??(_P)"
 
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1548
 msgid "Apply filter rules to the selected messages"
 msgstr "åº?ç?¨è¿?滤è§?å??å?°é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1429
+#: ../mail/e-mail-reader.c:1553
 msgid "_Find in Message..."
 msgstr "�信�中��(_F)..."
 
-#: ../mail/e-mail-reader.c:1431
+#: ../mail/e-mail-reader.c:1555
 msgid "Search for text in the body of the displayed message"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??主ä½?中æ??ç´¢æ??æ?¬"
 
-#: ../mail/e-mail-reader.c:1436
+#: ../mail/e-mail-reader.c:1560
 msgid "_Clear Flag"
 msgstr "����(_C)"
 
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1562
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "å? é?¤é??中信æ?¯ç??è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1443
+#: ../mail/e-mail-reader.c:1567
 msgid "_Flag Completed"
 msgstr "æ ?å¿?为已å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1569
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置é??中信æ?¯ç??è·?é??æ ?å¿?为已å®?æ??"
 
-#: ../mail/e-mail-reader.c:1450
+#: ../mail/e-mail-reader.c:1574
 msgid "Follow _Up..."
 msgstr "è·?é??(_U)..."
 
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1576
 msgid "Flag the selected messages for follow-up"
 msgstr "为é??中信æ?¯æ·»å? è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1457
+#: ../mail/e-mail-reader.c:1581
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1459 ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1583 ../mail/e-mail-reader.c:1590
 msgid "Forward the selected message to someone as an attachment"
 msgstr "æ??é??中信æ?¯ä½?为é??件转å??ç»?æ??人"
 
-#: ../mail/e-mail-reader.c:1464
+#: ../mail/e-mail-reader.c:1588
 msgid "Forward As _Attached"
 msgstr "ä½?为é??件转å??(_A)"
 
-#: ../mail/e-mail-reader.c:1471
+#: ../mail/e-mail-reader.c:1595
 msgid "_Inline"
 msgstr "åµ?å?¥(_I)"
 
-#: ../mail/e-mail-reader.c:1473 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1597 ../mail/e-mail-reader.c:1604
 msgid "Forward the selected message in the body of a new message"
 msgstr "å?¨æ?°ä¿¡ä½?中转å??é??中信æ?¯"
 
-#: ../mail/e-mail-reader.c:1478
+#: ../mail/e-mail-reader.c:1602
 msgid "Forward As _Inline"
 msgstr "åµ?å?¥æ­£æ??转å??(_I)"
 
-#: ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1609
 msgid "_Quoted"
 msgstr "å¼?ç?¨(_Q)"
 
-#: ../mail/e-mail-reader.c:1487 ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1611 ../mail/e-mail-reader.c:1618
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?转å??é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1616
 msgid "Forward As _Quoted"
 msgstr "ä½?æ??å¼?ç?¨è½¬å??(_Q)"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1623
 msgid "_Load Images"
 msgstr "è½½å?¥å?¾å??(_L)"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1625
 msgid "Force images in HTML mail to be loaded"
 msgstr "强å?¶è½½å?¥ HTML é?®ä»¶ä¸­ç??å?¾å??"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1630
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1632
 msgid "Mark the selected messages as important"
 msgstr "æ??é??中信æ?¯æ ?记为é??è¦?é?®ä»¶"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1637
 msgid "_Junk"
 msgstr "å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1639
 msgid "Mark the selected messages as junk"
 msgstr "æ??é??中信æ?¯æ ?记为å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1644
 msgid "_Not Junk"
 msgstr "é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1646
 msgid "Mark the selected messages as not being junk"
 msgstr "æ??é??中信æ?¯æ ?记为é??å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1651
 msgid "_Read"
 msgstr "读å??(_R)"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1653
 msgid "Mark the selected messages as having been read"
 msgstr "æ??é??中信æ?¯æ ?记为已读"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1658
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1660
 msgid "Mark the selected messages as unimportant"
 msgstr "æ??é??中信æ?¯æ ?记为ä¸?é??è¦?é?®ä»¶"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1665
 msgid "_Unread"
 msgstr "�读(_U)"
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1667
 msgid "Mark the selected messages as not having been read"
 msgstr "æ??é??中信æ?¯æ ?记为æ?ªè¯»"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1672
 msgid "_Edit as New Message..."
 msgstr "�为�信�����(_E)..."
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1674
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨ç¼?è¾?å?¨ä¸­æ??å¼?é??中ç??ä¿¡æ?¯ä»¥ä¾¿ç¼?è¾?"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1679
 msgid "Compose _New Message"
 msgstr "æ?°å??æ?°ä¿¡æ?¯(_N)"
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1681
 msgid "Open a window for composing a mail message"
 msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1686
 msgid "_Open in New Window"
 msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?(_O)"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1688
 msgid "Open the selected messages in a new window"
 msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?é??中ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1693
 msgid "_Move to Folder..."
 msgstr "移è?³æ??件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1695
 msgid "Move selected messages to another folder"
 msgstr "æ??é??中ç??ä¿¡æ?¯ç§»è?³å?¶å®?æ??件夹"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1700
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "_Switch to Folder"
+msgstr "å??æ?¢å?° %s"
+
+#: ../mail/e-mail-reader.c:1702
+#, fuzzy
+#| msgid "Install the shared folder"
+msgid "Display the parent folder"
+msgstr "å®?è£?å?±äº«æ??件夹"
+
+#: ../mail/e-mail-reader.c:1707
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _next tab"
+msgstr "å??æ?¢å?° %s"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to the next tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1714
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _previous tab"
+msgstr "å??æ?¢å?° %s"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to the previous tab"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1721
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Cl_ose current tab"
+msgstr "å?³é?­å½?å??æ??件"
+
+#: ../mail/e-mail-reader.c:1723
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close current tab"
+msgstr "å?³é?­å½?å??æ??件"
+
+#: ../mail/e-mail-reader.c:1728
 msgid "_Next Message"
 msgstr "���信(_N)"
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1730
 msgid "Display the next message"
 msgstr "�示���信�"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1735
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_I)"
 
-#: ../mail/e-mail-reader.c:1585
+#: ../mail/e-mail-reader.c:1737
 msgid "Display the next important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1742
 msgid "Next _Thread"
 msgstr "���线索(_T)"
 
-#: ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1744
 msgid "Display the next thread"
 msgstr "�示���线索"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1749
 msgid "Next _Unread Message"
 msgstr "����读信�(_U)"
 
-#: ../mail/e-mail-reader.c:1599
+#: ../mail/e-mail-reader.c:1751
 msgid "Display the next unread message"
 msgstr "�示����读信�"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1756
 msgid "_Previous Message"
 msgstr "���信(_P)"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1758
 msgid "Display the previous message"
 msgstr "�示���信�"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1763
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_E)"
 
-#: ../mail/e-mail-reader.c:1613
+#: ../mail/e-mail-reader.c:1765
 msgid "Display the previous important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1770
 msgid "P_revious Unread Message"
 msgstr "����读信�(_R)"
 
-#: ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1772
 msgid "Display the previous unread message"
 msgstr "�示����读信�"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1779
 msgid "Print this message"
 msgstr "æ??å?°è¯¥ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1786
 msgid "Preview the message to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1791
 msgid "Re_direct"
 msgstr "é??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1793
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é??中信æ?¯é??å??(é??å??)ç»?æ??人"
 
-#: ../mail/e-mail-reader.c:1646 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1798 ../mail/mail.error.xml.h:91
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:139
+#: ../modules/mail/e-mail-attachment-handler.c:151
 msgid "Reply to _All"
 msgstr "å??å¤?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1800
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为é??中信æ?¯ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1653 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1805 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "å??å¤?é?®ä»¶å??表(_L)"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1807
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为é??中信æ?¯ç??é?®ä»¶å??表æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1660
-#: ../modules/mail/e-mail-attachment-handler.c:146
+#: ../mail/e-mail-reader.c:1812
+#: ../modules/mail/e-mail-attachment-handler.c:158
 msgid "_Reply to Sender"
 msgstr "å??å¤?å??件人(_R)"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1814
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为é??中信æ?¯ç??å??件人æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1819
 msgid "_Save as mbox..."
 msgstr "��为 mbox 格�(_S)..."
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1821
 msgid "Save selected messages as an mbox file"
 msgstr "æ??é??中信æ?¯å?¦å­?为 mbox æ ¼å¼?æ??件"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1826
 msgid "Search Folder from Mailing _List..."
 msgstr "å?ºäº?é?®ä»¶å??表ç??æ??ç´¢æ??件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1828
 msgid "Create a search folder for this mailing list"
 msgstr "为此é?®ä»¶å??表å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1833
 msgid "Search Folder from Recipien_ts..."
 msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1835
 msgid "Create a search folder for these recipients"
 msgstr "为è¿?äº?æ?¶ä»¶äººå??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1840
 msgid "Search Folder from Sen_der..."
 msgstr "å?ºäº?å??件人ç??æ??ç´¢æ??件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1842
 msgid "Create a search folder for this sender"
 msgstr "为该å??件人å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1847
 msgid "Search Folder from S_ubject..."
 msgstr "å?ºäº?主é¢?ç??æ??ç´¢æ??件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1849
 msgid "Create a search folder for this subject"
 msgstr "为该主é¢?å??建æ??ç´¢æ??件夹"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1854
 msgid "_Message Source"
 msgstr "信��代�(_M)"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1856
 msgid "Show the raw email source of the message"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??å??å§?é?®ä»¶æº?代ç ?"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1868
 msgid "_Undelete Message"
 msgstr "å??æ¶?å? é?¤ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1870
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?é??中信æ?¯ç??å? é?¤"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1875
 msgid "_Normal Size"
 msgstr "æ?®é??大å°?(_N)"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1877
 msgid "Reset the text to its original size"
 msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??大å°?"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1882
 msgid "_Zoom In"
 msgstr "�大(_Z)"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1884
 msgid "Increase the text size"
 msgstr "å¢?å? æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1889
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1891
 msgid "Decrease the text size"
 msgstr "å??å°?æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1898
 msgid "Create R_ule"
 msgstr "å??建è§?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1905
 msgid "Ch_aracter Encoding"
 msgstr "�符��(_A)"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1912
 msgid "F_orward As"
 msgstr "转å??为(_O)"
 
-#: ../mail/e-mail-reader.c:1767
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:1919
 msgid "_Group Reply"
 msgstr "å??å¤?å?¨é?¨(_G)"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1926
 msgid "_Go To"
 msgstr "转�(_G)"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1933
 msgid "Mar_k As"
 msgstr "�记为(_K)"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1940
 msgid "_Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1947
 msgid "_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../mail/e-mail-reader.c:1820
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark for Follo_w Up..."
 msgstr "æ ?记为è·?é??(_W)..."
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1980
 msgid "Mark as _Important"
 msgstr "æ ?记为é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1984
 msgid "Mark as _Junk"
 msgstr "æ ?记为å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:1836
+#: ../mail/e-mail-reader.c:1988
 msgid "Mark as _Not Junk"
 msgstr "æ ?记为é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1992
 msgid "Mar_k as Read"
 msgstr "�记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1996
 msgid "Mark as Uni_mportant"
 msgstr "æ ?记为ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1848
+#: ../mail/e-mail-reader.c:2000
 msgid "Mark as _Unread"
 msgstr "�记为�读(_U)"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2036
 msgid "_Caret Mode"
 msgstr "å??æ ?模å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2038
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¿¡ä½?中æ?¾ç¤ºé?ªç??å??æ ?"
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:2044
 msgid "All Message _Headers"
 msgstr "��信头(_H)"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:2046
 msgid "Show messages with all email headers"
 msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??信头"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2267
 msgid "Unable to retrieve message"
 msgstr "æ? æ³?è?·å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2175 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2327 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ?¶å??ä¿¡æ?¯ %s"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2701 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:2887 ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -9804,12 +9853,12 @@ msgstr "æ?¶å??ä¿¡æ?¯ %s"
 msgid "Default"
 msgstr "�认"
 
-#: ../mail/e-mail-reader.c:2841
-#: ../modules/mail/e-mail-attachment-handler.c:132
+#: ../mail/e-mail-reader.c:3056
+#: ../modules/mail/e-mail-attachment-handler.c:144
 msgid "_Forward"
 msgstr "转å??(_F)"
 
-#: ../mail/e-mail-reader.c:2842
+#: ../mail/e-mail-reader.c:3057
 msgid "Forward the selected message to someone"
 msgstr "æ??é??中信æ?¯è½¬å??ç»?æ??人"
 
@@ -9818,37 +9867,41 @@ msgstr "æ??é??中信æ?¯è½¬å??ç»?æ??人"
 #. (if possible and if that configuration option is enabled), or else
 #. it will reply to all. The word "Group" was chosen because it covers
 #. either of those, without too strongly implying one or the other.
-#: ../mail/e-mail-reader.c:2860
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3075
 msgid "Group Reply"
 msgstr "å??å¤?å?¨é?¨"
 
-#: ../mail/e-mail-reader.c:2861
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3076
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为é??中信æ?¯ç??é?®ä»¶å??表æ??å?¨é?¨æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:2906 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3121 ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../mail/e-mail-reader.c:2918
+#: ../mail/e-mail-reader.c:3153
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "��项"
 
-#: ../mail/e-mail-reader.c:2922
+#: ../mail/e-mail-reader.c:3157
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "��项"
 
-#: ../mail/e-mail-reader.c:2932 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3167 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "å??å¤?"
 
+#: ../mail/e-mail-reader.c:3782
+#, fuzzy, c-format
+#| msgid "Folder"
+msgid "Folder '%s'"
+msgstr "æ??件夹"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "è·?é??ç??æ ?å¿?"
@@ -9949,7 +10002,7 @@ msgstr "�����件"
 msgid "Please configure the following account settings."
 msgstr "请é??ç½®ä¸?å??å¸?å?·è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
 msgid "Sending Email"
 msgstr "å??é??ç?µå­?é?®ä»¶"
 
@@ -9999,44 +10052,44 @@ msgstr "è?ªå?¨æ£?æ?¥æ?°é?®ä»¶ç??é?´é??(_N)"
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2836
+#: ../mail/em-account-editor.c:2838
 msgid "Please select a folder from the current account."
 msgstr "请ä»?å½?å??å¸?å?·é??æ?©ä¸?个æ??件夹ã??"
 
-#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "å®?å?¨"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
+#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é??项"
 
-#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
+#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
 msgid "Checking for New Messages"
 msgstr "����件"
 
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1539
+#: ../mail/em-composer-utils.c:1695
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æ?¨å?¨ %3$s ä¸?ç»? %1$s å??é??ç??å?³äº?â??%2$sâ??ç??ä¿¡æ?¯å·²è¢«é??读ã??"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1587
+#: ../mail/em-composer-utils.c:1743
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é?®ä»¶é??ç?¥ï¼?%s"
 
-#: ../mail/em-composer-utils.c:1991
+#: ../mail/em-composer-utils.c:2152
 msgid "an unknown sender"
 msgstr "æ?ªç?¥å??件人"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2038
+#: ../mail/em-composer-utils.c:2199
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10044,15 +10097,15 @@ msgstr ""
 "å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender}å??é??ï¼?"
 
-#: ../mail/em-composer-utils.c:2182
+#: ../mail/em-composer-utils.c:2343
 msgid "-----Original Message-----"
 msgstr "-------- å??å§?ä¿¡æ?¯ --------"
 
-#: ../mail/em-composer-utils.c:2372
+#: ../mail/em-composer-utils.c:2555
 msgid "Posting destination"
 msgstr "æ??é??ç?®ç??"
 
-#: ../mail/em-composer-utils.c:2373
+#: ../mail/em-composer-utils.c:2556
 msgid "Choose folders to post the message to."
 msgstr "é??æ?©è¦?å°?ä¿¡æ?¯æ??é??å?°å?ªä¸ªæ??件夹ã??"
 
@@ -10355,7 +10408,7 @@ msgstr "æ??件夹å??称(_N)ï¼?"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
+#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
 msgid "Search Folders"
 msgstr "æ??ç´¢æ??件夹"
 
@@ -10364,7 +10417,7 @@ msgstr "æ??ç´¢æ??件夹"
 msgid "UNMATCHED"
 msgstr "ä¸?å?¹é??"
 
-#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
 msgstr "正�载�..."
 
@@ -10415,12 +10468,12 @@ msgstr "移å?¨æ??件夹â??%sâ??"
 msgid "Copying folder %s"
 msgstr "å¤?å?¶æ??件夹 %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ??ä¿¡æ?¯ç§»è?³æ??件夹 %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?°æ??件夹 %s"
@@ -10459,7 +10512,7 @@ msgstr "æ??å®?å?¨å?ªé??å??建æ??件夹ï¼?"
 msgid "Unsubscribing from folder \"%s\""
 msgstr "æ? æ³?é??订æ??件夹â??%sâ??"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "æ?ªç­¾å??"
 
@@ -10469,7 +10522,7 @@ msgid ""
 "authentic."
 msgstr "此信æ?¯æ?ªç­¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "æ??æ??ç­¾å??"
 
@@ -10479,7 +10532,7 @@ msgid ""
 "message is authentic."
 msgstr "此信æ?¯å·²ç­¾å??ï¼?è??ä¸?ç­¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?该æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "æ? æ??ç­¾å??"
 
@@ -10489,7 +10542,7 @@ msgid ""
 "in transit."
 msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç­¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?中é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç­¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
 
@@ -10499,7 +10552,7 @@ msgid ""
 "cannot be verified."
 msgstr "è¿?å°?ä¿¡ç??ç­¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "ç­¾å??å·²å­?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
 
@@ -10509,7 +10562,7 @@ msgid ""
 "public key."
 msgstr "è¿?å°?ä¿¡ç??ç­¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "���"
 
@@ -10519,7 +10572,7 @@ msgid ""
 "the Internet."
 msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??人é?½å?¯ä»¥ç??å?°å?¶å??容ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "弱��"
 
@@ -10532,7 +10585,7 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?使ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?人æ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??容ï¼?å?¯è?½è¦?è?±ä¸?"
 "å®?æ?¶é?´è¿?è¡?æ?´å??破解ï¼?è¿?å¾?å?°é?¾ä½?并ä¸?æ?¯ä¸?å?¯è?½ã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "��"
 
@@ -10542,7 +10595,7 @@ msgid ""
 "the content of this message."
 msgstr "è¿?å°?ä¿¡å·²å? å¯?ã??å¤?人è¦?æ?³æ?¥ç??è¿?å°?ä¿¡ç??å??容å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "强��"
 
@@ -10584,72 +10637,72 @@ msgstr "延æ??ï¼?"
 msgid "by"
 msgstr "å??建è??ï¼?"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "æ? æ ¼å¼?é??è??(_U)"
 
-#: ../mail/em-format-html-display.c:1019
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "æ??å¼?æ?¹å¼?(_P)"
 
-#: ../mail/em-format-html-print.c:162
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页�� %d 页"
 
-#: ../mail/em-format-html.c:151
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??ä¿¡æ?¯"
 
-#: ../mail/em-format-html.c:347
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "æ­£å?¨æ ¼å¼?å??ä¿¡æ?¯..."
 
-#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ?¶å??â??%sâ??"
 
-#: ../mail/em-format-html.c:1896
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?正确ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1934
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
 
-#: ../mail/em-format-html.c:1945
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??件 (%1$s) å??æ³?"
 
-#: ../mail/em-format-html.c:1947
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ??å??æ?¬å?°æ??件 (%s)"
 
-#: ../mail/em-format-html.c:1968
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "æ??å??æ?ªç?¥ç??å¤?é?¨æ?°æ?® (â??%sâ??ç±»å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2647
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "此信æ?¯ç?± %s 代表 %s ç??身份å??é??"
@@ -10951,8 +11004,8 @@ msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
-"å?¨ HTML é?®ä»¶ä¸­å?¯ç?¨å?¨ç?»å?¾å??ã??å¾?å¤?ç?¨æ?·æ??è§?å?¨ç?»å?¾å??å¾?ç?¦äººå¹¶ä¸?å??欢ç??é??æ??å?¾å??è??ä¸?æ?¯"
-"å?¨æ??ç??ã??"
+"å?¨ HTML é?®ä»¶ä¸­å?¯ç?¨å?¨ç?»å?¾å??ã??å¾?å¤?ç?¨æ?·æ??è§?å?¨ç?»å?¾å??å¾?ç?¦äººå¹¶ä¸?å??欢ç??é??æ??å?¾å??è??ä¸?"
+"æ?¯å?¨æ??ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -10994,7 +11047,7 @@ msgstr "å?¯ç?¨ä»¥å?¨ä¿¡æ?¯é¢?è§?ã??ä¿¡æ?¯å??表å??æ??件夹中使ç?¨ç©ºæ ¼é?®ã??
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
-msgstr ""
+msgstr "å?¯ç?¨ä»?æ?¾ç¤ºä¸?è¶?è¿?â??message_text_part_limitâ??é?®å?¼ä¸­å®?ä¹?ç??大å°?ç??é?®ä»¶æ??æ?¬ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable to use a similar message list view settings for all folders"
@@ -11019,6 +11072,9 @@ msgid ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
+"å¦? Outlook æ?? GMail ä¸?æ ·ç¼?ç ?é?®ä»¶å¤´ä¸­ç??æ??件å??ï¼?è¿?æ ·å?¯ä»¥æ­£ç¡®ç??æ?¾ç¤ºç?± Evolution "
+"å??é??ç??é?®ä»¶å¸¦æ??ç?? UTF-8 ç??æ??件å??称ï¼?å? ä¸ºå®?们ä¸?符å?? RFC 2231ï¼?è??æ?¯ä½¿ç?¨äº?ä¸?正确"
+"ç?? RFC 2047 æ ?å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:70
 msgid "Flush Outbox after filtering"
@@ -11026,7 +11082,7 @@ msgstr "å?¨è¿?滤ä¹?å??æ¸?空è¾?å?ºçª?å?£"
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "â??ç»?å??å¤?â??æ?¯å??å¤?å?°é?®ä»¶å??表"
 
 #: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
@@ -11085,6 +11141,9 @@ msgid ""
 "value is not used by Evolution since the \"Filter Editor\" window cannot be "
 "maximized. This key exists only as an implementation detail."
 msgstr ""
+"â??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£ç??æ??大å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??大å??æ??å??æ¶?æ??大å??çª?å?£æ?¶ä¼?æ?´æ?°è¯¥"
+"å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? ä¸ºâ??è¿?滤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??è¿?个å?¼"
+"å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
@@ -11093,6 +11152,9 @@ msgid ""
 "particular value is not used by Evolution since the \"Search Folder Editor\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
+"â??æ??ç´¢æ??件夹ç¼?è¾?å?¨â??çª?å?£ç??æ??大å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??大å??æ??å??æ¶?æ??大å??çª?å?£æ?¶ä¼?æ?´æ?°"
+"该å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? ä¸ºâ??æ??ç´¢æ??件夹ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??大å??ã??"
+"è¿?个å?¼å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
@@ -11102,6 +11164,9 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
+"â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£ç??æ??大å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??大å??æ??å??æ¶?æ??大å??çª?å?£æ?¶ä¼?æ?´æ?°è¯¥"
+"å?¼ï¼?è¿?个å?¼æ?¯ä¸?ä¼?被 Evolution 使ç?¨ç??ï¼?å? ä¸ºâ??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£æ? æ³?æ??大å??ã??è¿?个"
+"å?¼å?ªæ?¯ä½?为å®?ç?°ç»?è??è??å­?å?¨ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
@@ -11128,6 +11193,8 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
+"ä¸?æ?®é??ç??â??å??å¤?å?¨é?¨â??è¡?为ä¸?å??ï¼?è¿?个é??项使â??ç»?å??å¤?â??å·¥å?·æ??é?®é??è¿?æ?¨æ­£å?¨å??å¤?ç??å??æ?¶å?°"
+"ç??é?®ä»¶ç??å?ªå??å¤?ç»?é?®ä»¶å??表ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
@@ -11138,21 +11205,16 @@ msgstr ""
 "ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??中移é?¤)æ??ç´¢æ??件夹中ç??ä¿¡æ?¯æ?¶ä¸?æ?­å¼¹å?ºç??æ??示ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:89
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that deleting messages "
-#| "from a search folder permanently deletes the message, not simply removing "
-#| "it from the search results."
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
-msgstr ""
-"ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?æ¶?æ?¯ç??ç§?人å??å¤?å??é??è?³é?®ä»¶å??表æ?¶å??å?ºè­¦å??ã??"
+msgstr "ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?æ¶?æ?¯ç??ç§?人å??å¤?å??é??è?³é?®ä»¶å??表æ?¶å??å?ºè­¦å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
-msgstr ""
+msgstr "ç¦?ç?¨æ??å?¯ç?¨å½?æ?¨å??é??å??å¤?ç»?许å¤?人ç??æ?¶å??ç??å??å¤?ç??è­¦å??æ??示ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
@@ -11160,6 +11222,8 @@ msgid ""
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
+"å½?æ?¨æ­£è¦?å??é??ä¸?个é??è¿?é?®ä»¶å??表æ?¶å?°ç??é?®ä»¶ç??ç§?人å??å¤?ï¼?è??é?®ä»¶å¤´ç?? Reply-To: é??å®?å??"
+"å?°äº?å??表æ?¶ï¼?ç¦?ç?¨æ??å?¯ç?¨å??å¤?ç??è­¦å??æ??示ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:92
 msgid "Last time Empty Junk was run"
@@ -11320,17 +11384,14 @@ msgid "Prompt when deleting messages in search folder"
 msgstr "å? é?¤æ??ç´¢æ??件夹中ç??ä¿¡æ?¯æ?¶æ??示"
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "å½?é?®ä»¶å??表å?«æ??ç§?人å??å¤?æ?¶æ??示"
 
 #: ../mail/evolution-mail.schemas.in.h:130
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
 msgstr "å½?对é?®ä»¶å??表ä½?ç§?人å??å¤?æ?¶æ??示"
 
 #: ../mail/evolution-mail.schemas.in.h:131
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
 msgstr "å½?å??å¤?个æ?¶ä»¶äººå??å¤?æ?¶æ??示"
 
@@ -11475,8 +11536,8 @@ msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?件æ??é??å??ã??å?¨é??å®?äº?ä¸?个é?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§å?¶æ­¤å??"
-"è?½ã??"
+"å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?件æ??é??å??ã??å?¨é??å®?äº?ä¸?个é?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??中æ?§å?¶æ­¤"
+"å??è?½ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
@@ -11539,6 +11600,11 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
+"ä¸?äº?é?®ä»¶å??表设置äº? Reply-To 头æ?¥ä½¿ç?¨æ?·å??é??ç??å??å¤?ç?´æ?¥å?°é?®ä»¶å??表ï¼?å?³ä½¿ç?¨æ?·å¸?æ?? "
+"Evolution æ?¥å??é??ä¸?个ç§?人ç??å??å¤?ã??设置è¿?个é??项为 TRUE å°?ä¼?è¯?å?¾å¿½ç?¥ Reply-To: "
+"头ï¼?è¿?æ · Evolution å°?ä¼?å??æ?¨è¦?æ±?ç??é?£æ ·å??é??ç§?人ç??å??å¤?ã??å¦?æ??æ?¨ä½¿ç?¨ç§?人ç??å??å¤?å?¨"
+"ä½?ï¼?å®?ä¼?è¿?è¡?ç§?人ç??å??å¤?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨â??å??å¤?å?°å??表â??è¡?为ï¼?å®?å°±ä¼?å??å¤?å?°å??表ã??å¦?æ??"
+"å­?å?¨ç??è¯?ï¼?å®?ä¼?æ¯?è¾? Reply-To: å?? List-Post: æ?¥å®?æ??该ç?®ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
@@ -11608,8 +11674,8 @@ msgid ""
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr ""
-"æ­¤é??项å?³å®?äº? Evolution 中æ?¾ç¤ºç??æ??大æ??æ?¬é?¨å??大å°?ï¼?é»?认为 4096KB (4MB)ã??"
-"æ­¤å?¼ä»?å?¨ force_message_limit é?®æ¿?æ´»æ?¶æ??æ??ã??"
+"æ­¤é??项å?³å®?äº? Evolution 中æ?¾ç¤ºç??æ??大æ??æ?¬é?¨å??大å°?ï¼?é»?认为 4096KB (4MB)ã??æ­¤å?¼ä»?"
+"å?¨ force_message_limit é?®æ¿?æ´»æ?¶æ??æ??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid ""
@@ -11644,6 +11710,8 @@ msgid ""
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
+"æ­¤é??项ä¸? lookup_addressbook é?®å?¼ç?¸å?³ï¼?ç?¨äº?å?³å®?æ?¯å?¦æ?¥è¯¢æ?¬å?°å?°å??簿以é?¿å??æ?¨è®¤è¯?"
+"ç??人ç»?æ?¨å??é?®ä»¶è??被å??å?¾é?®ä»¶è¿?滤å?¨ç»?è¿?滤æ??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
@@ -11688,7 +11756,7 @@ msgstr "é»?认å¸?å?·ç?? UID å­?符串ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
+msgstr "å½?使ç?¨è¡?å??æ?¼å??æ£?æ?¥æ?¶ï¼?é??误æ?¼å??å??è¯?ç??ä¸?å??线ç??é¢?è?²ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
@@ -11715,18 +11783,24 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "ä¹?使ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?(æ?  DNS)ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:207
+#, fuzzy
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
+"å½?å??å¤?é?®ä»¶ç??æ?¶å??ï¼?ç?¨æ?·å°?å?¨å??æ ?æ??å¤?ç??ä½?ç½®å¾?å?°æ??æ??ç??è£?å¤?ã??è¿?å?³å®?äº?å??æ ?æ?¯æ?¾å?¨é?®"
+"件ç??顶é?¨è¿?æ?¯åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:208
+#, fuzzy
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
+"å½?å??å¤?é?®ä»¶ç??æ?¶å??ï¼?ç?¨æ?·å°?å?¨ç­¾å??æ??å¤?ç??ä½?ç½®å¾?å?°æ??æ??ç??è£?å¤?ã??è¿?å?³å®?äº?ç­¾å??æ?¯æ?¾å?¨é?®"
+"件ç??顶é?¨è¿?æ?¯åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
@@ -11756,6 +11830,8 @@ msgid ""
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
+"å?¨è¿?滤ç»?æ??å??æ?¯å?¦å?·æ?°å??件箱ã??ä»?å?¨ä½¿ç?¨è¿?ä»»ä½?â??转å??ç»?â??è¿?滤å?¨è¡?为并ä¸?å?¨ä¸?次è°?ç?¨å¤§"
+"约ä¸?å??é??å??è¿?è¡?å??件箱å?·æ?°ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
@@ -11770,7 +11846,7 @@ msgid "Importing Elm data"
 msgstr "导� Elm ��"
 
 #: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../modules/mail/e-mail-shell-view.c:951
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
@@ -11895,6 +11971,8 @@ msgid_plural ""
 "%s have been updated, because they used just removed folder\n"
 "\"%s\"."
 msgstr[0] ""
+"å·²ç»?æ?´æ?°äº?è¿?滤å?¨è§?å??â??%sâ??ï¼?å? ä¸ºå®?使ç?¨äº?å??å??å? é?¤ç??æ??件夹\n"
+"â??%sâ??ã??"
 
 #. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
@@ -12088,7 +12166,7 @@ msgstr "å?¨å??(_E)ï¼?"
 
 #: ../mail/mail-config.ui.h:57
 msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+msgstr "å¦?æ??å?¯è?½ï¼?ç»?å??å¤?å?ªå??å¤?ç»?é?®ä»¶å??表ã??"
 
 #: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
@@ -12206,12 +12284,10 @@ msgid "Prompt when mailing list redirects private reply back to list"
 msgstr "å½?é?®ä»¶å??表é??å®?å??ç§?人å??å¤?å?°å??表æ?¶æ??示"
 
 #: ../mail/mail-config.ui.h:92
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when sending private replies to mailing _list messages"
 msgstr "å½?å??é?®ä»¶å??表信æ?¯å??é??ç§?人å??å¤?æ?¶æ??示(_L)"
 
 #: ../mail/mail-config.ui.h:93
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when sending replies to _many recipients"
 msgstr "å½?å??é??å??å¤?è?³å¤?个æ?¶ä»¶äººæ?¶æ??示(_M)"
 
@@ -12829,8 +12905,7 @@ msgstr[0] "ä¿?å­? %d å°?ä¿¡"
 #: ../mail/mail-ops.c:2192
 #, c-format
 msgid "Error saving messages to: %s:\n"
-msgstr ""
-"å?¨å°?ä¿¡æ?¯ä¿?å­?å?° %s æ?¶å??ç??é??误ï¼?\n"
+msgstr "å?¨å°?ä¿¡æ?¯ä¿?å­?å?° %s æ?¶å??ç??é??误ï¼?\n"
 
 #: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
@@ -12916,13 +12991,13 @@ msgstr "����"
 msgid "User canceled operation."
 msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-session.c:723
+#: ../mail/mail-session.c:724
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "缺å°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
 
-#: ../mail/mail-session.c:732
+#: ../mail/mail-session.c:733
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ? å?¯ç?¨å¸?å?·ï¼?é?®ä»¶è½¬å??被å??æ¶?ã??"
@@ -12984,11 +13059,11 @@ msgstr[0] ""
 "æ??ç´¢æ??件夹â??%sâ??å·²ç»?被æ?´æ?°ï¼?å? ä¸ºå®?使ç?¨äº?被移é?¤ç??æ??件夹\n"
 "â??%sâ??"
 
-#: ../mail/mail-vfolder.c:1179
+#: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
 msgstr "ç¼?è¾?æ??ç´¢æ??件夹"
 
-#: ../mail/mail-vfolder.c:1284
+#: ../mail/mail-vfolder.c:1287
 msgid "New Search Folder"
 msgstr "æ?°å»ºæ??ç´¢æ??件夹"
 
@@ -13367,7 +13442,6 @@ msgid "Really delete folder \"{0}\"?"
 msgstr "ç??è¦?å? é?¤æ??件夹â??{0}â??ï¼?"
 
 #: ../mail/mail.error.xml.h:90
-#| msgid "_Private"
 msgid "Reply _Privately"
 msgstr "ç§?人å??å¤?(_P)"
 
@@ -13508,6 +13582,8 @@ msgid ""
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr ""
+"æ?¨æ­£å?¨ç»?ä¸?å°?é??è¿?é?®ä»¶å??表æ?¶å?°ç??é?®ä»¶å??é??ä¸?个ç§?ä¸?ç??å??å¤?ï¼?è??é?®ä»¶å??表正è¯?å?¾é??å®?å??"
+"æ?¨ç??å??å¤?å??é?®ä»¶å??表ã??æ?¨ç¡®å®?è¦?继续ä¹?ï¼?"
 
 #: ../mail/mail.error.xml.h:123
 msgid ""
@@ -13515,6 +13591,8 @@ msgid ""
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr ""
+"æ?¨æ­£å?¨å??å¤?ä¸?å°?é??è¿?é?®ä»¶å??表æ?¶å?°ç??é?®ä»¶ï¼?ä½?æ?¯æ?¨æ­£ç§?ä¸?ç??å??å¤?ç»?å??件人ï¼?è??ä¸?æ?¯é?®ä»¶"
+"å??表ã??æ?¨ç¡®å®?è¦?è¿?ä¹?å??ä¹?ï¼?"
 
 #: ../mail/mail.error.xml.h:124
 msgid ""
@@ -13594,88 +13672,88 @@ msgstr "å??é??已读å??æ?§(_S)"
 msgid "_Synchronize"
 msgstr "å??æ­¥(_S)"
 
-#: ../mail/message-list.c:1159
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "æ?ªç??"
 
-#: ../mail/message-list.c:1160
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "å·²ç??"
 
-#: ../mail/message-list.c:1161
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "已��"
 
-#: ../mail/message-list.c:1162
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "已转å??"
 
-#: ../mail/message-list.c:1163
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å°?æ?ªç??ä¿¡æ?¯"
 
-#: ../mail/message-list.c:1164
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "��信"
 
-#: ../mail/message-list.c:1168
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1169
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "è¾?ä½?"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "è¾?é«?"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天%p%l:%M"
 
-#: ../mail/message-list.c:1800
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "�天%p%l:%M"
 
-#: ../mail/message-list.c:1812
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1820
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p%l:%M"
 
-#: ../mail/message-list.c:1822
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥"
 
-#: ../mail/message-list.c:2582
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "é??中æ??æ??å?¯è§?ç??ä¿¡æ?¯"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4329 ../mail/message-list.c:4721
+#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
 msgid "Generating message list"
 msgstr "ç??æ??ä¿¡æ?¯å??表"
 
-#: ../mail/message-list.c:4560
+#: ../mail/message-list.c:4643
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "没æ??ä¿¡æ?¯æ»¡è¶³æ?¨ç??æ??ç´¢æ?¡ä»¶ã??ç?¨â??æ??ç´¢â??è??å??ç??â??æ¸?é?¤â??è??å??项æ¸?é?¤"
 
-#: ../mail/message-list.c:4562
+#: ../mail/message-list.c:4645
 msgid "There are no messages in this folder."
 msgstr "æ­¤æ??件夹中没æ??ä¿¡æ?¯ã??"
 
@@ -13704,7 +13782,7 @@ msgid "Sent Messages"
 msgstr "å·²å??é??ä¿¡æ?¯"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:560
+#: ../widgets/misc/e-attachment-tree-view.c:576
 msgid "Size"
 msgstr "大�"
 
@@ -13904,106 +13982,110 @@ msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦æ?¾ç¤ºé¢?è§?é?¢æ?¿ã??"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:162
 #: ../modules/mail/em-mailer-prefs.c:1165
 msgid "_Table column:"
 msgstr "表å??(T)ï¼?"
 
-#: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "��补�"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??系人ç??å?°å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-backend.c:98
 #: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP æ??å?¡å?¨ä¸?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:267
+#: ../modules/addressbook/e-book-shell-backend.c:281
 msgctxt "New"
 msgid "_Contact"
 msgstr "è??系人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:757
+#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "å??建ä¸?个æ?°è??系人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
+#: ../modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Contact _List"
 msgstr "è??系人å??表(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:764
+#: ../modules/addressbook/e-book-shell-backend.c:290
+#: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "å??建ä¸?个æ?°ç??è??系人å??表"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:298
 msgctxt "New"
 msgid "Address _Book"
 msgstr "å?°å??ç°¿(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:687
+#: ../modules/addressbook/e-book-shell-backend.c:300
+#: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "å??建æ?°å?°å??ç°¿"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/addressbook/e-book-shell-backend.c:317
+#: ../modules/addressbook/e-book-shell-view.c:401
 #: ../modules/calendar/e-cal-shell-backend.c:104
 #: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "è??系人"
 
+#: ../modules/addressbook/e-book-shell-backend.c:326
+msgid "Certificates"
+msgstr "�书"
+
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:263
-#: ../modules/addressbook/e-book-shell-view-actions.c:541
+#: ../modules/addressbook/e-book-shell-view-actions.c:549
 msgid "Save as vCard"
 msgstr "��为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
 msgstr "å°?å?¨é?¨è??系人å¤?å?¶å?°(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
 msgstr "æ??é??中å?°å??簿中ç??è??系人å¤?å?¶å?°å?¶å®?å?°å??ç°¿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "D_elete Address Book"
 msgstr "å? é?¤å?°å??ç°¿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:673
+#: ../modules/addressbook/e-book-shell-view-actions.c:689
 msgid "Delete the selected address book"
 msgstr "å? é?¤é??中ç??å?°å??è??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
 msgstr "å°?å?¨é?¨è??系人移è?³(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:680
+#: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
 msgstr "æ??é??中ç??å?°å??簿中ç??è??系人移è?³å?¶å®?å?°å??ç°¿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "_New Address Book"
 msgstr "æ?°å»ºå?°å??ç°¿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Address _Book Properties"
 msgstr "å?°å??ç°¿å±?æ?§(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:694
+#: ../modules/addressbook/e-book-shell-view-actions.c:710
 msgid "Show properties of the selected address book"
 msgstr "æ?´æ?¹é??中å?°å??è??ç??å±?æ?§"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 #: ../modules/calendar/e-cal-shell-view-actions.c:1354
 #: ../modules/calendar/e-memo-shell-view-actions.c:620
 #: ../modules/calendar/e-task-shell-view-actions.c:744
@@ -14011,157 +14093,157 @@ msgstr "æ?´æ?¹é??中å?°å??è??ç??å±?æ?§"
 msgid "_Rename..."
 msgstr "é??å?½å??(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:701
+#: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
 msgstr "é??å?½å??é??中å?°å??è??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "S_ave Address Book as vCard"
 msgstr "ä¿?å­?å?°å??簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:708
+#: ../modules/addressbook/e-book-shell-view-actions.c:724
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "æ??é??中å?°å??è??中ç??ç??è??系人ä¿?å­?为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:715
+#: ../modules/addressbook/e-book-shell-view-actions.c:731
 msgid "Stop loading"
 msgstr "å??止载å?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
 msgstr "å¤?å?¶è??系人å?°(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:722
+#: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
 msgstr "æ??é??中ç??è??系人å¤?å?¶å?°å?¶å®?å?°å??è??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "_Delete Contact"
 msgstr "å? é?¤è??系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
 msgstr "å?¨è??系人æ?¥æ?¾(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
 msgstr "å?¨æ?¾ç¤ºç??è??系人中æ??ç´¢æ??æ?¬"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
 msgstr "转å??è??系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:743
+#: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
 msgstr "æ??é??中ç??è??系人å??é??ç»?å?¶ä»?人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
 msgstr "移å?¨è??系人è?³(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:750
+#: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
 msgstr "æ??é??中ç??è??系人移è?³å?¶å®?å?°å??è??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
 msgstr "æ?°å»ºè??系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
 msgstr "æ?°å»ºè??系人å??表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
 msgstr "æ??å¼?è??系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:787
 msgid "View the current contact"
 msgstr "æ?¥ç??å½?å??è??系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
 msgstr "ç»?è??系人å??é??ä¿¡æ?¯(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:778
+#: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "ç»?é??中ç??è??系人å??é??ä¿¡æ?¯"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
 #: ../modules/calendar/e-cal-shell-view-actions.c:1496
 #: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "æ??ä½?(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:808
 #: ../modules/calendar/e-memo-shell-view-actions.c:657
 #: ../modules/calendar/e-task-shell-view-actions.c:809
 #: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "��(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/addressbook/e-book-shell-view-actions.c:817
 #: ../modules/calendar/e-cal-shell-view-actions.c:1513
 #: ../modules/calendar/e-memo-shell-view-actions.c:670
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "å? é?¤(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
 msgstr "��为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
 msgstr "è??系人é¢?è§?(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:844
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Show contact preview window"
 msgstr "æ?¾ç¤ºè??系人é¢?è§?çª?å?£"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 #: ../modules/calendar/e-memo-shell-view-actions.c:727
 #: ../modules/calendar/e-task-shell-view-actions.c:891
 #: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "å??ç±»è§?å?¾(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Show contact preview below the contact list"
 msgstr "å?¨è??系人å??表ä¸?æ?¹æ?¾ç¤ºè??系人é¢?è§?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 #: ../modules/calendar/e-memo-shell-view-actions.c:734
 #: ../modules/calendar/e-task-shell-view-actions.c:898
 #: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "����(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:872
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Show contact preview alongside the contact list"
 msgstr "å?¨è??系人å??表æ??æ?¾ç¤ºè??系人é¢?è§?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 #: ../modules/calendar/e-cal-shell-view-actions.c:1656
 #: ../modules/calendar/e-memo-shell-view-actions.c:744
 #: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "任�类�"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 #: ../modules/calendar/e-cal-shell-view-actions.c:1670
 #: ../modules/calendar/e-memo-shell-view-actions.c:751
 #: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "æ? å?¹é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
 #: ../modules/calendar/e-cal-shell-view-actions.c:1680
 #: ../modules/calendar/e-memo-shell-view-actions.c:761
 #: ../modules/calendar/e-task-shell-view-actions.c:960
@@ -14170,58 +14252,58 @@ msgstr "æ? å?¹é??"
 msgid "Advanced Search"
 msgstr "é«?级æ??ç´¢"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Print all shown contacts"
 msgstr "æ??å?°å?¨é?¨æ?¾ç¤ºç??è??系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Preview the contacts to be printed"
 msgstr "é¢?è§?å°?è¦?æ??å?°ç??è??系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Print selected contacts"
 msgstr "æ??å?°é??中ç??è??系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Save selected contacts as a vCard"
 msgstr "æ??é??中ç??è??系人ä¿?å­?为 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:342
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "转å??è??系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "转å??è??系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "ç»?è??系人å??é??ä¿¡æ?¯(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "ç»?å??表å??é??ä¿¡æ?¯(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:379
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "ç»?è??系人å??é??ä¿¡æ?¯(_M)"
 
-#: ../modules/addressbook/eab-composer-util.c:137
+#: ../modules/addressbook/eab-composer-util.c:143
 msgid "Multiple vCards"
 msgstr "�个 vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:145
+#: ../modules/addressbook/eab-composer-util.c:151
 #, c-format
 msgid "vCard for %s"
 msgstr "%s ç?? vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:157
-#: ../modules/addressbook/eab-composer-util.c:184
+#: ../modules/addressbook/eab-composer-util.c:163
+#: ../modules/addressbook/eab-composer-util.c:190
 #, c-format
 msgid "Contact information"
 msgstr "è??系人信æ?¯"
 
-#: ../modules/addressbook/eab-composer-util.c:186
+#: ../modules/addressbook/eab-composer-util.c:192
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s ç??è??系人信æ?¯"
@@ -14267,7 +14349,6 @@ msgid "Search _filter:"
 msgstr "æ??ç´¢è¿?滤å?¨(_F)ï¼?"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-#, fuzzy
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14403,7 +14484,7 @@ msgstr "æ?¥å??(_N)"
 msgid "Create a new calendar"
 msgstr "å??建æ?°æ?¥å??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../modules/calendar/e-cal-shell-backend.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "æ?¥å??å??ä»»å?¡"
@@ -15108,7 +15189,7 @@ msgid "Delete Task"
 msgstr "��任�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:333
+#: ../modules/mail/e-mail-attachment-handler.c:345
 #, c-format
 msgid "%d attached messages"
 msgstr "%d 个é??å? ç??ä¿¡æ?¯"
@@ -15120,42 +15201,42 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ? "
 
-#: ../modules/mail/e-mail-shell-backend.c:169
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:173
 msgid "Compose a new mail message"
 msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
 
-#: ../modules/mail/e-mail-shell-backend.c:179
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?®ä»¶æ??件夹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgid "Create a new mail folder"
 msgstr "å??建æ?°é?®ä»¶æ??件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:200
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Accounts"
 msgstr "�件��"
 
-#: ../modules/mail/e-mail-shell-backend.c:208
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Mail Preferences"
 msgstr "é?®ä»¶é¦?é??项"
 
-#: ../modules/mail/e-mail-shell-backend.c:216
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Composer Preferences"
 msgstr "ç¼?å??å?¨é¦?é??项"
 
-#: ../modules/mail/e-mail-shell-backend.c:224
+#: ../modules/mail/e-mail-shell-backend.c:513
 msgid "Network Preferences"
 msgstr "ç½?ç»?é¦?é??项"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:871
+#: ../modules/mail/e-mail-shell-view.c:870
 msgid "_Disable Account"
 msgstr "����(_D)"
 
@@ -15419,50 +15500,50 @@ msgstr "å½?å??å¸?å?·"
 msgid "Current Folder"
 msgstr "å½?å??æ??件夹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:887
+#: ../modules/mail/e-mail-shell-view-private.c:936
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é??中 %d 个ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:898
+#: ../modules/mail/e-mail-shell-view-private.c:947
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已��"
 
-#: ../modules/mail/e-mail-shell-view-private.c:904
-#: ../modules/mail/e-mail-shell-view-private.c:911
+#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:917
+#: ../modules/mail/e-mail-shell-view-private.c:966
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å°?è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:923
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:929
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:941
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "�%d ��读�"
 
-#: ../modules/mail/e-mail-shell-view-private.c:944
+#: ../modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15476,26 +15557,26 @@ msgstr "å?¨é?¨å¸?å?·æ??ç´¢"
 msgid "Account Search"
 msgstr "å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:869
+#: ../modules/mail/e-mail-shell-view.c:868
 msgid "Proxy _Logout"
 msgstr "代ç??æ??å?¡å?¨æ³¨é??(_L)"
 
-#: ../modules/mail/em-account-prefs.c:129
+#: ../modules/mail/em-account-prefs.c:130
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
-#: ../modules/mail/em-account-prefs.c:178
+#: ../modules/mail/em-account-prefs.c:179
 msgid "Account Editor"
 msgstr "�����"
 
-#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/mail/em-composer-prefs.c:530
 #: ../plugins/plugin-manager/plugin-manager.c:349
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "已��"
 
-#: ../modules/mail/em-composer-prefs.c:502
+#: ../modules/mail/em-composer-prefs.c:534
 msgid "Language(s)"
 msgstr "语�"
 
@@ -15591,12 +15672,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python Eplugin å? è½½å?¨æµ?è¯?æ??件ã??"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:270
-#: ../widgets/misc/e-import-assistant.c:389
+#: ../widgets/misc/e-import-assistant.c:393
 msgid "Please select the information that you would like to import:"
 msgstr "请é??æ?©æ?¨å¸?æ??导å?¥ç??ä¿¡æ?¯ï¼?"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:302
-#: ../widgets/misc/e-import-assistant.c:545
+#: ../widgets/misc/e-import-assistant.c:549
 #, c-format
 msgid "From %s:"
 msgstr "ä»? %sï¼?"
@@ -15704,14 +15785,12 @@ msgid "_Restart Evolution after restore"
 msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:298
-#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"æ?¨å?¯ä»¥ä»?å¤?份中æ?¢å¤? Evolutionã??å®?è?½å¤?æ?¢å¤?æ??æ??é?®ä»¶ã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?å??è??ç³»"
-"人ã??\n"
+"æ?¨å?¯ä»¥ä»?å¤?份中æ?¢å¤? Evolutionã??å®?è?½å¤?æ?¢å¤?æ??æ??é?®ä»¶ã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?å??è??系人ã??"
 "å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??个人设置å??é?®ä»¶è¿?滤å?¨ç­?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:305
@@ -15867,43 +15946,46 @@ msgid ""
 msgstr "æ?¨ç¡®å®?æ?³è¦?ä»?é??中ç??å¤?份æ??件中æ?¢å¤? Evolution å??ï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid ""
-"Evolution backup can start only when Evolution is not running. Please make "
-"sure that you save and close all your unsaved windows before proceeding.  If "
-"you want Evolution to restart automatically after backup, please enable the "
-"toggle button."
-msgstr ""
-"Evolution å¤?份å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å­?å??å?³é?­äº?æ?¨"
-"ç??æ??æ??ç??æ?ªä¿?å­?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨å¤?份å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨å??æ?¢æ??"
-"é?®ã??"
+msgid "Close and Backup Evolution"
+msgstr "��并�份 Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Close and Restore Evolution"
+msgstr "��并�� Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "æ??é??ä¸?å¤?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "æ? æ??ç?? Evolution å¤?份æ??件"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "请é??æ?©è¦?æ?¢å¤?ç??æ??æ??å¤?份æ??件ã??"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "é??中ç??æ??件夹ä¸?å?¯å??ã??"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"This will delete all your current Evolution data and settings and restore "
-"them from your backup. Evolution restore can start only when Evolution is "
-"not running. Please make sure that you close all your unsaved windows before "
-"you proceed. If you want Evolution to restart automatically restart after "
-"restore, please enable the toggle button."
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
 msgstr ""
-"è¿?å°?å? é?¤æ?¨å½?å??ç??æ??æ?? Evolution æ?°æ?®å??设置并ä»?æ?¨ç??å¤?份中æ?¢å¤?å®?们ã??Evolution æ?¢"
-"å¤?å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å­?å??å?³é?­äº?æ?¨ç??æ??æ??ç??æ?ªä¿?"
-"å­?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨æ?¢å¤?å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨å??æ?¢æ??é?®ã??"
+"è¦?å¤?份æ?¨ç??æ?°æ?®å??设置ï¼?æ?¨å¿?é¡»å??å?³é?­ Evolutionã??请å?¨å¤?ç??å??确认æ?¨ä¿?å­?äº?æ??æ??æ?ªä¿?"
+"å­?ç??æ?°æ?®ã??"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+"è¦?æ?¢å¤?æ?¨ç??æ?°æ?®å??设置ï¼?æ?¨å¿?é¡»å??å?³é?­ Evolutionã??请å?¨å¤?ç??å??确认æ?¨ä¿?å­?äº?æ??æ??æ?ªä¿?"
+"å­?ç??æ?°æ?®ã??è¿?ä¼?å? é?¤æ??æ??æ?¨å½?å?? Evolution ç??æ?°æ?®å??设置ï¼?并ä»?æ?¨ç??å¤?份中æ?¢å¤?ã??"
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -15942,7 +16024,6 @@ msgid "BBDB"
 msgstr "BBDB"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-#, fuzzy
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
@@ -15950,6 +16031,8 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
+"让æ?¨ä»?ç¹?é??ç??ç??å?°å??簿管ç??中解è?±å?ºæ?¥ã??\n"
+"\n"
 "å?¨æ?¨å??å¤?é?®ä»¶æ?¶è?ªå?¨ç?¨å§?å??å??ç?µå­?é?®ä»¶å?°å??å¡«å?¥æ?¨ç??å?°å??ç°¿ã??å??æ?¶è¿?å°?å¡«å?¥æ?¨å¥½å??å??表"
 "ç??å?³æ?¶é??讯è??系信æ?¯ã??"
 
@@ -16067,11 +16150,9 @@ msgid "Enter password for user %s on server %s"
 msgstr "è¾?å?¥æ??å?¡å?¨ %2$s ä¸?ç?¨æ?· %1$s ç??å¯?ç ?"
 
 #: ../plugins/caldav/caldav-browse-server.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr ""
-"æ? æ³?å??建è¾?å?ºæ??件ï¼?%sï¼?\n"
-" %s"
+msgstr "æ? æ³?为 URL â??%sâ??å??建 soup æ¶?æ?¯"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1095
@@ -16325,6 +16406,8 @@ msgid ""
 "message. The format for specifying a Header and Header value is: Name of the "
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
+"æ­¤é?®å?¼æ??å®?äº?æ?¨å?¯ä»¥å??å??é??é?®ä»¶ä¸­æ·»å? ç??è?ªå®?ä¹?头ç??å??表ã??æ??å®?头å??头å?¼ç??æ ¼å¼?为ï¼?è?ª"
+"å®?ä¹?头ç??å??称ï¼?æ?¥ä¸?æ?¥æ?¯â??=â??å??å®?ç??å?¼ï¼?头ä¸?头ä¹?é?´ä»¥â??;â??å??å?²"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
@@ -16364,6 +16447,8 @@ msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
 msgstr ""
+"æ??å®?头å??头å?¼ç??æ ¼å¼?为ï¼?\n"
+"è?ªå®?ä¹?头ç??å??称ï¼?å?¼ï¼?头ä¸?头ä¹?é?´ä»¥â??;â??å??å?²ã??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
@@ -16696,14 +16781,12 @@ msgid "Message retract failed"
 msgstr "é?®ä»¶æ?¶å??失败"
 
 #: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
-#, fuzzy
 msgid "The server did not allow the selected message to be retracted."
-msgstr "å°?é??中é?®ä»¶è½¬æ?¢ä¸ºæ?°ä»»å?¡"
+msgstr "æ??å?¡å?¨ä¸?å??许æ?¶å??é??中ç??é?®ä»¶ã??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
-#, fuzzy
 msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "å·²ç»?å­?å?¨å??为â??{0}â??ç??æ??件夹ã??请使ç?¨ä¸?å??ç??å??称ã??"
+msgstr "å·²ç»?å­?å?¨è´¦æ?·â??{0}â??ã??请æ£?æ?¥æ?¨ç??æ??件夹ç?®å½?ã??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
 msgid "Account Already Exists"
@@ -16723,9 +16806,8 @@ msgstr "使ç?¨&quot;{0}&quot;ç?»å½?代ç??æ??å??ã??请æ£?æ?¥æ?¨ç??é?®ä»¶å?°å??并
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
-#, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
-msgstr "æ? æ³?ä¿?å­?å?°æ??件â??{0}â??ã??"
+msgstr "æ? æ³?ç»?ç?¨æ?·â??{0}â??代ç??æ??å?¡å?¨ç??访é?®è?½å??ã??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
@@ -16743,9 +16825,8 @@ msgid "You have to specify a valid user name to give proxy rights."
 msgstr "æ?¨å¿?é¡»æ??å®?ä¸?个æ??æ??ç??ç?¨æ?·å??æ?¥è?·å¾?代ç??æ??å?¡ä½¿ç?¨æ??é??ã??"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
-#, fuzzy
 msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "æ? æ³?ä¿?å­?å?°è?ªå?¨ä¿?å­?æ??件â??{0}â??ã??"
+msgstr "æ?¨æ? æ³?ä¸?æ??å®?ç?¨æ?·â??{0}â??å?±äº«è¯¥æ??件夹ã??"
 
 #: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
 msgid "You have to specify a user name which you want to add to the list"
@@ -16756,24 +16837,20 @@ msgid "Do you want to resend the meeting?"
 msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?é??æ?°å??é??该ä¼?è®®å??ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
-#, fuzzy
 msgid "Do you want to resend the recurring meeting?"
-msgstr "æ?¨ç¡®ä¿¡æ?¨è¦?å? é?¤è¯¥ä¼?è®®å??ï¼?"
+msgstr "æ?¨ç¡®å®?è¦?å??次å??é??è¿?个å®?æ??å?¬å¼?ç??ä¼?è®®ä¹?ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
-#, fuzzy
 msgid "Do you want to retract the original item?"
-msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??ä¿¡æ?¯ï¼?"
+msgstr "æ?¨æ?³è¦?æ?¶å??å??件ä¹?ï¼?"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
-#, fuzzy
 msgid "The original will be removed from the recipient's mailbox."
-msgstr "ä»?å?¨é?¨å?¶å®?æ?¶ä»¶äººç??é?®ç®±ä¸­å? é?¤æ­¤é¡¹å??ï¼?(_D)"
+msgstr "å°?ä»?æ?¶ä»¶äººç??é?®ç®±å? é?¤å??件ã??"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
-#, fuzzy
 msgid "This is a recurring meeting"
-msgstr "å°?æ­¤äº?件æ ?为é??å¤?å??ç??"
+msgstr "è¿?æ?¯ä¸?个å®?æ??å?¬å¼?ç??ä¼?è®®"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
 msgid "This will create a new meeting using the existing meeting details."
@@ -17759,9 +17836,8 @@ msgid "Play sound when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?­æ?¾å£°é?³ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-#, fuzzy
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "ä¸?å?¨ beep 模å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?­æ?¾ç??声é?³æ??件ã??"
+msgstr "ä¸?å?¨ beep 模å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?­æ?¾ä¸»é¢?ç??声é?³æ??件ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -17799,15 +17875,15 @@ msgstr "æ?¯å?¦é?ªç??å?¾æ ?ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶ç®±æ??件夹中ç??æ?°ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:355
+#: ../plugins/mail-notification/mail-notification.c:369
 msgid "Evolution's Mail Notification"
 msgstr "Evolution é?®ä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:377
+#: ../plugins/mail-notification/mail-notification.c:391
 msgid "Mail Notification Properties"
 msgstr "é?®ä»¶é??ç?¥å±?æ?§"
 
-#: ../plugins/mail-notification/mail-notification.c:513
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17819,66 +17895,66 @@ msgstr[0] "æ?¨å?¨ %2$s 中æ?¶å?°äº? %1$d å°?æ?°é?®ä»¶ã??"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:539
 #, c-format
 msgid "From: %s"
 msgstr "���%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:538
+#: ../plugins/mail-notification/mail-notification.c:552
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:548
+#: ../plugins/mail-notification/mail-notification.c:562
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨æ?¶å?°äº? %d å°?æ?°é?®ä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:570
-#: ../plugins/mail-notification/mail-notification.c:577
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "New email"
 msgstr "����件"
 
-#: ../plugins/mail-notification/mail-notification.c:638
+#: ../plugins/mail-notification/mail-notification.c:652
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:666
+#: ../plugins/mail-notification/mail-notification.c:680
 msgid "B_link icon in notification area"
 msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:676
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "Popup _message together with the icon"
 msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??ä¿¡æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:863
+#: ../plugins/mail-notification/mail-notification.c:877
 msgid "_Play sound when new messages arrive"
 msgstr "��件�达���声�(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:892
+#: ../plugins/mail-notification/mail-notification.c:906
 msgid "_Beep"
 msgstr "å??é??(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:905
+#: ../plugins/mail-notification/mail-notification.c:919
 msgid "Use sound _theme"
 msgstr "使�声�主�(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:924
+#: ../plugins/mail-notification/mail-notification.c:938
 msgid "Play _file:"
 msgstr "æ?­æ?¾æ??件(_F)ï¼?"
 
-#: ../plugins/mail-notification/mail-notification.c:935
+#: ../plugins/mail-notification/mail-notification.c:949
 msgid "Select sound file"
 msgstr "é??æ?©å£°é?³æ??件"
 
-#: ../plugins/mail-notification/mail-notification.c:993
+#: ../plugins/mail-notification/mail-notification.c:1007
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸­ç??æ?°ä¿¡æ?¯(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1002
+#: ../plugins/mail-notification/mail-notification.c:1016
 msgid "Generate a _D-Bus message"
 msgstr "ç??æ?? _D-Bus ä¿¡æ?¯"
 
@@ -17999,11 +18075,10 @@ msgid "Cannot open calendar. %s"
 msgstr "æ? æ³?æ??å¼?æ?¥å??ã??%s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:743
-#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
-msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
+msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建äº?件ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
 #: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
@@ -18012,11 +18087,10 @@ msgid ""
 msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
 #: ../plugins/mail-to-task/mail-to-task.c:749
-#, fuzzy
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
-msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建任å?¡ã??请é??æ?©å?¶å®?ç??æº?ã??"
+msgstr "é??中ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ­¤ä¸?è?½å?¨æ­¤å??建å¤?å¿?å½?ã??请é??æ?©å?¶å®?ç??æº?ã??"
 
 #: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
@@ -18059,55 +18133,55 @@ msgstr "ç?¨æ??é??é?®ä»¶å??建æ?°ä¼?è®®"
 msgid "Convert a mail message to a task."
 msgstr "转æ?¢ä¸?个é?®ä»¶ä¿¡æ?¯æ??为ä¸?个任å?¡ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 msgid "Get List _Archive"
 msgstr "è?·å¾?å??表å­?æ¡£(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get an archive of the list this message belongs to"
 msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??å­?æ¡£"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 msgid "Get List _Usage Information"
 msgstr "è?·å¾?å??表ç?¨æ³?ä¿¡æ?¯(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??ç?¨æ³?ä¿¡æ?¯"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 msgid "Contact List _Owner"
 msgstr "è??ç³»å??表æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "è??ç³»è¿?å°?ä¿¡æ??å±?é?®ä»¶å??表ç??æ??æ??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 msgid "_Post Message to List"
 msgstr "æ??é??å?°å??表(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ç»?è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表æ??é??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "_Subscribe to List"
 msgstr "订é??å??表(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "订é??è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
 msgid "_Unsubscribe from List"
 msgstr "é??订å??表(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "é??订è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??表"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
 msgid "Mailing _List"
 msgstr "é?®ä»¶å??表(_L)"
 
@@ -18159,14 +18233,13 @@ msgid "Send e-mail message to mailing list?"
 msgstr "æ??ä¿¡æ?¯å??é??å?°é?®ä»¶å??表å??ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-#, fuzzy
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"æ? æ³?æ?§è¡?æ­¤å?¨ä½?ã??è¿?æ??å?³ç??æ­¤å?¨ä½?æ??ç?¨ç??头ä¸?å??å?«æ??们å?¯å¤?ç??ç??ä»»ä½?å?¨ä½?ã??\n"
+"æ? æ³?æ?§è¡?æ­¤å?¨ä½?ã??è¿?æ??å?³ç??æ­¤å?¨ä½?æ??ç?¨ç??头ä¸?å??å?«å?¯å¤?ç??ç??ä»»ä½?å?¨ä½?ã??\n"
 "\n"
 "头�{0}"
 
@@ -18716,25 +18789,24 @@ msgid "F_all back to threading messages by subject"
 msgstr "é»?认æ??ç?§ä¸»é¢?对线索中ç??ä¿¡æ?¯æ??åº?(_A)"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-#, fuzzy
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
 "message body."
-msgstr "ä¿¡æ?¯ä¸»ä½?中ç??ç?¨äº?é??件æ??é??æ??件ç??线索å??表ã??"
+msgstr "ç?¨äº?模æ?¿æ??件以æ?¿æ?¢é?®ä»¶å??容ç??é?®/å?¼å¯¹å??表ã??"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
 msgstr "å?ºäº?è??稿ç??模æ?¿å??æ??件"
 
-#: ../plugins/templates/templates.c:616
+#: ../plugins/templates/templates.c:620
 msgid "No Title"
 msgstr "���"
 
-#: ../plugins/templates/templates.c:687
+#: ../plugins/templates/templates.c:691
 msgid "Save as _Template"
 msgstr "��为模�(_T)"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:693
 msgid "Save as Template"
 msgstr "��为模�"
 
@@ -18754,26 +18826,26 @@ msgstr "åµ?å?¥ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:164
-#: ../plugins/vcard-inline/vcard-inline.c:249
+#: ../plugins/vcard-inline/vcard-inline.c:181
+#: ../plugins/vcard-inline/vcard-inline.c:266
 msgid "Show Full vCard"
 msgstr "�示�� vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:167
+#: ../plugins/vcard-inline/vcard-inline.c:184
 msgid "Show Compact vCard"
 msgstr "æ?¾ç¤ºç´§å?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:228
+#: ../plugins/vcard-inline/vcard-inline.c:245
 msgid "There is one other contact."
 msgstr "æ??å?¦å¤? 1 个è??系人ã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:237
+#: ../plugins/vcard-inline/vcard-inline.c:254
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "æ??å?¦å¤? %d 个è??系人ã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "ä¿?å­?è?³å?°å??ç°¿"
 
@@ -18873,6 +18945,9 @@ msgid ""
 "authentication_user\" GConf key, and the password is retrieved from either "
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
+"å¦?æ??为ç??ï¼?é?£ä¹?å?°ä»£ç??æ??å?¡å?¨ç??é?¾æ?¥é??è¦?认è¯?ã??ç?¨æ?·å??ä»? GConf ç??é?®å?¼ â??/apps/"
+"evolution/shell/network_config/authentication_userâ?? 中å¾?å?°ï¼?è??å¯?ç ?å°?æ?¥è?ª "
+"gnome-keyring æ??è?? ~/.gnome2_private/Evolution å¯?ç ?æ??件ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -18890,7 +18965,7 @@ msgstr "GtkFileChooser 对è¯?æ¡?ç??èµ·å§?æ??件夹ã??"
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
-msgstr ""
+msgstr "é??件æ ?ç??å??å§?è§?å?¾ã??â??0â??æ?¯å?¾æ ?è§?å?¾ã??â??1â??æ?¯å??表è§?å?¾ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
@@ -18936,6 +19011,9 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
+"é??æ?©ä»£ç??æ??å?¡å?¨é??置模å¼?ã??æ?¯æ??ç??å?¼ä¸º0ã??1ã??2 å?? 3ï¼?å??å?«è¡¨ç¤ºâ??使ç?¨ç³»ç»?设置â??ã??â??æ? ä»£"
+"ç??æ??å?¡å?¨â??ã??â??使ç?¨æ??å?¨ä»£ç??æ??å?¡å?¨è®¾ç½®â??ä¸?â??使ç?¨ autoconfig é?¾æ?¥ä¸­ç??代ç??æ??å?¡å?¨è®¾"
+"ç½®â??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -18945,7 +19023,7 @@ msgstr "侧边���"
 msgid "Skip development warning dialog"
 msgstr "è·³è¿?å¼?å??è­¦å??对è¯?æ¡?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "以��模���"
 
@@ -19037,6 +19115,9 @@ msgid ""
 "(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
+"æ­¤é?®å?¼å??å?«äº?ç?´æ?¥è¿?æ?¥ç??ï¼?è??ä¸?æ?¯é??è¿?代ç??æ??å?¡å?¨ç??(å¦?æ??被é??中)ï¼?主æ?ºå??表ã??å?¼å?¯ä»¥"
+"为主æ?ºå??ã??å??å??(使ç?¨å??å§?é??é??符å¦? *.foo.com)ã??IP 主æ?ºå?°å?? (IPv4 æ?? IPv6)å??带å­?"
+"ç½?æ?©ç ?ç??ç½?ç»?å?°å??(å¦? 192.168.0.0/24)ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -19149,274 +19230,274 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution ç½?ç«?"
 
-#: ../shell/e-shell-window-actions.c:1235
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "æ? æ³?è¿?è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1418
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "æ?¾ç¤ºå?³äº? Evolution ç??ä¿¡æ?¯"
 
-#: ../shell/e-shell-window-actions.c:1423
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "����(_C)"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "��(_C)"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "æ??å¼? Evolution ç?¨æ?·æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "Evolution 常���(_FAQ)"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "æ??å¼? FAQ ç½?页"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "丢���(_F)"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "丢å¼?æ??æ??è®°ä½?ç??å¯?ç ?"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "导�(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "�����导���"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "�建��(_W)"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "å??建ä¸?个æ?°çª?å?£æ?¥æ?¾ç¤ºè¿?个è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "é??ç½® Evolution"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "å¿«é??é¦?é??项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "æ?¾ç¤º Evolution ç??å¿«æ?·é?®"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "é??å?ºç¨?åº?"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "é«?级æ??ç´¢(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "æ??é? ä¸?个æ?´é«?级ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "æ¸?æ¥?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "ç¼?è¾?ä¿?å­?ç??æ??ç´¢(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "管ç??æ?¨ä¿?å­?ç??æ??ç´¢"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "å??å?»æ­¤å¤?æ?´æ?¹æ??索类å??"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "����(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "æ?§è¡?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "ä¿?å­?æ??ç´¢(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "ä¿?å­?å½?å??æ??ç´¢å??æ?°"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "å??é??/æ?¥æ?¶(_R)"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "å??é??é??å??中ç??ç??é?®ä»¶å¹¶æ?¶å??æ?°é?®ä»¶"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "æ??交é??误æ?¥å??(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ç?¨ Bug Buddy æ??交é??误æ?¥å??"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "��工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "� Evolution 转���模�"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "è??æ?ºå·¥ä½?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "å°? Evolution 转å?¥è??æ?ºæ¨¡å¼?"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "�建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "æ??ç´¢(_S)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "å??æ?¢å?¨å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "��(_W)"
 
-#: ../shell/e-shell-window-actions.c:1692
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "�示侧边�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1694
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "�示侧边�"
 
-#: ../shell/e-shell-window-actions.c:1700
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "æ?¾ç¤ºæ??é?®(_B)"
 
-#: ../shell/e-shell-window-actions.c:1702
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "æ?¾ç¤ºå??æ?¢å?¨æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "�示工��(_T)"
 
-#: ../shell/e-shell-window-actions.c:1718
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "�示工��"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "å?ªæ??å?¾æ ?(_I)"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "æ?¾ç¤ºå?ªæ??å?¾æ ?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1747
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "æ?¾ç¤ºå?ªæ??æ??å­?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "å?¾æ ?å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "æ?¾ç¤ºå¸¦å?¾æ ?å??æ??å­?ç??çª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "工��样�(_B)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·æ ?设置æ?¾ç¤ºçª?å?£æ??é?®"
 
-#: ../shell/e-shell-window-actions.c:1771
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "����..."
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "å??建æ??ç¼?è¾?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "ä¿?å­?å½?å??è§?å?¾..."
 
-#: ../shell/e-shell-window-actions.c:1780
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "ä¿?å­?å½?å??è?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "å½?å??è§?å?¾(_U)"
 
-#: ../shell/e-shell-window-actions.c:1797
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "å½?å??è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
 
-#: ../shell/e-shell-window-actions.c:1809
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "æ?´æ?¹å½?å??æ??å?°æ?ºç??页é?¢è®¾ç½®"
 
-#: ../shell/e-shell-window-actions.c:2182
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ?¢å?° %s"
 
-#: ../shell/e-shell-window-actions.c:2395
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "æ?§è¡?è¿?äº?æ??ç´¢å??æ?°"
 
@@ -19443,7 +19524,7 @@ msgid "Preparing to quit..."
 msgstr "æ­£å?¨å??å¤?é??å?º..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:175
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19475,7 +19556,7 @@ msgstr ""
 "\n"
 "æ??们å¸?æ??æ?¨å°½æ??享å??æ??们å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??们ä¹?ç?­å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19483,55 +19564,55 @@ msgstr ""
 "æ??è°¢\n"
 "Evolution å?¢é??\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é??ç?¥æ??"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "å?¯å?¨ Evolution 并æ¿?æ´»æ??å®?ç»?件"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "åº?ç?¨ç»?å®?ç??å? ä½?å??æ?°å?°ä¸»çª?å?£"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "以è??æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "以â??å¿«é??â??模å¼?å?¯å?¨"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "强å?¶å?³é?­æ??æ?? Evolution"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:341
 msgid "Send the debugging output of all components to a file."
 msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?个æ??件中ã??"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "ç¦?止载å?¥ä»»ä½?æ??件ã??"
 
-#: ../shell/main.c:340
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ç¦?ç?¨é?®ä»¶ã??è??系人å??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "导å?¥URIsæ??è??æ??件å??ä½?为å?©ä½?ç??å??æ?°"
 
-#: ../shell/main.c:346
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "请æ±?æ­£å?¨è¿?è¡?ç?? Evolution è¿?ç¨?é??å?º"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
 
-#: ../shell/main.c:531
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19648,9 +19729,8 @@ msgid "Disable connection to session manager"
 msgstr "ç¦?æ­¢è¿?æ?¥å?°ä¼?è¯?管ç??å?¨"
 
 #: ../smclient/eggsmclient.c:230
-#, fuzzy
 msgid "Specify file containing saved configuration"
-msgstr "é??ç½® Pilot"
+msgstr "æ??å®?å??å?«äº?ä¿?å­?ç??é??ç½®ç??æ??件ã??"
 
 #: ../smclient/eggsmclient.c:230
 msgid "FILE"
@@ -19757,10 +19837,6 @@ msgstr "å?¨é?¨é¢?è¯?æ?ºæ??æ??件"
 msgid "Failed to import certificate authority's certificate"
 msgstr "导å?¥è¯?书æ??æ??è??ç??è¯?书失败"
 
-#: ../smime/gui/certificate-manager.c:1156
-msgid "Certificates"
-msgstr "�书"
-
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
@@ -20360,26 +20436,25 @@ msgid "_Send To..."
 msgstr "å??é??å?°(_S)..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:131
-#, fuzzy
 msgid "Send the selected attachments somewhere"
-msgstr "é??æ?©ä¿?å­?é??中é??件ç??æ??件夹..."
+msgstr "å??é??æ??个é??中ç??é??件"
 
-#: ../widgets/misc/e-attachment-icon-view.c:495
-#: ../widgets/misc/e-attachment-tree-view.c:535
+#: ../widgets/misc/e-attachment-icon-view.c:511
+#: ../widgets/misc/e-attachment-tree-view.c:551
 msgid "Loading"
 msgstr "载�"
 
-#: ../widgets/misc/e-attachment-icon-view.c:507
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:523
+#: ../widgets/misc/e-attachment-tree-view.c:563
 msgid "Saving"
 msgstr "ä¿?å­?"
 
-#: ../widgets/misc/e-attachment-paned.c:87
+#: ../widgets/misc/e-attachment-paned.c:88
 msgid "Hide Attachment _Bar"
 msgstr "é??è??é??件æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../widgets/misc/e-attachment-paned.c:90
+#: ../widgets/misc/e-attachment-paned.c:637
 msgid "Show Attachment _Bar"
 msgstr "æ?¾ç¤ºé??件æ ?(_B)"
 
@@ -20402,28 +20477,40 @@ msgstr[0] "ä¿?å­?é??件"
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:301
+#: ../widgets/misc/e-attachment-view.c:346
 msgid "S_ave All"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:327
+#: ../widgets/misc/e-attachment-view.c:372
 msgid "A_dd Attachment..."
 msgstr "æ·»å? é??件(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:396
 msgid "_Hide"
 msgstr "é??è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:358
+#: ../widgets/misc/e-attachment-view.c:403
+#, fuzzy
+#| msgid "S_ave All"
+msgid "Hid_e All"
+msgstr "����(_A)"
+
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "_View Inline"
 msgstr "åµ?å?¥æ?¥ç??(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:640
+#: ../widgets/misc/e-attachment-view.c:417
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "åµ?å?¥æ?¥ç??(_V)"
+
+#: ../widgets/misc/e-attachment-view.c:734
 #, c-format
 msgid "Open with \"%s\""
 msgstr "使ç?¨â??%sâ??æ??å¼?"
 
-#: ../widgets/misc/e-attachment-view.c:643
+#: ../widgets/misc/e-attachment-view.c:737
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s 中æ??å¼?é??件"
@@ -20549,85 +20636,83 @@ msgstr "æ? æ??ç??æ?¥æ??å?¼"
 msgid "Invalid Time Value"
 msgstr "æ? æ??ç??æ?¶é?´å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:242
+#: ../widgets/misc/e-import-assistant.c:246
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é??æ?©æ?¨å¸?æ??导å?¥å?° Evolution ç??æ??件ï¼?并ä»?å??表中é??æ?©æ??件ç??ç±»å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:259
+#: ../widgets/misc/e-import-assistant.c:263
 msgid "F_ilename:"
 msgstr "æ??件å??(_I)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:269
+#: ../widgets/misc/e-import-assistant.c:273
 msgid "Select a file"
 msgstr "é??æ?©ä¸?个æ??件"
 
-#: ../widgets/misc/e-import-assistant.c:283
-#: ../widgets/misc/e-import-assistant.c:458
+#: ../widgets/misc/e-import-assistant.c:287
+#: ../widgets/misc/e-import-assistant.c:462
 msgid "File _type:"
 msgstr "æ??件类å??(_T)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:326
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:330
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "é??æ?©æ­¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:351
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Choose the type of importer to run:"
 msgstr "é??æ?©è¦?è¿?è¡?ç??导å?¥å?¨ç±»å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:359
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import data and settings from _older programs"
 msgstr "ä»?æ?§ç??ç¨?åº?中导å?¥æ?°æ?®å??设置(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:367
+#: ../widgets/misc/e-import-assistant.c:371
 msgid "Import a _single file"
 msgstr "导å?¥å??个æ??件(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:519
-#, fuzzy
+#: ../widgets/misc/e-import-assistant.c:523
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
 "like to try again, please click the \"Back\" button."
 msgstr ""
-"Evolution æ£?æ?¥äº?ä»?以ä¸?ç¨?åº?导å?¥ç??设置ï¼?Pineã??Netscapeã??Elmã??\n"
-"iCalendarã??并æ?ªå??ç?°å?¯å¯¼å?¥ç??设置ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?次ï¼?请å??å?»\n"
-"â??ä¸?ä¸?æ­¥â??æ??é?®ã??\n"
+"Evolution æ£?æ?¥äº?ä»?以ä¸?ç¨?åº?导å?¥ç??设置ï¼?Pineã??Netscapeã??Elmã??iCalendarã??并æ?ªå??"
+"ç?°å?¯å¯¼å?¥ç??设置ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?次ï¼?请å??å?»â??ä¸?ä¸?æ­¥â??æ??é?®ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:770
 msgid "_Cancel Import"
 msgstr "å??æ¶?导å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "é¢?è§?è¦?导å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1342
-#: ../widgets/misc/e-import-assistant.c:1351
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1356
 msgid "Import Data"
 msgstr "导���"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "é??æ?©æ?¨æ?³ä»?å??表导å?¥ç??ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1268
-#: ../widgets/misc/e-import-assistant.c:1300
+#: ../widgets/misc/e-import-assistant.c:1271
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid "Evolution Import Assistant"
 msgstr "Evolution 导å?¥å?©æ??"
 
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1330
+#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1335
 msgid "Import Location"
 msgstr "导��置"
 
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1299
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20636,19 +20721,19 @@ msgstr ""
 "欢è¿?使ç?¨ Evolution 导å?¥å?©æ??ã??\n"
 "æ?¬å?©æ??å°?å?¨ç¨?æ??导æ?¨å°?å¤?é?¨æ??件导å?¥ Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1313
 msgid "Importer Type"
 msgstr "导å?¥å?¨ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "é??æ?©è¦?导å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:1323
+#: ../widgets/misc/e-import-assistant.c:1328
 msgid "Select a File"
 msgstr "é??æ?©ä¸?个æ??件"
 
-#: ../widgets/misc/e-import-assistant.c:1337
+#: ../widgets/misc/e-import-assistant.c:1342
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "å??å?»â??åº?ç?¨â??以便å¼?å§?å°?æ??件导å?¥å?° Evolutionã??"
 
@@ -20676,7 +20761,7 @@ msgstr "Evolution ç?®å??è?±æ?ºã??å??å?»è¯¥æ??é?®å?¯è??æ?ºå·¥ä½?ã??"
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "å? ä¸ºç½?ç»?ä¸?å?¯ç?¨ï¼?æ??以 Evolution ç?®å??è?±æ?ºã??"
 
-#: ../widgets/misc/e-preferences-window.c:266
+#: ../widgets/misc/e-preferences-window.c:276
 msgid "Evolution Preferences"
 msgstr "Evolution é¦?é??项"
 
@@ -20872,7 +20957,6 @@ msgid "Add _Script"
 msgstr "æ·»å? è??æ?¬(_S)"
 
 #: ../widgets/misc/e-signature-script-dialog.c:266
-#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21219,6 +21303,28 @@ msgstr "å?¨é??"
 msgid "Input Methods"
 msgstr "���"
 
+#~ msgid ""
+#~ "Evolution backup can start only when Evolution is not running. Please "
+#~ "make sure that you save and close all your unsaved windows before "
+#~ "proceeding.  If you want Evolution to restart automatically after backup, "
+#~ "please enable the toggle button."
+#~ msgstr ""
+#~ "Evolution å¤?份å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å­?å??å?³é?­"
+#~ "äº?æ?¨ç??æ??æ??ç??æ?ªä¿?å­?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨å¤?份å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨"
+#~ "å??æ?¢æ??é?®ã??"
+
+#~ msgid ""
+#~ "This will delete all your current Evolution data and settings and restore "
+#~ "them from your backup. Evolution restore can start only when Evolution is "
+#~ "not running. Please make sure that you close all your unsaved windows "
+#~ "before you proceed. If you want Evolution to restart automatically "
+#~ "restart after restore, please enable the toggle button."
+#~ msgstr ""
+#~ "è¿?å°?å? é?¤æ?¨å½?å??ç??æ??æ?? Evolution æ?°æ?®å??设置并ä»?æ?¨ç??å¤?份中æ?¢å¤?å®?们ã??"
+#~ "Evolution æ?¢å¤?å?ªè?½å?¨ Evolution æ?ªè¿?è¡?æ?¶å?¯å?¨ã??请确ä¿?å?¨å¼?å§?ä¹?å??æ?¨ä¿?å­?å??å?³é?­"
+#~ "äº?æ?¨ç??æ??æ??ç??æ?ªä¿?å­?ç??çª?å?£ã??å¦?æ??æ?¨æ?³è®© Evolution å?¨æ?¢å¤?å??è?ªå?¨é??å?¯å?¨ï¼?请å?¯ç?¨"
+#~ "å??æ?¢æ??é?®ã??"
+
 #~ msgid "{0}"
 #~ msgstr "{0}"
 



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