[evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sat, 21 Aug 2010 12:11:59 +0000 (UTC)
commit 89161c387a7ed6edb8b63d784fb7efd01ee83516
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Aug 21 20:11:47 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1522 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 1530 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 1600 insertions(+), 1452 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 105b691..4223fd6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:519
+#: ../shell/main.c:533
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.31.6\n"
+"Project-Id-Version: evolution 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-20 14:48+0800\n"
-"PO-Revision-Date: 2010-07-20 14:48+0800\n"
+"POT-Creation-Date: 2010-08-21 20:09+0800\n"
+"PO-Revision-Date: 2010-08-21 20:10+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. 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 "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
@@ -225,7 +225,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 "ç??æ?¥"
 
@@ -250,9 +250,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 "è?¯çµ¡äººç·¨è¼¯å?¨"
 
@@ -275,7 +275,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 "ä½?å®¶"
@@ -318,7 +318,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
@@ -346,7 +346,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"
@@ -454,74 +454,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 "Yahoo"
 
-#: ../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"
@@ -529,23 +529,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 "ç?¡æ??ç??è?¯çµ¡äººã??"
 
@@ -635,7 +635,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../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 "è?¯çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -660,24 +660,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 "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -734,7 +734,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
@@ -742,12 +742,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 "å??ç¨±å??å?«"
 
@@ -774,54 +774,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"
@@ -830,11 +830,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)"
 
@@ -1212,7 +1212,7 @@ msgstr "ç¶²èª?"
 #. 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
@@ -1242,37 +1242,37 @@ msgstr "é?¨è?½æ ¼"
 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 "
 "load the address book once in online mode to download its contents."
 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."
 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."
 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"
@@ -1284,7 +1284,7 @@ msgstr ""
 "è«?ä½¿ç?¨æ?´å? æ??ç¢ºç??æ?¥è©¢æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??\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"
@@ -1297,49 +1297,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 "è¤?è£½è?¯çµ¡äººå?°"
 
@@ -1844,7 +1844,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)"
 
@@ -1905,20 +1905,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
@@ -1926,12 +1916,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
@@ -2621,7 +2611,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 "æ??è¿°:"
@@ -2905,7 +2895,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 "æ?¥æ??/æ??å?»æ ¼å¼?"
 
@@ -3316,22 +3306,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 "å?ªé?¤é?¸å??ç¯?å??"
@@ -3340,8 +3330,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"
@@ -3351,8 +3341,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 "é?¸å??æ??æ??æ??å?"
@@ -3361,14 +3351,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)"
 
@@ -3377,17 +3376,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)..."
 
@@ -3473,7 +3472,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 "é??å? "
 
@@ -3869,9 +3868,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 "æ?¶ä»¶è??"
@@ -4149,7 +4148,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 "é«?"
 
@@ -4168,7 +4167,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 "ä½?"
 
@@ -4176,7 +4175,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 "ä¸?è?¬"
@@ -4541,7 +4540,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 "é¡?å??"
 
@@ -5327,7 +5326,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
@@ -5386,7 +5385,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
@@ -7734,141 +7733,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 "PG_P å? å¯?"
 
-#: ../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 "P_GP å? ç°½"
 
-#: ../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 å? å¯?"
 
-#: ../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/MI_ME å? ç°½"
 
-#: ../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 "å?²å?è??ç¨¿"
 
@@ -7886,35 +7885,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):"
 
@@ -7926,58 +7925,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 "æ?ªå?½å??ç??é?µä»¶"
 
@@ -8274,7 +8273,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 "é ?è¨å?¼"
 
@@ -8352,8 +8351,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
@@ -8389,7 +8388,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"
@@ -8609,15 +8608,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 "é??é??æ?¬è¦?çª?"
 
@@ -8660,7 +8659,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 "è?ªå??ç?¢ç??ç??"
 
@@ -8705,30 +8704,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
@@ -8736,73 +8735,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 "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../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"
@@ -9102,26 +9101,26 @@ 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] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../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 "(æ²?æ??ä¸»æ?¨)"
 
@@ -9200,26 +9199,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 "ç¯?æ?¬"
 
@@ -9256,6 +9255,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.
@@ -9264,33 +9267,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
+#: ../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] "å?²å?é?µä»¶"
@@ -9302,510 +9305,542 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * 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] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../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
+msgid "_Switch to Folder"
+msgstr "å??æ??è?³è³?æ??å¤¾(_S)"
+
+#: ../mail/e-mail-reader.c:1702
+msgid "Display the parent folder"
+msgstr "é¡¯ç¤ºä¸?å±¤è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1707
+msgid "Switch to _next tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to the next tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
+
+#: ../mail/e-mail-reader.c:1714
+msgid "Switch to _previous tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to the previous tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
+
+#: ../mail/e-mail-reader.c:1721
+msgid "Cl_ose current tab"
+msgstr "é??é??ç?®å??ç??å??é ?(_O)"
+
+#: ../mail/e-mail-reader.c:1723
+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 "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1779
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: 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
+#: ../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
@@ -9813,12 +9848,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 "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
@@ -9827,35 +9862,40 @@ 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
+#: ../mail/e-mail-reader.c:3075
 msgid "Group Reply"
 msgstr "ç¾£çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:2861
+#: ../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
+#, c-format
+msgid "Folder '%s'"
+msgstr "è³?æ??å¤¾ã??%sã??"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
@@ -9955,7 +9995,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 "å?³é??é?»å?é?µä»¶"
 
@@ -10003,58 +10043,58 @@ 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 "ä½ å¯?çµ¦ %s ä¸»æ?¨ã??%sã?? (%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:"
 msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${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 "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
@@ -10359,7 +10399,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 "æ??å°?è³?æ??å¤¾"
 
@@ -10368,7 +10408,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 "è¼?å?¥ä¸..."
 
@@ -10419,12 +10459,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"
@@ -10463,7 +10503,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 "æ?ªç°½ç½²"
 
@@ -10473,7 +10513,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 "æ??æ??ç??ç°½ç½²"
 
@@ -10483,7 +10523,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 "ç?¡æ??ç??ç°½ç½²"
 
@@ -10493,7 +10533,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 "ç°½ç½²æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
@@ -10503,7 +10543,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 "ç°½ç½²å?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?ç¢¼å??"
 
@@ -10513,7 +10553,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 "æ?ªå? å¯?"
 
@@ -10523,7 +10563,7 @@ msgid ""
 "the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../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 "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
@@ -10534,7 +10574,7 @@ msgid ""
 "message in a practical amount of time."
 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 "å·²å? å¯?"
 
@@ -10544,7 +10584,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 "å·²å? å¯?ï¼?å?´å¯?"
 
@@ -10582,72 +10622,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 "ä»¥...é??å??(_O)"
 
-#: ../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 "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../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 "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%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 å¯?å?º"
@@ -11721,7 +11761,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"
@@ -12874,13 +12914,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 "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
@@ -12946,11 +12986,11 @@ msgstr[1] ""
 "%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 "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13547,88 +13587,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 "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -13657,7 +13697,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 "å¤§å°?"
 
@@ -13842,106 +13882,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
@@ -13949,157 +13993,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 "å°?é??è¨?é??å?¦å?ç?º vC_ard"
 
-#: ../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..."
 
-#: ../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
@@ -14109,60 +14153,60 @@ msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: 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 "å??å?°é?¸å®?ç??é?£çµ¡äºº"
 
 # zh_HK: 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 "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: 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 "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)"
 
-#: ../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 ç??è?¯çµ¡äººè³?è¨?"
@@ -14341,7 +14385,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 "è¡?äº?æ??è??å·¥ä½?"
@@ -15055,7 +15099,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 å??é??å? ç??é?µä»¶"
@@ -15067,42 +15111,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)"
 
@@ -15366,57 +15410,57 @@ 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 å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %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 å°?å·²å?ªé?¤"
 msgstr[1] "%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 å°?å??å?¾"
 msgstr[1] "%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 å??è??ç¨¿"
 msgstr[1] "%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 å°?æ?ªå?³é??"
 msgstr[1] "%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 å°?å·²å?³é??"
 msgstr[1] "%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 å°?æ?ªè®?ï¼?"
 msgstr[1] "%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"
@@ -15431,26 +15475,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 "èª?è¨?"
 
@@ -15546,12 +15590,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ï¼?"
@@ -15801,11 +15845,11 @@ msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??æ±ºæ?¼ä½ ç??å¸³è??ä¸è³?æ??ç??å¤?å¯¡ã??"
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and Restore"
-msgstr "å??ä»½è??å??å?"
+msgstr "å??ä»½è??é??å??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore your Evolution data and settings."
-msgstr "å??ä»½è??å??å? Evolution ç??è³?æ??è??è¨å®?å?¼ã??"
+msgstr "å??ä»½è??é??å?? Evolution ç??è³?æ??è??è¨å®?å?¼ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -15817,37 +15861,42 @@ 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."
-msgstr "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??è¨å®?å?¼ä¸¦å¾?å??ä»½ä¸é??å??å®?å??ã??Evolution é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr "è¦?å??ä»½ä½ ç??è³?æ??å??è¨å®?å?¼ï¼?ä½ å¿?é ?å??é??é?? 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
@@ -17731,15 +17780,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"
@@ -17756,67 +17805,67 @@ msgstr[1] ""
 
 #. 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 å°?é?µä»¶ ã?? "
 msgstr[1] "ä½ å·²ç¶?æ?¥æ?¶ %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 è¨?æ?¯"
 
@@ -17998,55 +18047,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)"
 
@@ -18662,15 +18711,15 @@ msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?
 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 "å?²å?ç?ºç¯?æ?¬"
 
@@ -18690,27 +18739,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
 
-#: ../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 "é??æ??è?¯çµ¡äººã??"
 
-#: ../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 å??å?¶ä»?è?¯çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "å?å?¥é??è¨?é??"
 
@@ -18882,7 +18931,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 "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -19080,276 +19129,276 @@ 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 é?²å?¥é?¢ç·?æ¨¡å¼?"
 
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
 
-#: ../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 "è¦?çª?(_O)"
 
-#: ../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 "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
 
-#: ../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 "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
@@ -19376,7 +19425,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"
@@ -19411,7 +19460,7 @@ msgstr ""
 "æ??å??å¸?æ??ä½ äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19419,56 +19468,56 @@ 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 "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: 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 "å¼·å?¶é??é?? Evoultion"
 
-#: ../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 "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../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 PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:531
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19691,10 +19740,6 @@ msgstr "æ??æ??ç?? CA è?æ?¸æª?æ¡?"
 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"
@@ -20298,22 +20343,22 @@ msgstr "å?³é??è?³(_S)..."
 msgid "Send the selected attachments somewhere"
 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)"
 
@@ -20337,28 +20382,36 @@ msgstr[1] "å?²å?é??ä»¶"
 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 "å? å?¥é??ä»¶(_A)..."
 
-#: ../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
+msgid "Hid_e All"
+msgstr "å?¨é?¨é?±è??(_E)"
+
+#: ../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
+msgid "Vie_w All Inline"
+msgstr "å?¨é?¨ä»¥è¡?å?§æª¢è¦?(_W)"
+
+#: ../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 ä¸é??å??é??å??é??ä»¶"
@@ -20484,43 +20537,43 @@ 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
+#: ../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 "
@@ -20528,37 +20581,37 @@ msgid ""
 msgstr "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 "
@@ -20567,19 +20620,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ã??"
 
@@ -20608,7 +20661,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 å??å¥½è¨å®?"
 
@@ -21155,6 +21208,27 @@ 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}"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7023c1d..23c627e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:519
+#: ../shell/main.c:533
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.31.6\n"
+"Project-Id-Version: evolution 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-20 14:48+0800\n"
-"PO-Revision-Date: 2010-07-16 19:48+0800\n"
+"POT-Creation-Date: 2010-08-21 20:09+0800\n"
+"PO-Revision-Date: 2010-08-20 08:47+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. 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 "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
@@ -238,7 +238,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 "ç??æ?¥"
 
@@ -263,9 +263,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 "é?£çµ¡äººç·¨è¼¯å?¨"
 
@@ -288,7 +288,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 "ä½?å®¶"
@@ -331,7 +331,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
@@ -359,7 +359,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"
@@ -467,74 +467,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 "Yahoo"
 
-#: ../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"
@@ -542,23 +542,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 "ç?¡æ??ç??é?£çµ¡äººã??"
 
@@ -648,7 +648,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../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 "é?£çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -673,24 +673,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 "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -747,7 +747,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
@@ -755,12 +755,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 "å??ç¨±å??å?«"
 
@@ -787,54 +787,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"
@@ -843,11 +843,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)"
 
@@ -1225,7 +1225,7 @@ msgstr "ç¶²èª?"
 #. 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
@@ -1255,7 +1255,7 @@ msgstr "é?¨è?½æ ¼"
 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 "
@@ -1264,7 +1264,7 @@ 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 "
@@ -1272,7 +1272,7 @@ msgid ""
 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,17 +1280,17 @@ 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."
 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"
@@ -1302,7 +1302,7 @@ msgstr ""
 "è«?ä½¿ç?¨æ?´å? æ??ç¢ºç??æ?¥è©¢æ??æ?¯æ??é«?æ¤ç?®é??æ??å??ç??ç?®é??\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 +1315,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 "è¤?è£½é?£çµ¡äººå?°"
 
@@ -1866,7 +1866,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)"
 
@@ -1927,20 +1927,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
@@ -1948,12 +1938,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
@@ -2658,7 +2648,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 "æ??è¿°:"
@@ -2942,7 +2932,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 "æ?¥æ??/æ??å?»æ ¼å¼?"
 
@@ -3353,22 +3343,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 "å?ªé?¤é?¸å??ç¯?å??"
@@ -3377,8 +3367,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"
@@ -3388,8 +3378,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 "é?¸å??æ??æ??æ??å?"
@@ -3398,14 +3388,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)"
 
@@ -3414,17 +3413,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)..."
 
@@ -3510,7 +3509,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 "é??å? "
 
@@ -3906,9 +3905,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 "æ?¶ä»¶è??"
@@ -4186,7 +4185,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 "é«?"
 
@@ -4205,7 +4204,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 "ä½?"
 
@@ -4213,7 +4212,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 "ä¸?è?¬"
@@ -4578,7 +4577,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 "é¡?å??"
 
@@ -5364,7 +5363,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
@@ -5423,7 +5422,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
@@ -7771,141 +7770,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 "PG_P å? å¯?"
 
-#: ../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 "P_GP å? ç°½"
 
-#: ../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 å? å¯?"
 
-#: ../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/MI_ME å? ç°½"
 
-#: ../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 "å?²å?è??ç¨¿"
 
@@ -7924,35 +7923,35 @@ msgid ""
 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):"
 
@@ -7964,58 +7963,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 "æ?ªå?½å??ç??é?µä»¶"
 
@@ -8322,7 +8321,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 "é ?è¨å?¼"
 
@@ -8402,8 +8401,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
@@ -8439,7 +8438,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"
@@ -8659,15 +8658,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 "é??é??æ?¬è¦?çª?"
 
@@ -8710,7 +8709,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 "è?ªå??ç?¢ç??ç??"
 
@@ -8755,30 +8754,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
@@ -8786,73 +8785,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 "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../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"
@@ -9152,26 +9151,26 @@ 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] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../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 "(æ²?æ??ä¸»æ?¨)"
 
@@ -9250,26 +9249,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 "ç¯?æ?¬"
 
@@ -9306,6 +9305,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.
@@ -9314,33 +9317,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
+#: ../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] "å?²å?é?µä»¶"
@@ -9352,510 +9355,542 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * 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] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../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
+msgid "_Switch to Folder"
+msgstr "å??æ??è?³è³?æ??å¤¾(_S)"
+
+#: ../mail/e-mail-reader.c:1702
+msgid "Display the parent folder"
+msgstr "é¡¯ç¤ºä¸?å±¤è³?æ??å¤¾"
+
+#: ../mail/e-mail-reader.c:1707
+msgid "Switch to _next tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
+
+#: ../mail/e-mail-reader.c:1709
+msgid "Switch to the next tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
+
+#: ../mail/e-mail-reader.c:1714
+msgid "Switch to _previous tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
+
+#: ../mail/e-mail-reader.c:1716
+msgid "Switch to the previous tab"
+msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
+
+#: ../mail/e-mail-reader.c:1721
+msgid "Cl_ose current tab"
+msgstr "é??é??ç?®å??ç??å??é ?(_O)"
+
+#: ../mail/e-mail-reader.c:1723
+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 "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1779
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: 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
+#: ../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
@@ -9863,12 +9898,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 "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
@@ -9877,35 +9912,40 @@ 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
+#: ../mail/e-mail-reader.c:3075
 msgid "Group Reply"
 msgstr "ç¾¤çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:2861
+#: ../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
+#, c-format
+msgid "Folder '%s'"
+msgstr "è³?æ??å¤¾ã??%sã??"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
@@ -10007,7 +10047,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 "å?³é??é?»å?é?µä»¶"
 
@@ -10057,44 +10097,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 "æ?¨å¯?çµ¦ %s ä¸»æ?¨ã??%sã?? (%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:"
@@ -10102,15 +10142,15 @@ msgstr ""
 "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${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 "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
@@ -10415,7 +10455,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 "æ??å°?è³?æ??å¤¾"
 
@@ -10424,7 +10464,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 "è¼?å?¥ä¸..."
 
@@ -10475,12 +10515,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"
@@ -10519,7 +10559,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 "æ?ªç°½å??"
 
@@ -10529,7 +10569,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 "æ??æ??ç??ç°½å??"
 
@@ -10539,7 +10579,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 "ç?¡æ??ç??ç°½å??"
 
@@ -10549,7 +10589,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 "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
@@ -10559,7 +10599,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 "ç°½ç« å?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
@@ -10569,7 +10609,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 "æ?ªå? å¯?"
 
@@ -10579,7 +10619,7 @@ msgid ""
 "the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??ç¶²é??ç¶²è·¯å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../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 "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
@@ -10592,7 +10632,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 "å·²å? å¯?"
 
@@ -10602,7 +10642,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 "å·²å? å¯?ï¼?å?´å¯?"
 
@@ -10644,72 +10684,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 "ä»¥...é??å??(_O)"
 
-#: ../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 "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1904
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../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 "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%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 å¯?å?º"
@@ -11854,7 +11894,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"
@@ -13007,13 +13047,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 "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
@@ -13079,11 +13119,11 @@ msgstr[1] ""
 "%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 "æ?°å¢?æ??å°?è³?æ??å¤¾"
 
@@ -13696,89 +13736,89 @@ 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 "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -13807,7 +13847,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 "å¤§å°?"
 
@@ -14006,106 +14046,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
@@ -14113,157 +14157,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 "å°?é??è¨?é??å?¦å?ç?º vC_ard"
 
-#: ../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..."
 
-#: ../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
@@ -14273,60 +14317,60 @@ msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: 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 "å??å?°æ??æ??é¡¯ç¤ºç??é?£çµ¡äºº"
 
 # zh_HK: 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 "é ?è¦½å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: 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 "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)"
 
-#: ../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 ç??é?£çµ¡äººè³?è¨?"
@@ -14507,7 +14551,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 "è¡?äº?æ??è??å·¥ä½?"
@@ -15223,7 +15267,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 å??é??å? ç??é?µä»¶"
@@ -15235,42 +15279,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)"
 
@@ -15534,57 +15578,57 @@ 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 å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %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 å°?å·²å?ªé?¤"
 msgstr[1] "%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 å°?å??å?¾"
 msgstr[1] "%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 å??è??ç¨¿"
 msgstr[1] "%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 å°?æ?ªå?³é??"
 msgstr[1] "%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 å°?å·²å?³é??"
 msgstr[1] "%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 å°?æ?ªè®?ï¼?"
 msgstr[1] "%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"
@@ -15599,26 +15643,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 "èª?è¨?"
 
@@ -15714,12 +15758,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ï¼?"
@@ -15972,11 +16016,11 @@ msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??æ±ºæ?¼æ?¨ç??å¸³è??ä¸è³?æ??ç??å¤?å¯¡ã??"
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and Restore"
-msgstr "å??ä»½è??å??å?"
+msgstr "å??ä»½è??é??å??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore your Evolution data and settings."
-msgstr "å??ä»½è??å??å? Evolution ç??è³?æ??è??è¨å®?å?¼ã??"
+msgstr "å??ä»½è??é??å?? Evolution ç??è³?æ??è??è¨å®?å?¼ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
@@ -15988,42 +16032,47 @@ 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 ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
+"è¦?å??ä»½æ?¨ç??è³?æ??å??è¨å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?ç¢ºå®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?"
+"ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 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 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 é??å??"
-"å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?"
-"å??ç?¨å??æ??æ??é??ã??"
+"è¦?é??å??æ?¨ç??è³?æ??å??è¨å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?ç¢ºå®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?"
+"ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤æ?¨ç?®å?? Evolution æ??æ??ç??è³?æ??å??è¨å®?å?¼ï¼?ä¸¦å¾?æ?¨"
+"ç??å??ä»½é??å??å®?å??ã??"
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -17916,15 +17965,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"
@@ -17941,67 +17990,67 @@ msgstr[1] ""
 
 #. 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 å°?é?µä»¶ ã?? "
 msgstr[1] "æ?¨å·²ç¶?æ?¥æ?¶ %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 è¨?æ?¯"
 
@@ -18186,55 +18235,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)"
 
@@ -18855,15 +18904,15 @@ msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?
 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 "å?²å?ç?ºç¯?æ?¬"
 
@@ -18883,27 +18932,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸é¡¯ç¤º vCardã??"
 
-#: ../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 "é??æ??é?£çµ¡äººã??"
 
-#: ../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 å??å?¶ä»?é?£çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:258
+#: ../plugins/vcard-inline/vcard-inline.c:275
 msgid "Save in Address Book"
 msgstr "å?å?¥é??è¨?é??"
 
@@ -19081,7 +19130,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 "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -19294,276 +19343,276 @@ 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 é?²å?¥é?¢ç·?æ¨¡å¼?"
 
 # zh_HK: msgstr "ç·?ä¸?å·¥ä½?(_W)"
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "ç·?ä¸?å·¥ä½?(_W)"
 
 # zh_HK: msgstr "ä»¥ç·?ä¸?æ¨¡å¼?å??å??"
-#: ../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 "è¦?çª?(_O)"
 
-#: ../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 "å»ºç«?æ??ç·¨è¼¯æª¢è¦?(_C)"
 
-#: ../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 "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
@@ -19590,7 +19639,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"
@@ -19625,7 +19674,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19633,56 +19682,56 @@ 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 "å°?æ??å®?ç??å°ºå¯¸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: 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 "å¼·å?¶é??é?? Evoultion"
 
-#: ../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 "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../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 PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:531
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19912,10 +19961,6 @@ msgstr "æ??æ??ç?? CA æ??è?æª?æ¡?"
 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"
@@ -20521,22 +20566,22 @@ msgstr "å?³é??è?³(_S)..."
 msgid "Send the selected attachments somewhere"
 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)"
 
@@ -20560,28 +20605,36 @@ msgstr[1] "å?²å?é??ä»¶"
 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 "å? å?¥é??ä»¶(_A)..."
 
-#: ../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
+msgid "Hid_e All"
+msgstr "å?¨é?¨é?±è??(_E)"
+
+#: ../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
+msgid "Vie_w All Inline"
+msgstr "å?¨é?¨ä»¥è¡?å?§æª¢è¦?(_W)"
+
+#: ../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 ä¸é??å??é??å??é??ä»¶"
@@ -20707,43 +20760,43 @@ 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
+#: ../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 "
@@ -20753,37 +20806,37 @@ msgstr ""
 "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 "
@@ -20792,19 +20845,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ã??"
 
@@ -20835,7 +20888,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 å??å¥½è¨å®?"
 
@@ -21382,6 +21435,27 @@ 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]