[evolution] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Update Simplified Chinese translation.
Date: Mon, 25 Oct 2010 07:18:13 +0000 (UTC)
commit ff6c8215a82a56d8163086158a568b7a9aabafde
Author: Yinghua Wang <wantinghard gmail com>
Date:   Mon Oct 25 07:17:56 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 6087 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 3222 insertions(+), 2865 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d0a94a3..cf599e6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,14 +13,14 @@
 # du baodao <centerpoint 139 com>, 2010.
 # Tao Wang <dancefire gmail com>, 2010.
 #
-#: ../shell/main.c:533
+#: ../shell/main.c:571
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2010-08-27 22:13+0000\n"
-"PO-Revision-Date: 2010-08-28 09:36+0800\n"
+"POT-Creation-Date: 2010-10-15 07:40+0000\n"
+"PO-Revision-Date: 2010-10-18 21:05+0800\n"
 "Last-Translator: æ?±æ¶? <bill_zt sina com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgid "Delete address book '{0}'?"
 msgstr "å? é?¤å?°å??ç°¿â??{0}â??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "ä¸?å? é?¤(_N)"
 
@@ -207,9 +207,9 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å?? {0} ç??è??ç³»äººæ? æ³?ä½¿ç?¨ã??"
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:599
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "æ·»å? (_A)"
@@ -232,7 +232,7 @@ msgstr "å??æ ·ä½¿ç?¨(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2027
 msgid "Anniversary"
 msgstr "çºªå¿µæ?¥"
 
@@ -243,8 +243,8 @@ msgstr "çºªå¿µæ?¥"
 #. * the directory components.
 #: ../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:123
+#: ../calendar/gui/e-calendar-view.c:2026 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:129
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -254,7 +254,7 @@ msgid "Blog:"
 msgstr "å??å®¢ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ç±»å?«(_T)..."
@@ -281,7 +281,7 @@ msgstr "è??ç³»äººç¼?è¾?å?¨"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "ç?µå?é?®ä»¶"
 
@@ -340,7 +340,7 @@ msgstr "ç¬?è®°"
 #: ../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
+#: ../calendar/gui/e-calendar-view.c:1732
 msgid "Other"
 msgstr "å?¶å®?"
 
@@ -392,9 +392,9 @@ msgid "_Blog:"
 msgstr "å??å®¢(_N)ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:882
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/itip-formatter/itip-view.c:1921
+#: ../calendar/gui/dialogs/event-page.c:885
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "æ?¥å??(_C)ï¼?"
 
@@ -513,7 +513,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "æ·»å? è??ç³»äººå?ºé??"
 
@@ -653,7 +653,7 @@ msgid "_Suffix:"
 msgstr "å??ç¼?(_S)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "è??ç³»äººå??è¡¨ç¼?è¾?å?¨"
 
@@ -670,7 +670,7 @@ msgid "_List name:"
 msgstr "å??è¡¨å??ç§°(_L)ï¼?"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:154
 msgid "_Select..."
 msgstr "é??æ?©(_S)..."
 
@@ -678,24 +678,24 @@ msgstr "é??æ?©(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "è¾?å?¥ç?µå?é?®ä»¶å?°å??æ??è??æ??è??ç³»äººæ??æ?¾å?°ä¸?é?¢ç??å??è¡¨(_T)ï¼?"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "è??ç³»äººå??è¡¨æ??å??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "æ??å??(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "æ·»å? å??è¡¨å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "ä¿®æ?¹å??è¡¨å?ºé??"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "å? é?¤å??è¡¨å?ºé??"
 
@@ -791,24 +791,24 @@ msgstr "æ??ç´¢ä¸æ?äº?"
 msgid "Error modifying card"
 msgstr "ä¿®æ?¹å??ç??é??è¯¯"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:625
 msgid "Cut selected contacts to the clipboard"
 msgstr "å°?é??è??ç³»äººå?ªå??å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:631
 msgid "Copy selected contacts to the clipboard"
 msgstr "å°?é??ä¸è??ç³»äººå¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:637
 msgid "Paste contacts from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:643
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å? é?¤é??ä¸ç??è??ç³»äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Select all visible contacts"
 msgstr "é??ä¸å?¨é?¨å?¯è§?è??ç³»äºº"
 
@@ -885,7 +885,7 @@ msgid "Car Phone"
 msgstr "è½¦è½½ç?µè¯?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1022,7 +1022,7 @@ msgstr "å??ä½?"
 msgid "Web Site"
 msgstr "ç½?ç«?"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1032,7 +1032,7 @@ msgstr ""
 "\n"
 "æ£å?¨æ??ç´¢è??ç³»äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 "\n"
 "æ??å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1060,7 +1060,7 @@ msgstr ""
 "\n"
 "è¯·å?¨æ¤å??å?»ä»¥å??å»ºæ?°è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1070,7 +1070,7 @@ msgstr ""
 "\n"
 "æ??ç´¢è??ç³»äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1080,16 +1080,16 @@ msgstr ""
 "\n"
 "æ?¬è§?å?¾ä¸æ²¡æ??å?¯æ?¾ç¤ºç??é¡¹ã??"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "å·¥ä½?ç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "å®¶åºç?µå?é?®ä»¶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:810
 msgid "Other Email"
 msgstr "å?¶å®?ç?µå?é?®ä»¶"
 
@@ -1134,17 +1134,17 @@ msgid "Copy _Email Address"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:395
 msgid "Copy the email address to the clipboard"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??å?°å?ªè´´æ?¿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:401
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
 msgstr "æ??æ?°ä¿¡å??é??å?°(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:403
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
 msgstr "å??é??ä¸?ä¸ªé?®ä»¶ä¿¡æ?¯å?°è¿?ä¸ªå?°å??"
 
@@ -1180,10 +1180,10 @@ msgid "Video Chat"
 msgstr "è§?é¢?è??å¤©"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
@@ -1194,8 +1194,8 @@ msgstr "æ?¥å??"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "å¿?/é?²"
@@ -1227,11 +1227,11 @@ msgstr "Web æ?¥å¿?"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:359
 #: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:156
 #: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:112
@@ -1253,7 +1253,7 @@ msgid "Blog"
 msgstr "Blog"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:853
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "å??å?»ä»¥ç»? %s å??é??é?®ä»¶"
@@ -1267,14 +1267,14 @@ msgstr ""
 "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ??å?³ç??æ¤å?°å??ç°¿æ²¡æ??æ ?ä¸ºå?¯è?±æ?ºä½¿ç?¨ï¼?æ??è??å°?æ?ªä¸?è½½å®?æ??ä»¥"
 "ä¾?è?±æ?ºä½¿ç?¨ã??è¯·å?¨è??æ?ºæ¨¡å¼?ä¸è½½å?¥æ¤å?°å??ç°¿ä»¥ä¾¿ä¸?è½½å?¶å??å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, 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:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 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."
@@ -1282,7 +1282,7 @@ msgstr ""
 "æ?¬ç??æ?¬ç?? Evolution å¹¶æ²¡æ??æ?? LDAP æ?¯æ??ç¼?è¯?è¿?å?»ã??å¦?æ??æ?¨å¸?æ??å?¨ Evolution ä¸ä½¿ç?¨ "
 "LDAPï¼?å°±å¿?é¡»å®?è£?å?¯ç?¨äº? LDAP ç?? Evolution å??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1290,11 +1290,11 @@ msgstr ""
 "æ? æ³?æ??å¼?æ¤å?°å??ç°¿ã??è¿?å?¯è?½æ?¯ç?±äº?æ?¨è¾?å?¥äº?é??è¯¯ç?? URIï¼?ä¹?å?¯è?½æ?¯å? ä¸ºæ??å?¡å?¨å·²ç»?å?³"
 "é?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
-msgstr "é??è¯¯ç»?è??ä¿¡æ?¯ï¼?"
+msgstr "è¯¦ç»?é??è¯¯ä¿¡æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1305,7 +1305,7 @@ msgstr ""
 "Evolution é??ç½®è¦?æ?¾ç¤ºç??æ?°ç?®ã??è¯·å?¨æ??ç´¢ç??æ?¶å??æ??å®?æ?´å? ä¸¥æ ¼ç??\n"
 "æ??ç´¢æ?¡ä»¶ï¼?æ??è??å?¨æ¤å?°å??ç°¿ç??ç?®å½?æ??å?¡å?¨å??æ?°ä¸å°?ç»?æ??é??å?¶è°?é«?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 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"
@@ -1317,49 +1317,49 @@ msgstr ""
 "ä¸å°?æ?¶é?´é??å?¶è°?é«?ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, 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:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, 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:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, 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:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "é??æ?©å?°å??ç°¿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "å??è¡¨"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:444
 msgid "Move contact to"
 msgstr "å°?è??ç³»äººç§»è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Copy contact to"
 msgstr "å°?è??ç³»äººå¤?å?¶å?°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:449
 msgid "Move contacts to"
 msgstr "å°?è??ç³»äººç§»è?³"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Copy contacts to"
 msgstr "å°?è??ç³»äººå¤?å?¶å?°"
 
@@ -1368,7 +1368,7 @@ msgid "Card View"
 msgstr "å??ç??è§?å?¾"
 
 #: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-ldif-importer.c:518
 #: ../addressbook/importers/evolution-vcard-importer.c:264
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
@@ -1399,11 +1399,11 @@ msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV å?? Tab å¯¼å?¥å?¨"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:744
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP æ?°æ?®äº¤æ?¢æ ¼å¼?(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:745
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF å¯¼å?¥å?¨"
 
@@ -1436,58 +1436,58 @@ msgstr "æ? æ³?è?·å¾?å?°å??ç°¿å??è¡¨"
 msgid "failed to open book"
 msgstr "æ??å¼?å?°å??ç°¿å¤±è´¥"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "æ??å®?ç?¨æ?¥å??ä»£æ ?å??è¾?å?ºç??è¾?å?ºæ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "è¾?å?ºæ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "å??å?ºæ?¬å?°å?°å??ç°¿æ??ä»¶å¤¹"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "å°?å??ç??æ?¾ç¤ºä¸º vcard è¿?æ?¯ csv æ??ä»¶"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "ä»¥å¼?æ¥æ¨¡å¼?å¯¼å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "å¼?æ¥æ¨¡å¼?ä¸ä¸?ä¸ªè¾?å?ºæ??ä»¶ä¸ç??å??ç??æ?°ï¼?é»?è®¤å¤§å°?ä¸º 100ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "æ?°å?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "å?½ä»¤è¡?å??æ?°é??è¯¯ï¼?è¯·ä½¿ç?¨ --help é??é¡¹æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "ä»?æ?¯æ?? csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "å?¨å¼?æ¥æ¨¡å¼?ä¸ï¼?è¾?å?ºå¿?é¡»æ?¯æ??ä»¶ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨æ?®é??æ¨¡å¼?ä¸ï¼?ä¸?åº?è¯¥æ??å¤§å°?é??é¡¹ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "æ?ªå¤?ç??ç??é??è¯¯"
 
@@ -1863,11 +1863,11 @@ msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é?¤é??æ?¨é??æ?°å?¯å?¨ Evolutionï¼?å?¦å??æ?¨ç??ä»»å?¡å°?æ? æ³?ä½¿ç?¨ã??"
 
 #: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:257
 msgid "_Save"
 msgstr "ä¿?å?(_S)"
 
@@ -1876,7 +1876,7 @@ msgid "_Save Changes"
 msgstr "ä¿?å?æ?´æ?¹(_S)"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:150
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å??é??(_S)"
@@ -1885,17 +1885,17 @@ msgstr "å??é??(_S)"
 msgid "_Send Notice"
 msgstr "å??é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ?¶"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "å¼?å§?æ?¶é?´"
 
@@ -1910,10 +1910,10 @@ msgstr "å?¨é?¨é??è¿?(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®ï¼?"
 
@@ -1922,6 +1922,7 @@ msgid "Snooze _time:"
 msgstr "å??ç?¡æ?¶é?´(_T)ï¼?"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../widgets/misc/e-alert-bar.c:75
 msgid "_Dismiss"
 msgstr "é??è¿?(_D)"
 
@@ -1931,7 +1932,7 @@ msgstr "å??ç?¡(_S)"
 
 #: ../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
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
 #: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
@@ -1944,14 +1945,14 @@ msgstr "çº¦ä¼?ä½?ç½®"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../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
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "æ²¡æ??å?¯ç?¨ç??æ??è¦?ã??"
 
@@ -1969,13 +1970,13 @@ msgstr "æ²¡æ??å?¯ç?¨ç??ä½?ç½®ä¿¡æ?¯ã??"
 msgid "You have %d alarms"
 msgstr "æ?¨æ?? %d ä¸ªæ??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1694
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1987,7 +1988,7 @@ msgstr ""
 "å??é??ç?µå?é?®ä»¶ã??Evolution å°?ä»¥\n"
 "æ?¾ç¤ºæ?®é??æ??ç¤ºä¼?è¯?æ¡?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2003,7 +2004,7 @@ msgstr ""
 "\n"
 "æ?¨ç¡®ä¿¡æ?¨è¦?è¿?è¡?è¯¥ç¨?åº?å??ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®æ¤é?®é¢?ã??"
 
@@ -2042,7 +2043,7 @@ msgid "Alarm programs"
 msgstr "æ??é??ç¨?åº?"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "å?¨ç?¶æ??æ ?ä¸æ?¾ç¤ºé??è¯¯ç??æ?¶é?´ç§?æ?°ã??"
 
@@ -2168,7 +2169,7 @@ msgid "Last alarm time"
 msgstr "ä¸?æ¬¡æ??é??æ?¶é?´"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Level beyond which the message should be logged."
 msgstr "å¤§äº?æ¤çº§å?«ç??ä¿¡æ?¯ä¼?è¢«è®°å½?ã??"
 
@@ -2623,8 +2624,8 @@ msgstr "ç±»å?«"
 msgid "Classification"
 msgstr "å??ç±»"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:535 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
@@ -2633,7 +2634,7 @@ msgstr "æ?ºå¯?"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2667,21 +2668,21 @@ msgstr "ä½?ç½®"
 msgid "Organizer"
 msgstr "ç»?ç»?è??"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:533 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ä¿?å¯?"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:524 ../calendar/gui/e-cal-model.c:531
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬å¼?"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "å??ç?°"
@@ -2749,7 +2750,7 @@ msgid "Add Alarm"
 msgstr "æ·»å? æ??é??"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
 msgstr "æ??é??"
 
@@ -2765,7 +2766,7 @@ msgstr "è?ªå®?ä¹?æ??é??å£°é?³"
 msgid "Mes_sage:"
 msgstr "ä¿¡æ?¯(_S)ï¼?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:70
 msgid "Options"
 msgstr "é??é¡¹"
 
@@ -2805,20 +2806,16 @@ msgstr "ä¹?å??"
 msgid "before"
 msgstr "ä¹?å??"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "å¤©"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "å¤©"
 
@@ -2853,33 +2850,34 @@ msgstr "æ·»å? (_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "Alarms"
 msgstr "æ??é??"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
 #: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "é??æ?©..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:503
 msgid "Selected Calendars for Alarms"
 msgstr "å·²é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:832
 msgid "Ti_me and date:"
 msgstr "æ?¶é?´å??æ?¥æ??(_M)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:833
 msgid "_Date only:"
 msgstr "ä»?æ?¥æ??(_D)ï¼?"
 
@@ -2912,13 +2910,13 @@ msgstr "30 å??é??"
 msgid "60 minutes"
 msgstr "60 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
 msgid "Alerts"
 msgstr "æ??é??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:30
-#: ../modules/addressbook/autocompletion-config.c:156
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:155
 msgid "Date/Time Format"
 msgstr "æ?¥æ??/æ?¶é?´æ ¼å¼?"
 
@@ -2943,18 +2941,18 @@ msgid "Display alarms in _notification area only"
 msgstr "å?ªå?¨é??ç?¥å?ºå??æ?¾ç¤ºæ??é??(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2678
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:201 ../mail/mail-config.ui.h:49
+#: ../modules/addressbook/addressbook-config.c:1012
+#: ../plugins/itip-formatter/itip-formatter.c:2785
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2969,265 +2967,257 @@ msgid "Minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:763 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "æ? "
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:74
 msgid "Pick a color"
 msgstr "é??å??ä¸?ç§?é¢?è?²"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "å?¨æ?¥(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
 msgid "Sc_roll Month View by a week"
 msgstr "é??è¿?ä¸?ä¸ªå?¨æ?¥æ»?å?¨æ??è§?å?¾(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "ç¬¬äº?æ?¶å?º(_C)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "é??æ?©ç?¨äº?æ??é??ç??æ?¥å??"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Sh_ow a reminder"
 msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_O)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show a _reminder"
 msgstr "æ?¾ç¤ºä¸?æ?¡æ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show week _numbers"
 msgstr "æ?¾ç¤ºå?¨æ?°(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_asks due today:"
 msgstr "ä»?å¤©å?°æ??ç??ä»»å?¡(_A)ï¼?"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "T_hu"
 msgstr "å?¨å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:381
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/calendar-setup.c:387
 msgid "Task List"
 msgstr "ä»»å?¡å??è¡¨"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
 msgid "Template:"
 msgstr "æ¨¡æ?¿ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:597
 msgid "Time"
 msgstr "æ?¶é?´"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
-#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Time _zone:"
 msgstr "æ?¶å?º(_Z)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
 msgid "Time format:"
 msgstr "æ?¶é?´æ ¼å¼?ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Use s_ystem time zone"
 msgstr "æ?¾ç¤ºç³»ç»?æ?¶å?º(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "Wee_k starts on:"
 msgstr "ä¸?å?¨å¼?å§?äº?(_K)ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 #: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "å·¥ä½?æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "Work days:"
 msgstr "å·¥ä½?æ?¥ï¼?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?¶(ä¸?/ä¸?å??)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_24 hour"
 msgstr "_24 å°?æ?¶"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "å? é?¤é¡¹æ?¶è¦?æ±?ç¡®è®¤(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Compress weekends in month view"
 msgstr "ä¸?å?¨æ??è§?å?¾ä¸æ?¾ç¤ºå?¨æ?«(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Day begins:"
 msgstr "ä¸?å¤©å¼?å§?(_D)ï¼?"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Fri"
 msgstr "å?¨äº?(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Hide completed tasks after"
 msgstr "é??å??é??è??å·²å®?æ??ç??ä»»å?¡(_H)"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Mon"
 msgstr "å?¨ä¸?(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Overdue tasks:"
 msgstr "å»¶æ??ä»»å?¡(_O)ï¼?"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "_Sat"
 msgstr "å?¨å?(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "å?¨å?¨è§?å?¾å??æ??è§?å?¾ä¸æ?¾ç¤ºçº¦ä¼?ç»?æ??æ?¶é?´(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Time divisions:"
 msgstr "æ?¶é?´å??å?²(_T)ï¼?"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:68
 msgid "_Tue"
 msgstr "å?¨äº?(_T)"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:70
 msgid "_Wed"
 msgstr "å?¨ä¸?(_W)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?ä¸ªå?¨å¹´/ç??æ?¥å??"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:74
 msgid "before every appointment"
 msgstr "å?¨æ¯?æ¬¡çº¦ä¼?å??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "ç±»å??ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../calendar/gui/dialogs/calendar-setup.c:175
 #: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "ç±»å??(_T)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:147
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "å??ç§°(_N)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "å°?æ?¥å??å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "å°?ä»»å?¡å??è¡¨å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "å°?å¤?å¿?å??è¡¨å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "é¢?è?²(_R)ï¼?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "å¤?å¿?å??è¡¨"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "æ?¥å??å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "æ?°å»ºæ?¥å??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "ä»»å?¡å??è¡¨å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "æ?°å»ºä»»å?¡å??è¡¨"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "å¤?å¿?å??è¡¨å±?æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "æ?°å»ºå¤?å¿?å??è¡¨"
 
@@ -3280,237 +3270,237 @@ msgstr "%s  æ?¨è¿?æ²¡æ??è¿?è¡?ä¿®æ?¹ï¼?æ?´æ?°ç¼?è¾?å?¨å??ï¼?"
 msgid "Validation error: %s"
 msgstr "æ ¡éª?é??è¯¯ï¼?%s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:251
 msgid "Could not save attachments"
 msgstr "ä¸?è?½ä¿?å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:527
 msgid "Could not update object"
 msgstr "æ? æ³?æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "Edit Appointment"
 msgstr "ç¼?è¾?çº¦ä¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:649
 #, c-format
 msgid "Meeting - %s"
 msgstr "ä¼?è®® - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:651
 #, c-format
 msgid "Appointment - %s"
 msgstr "çº¦ä¼? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "å??é??ç??ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Task - %s"
 msgstr "ä»»å?¡ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:664
 #, c-format
 msgid "Memo - %s"
 msgstr "å¤?å¿? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:680
 msgid "No Summary"
 msgstr "æ²¡æ??æ¦?è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "Keep original item?"
 msgstr "ä¿?ç??å??å§?æ?¡ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:987
 msgid "Click here to close the current window"
 msgstr "å??å?»æ¤å¤?å?¯å?³é?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../calendar/gui/dialogs/comp-editor.c:994 ../mail/e-mail-browser.c:120
 #: ../shell/e-shell-window-actions.c:1454
 #: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:552
-#: ../widgets/misc/e-web-view.c:413 ../widgets/misc/e-web-view.c:1066
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "å¤?å?¶é??ä¸å??å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:127
 #: ../shell/e-shell-window-actions.c:1461
 #: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:547
-#: ../widgets/misc/e-web-view.c:1060
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "å?ªå??é??ä¸å??å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 #: ../shell/e-shell-window-actions.c:1468
 #: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "å? é?¤é??ä¸å??å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 msgid "Click here to view help available"
 msgstr "å??å?»æ¤å¤?å?¯æ?¥ç??å?¯ç?¨ç??å¸®å?©"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:1503
 #: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:557
-#: ../widgets/misc/e-web-view.c:1072
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "ç²?è´´å?ªè´´æ?¿"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1043
 msgid "Click here to save the current window"
 msgstr "å??å?»æ¤å¤?å?¯ä¿?å?å½?å??çª?å?£"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1573
 #: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "é??ä¸æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1057
 msgid "_Classification"
 msgstr "å??ç±»(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1064
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:155
 #: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1071 ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:220
+#: ../widgets/misc/e-signature-editor.c:222
 msgid "_File"
 msgstr "æ??ä»¶(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 #: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "å¸®å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../composer/e-composer-actions.c:287
 msgid "_Options"
 msgstr "é??é¡¹(_O)"
 
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1099 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 #: ../composer/e-composer-actions.c:243
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "Click here to attach a file"
 msgstr "å??å?»æ¤å¤?å?¯ä¾¿é??å? æ??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Categories"
 msgstr "ç±»å?«(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Toggles whether to display categories"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç±»å?«"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 msgid "Time _Zone"
 msgstr "æ?¶å?º(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºæ?¶å?º"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Pu_blic"
 msgstr "å?¬å¼?(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1140
 msgid "Classify as public"
 msgstr "å??ç±»ä¸ºå?¬å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Classify as private"
 msgstr "å??ç±»ä¸ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Confidential"
 msgstr "æ?ºå¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Classify as confidential"
 msgstr "å??ç±»ä¸ºæ?ºå¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "R_ole Field"
 msgstr "è§?è?²å??(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè§?è?²å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_RSVP"
 msgstr "è¯·å??å¤?(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºè¯·å??å¤?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "_Status Field"
 msgstr "ç?¶æ??å??(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºç?¶æ??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1186
 msgid "_Type Field"
 msgstr "ç±»å??å??(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ?¢æ?¯å?¦æ?¾ç¤ºå?ºå¸è??ç±»å??å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?æ??æ¡£(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1747
+#: ../composer/e-composer-actions.c:447
 msgid "Attach"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:3092
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ?´æ?°å?°è¾¾ç??è¯?ï¼?å¯¹æ¤é¡¹ç?®ç??æ?´æ?¹å°?è¢«ä¸¢å¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3056
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3124
 msgid "Unable to use current version!"
 msgstr "æ? æ³?ä½¿ç?¨å½?å??ç??æ?¬ï¼?"
 
@@ -3610,147 +3600,147 @@ msgstr "æ??æ??ç»?ï¼?"
 msgid "Enter Delegate"
 msgstr "è¾?å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "æ??é??(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Click here to set or unset alarms for this event"
 msgstr "å??å?»æ¤å¤?ä»¥è®¾å®?æ??å??æ¶?æ¤äº?ä»¶ç??æ??é??"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ?¢æ?¯å?¦å°?æ?¶é?´æ?¾ç¤ºä¸ºå¿?"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "å??ç?°(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
 msgstr "å°?æ¤äº?ä»¶æ ?ä¸ºé??å¤?å??ç??"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "å??é??é??é¡¹"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é«?çº§å??é??é??é¡¹"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ?¢æ?¯å?¦æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "å¿?/é?²(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è¯¢å?ºå¸è??ç??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3094
 msgid "Appointment"
 msgstr "çº¦ä¼?"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?ºå¸è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "æ??å?°æ¤äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:769
 msgid "Event's start time is in the past"
 msgstr "äº?ä»¶å¼?å§?æ?¶é?´å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:810
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "å? æ??é??ç??æ?¥ç¨?ä¸ºå?ªè¯»ï¼?æ?¨æ? æ³?ç¼?è¾?è¯¥äº?ä»¶ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:814
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨äº?ä»¶ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2778
 msgid "This event has alarms"
 msgstr "æ¤äº?ä»¶æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:893
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ç»?ç»?è??(_G)ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:940
 msgid "_Delegatees"
 msgstr "ä»£ç??äºº(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "Atte_ndees"
 msgstr "å?ºå¸è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no start date"
 msgstr "æ²¡æ??å¼?å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1160
 msgid "Event with no end date"
 msgstr "æ²¡æ??ç»?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/event-page.c:1331
 #: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:910
 msgid "Start date is wrong"
 msgstr "å¼?å§?æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1341
 msgid "End date is wrong"
 msgstr "ç»?æ??æ?¥æ??æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1364
 msgid "Start time is wrong"
 msgstr "å¼?å§?æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1371
 msgid "End time is wrong"
 msgstr "ç»?æ??æ?¶é?´æ??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/event-page.c:1533
 #: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/task-page.c:970
 msgid "The organizer selected no longer has an account."
 msgstr "é??ä¸ç??ç»?ç»?è??æ²¡æ??å¸?å?·äº?ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/event-page.c:1539
 #: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/task-page.c:976
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??ç»?ç»?è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:1000
 msgid "At least one attendee is required."
 msgstr "é??è¦?è?³å°?ä¸?ä¸ªå?ºå¸è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2652
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
@@ -3761,109 +3751,115 @@ msgstr "æ? æ³?æ??å¼?æ?¥å??â??%sâ??ã??"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/event-page.c:2696
 #: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/task-page.c:1790
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£å?¨ä»¥ %s ç??èº«ä»½è¡?å?¨"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:2997
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å¤©å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3000
+#: ../calendar/gui/dialogs/event-page.c:3003
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å°?æ?¶å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3006
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "çº¦ä¼?ç?? %d å??é??å??"
 
-#: ../calendar/gui/dialogs/event-page.c:3019
+#: ../calendar/gui/dialogs/event-page.c:3022
 msgid "Customize"
 msgstr "è?ªå®?ä¹?"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3024
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ? "
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "çº¦ä¼?ç?? 1 å¤©å??"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "çº¦ä¼?ç?? 1 å°?æ?¶å??"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "çº¦ä¼?ç?? 15 å??é??å??"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "Atte_ndees..."
 msgstr "å?ºå¸è??(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
 msgstr "è?ªå®?ä¹?æ??é??ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "äº?ä»¶æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "æ??é??(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "æ??è¿°(_D)ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 #: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ä½?ç½®(_L)ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "æ¦?è¦?(_S)ï¼?"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "æ?¶é?´(_T)ï¼?"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#| msgid "1 day before appointment"
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "çº¦ä¼?å?? 1 å¤©"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#| msgid "1 hour before appointment"
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "çº¦ä¼?å?? 1 å°?æ?¶"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+#| msgid "15 minutes before appointment"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "çº¦ä¼?å?? 15 å??é??"
+
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#| msgid "for"
+msgctxt "eventpage"
 msgid "for"
 msgstr "æ??ç»æ?¶é?´"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#| msgid "until"
+msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3098
 msgid "Memo"
 msgstr "å¤?å¿?"
 
@@ -3888,10 +3884,10 @@ msgstr "æ?¨å¹¶é??ç»?ç»?è??ï¼?å? æ¤æ? æ³?ç¼?è¾?å?¨é?¨å¤?å¿?ã??"
 msgid "Unable to open memos in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??å¤?å¿?ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1043 ../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:74
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2400
+#: ../mail/em-format-html.c:2459 ../mail/em-format-html.c:2483
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:73
 msgid "To"
 msgstr "æ?¶ä»¶äºº"
 
@@ -3910,7 +3906,7 @@ msgid "T_o:"
 msgstr "å?°(_O)ï¼?"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:429
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç»?(_G)ï¼?"
@@ -3951,21 +3947,21 @@ msgstr "æ?¬æ¬¡å??ä»¥å??å??æ¬¡"
 msgid "All Instances"
 msgstr "æ??æ??å??æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:559
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "æ¤çº¦ä¼?å?«æ?? Evolution æ? æ³?ç¼?è¾?ç??å??ç?°ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:891
 msgid "Recurrence date is invalid"
 msgstr "å??ç?°æ?¥æ??æ? æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:931
 msgid "End time of the recurrence was before event's start"
 msgstr "é??å¤?äº?ä»¶æ?¡ç?®ç??ç»?æ??æ?¶é?´å°?äº?å¼?å§?æ?¶é?´"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:960
 msgid "on"
 msgstr "å?¨"
 
@@ -3973,7 +3969,7 @@ msgstr "å?¨"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "first"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -3982,7 +3978,7 @@ msgstr "ç¬¬ä¸?ä¸ª"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "second"
 msgstr "ç¬¬äº?"
 
@@ -3990,7 +3986,7 @@ msgstr "ç¬¬äº?"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1028
 msgid "third"
 msgstr "ç¬¬ä¸?ä¸ª"
 
@@ -3998,7 +3994,7 @@ msgstr "ç¬¬ä¸?ä¸ª"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1033
 msgid "fourth"
 msgstr "ç¬¬å??ä¸ª"
 
@@ -4006,7 +4002,7 @@ msgstr "ç¬¬å??ä¸ª"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "fifth"
 msgstr "ç¬¬äº?ä¸ª"
 
@@ -4014,13 +4010,13 @@ msgstr "ç¬¬äº?ä¸ª"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "last"
 msgstr "æ??å??ä¸?ä¸ª"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1067
 msgid "Other Date"
 msgstr "å?¶å®?æ?¥æ??"
 
@@ -4028,7 +4024,7 @@ msgstr "å?¶å®?æ?¥æ??"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "1st to 10th"
 msgstr "ä¸?æ?¬"
 
@@ -4036,7 +4032,7 @@ msgstr "ä¸?æ?¬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "11th to 20th"
 msgstr "ä¸æ?¬"
 
@@ -4044,45 +4040,45 @@ msgstr "ä¸æ?¬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "21st to 31st"
 msgstr "ä¸?æ?¬"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
 msgid "day"
 msgstr "å¤©"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1239
 msgid "on the"
 msgstr "å?¨"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1411
 msgid "occurrences"
 msgstr "å¾ªç?¯"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2118
 msgid "Add exception"
 msgstr "æ·»å? ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
 msgid "Could not get a selection to modify."
 msgstr "æ? æ³?è?·å¾?è¦?ä¿®æ?¹ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2165
 msgid "Modify exception"
 msgstr "ä¿®æ?¹ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2209
 msgid "Could not get a selection to delete."
 msgstr "æ? æ³?è?·å¾?è¦?å? é?¤ç??é??ä¸é¡¹ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2336
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ?¶é?´"
 
@@ -4094,7 +4090,7 @@ msgstr "æ¯?"
 msgid "Exceptions"
 msgstr "ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:77
 msgid "Preview"
 msgstr "é¢?è§?"
 
@@ -4103,22 +4099,51 @@ msgid "This appointment rec_urs"
 msgstr "æ¤çº¦ä¼?é??ç?°(_U)"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#| msgid "day(s)"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "å¤©"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#| msgid "for"
+msgctxt "recurrpage"
+msgid "for"
+msgstr "æ??ç»æ?¶é?´"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#| msgid "forever"
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "æ°¸è¿?"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+#| msgid "month(s)"
+msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "æ??"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#| msgid "until"
+msgctxt "recurrpage"
+msgid "until"
+msgstr "ç?´å?°"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#| msgid "week(s)"
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "å?¨"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#| msgid "year(s)"
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
 
@@ -4143,11 +4168,11 @@ msgstr "ç½?é¡µ"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:443
-#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
-#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
-#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#: ../calendar/gui/e-cal-model-tasks.c:442
+#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3181 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
@@ -4155,12 +4180,12 @@ msgstr "å·²å??æ¶?"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:714
+#: ../calendar/gui/e-itip-control.c:932 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:592
+#: ../calendar/gui/print.c:3178 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
@@ -4168,46 +4193,46 @@ msgstr "å·²å®?æ??"
 #. To Translators: This is task priority
 #: ../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:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1188 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712
+#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3175
 msgid "In Progress"
 msgstr "è¿?è¡?ä¸"
 
 #. To Translators: This is task priority
 #: ../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:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1186 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../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:1182
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-model.c:1279 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1187
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "ä¸"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3172 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "å°?æ?ªå¼?å§?"
 
@@ -4223,7 +4248,7 @@ msgstr "ç?¶æ??(_U)ï¼?"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4233,8 +4258,8 @@ msgstr "ç?¶æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "æ?ªå®?ä¹?"
 
@@ -4243,7 +4268,7 @@ msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D)ï¼?"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "ä¼?å??çº§(_P)ï¼?"
 
@@ -4251,20 +4276,20 @@ msgstr "ä¼?å??çº§(_P)ï¼?"
 msgid "_Web Page:"
 msgstr "ç½?é¡µ(_W)ï¼?"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "ç?¶æ??ç»?è??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "å??å?»å?¯æ?´æ?¹æ??æ?¥ç??ä»»å?¡ç??ç?¶æ??ç»?è??"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å??é??é??é¡¹(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:3096
 #: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "ä»»å?¡"
@@ -4277,32 +4302,32 @@ msgstr "ä»»å?¡ç»?è??"
 msgid "Print this task"
 msgstr "æ??å?°æ¤ä»»å?¡"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's start date is in the past"
 msgstr "ä»»å?¡ç??å¼?å§?æ?¥æ??æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:347
 msgid "Task's due date is in the past"
 msgstr "ä»»å?¡ç??å?°æ??æ?¶é?´æ?¯å?¨è¿?å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:382
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä»»å?¡ä¸?è?½è¢«ç¼?è¾?ï¼?å? ä¸ºé??æ?©ç??ä»»å?¡å??è¡¨æ?¯å?ªè¯»ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:386
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "æ? æ³?å®?å?¨ç¼?è¾?ä»»å?¡ï¼?å? ä¸ºæ?¨ä¸?æ?¯ç»?ç»?è??"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:437
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ç»?ç»?è??(_Z)ï¼?"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:883
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥æ??é??è¯¯"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1747
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "æ? æ³?æ??å¼?â??%sâ??ä¸ç??ä»»å?¡ã??"
@@ -4402,7 +4427,7 @@ msgid "Categories:"
 msgstr "ç±»å?«ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1165 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ¦?è¦?ï¼?"
 
@@ -4417,8 +4442,8 @@ msgstr "å?°æ??æ?¥æ??ï¼?"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-itip-control.c:1190
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç?¶æ??ï¼?"
 
@@ -4427,8 +4452,8 @@ msgid "Priority:"
 msgstr "ä¼?å??çº§ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-itip-control.c:1228 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
@@ -4459,16 +4484,16 @@ msgid "Start Date"
 msgstr "å¼?å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "ç©ºé?²"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:557 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "ç¹?å¿?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4479,47 +4504,46 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "å?¦"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-cal-model.c:537 ../calendar/gui/e-itip-control.c:1211
+#: ../calendar/gui/e-itip-control.c:1350
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
-#: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2345
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:1013
+#: ../calendar/gui/print.c:1030 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
+#: ../plugins/itip-formatter/itip-formatter.c:458
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1281
 msgid "Recurring"
 msgstr "é??å¤?"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1283
 msgid "Assigned"
 msgstr "å·²å??é??"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2185
 #, c-format
 msgid "Opening %s"
 msgstr "æ??å¼? %s"
@@ -4563,90 +4587,90 @@ msgstr "å¼?å§?æ?¥æ??"
 msgid "Type"
 msgstr "ç±»å??"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:414
 msgid "Cut selected events to the clipboard"
 msgstr "å°?é??ä¸äº?ä»¶å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:420
 msgid "Copy selected events to the clipboard"
 msgstr "å°?é??ä¸äº?ä»¶å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:426
 msgid "Paste events from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:432
 msgid "Delete selected events"
 msgstr "å? é?¤é??ä¸ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:451 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "å? é?¤é??ä¸ç??å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-task-table.c:1075
 msgid "Updating objects"
 msgstr "æ?´æ?°å¯¹è±¡"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1727
+#: ../calendar/gui/e-itip-control.c:1196
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2333
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-itip-control.c:1206
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2339
+#: ../plugins/itip-formatter/itip-formatter.c:2446
 msgid "Declined"
 msgstr "æ??ç»?"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1729
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:556
 msgid "Tentative"
 msgstr "æ??æ?¶ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1730
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2342
+#: ../plugins/itip-formatter/itip-formatter.c:2449
 msgid "Delegated"
 msgstr "è¢«å§?ä»»ç??"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1731
 msgid "Needs action"
 msgstr "é??è¦?å?¨ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1875 ../calendar/gui/e-memo-table.c:535
+#: ../calendar/gui/e-task-table.c:750
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ç»?ç»?è??ï¼?%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s"
 msgstr "ç»?ç»?è??ï¼?%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1895 ../calendar/gui/print.c:3130
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1926
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ?¶é?´ï¼?%s %s"
@@ -4689,8 +4713,8 @@ msgstr "æ?¾ç¤ºç¬¬äº?æ?¶å?º"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1892
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1785
 msgid "%A %d %B"
 msgstr "%B%dæ?¥%A"
 
@@ -4700,10 +4724,10 @@ msgstr "%B%dæ?¥%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1909
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../modules/calendar/e-cal-shell-view-private.c:1014
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1018
 msgid "%a %d %b"
 msgstr "%-mæ??%-dæ?¥%A"
 
@@ -4712,121 +4736,121 @@ msgstr "%-mæ??%-dæ?¥%A"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1925
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%d %b"
 msgstr "%B%-dæ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1088 ../calendar/gui/e-week-view.c:766
+#: ../calendar/gui/print.c:860 ../calendar/gui/print.c:2321
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1091 ../calendar/gui/e-week-view.c:769
+#: ../calendar/gui/print.c:862 ../calendar/gui/print.c:2323
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2645
+#: ../calendar/gui/e-day-view.c:2676
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬%då?¨"
 
-#: ../calendar/gui/e-itip-control.c:761
+#: ../calendar/gui/e-itip-control.c:762
 msgid "Recurring:"
 msgstr "é??å¤?ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:765
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯(å¤?æ??é??ç?°)"
 
-#: ../calendar/gui/e-itip-control.c:782
+#: ../calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "æ¯? %d å¤©"
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "æ¯? %d å?¨"
 
-#: ../calendar/gui/e-itip-control.c:802
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "æ¯? %d å?¨ç??"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " å?? "
 
-#: ../calendar/gui/e-itip-control.c:822
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "ç¬¬ %s å¤©å±?äº?"
 
-#: ../calendar/gui/e-itip-control.c:838
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s å±?äº?"
 
-#: ../calendar/gui/e-itip-control.c:849
+#: ../calendar/gui/e-itip-control.c:850
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "æ¯? %d æ??"
 
-#: ../calendar/gui/e-itip-control.c:861
+#: ../calendar/gui/e-itip-control.c:862
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "æ¯? %d å¹´"
 
-#: ../calendar/gui/e-itip-control.c:874
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
 msgstr[0] "æ?»è®¡ %d æ¬¡"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
+#: ../calendar/gui/e-itip-control.c:886
 msgid ", ending on "
 msgstr "ï¼?ç»?æ??äº? "
 
 #. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "å¼?å§?"
 
 #. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "ç»?æ??"
 
-#: ../calendar/gui/e-itip-control.c:943
+#: ../calendar/gui/e-itip-control.c:944
 #: ../plugins/save-calendar/csv-format.c:372
 msgid "Due"
 msgstr "å?°æ??"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
+#: ../calendar/gui/e-itip-control.c:987 ../calendar/gui/e-itip-control.c:1060
 msgid "iCalendar Information"
 msgstr "iCalendar ä¿¡æ?¯"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:1009
 msgid "iCalendar Error"
 msgstr "iCalendar é??è¯¯"
 
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../calendar/gui/e-itip-control.c:1093 ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1120 ../calendar/gui/e-itip-control.c:1137
 #: ../plugins/itip-formatter/itip-view.c:362
 #: ../plugins/itip-formatter/itip-view.c:363
 #: ../plugins/itip-formatter/itip-view.c:450
@@ -4835,293 +4859,293 @@ msgstr "iCalendar é??è¯¯"
 msgid "An unknown person"
 msgstr "æ?ªç?¥ç??äºº"
 
-#: ../calendar/gui/e-itip-control.c:1145
+#: ../calendar/gui/e-itip-control.c:1146
 msgid ""
 "Please review the following information, and then select an action from the "
 "menu below."
 msgstr "è¯·æ?¥ç??ä¸?å??ä¿¡æ?¯ï¼?å¹¶ä»?ä¸?é?¢ç??è??å??ä¸é??æ?©ä¸?ä¸ªå?¨ä½?ã??"
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2320
+#: ../calendar/gui/e-itip-control.c:1161
+#: ../plugins/itip-formatter/itip-formatter.c:2427
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ? "
 
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../plugins/itip-formatter/itip-formatter.c:2443
 msgid "Tentatively Accepted"
 msgstr "æ??æ?¶æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1290
+#: ../calendar/gui/e-itip-control.c:1291
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "ä¼?è®®å·²ç»?è¢«å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??æ?¥å??ä¸æ?¾å?°è¯¥ä¼?è®®"
 
-#: ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-itip-control.c:1293
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "ä»»å?¡å·²ç»?è¢«å??æ¶?ï¼?ä½?æ? æ³?å?¨æ?¨ç??ä»»å?¡å??è¡¨ä¸æ?¾å?°è¯¥ä»»å?¡"
 
-#: ../calendar/gui/e-itip-control.c:1369
+#: ../calendar/gui/e-itip-control.c:1370
 #, c-format
 msgid "%s has published meeting information."
 msgstr "%s å??å¸?äº?ä¼?è®®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1370
+#: ../calendar/gui/e-itip-control.c:1371
 msgid "Meeting Information"
 msgstr "ä¼?è®®ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1376
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "%s requests the presence of %s at a meeting."
 msgstr "%s è¯·æ±? %s å??å? ä¸?ä¸ªä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1379
 #, c-format
 msgid "%s requests your presence at a meeting."
 msgstr "%s é??è¯·æ?¨å??å? ä¸?ä¸ªä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1380
 msgid "Meeting Proposal"
 msgstr "ä¼?è®®å»ºè®®"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "%s wishes to be added to an existing meeting."
 msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Update"
 msgstr "ä¼?è®®æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1390
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "%s wishes to receive the latest meeting information."
 msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??ä¼?è®®ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Meeting Update Request"
 msgstr "ä¼?è®®æ?´æ?°è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1399
 #, c-format
 msgid "%s has replied to a meeting request."
 msgstr "%s å·²å??å¤?ä¸?ä¸ªä¼?è®®è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1400
 msgid "Meeting Reply"
 msgstr "ä¼?è®®ç?å¤?"
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1407
 #, c-format
 msgid "%s has canceled a meeting."
 msgstr "%s å??æ¶?äº?ä¸?ä¸ªä¼?è®®ã??"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1408
 msgid "Meeting Cancelation"
 msgstr "ä¼?è®®å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
+#: ../calendar/gui/e-itip-control.c:1418 ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1535
 #, c-format
 msgid "%s has sent an unintelligible message."
 msgstr "%s å??é??äº?ä¸?ä¸ªæ? æ³?ç??è§£ç??ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1419
 msgid "Bad Meeting Message"
 msgstr "é??è¯¯ç??ä¼?è®®ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "%s has published task information."
 msgstr "%s å??å¸?äº?ä»»å?¡ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1446
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Information"
 msgstr "ä»»å?¡ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1453
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "%s requests %s to perform a task."
 msgstr "%s è¯·æ±? %s å®?æ??ä¸?ä¸ªä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1456
 #, c-format
 msgid "%s requests you perform a task."
 msgstr "%s è¯·æ±?æ?¨å®?æ??ä¸?ä¸ªä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1457
 msgid "Task Proposal"
 msgstr "ä»»å?¡å»ºè®®"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "%s wishes to be added to an existing task."
 msgstr "%s å¸?æ??å? å?¥å?°å·²æ??ç??ä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Update"
 msgstr "ä»»å?¡æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1468
 #, c-format
 msgid "%s wishes to receive the latest task information."
 msgstr "%s å¸?æ??è?·å??æ??æ?°ç??ä»»å?¡ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1469
 msgid "Task Update Request"
 msgstr "ä»»å?¡æ?´æ?°è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1475
+#: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "%s has replied to a task assignment."
 msgstr "%s å·²ç»?å??å¤?äº?ä»»å?¡å??é??ã??"
 
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../calendar/gui/e-itip-control.c:1477
 msgid "Task Reply"
 msgstr "ä»»å?¡å??å¤?"
 
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1484
 #, c-format
 msgid "%s has canceled a task."
 msgstr "%s å??æ¶?äº?ä»»å?¡ã??"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1485
 msgid "Task Cancelation"
 msgstr "ä»»å?¡å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1495
+#: ../calendar/gui/e-itip-control.c:1496
 msgid "Bad Task Message"
 msgstr "é??è¯¯ç??ä»»å?¡ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1520
 #, c-format
 msgid "%s has published free/busy information."
 msgstr "%s å??å¸?äº?å¿?é?²ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1520
+#: ../calendar/gui/e-itip-control.c:1521
 msgid "Free/Busy Information"
 msgstr "å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1525
 #, c-format
 msgid "%s requests your free/busy information."
 msgstr "%s è¯·æ±?æ?¨ç??å¿?é?²ä¿¡æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1525
+#: ../calendar/gui/e-itip-control.c:1526
 msgid "Free/Busy Request"
 msgstr "å¿?/é?²è¯·æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1529
+#: ../calendar/gui/e-itip-control.c:1530
 #, c-format
 msgid "%s has replied to a free/busy request."
 msgstr "%s åº?ç?äº?å¿?é?²è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1530
+#: ../calendar/gui/e-itip-control.c:1531
 msgid "Free/Busy Reply"
 msgstr "å¿?é?²åº?ç?"
 
-#: ../calendar/gui/e-itip-control.c:1535
+#: ../calendar/gui/e-itip-control.c:1536
 msgid "Bad Free/Busy Message"
 msgstr "é??è¯¯ç??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1612
 msgid "The message does not appear to be properly formed"
 msgstr "ä¿¡æ?¯ç??æ ¼å¼?å?¯è?½ä¸?æ£ç¡®"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1671
 msgid "The message contains only unsupported requests."
 msgstr "ä¿¡æ?¯å?ªå?«æ??ä¸?æ?¯æ??ç??è¯·æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1703
+#: ../calendar/gui/e-itip-control.c:1704
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??ä»¶ä¸æ²¡æ??æ??æ??ç??æ?¥å??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1741
+#: ../calendar/gui/e-itip-control.c:1742
 msgid "The attachment has no viewable calendar items"
 msgstr "é??ä»¶ä¸æ²¡æ??å?¯æ?¥ç??ç??æ?¥å??é¡¹ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1983
+#: ../calendar/gui/e-itip-control.c:1984
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2017
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "Object is invalid and cannot be updated\n"
 msgstr "å¯¹è±¡æ? æ??ï¼?æ? æ³?æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2035
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "æ¤å??åº?å¹¶é??æ?¥è?ªå½?å??å?ºå¸è??ã??å°?å??åº?è??å? ä¸ºå?ºå¸è??å??ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:2053
+#: ../calendar/gui/e-itip-control.c:2054
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "å? ä¸ºæ? æ??ç?¶æ??è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2077
+#: ../calendar/gui/e-itip-control.c:2078
 msgid "Attendee status updated\n"
 msgstr "æ?´æ?°å?ºå¸è??ç?¶æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2084
-#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../calendar/gui/e-itip-control.c:2085
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ç?±äº?æ?¡ç?®ä¸?å??å?å?¨è??æ? æ³?æ?´æ?°å?ºå¸è??ç?¶æ??"
 
-#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
+#: ../calendar/gui/e-itip-control.c:2116 ../calendar/gui/e-itip-control.c:2173
 msgid "Item sent!\n"
 msgstr "é¡¹ç?®å·²å??é??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
+#: ../calendar/gui/e-itip-control.c:2122 ../calendar/gui/e-itip-control.c:2181
 msgid "The item could not be sent!\n"
 msgstr "æ? æ³?å??é??é¡¹ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2273
+#: ../calendar/gui/e-itip-control.c:2274
 msgid "Choose an action:"
 msgstr "é??æ?©ä¸?é¡¹æ´»å?¨ï¼?"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-itip-control.c:2303
 #: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "è¯·å??å¤?"
 
-#: ../calendar/gui/e-itip-control.c:2342
+#: ../calendar/gui/e-itip-control.c:2343
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2366
+#: ../calendar/gui/e-itip-control.c:2367
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2367
+#: ../calendar/gui/e-itip-control.c:2368
 msgid "Tentatively accept"
 msgstr "æ??æ?¶æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2368
+#: ../calendar/gui/e-itip-control.c:2369
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "æ??ç»?"
 
-#: ../calendar/gui/e-itip-control.c:2393
+#: ../calendar/gui/e-itip-control.c:2394
 msgid "Send Free/Busy Information"
 msgstr "å??é??å¿?é?²ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:2417
+#: ../calendar/gui/e-itip-control.c:2418
 msgid "Update respondent status"
 msgstr "æ?´æ?°åº?ç?è??ç?¶æ??"
 
-#: ../calendar/gui/e-itip-control.c:2441
+#: ../calendar/gui/e-itip-control.c:2442
 msgid "Send Latest Information"
 msgstr "å??é??æ??æ?°ç??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:2465
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:300
+#: ../calendar/gui/e-itip-control.c:2466
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../widgets/misc/e-activity-proxy.c:314
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -5171,49 +5195,49 @@ msgstr "èµ?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:1009
 msgid "Individual"
 msgstr "ä¸ªäºº"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1010 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "ç»?"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/print.c:1011
 msgid "Resource"
 msgstr "èµ?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/print.c:1012
 msgid "Room"
 msgstr "æ?¿é?´"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/print.c:1026
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:1027
 msgid "Required Participant"
 msgstr "å¿?é??ç??å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/print.c:1028
 msgid "Optional Participant"
 msgstr "å?¯é??ç??å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:1029
 msgid "Non-Participant"
 msgstr "ä¸?å??å? "
 
@@ -5235,7 +5259,7 @@ msgstr "å¤?ç??ä¸"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel.c:2378
 msgid "%A, %B %d, %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
@@ -5244,7 +5268,7 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel.c:2409
 msgid "%a %m/%d/%Y"
 msgstr "%Yå¹´%mæ??%dæ?¥%A"
 
@@ -5254,63 +5278,63 @@ msgstr "%Yå¹´%mæ??%dæ?¥%A"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "Out of Office"
 msgstr "å??å?¬å®¤ä»¥å¤?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:559
 msgid "No Information"
 msgstr "æ²¡æ??ä¿¡æ?¯"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "O_ptions"
 msgstr "é??é¡¹(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _only working hours"
 msgstr "å?ªæ?¾ç¤ºå·¥ä½?å°?æ?¶(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:624
 msgid "Show _zoomed out"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç??è¾?å?º(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:640
 msgid "_Update free/busy"
 msgstr "æ?´æ?°å¿?é?²(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:655
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid "_Autopick"
 msgstr "è?ªå?¨è?·å??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_All people and resources"
 msgstr "å?¨é?¨äººå??èµ?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "All _people and one resource"
 msgstr "å?¨é?¨äººå??ä¸?ä¸ªèµ?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "_Required people"
 msgstr "å¿?é??ç??äºº(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:735
 msgid "Required people and _one resource"
 msgstr "å¿?é??ç??äººå??ä¸?ä¸ªèµ?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:784
 msgid "_Start time:"
 msgstr "å¼?å§?æ?¶é?´(_S)ï¼?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:824
 msgid "_End time:"
 msgstr "ç»?æ??æ?¶é?´(_E)ï¼?"
 
@@ -5338,7 +5362,7 @@ msgstr "è¯è¨?"
 msgid "Member"
 msgstr "æ??å??"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:419
 #: ../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
@@ -5347,38 +5371,38 @@ msgstr "æ??å??"
 msgid "Memos"
 msgstr "å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:497 ../calendar/gui/e-task-table.c:714
 msgid "* No Summary *"
 msgstr "* æ²¡æ??æ¦?è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:582 ../calendar/gui/e-task-table.c:794
 msgid "Start: "
 msgstr "å¼?å§?ï¼?"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:812
 msgid "Due: "
 msgstr "å?°æ??ï¼?"
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:717
 msgid "Cut selected memos to the clipboard"
 msgstr "å°?é??ä¸å¤?å¿?å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:723
 msgid "Copy selected memos to the clipboard"
 msgstr "å°?é??ä¸å¤?å¿?å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:729
 msgid "Paste memos from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:728
+#: ../calendar/gui/e-memo-table.c:735
 #: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "å? é?¤é??ä¸ç??å¤?å¿?"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Select all visible memos"
 msgstr "é??ä¸æ??æ??å?¯è§?ç??å¤?å¿?"
 
@@ -5390,18 +5414,18 @@ msgstr "å??å?»ä»¥æ·»å? å¤?å¿?"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2113
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../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
+#: ../modules/calendar/e-task-shell-view.c:444
 #: ../plugins/caldav/caldav-browse-server.c:429
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:562
@@ -5409,24 +5433,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:933
+#: ../calendar/gui/e-task-table.c:940
 msgid "Cut selected tasks to the clipboard"
 msgstr "å°?é??ä¸ä»»å?¡å?ªå??å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:946
 msgid "Copy selected tasks to the clipboard"
 msgstr "å°?é??ä¸ä»»å?¡å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:952
 msgid "Paste tasks from the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸ç²?è´´ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:951
+#: ../calendar/gui/e-task-table.c:958
 #: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "å? é?¤é??ä¸ç??ä»»å?¡"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:964
 msgid "Select all visible tasks"
 msgstr "é??ä¸æ??æ??å?¯è§?ç??ä»»å?¡"
 
@@ -5437,7 +5461,7 @@ msgstr "é??æ?©æ?¶å?º"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1766
 msgid "%d %B"
 msgstr "%-mæ??%-dæ?¥"
 
@@ -5470,23 +5494,23 @@ msgstr "æ?¥å??è§?å?¾äº?ä»¶"
 msgid "Grab Focus"
 msgstr "è?·å¾?ç?¦ç?¹"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "æ?°å»ºçº¦ä¼?"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "æ?°å»ºå?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "æ?°ä¼?è®®"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "è½¬å?°ä»?å¤©"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "è½¬å?°æ?¥æ??"
 
@@ -5495,7 +5519,7 @@ msgstr "è½¬å?°æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "å?¯æ?¥ç??å¹¶é??æ?©å½?å??æ?¶é?´è??å?´ç??è¡¨"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5503,14 +5527,14 @@ msgstr[0] "æ?? %d ä¸ªäº?ä»¶ã??"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "æ? äº?ä»¶ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
@@ -5518,47 +5542,47 @@ msgstr "å·¥ä½?æ?¥è§?å?¾ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?æ?¥ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "ä¸?å¤©æ??å¤?å¤©ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome æ?¥å??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%A %d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1017
-#: ../modules/calendar/e-cal-shell-view-private.c:1023
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1021
+#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1030
 msgid "%a %d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1047
+#: ../modules/calendar/e-cal-shell-view-private.c:1058
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1068
 msgid "%d %b %Y"
 msgstr "%Yå¹´%-mæ??%-dæ?¥"
 
@@ -5570,25 +5594,25 @@ msgstr "è·³è½¬æ??é?®"
 msgid "Click here, you can find more events."
 msgstr "å??å?»æ¤å¤?å?¯æ?¥æ?¾æ?´å¤?äº?ä»¶ã??"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "æ??è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "å?¨è§?å?¾ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "æ??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "ä¸?å?¨æ??å¤?å?¨ç??æ?¥å??è§?å?¾"
 
-#: ../calendar/gui/gnome-cal.c:2291
+#: ../calendar/gui/gnome-cal.c:2312
 msgid "Purging"
 msgstr "é??æ¯?"
 
@@ -5770,225 +5794,225 @@ msgstr "æ? æ³?é¢?çº¦èµ?æº?ï¼?é??è¯¯ï¼?"
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é¡»æ?¯äº?ä»¶ç??å?ºå¸è??ã??"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:516
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:517
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:518
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:519
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:520
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:521
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:522
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Mo"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "Tu"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:602
 msgid "We"
 msgstr "ä¸?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Fr"
 msgstr "äº?"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:603
 msgid "Sa"
 msgstr "å?"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2931
 msgid " to "
 msgstr " å?° "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2939
 msgid " (Completed "
 msgstr " (å®?æ?? "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:2943
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2951
 msgid " (Due "
 msgstr " (é¢?å®? "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:2454
+#: ../calendar/gui/print.c:2956
 msgid "Due "
 msgstr "é¢?å®? "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:3121
 #, c-format
 msgid "Summary: %s"
 msgstr "æ¦?è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:3145
 msgid "Attendees: "
 msgstr "å?ºå¸è??ï¼?"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:3188
 #, c-format
 msgid "Status: %s"
 msgstr "ç?¶æ??ï¼?%s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:3203
 #, c-format
 msgid "Priority: %s"
 msgstr "ä¼?å??çº§ï¼?%s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:3221
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç??ï¼?%i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:3232
 #, c-format
 msgid "URL: %s"
 msgstr "URLï¼?%s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:3245
 #, c-format
 msgid "Categories: %s"
 msgstr "ç±»å?«ï¼?%s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:3256
 msgid "Contacts: "
 msgstr "è??ç³»äººï¼?"
 
@@ -6015,7 +6039,7 @@ msgstr "çº¦ä¼?å??ä¼?è®®"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1835
+#: ../plugins/itip-formatter/itip-formatter.c:1942
 msgid "Opening calendar"
 msgstr "æ??å¼?æ?¥å??"
 
@@ -7746,12 +7770,12 @@ msgid "Save as..."
 msgstr "å?¦å?ä¸º..."
 
 #: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:379
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "æ·»å? é??ä»¶"
 
 #: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:206
+#: ../widgets/misc/e-signature-editor.c:208
 msgid "_Close"
 msgstr "å?³é?(_C)"
 
@@ -7759,173 +7783,173 @@ msgstr "å?³é?(_C)"
 msgid "Close the current file"
 msgstr "å?³é?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "æ??å?°(_P)..."
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "æ??å?°é¢?è§?(_V)"
-
-#: ../composer/e-composer-actions.c:273
+#: ../composer/e-composer-actions.c:259
 msgid "Save the current file"
 msgstr "ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:264
 msgid "Save _As..."
 msgstr "å?¦å?ä¸º(_A)..."
 
-#: ../composer/e-composer-actions.c:280
+#: ../composer/e-composer-actions.c:266
 msgid "Save the current file with a different name"
 msgstr "ç?¨ä¸?å??ç??æ??ä»¶å??ä¿?å?å½?å??æ??ä»¶"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:271
+msgid "New _Message"
+msgstr "æ?°å»ºä¿¡æ?¯(_M)"
+
+#: ../composer/e-composer-actions.c:273
+msgid "Open New Message window"
+msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
+
+#: ../composer/e-composer-actions.c:280
+msgid "Character _Encoding"
+msgstr "å?ç¬¦ç¼?ç ?(_E)"
+
+#: ../composer/e-composer-actions.c:297
+msgid "_Print..."
+msgstr "æ??å?°(_P)..."
+
+#: ../composer/e-composer-actions.c:304
+msgid "Print Pre_view"
+msgstr "æ??å?°é¢?è§?(_V)"
+
+#: ../composer/e-composer-actions.c:311
 msgid "Save as _Draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿(_D)"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:313
 msgid "Save as draft"
 msgstr "å?¦å?ä¸ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:318 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "å??é??(_E)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:320
 msgid "Send this message"
-msgstr "å??é??è¿?å°?ä¿¡"
-
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "æ?°å»ºä¿¡æ?¯(_M)"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "æ??å¼?æ?°å»ºä¿¡æ?¯çª?å?£"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "å?ç¬¦ç¼?ç ?(_E)"
+msgstr "å??é??è¿?æ?¡ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:328
 msgid "PGP _Encrypt"
 msgstr "PGP å? å¯?(_E)"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:330
 msgid "Encrypt this message with PGP"
 msgstr "ç?¨ PGP å? å¯?è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:336
 msgid "PGP _Sign"
 msgstr "PGP ç¾å??(_S)"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:338
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP å¯?é?¥ç¾å??è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:344
 msgid "_Prioritize Message"
 msgstr "æ ?ä¸ºä¼?å??(_P)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:346
 msgid "Set the message priority to high"
 msgstr "å°?ä¿¡æ?¯è®¾å®?ä¸ºé«?ä¼?å??çº§"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:352
 msgid "Re_quest Read Receipt"
 msgstr "è¯·æ±?å·²è¯»å??æ?§(_Q)"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:354
 msgid "Get delivery notification when your message is read"
 msgstr "å½?æ?¨ç??ä¿¡æ?¯è¢«é??è¯»æ?¶å¾?å?°æ??é??é??ç?¥"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:360
 msgid "S/MIME En_crypt"
 msgstr "S/MIME å? å¯?(_C)"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:362
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME å? å¯?è¯?ä¹¦å? å¯?è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:368
 msgid "S/MIME Sig_n"
 msgstr "S/MIME ç¾å??(_N)"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:370
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç¾å??è®¤è¯?ç¾å??è¯¥ä¿¡æ?¯"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:376
 msgid "_Bcc Field"
 msgstr "å¯?ä»¶æ??é??å??(_B)"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:378
 msgid "Toggles whether the BCC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå¯?ä»¶æ??é??å??"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:384
 msgid "_Cc Field"
 msgstr "æ??é??å??(_C)"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:386
 msgid "Toggles whether the CC field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºæ??é??å??"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:392
 msgid "_Reply-To Field"
 msgstr "å??å¤?è?³å??(_R)"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:394
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "æ?¯å?¦æ?¾ç¤ºå??å¤?å??"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:450
 msgid "Save Draft"
 msgstr "ä¿?å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "è¾?å?¥ä¿¡æ?¯ç??æ?¶ä»¶äºº"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "è¾?å?¥å°?æ?¥æ?¶è¯¥ä¿¡æ?¯å?¯æ?¬ï¼?ä½?ä¸?å?ºç?°å?¨æ?¶ä»¶äººå??è¡¨ä¸ç??æ?¶ä»¶äººå?°å??"
 
-#: ../composer/e-composer-header-table.c:1005
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "å??ä»¶äºº(_O)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1014
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "å??å¤?å?°(_R)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1018
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "æ?¶ä»¶äºº(_T)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1023
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "æ??é??(_C)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1028
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "å¯?ä»¶æ??é??(_B)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "æ??é??å?°(_P)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1037
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "ä¸»é¢?(_U)ï¼?"
 
-#: ../composer/e-composer-header-table.c:1046
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "ç¾å??(_G)ï¼?"
 
@@ -7933,62 +7957,52 @@ msgstr "ç¾å??(_G)ï¼?"
 msgid "Click here for the address book"
 msgstr "å??å?»æ¤å¤?ä»¥ä½¿ç?¨å?°å??ç°¿"
 
-#: ../composer/e-composer-post-header.c:130
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "å??å?»æ¤å¤?ä»¥é??æ?©è¦?æ??é??å?°ç??æ??ä»¶å¤¹"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "æ?¤æ¶?ä¸?æ¬¡æ??ä½?"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "é??å??ä¸?æ¬¡æ??ä½?"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "æ??ç´¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "æ??ç´¢å??æ?¿æ?¢æ??æ?¬"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "ä¿?å?è??ç¨¿"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:196
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
-
-#: ../composer/e-msg-composer.c:1028
+#: ../composer/e-msg-composer.c:780
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "æ? æ³?å¯¹å¯?å?ºç??ä¿¡æ?¯ç¾å??ï¼?æ?ªå¯¹æ¤å¸?å?·è®¾ç½®ç¾å??è¯?ä¹¦"
 
-#: ../composer/e-msg-composer.c:1040
+#: ../composer/e-msg-composer.c:789
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "æ? æ³?å¯¹å¯?å?ºç??ä¿¡æ?¯å? å¯?ï¼?æ?ªå¯¹æ¤å¸?å?·è®¾ç½®å? å¯?è¯?ä¹¦"
 
-#: ../composer/e-msg-composer.c:1465
-msgid "Unable to reconstruct message from autosave file"
-msgstr "æ? æ³?ä»?è?ªå?¨ä¿?å?ç??æ??ä»¶é??å»ºä¿¡æ?¯"
-
-#: ../composer/e-msg-composer.c:1535 ../composer/e-msg-composer.c:1881
+#: ../composer/e-msg-composer.c:1671 ../composer/e-msg-composer.c:2010
 msgid "Compose Message"
 msgstr "æ?°å»ºæ¶?æ?¯"
 
-#: ../composer/e-msg-composer.c:3540
+#: ../composer/e-msg-composer.c:3974
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "ç¼?å??å?¨å?«æ??ä¸?å?¯ç¼?è¾?ç??é??æ??æ?¬ä¿¡ä½?ã??"
 
-#: ../composer/e-msg-composer.c:4152
+#: ../composer/e-msg-composer.c:4679
 msgid "Untitled Message"
 msgstr "æ? æ ?é¢?ä¿¡æ?¯"
 
@@ -8003,126 +8017,152 @@ msgid "All accounts have been removed."
 msgstr "å·²ç»?å? é?¤äº?å?¨é?¨å¸?å?·ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
+#| msgid "Error occurred while spawning %s: %s."
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "å?¨ä¿?å?å?°æ?¨ç??è??ç¨¿æ??ä»¶å¤¹æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ã??"
+
+#: ../composer/mail-composer.error.xml.h:4
+#| msgid "An error occurred while printing"
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "å?¨ä¿?å?å?°æ?¨ç??å??ä»¶ç®±æ??ä»¶å¤¹æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ã??"
+
+#: ../composer/mail-composer.error.xml.h:5
+#| msgid "An error occurred while printing"
+msgid "An error occurred while sending."
+msgstr "å??é??æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ã??"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "æ?¨ç¡®å®?æ?³è¦?ä¸¢å¼?æ?¨æ£å?¨ç¼?å??ç??æ ?é¢?ä¸ºâ??{0}â??ç??ä¿¡æ?¯å??ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "ç?±äº?â??{0}â??ï¼?æ?¨å?¯è?½è¦?é??æ?©ä¸?å??ç??é?®ä»¶é??é¡¹ã??"
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "å??å? æ?¯â??{1}â??ã??"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message has been saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr "ç?±äº?æ?¨ç?°å?¨æ?¯ç¦»çº¿å·¥ä½?ï¼?ä¿¡æ?¯ä¿?å?å?°äº?æ?¨ç??æ?¬å?°å??ä»¶ç®±æ??ä»¶å¤¹ã??å?¨ä¸?çº¿å??ï¼?æ?¨"
+"å?¯ä»¥é??è¿?ç?¹å?» Evolution å·¥å?·æ ?ä¸?ç?? å??é??/æ?¥æ?¶ æ??é?®å??é??è¿?æ?¡ä¿¡æ?¯ã??"
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"å?³é?æ¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?ä¸¢å¼?ä¿¡æ?¯ï¼?é?¤é??æ?¨é??æ?©å?¨è??ç¨¿æ??ä»¶å¤¹ä¸ä¿?å?è¿?å°?ä¿¡ã??è¿?å??è®¸æ?¨"
+"å?³é?æ¤ç¼?å??çª?å?£å°?ä¼?æ°¸ä¹?ä¸¢å¼?ä¿¡æ?¯ï¼?é?¤é??æ?¨é??æ?©å?¨è??ç¨¿æ??ä»¶å¤¹ä¸ä¿?å?è¿?æ?¡ä¿¡æ?¯ã??è¿?å??è®¸æ?¨"
 "å?¨ç¨?å??ç»§ç»ç¼?å??ä¿¡æ?¯ã??"
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "æ? æ³?å??å»ºç¼?è¾?å?¨çª?å?£ã??"
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "æ? æ³?å??å»ºä¿¡æ?¯ã??"
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "æ? æ³?è¯»å??ç¾å??æ??ä»¶â??{0}â??ã??"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "æ? æ³?ä»? {0} è?·å??è¦?é??å? ç??ä¿¡æ?¯ã??"
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "æ? æ³?ä¿?å?å?°è?ªå?¨ä¿?å?æ??ä»¶â??{0}â??ã??"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?æ?¢å¤?æ?ªå®?æ??ç??ä¿¡æ?¯ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ä¸?è½½è¿?è¡?ä¸ã??æ?¨æ?³è¦?å??é??é?®ä»¶å??ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "ä¿?å?å?°è?ªå?¨ä¿?å?å?ºé??ï¼?å??å? æ?¯â??{1}â??ã??"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr "å?¨æ?¨ä¸?æ¬¡ç¼?å??æ?°ä¿¡æ?¯æ?¶ Evolution æ??å¤?é??å?ºã??æ?¢å¤?é?®ä»¶å°?å??è®¸æ?¨ç»§ç»å®?æ??ã??"
 
-#: ../composer/mail-composer.error.xml.h:16
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "æ??ä»¶â??{0}â??ä¸?æ?¯æ?®é??æ??ä»¶ï¼?æ? æ³?å?¨é?®ä»¶ä¸å??é??ã??"
-
-#: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
-msgstr ""
-"æ? æ³?æ¿?æ´» HTML ç¼?è¾?å?¨ç»?ä»¶ã??\n"
-"è¯·ç¡®å®?æ?¨ç?? gtkhtml å?? libgtkhtml æ??å®?è£?ç??ç??æ?¬æ£ç¡®ã??"
+#: ../composer/mail-composer.error.xml.h:19
+#| msgid "Message is not Junk"
+msgid "Message saved to Outbox."
+msgstr "é?®ä»¶å·²ä¿?å?å?°å??ä»¶ç®±ã??"
 
 #: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "æ? æ³?æ¿?æ´»å?°å??é??æ?©æ?§å?¶ã??"
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "æ??ä»¶â??{0}â??ä¸?æ?¯æ?®é??æ??ä»¶ï¼?æ? æ³?å?¨ä¿¡æ?¯ä¸å??é??ã??"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "æ?¨æ? æ³?å°?æ??ä»¶â??n{0}â??ä½?ä¸ºè¿?å°?ä¿¡ç??é??ä»¶ã??"
+#| msgid "Bad regular expression &quot;{0}&quot;."
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "æ?¥å??ç??é??è¯¯ä¸ºâ??{0}â??ã??"
 
 #: ../composer/mail-composer.error.xml.h:22
+msgid ""
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "æ?¥å??ç??é??è¯¯ä¸ºâ??{0}â??ã??ä¿¡æ?¯å¾?å?¯è?½æ²¡æ??ä¿?å?ã??"
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "æ?¥å??ç??é??è¯¯ä¸ºâ??{0}â??ã??ä¿¡æ?¯å¾?å?¯è?½æ²¡æ??å??é??ã??"
+
+#: ../composer/mail-composer.error.xml.h:24
+#| msgid "You cannot attach the file n{0}' to this message."
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "æ?¨æ? æ³?å°?æ??ä»¶â??{0}â??ä½?ä¸ºè¿?æ?¡ä¿¡æ?¯ç??é??ä»¶ã??"
+
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "å?¨æ?¨å?¯ä»¥æ?°å??é?®ä»¶ä¹?å??æ?¨é??è¦?é??ç½®ä¸?ä¸ªå¸?å?·ã??"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Continue Editing"
 msgstr "ç»§ç»ç¼?è¾?(_C)"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
 msgstr "ä¸?æ?¢å¤?(_D)"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
 msgstr "æ?¢å¤?(_R)"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Draft"
 msgstr "ä¿?å?è??ç¨¿(_S)"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "å?¨æ?°çª?å?£ä¸è¿?è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "å°? Anjal è®¾ä¸ºé»?è®¤ç?µå?é?®ä»¶å®¢æ?·ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "è¦?å??åµ?ç??ç«¯å?£ ID"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "å¥?æ?¥å?"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Anjal é?®ä»¶å®¢æ?·ç«¯"
 
@@ -8166,39 +8206,42 @@ msgid "Email address:"
 msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 
 #: ../capplet/settings/mail-account-view.c:490
-msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">è¯¦æ??ï¼?</span>"
+#| msgid "Details"
+msgid "Details:"
+msgstr "ç»?è??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨æ?¥æ?¶</span>"
+#: ../capplet/settings/mail-account-view.c:498
+#| msgid "Receiving mail"
+msgid "Receiving"
+msgstr "æ?¥æ?¶"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:505
 msgid "Server type:"
 msgstr "æ??å?¡å?¨ç±»å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Server address:"
 msgstr "æ??å?¡å?¨å?°å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:523
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:532
 msgid "Use encryption:"
 msgstr "ä½¿ç?¨å? å¯?ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:537
+#: ../capplet/settings/mail-account-view.c:572
 msgid "never"
 msgstr "ä»?ä¸?"
 
-#: ../capplet/settings/mail-account-view.c:545
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨å??é??</span>"
+#: ../capplet/settings/mail-account-view.c:549
+#| msgid "Ascending"
+msgid "Sending"
+msgstr "å??é??"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:591
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8208,7 +8251,7 @@ msgstr ""
 "ç ?ï¼?æ??ä¼?å°?è¯?å¹¶ä¸?å®?æ??æ??æ??è®¾å®?ã??å¦?æ??æ??ä¸?è?½è?ªå?¨è®¾å®?æ??æ??ç»?è??ï¼?æ?¨è¿?é??è¦?æ??ä¾?æ?¨ç??ç?µ"
 "å?é?®ä»¶æ??å?¡å?¨ç??è¯¦ç»?ä¿¡æ?¯ã??"
 
-#: ../capplet/settings/mail-account-view.c:587
+#: ../capplet/settings/mail-account-view.c:593
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8217,11 +8260,11 @@ msgstr ""
 "å¯¹ä¸?èµ·ï¼?æ??ä»¬ä¸?è?½è?ªå?¨å®?æ??è®¾ç½®æ?¥è?·å??æ?¨ç??ç?µå?é?®ä»¶ã??è¯·å®?æ??ä¸?é?¢ç??è®¾ç½®ã??æ??ä»¬å°?è¯?æ ¹"
 "æ?®æ?¨å??æ??è¾?å?¥ç??ä¿¡æ?¯å·¥ä½?ä½?æ?¯æ??è®¸æ?¨é??è¦?æ?´æ?¹å®?ä»¬ã??"
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:595
 msgid "You can specify more options to configure the account."
 msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?é??é¡¹ä»¥é??ç½®æ¤å¸?å?·ã??"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:597
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8229,111 +8272,111 @@ msgstr ""
 "ç?°å?¨æ??ä»¬é??è¦?æ?¨è®¾ç½®å??é??é?®ä»¶ï¼?æ??ä»¬ä¼?å°½é??è?ªå?¨å®?æ??ï¼?ä½?æ?¯æ?¨é??è¦?æ£?æ?¥è®¾ç½®æ?¥ç¡®ä¿?æ£"
 "ç¡®ã??"
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:598
 msgid "You can specify your default settings for your account."
 msgstr "æ?¨å?¯ä»¥ä¸ºæ?¨ç??å¸?å?·æ??å®?é»?è®¤è®¾ç½®ã??"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:599
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr "å?¨æ??ä»¬å°?è¯?è¿?æ?¥æ??å?¡å?¨å¹¶è?·å??æ?¨ç??ç?µå?é?®ä»¶ä¹?å??ï¼?è¯·æ£?æ?¥ä¸?é??æ?¨ç??é??ç½®ä¿¡æ?¯ã??"
 
-#: ../capplet/settings/mail-account-view.c:608
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2222
-#: ../mail/mail-config.ui.h:62
+#: ../capplet/settings/mail-account-view.c:614
+#: ../mail/em-account-editor.c:2208 ../mail/em-account-editor.c:2329
 msgid "Identity"
 msgstr "æ ?è¯?"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving mail"
 msgstr "å??è¿? - æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving mail"
 msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Next - Sending mail"
 msgstr "å??è¿? - å??é??ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Identity"
 msgstr "å??é?? - æ ?è¯?"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Receiving options"
 msgstr "å??è¿? - æ?¥æ?¶é??é¡¹"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:616
 msgid "Receiving options"
 msgstr "æ?¥æ?¶é??é¡¹"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:616
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving mail"
 msgstr "å??é?? - æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Sending mail"
 msgstr "å??é??ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Next - Review account"
 msgstr "å??è¿? - æ£?æ?¥å¸?å?·"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Defaults"
 msgstr "å??è¿? - é»?è®¤å?¼"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Receiving options"
 msgstr "å??é?? - æ?¥æ?¶é??é¡¹"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2988 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:619
+#: ../mail/em-account-editor.c:3146
 msgid "Defaults"
 msgstr "é»?è®¤å?¼"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:619
 msgid "Back - Sending mail"
 msgstr "å??é?? - å??é??ç?µå?é?®ä»¶"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Review account"
 msgstr "æ£?æ?¥å¸?å?·"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:621
 msgid "Back - Sending"
 msgstr "å??é?? - å??é??"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google contacts with Evolution"
 msgstr "è®¾ç½® Google è??ç³»äººå?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:727
 msgid "Setup Google calendar with Evolution"
 msgstr "æ·»å?  Google æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:732
 msgid "You may need to enable IMAP access."
 msgstr "æ?¨å?¯è?½é??è¦?å?¯ç?¨ IMAP è®¿é?®ã??"
 
-#: ../capplet/settings/mail-account-view.c:733
-msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Google å¸?å?·è®¾ç½®ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:740
+#| msgid "Backing Evolution accounts and settings"
+msgid "Google account settings:"
+msgstr "Google è´¦æ?·è®¾ç½®ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:767
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "æ·»å?  Yahoo æ?¥å??å?° Evolution"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:771
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -8342,42 +8385,43 @@ msgstr ""
 "Yahoo æ?¥å??å?½å??ä¸º å??å?_å§?æ°?ã??æ??ä»¬å°?è¯?ç??ç??æ??è¿?ç§?æ?¥å??å??ç§°ã??è¯·ç¡®è®¤å??å?æ?¯å?¦æ£ç¡®ï¼?"
 "å¦?æ??ä¸?æ£ç¡®ï¼?è¯·é??æ?°è¾?å?¥æ?¥å??å??ç§°ã??"
 
-#: ../capplet/settings/mail-account-view.c:768
-msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Yahoo å¸?å?·è®¾ç½®ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:778
+#| msgid "Backing Evolution accounts and settings"
+msgid "Yahoo account settings:"
+msgstr "Yahoo è´¦æ?·è®¾ç½®ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:792
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo æ?¥å??å??ç§°ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1049
+#: ../capplet/settings/mail-account-view.c:1064
 msgid "Password:"
 msgstr "å¯?ç ?ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1117
+#: ../capplet/settings/mail-account-view.c:1133
 #: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "å?³é?æ ?ç¾"
 
-#: ../capplet/settings/mail-account-view.c:1127
+#: ../capplet/settings/mail-account-view.c:1143
 msgid "Account Wizard"
 msgstr "å¸?å?·å??å¯¼"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:211
 msgid "Evolution account assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
-#: ../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:1666
+#: ../capplet/settings/mail-capplet-shell.c:351 ../mail/e-mail-migrate.c:678
+#: ../mail/e-mail-store.c:219 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1671
 #: ../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
+#: ../modules/calendar/e-cal-shell-migrate.c:146
 #: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
 #: ../modules/calendar/e-task-shell-backend.c:92
@@ -8386,9 +8430,10 @@ msgid "On This Computer"
 msgstr "å?¨æ¤è®¡ç®?æ?ºä¸"
 
 #: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "ä¿®æ?¹"
+#, c-format
+#| msgid "Modify"
+msgid "Modify %s..."
+msgstr "ä¿®æ?¹ %s..."
 
 #: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
@@ -8410,7 +8455,7 @@ msgstr "æ?¥å??äº?ä»¶ä¿¡æ?¯"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution æ??é??é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:851
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8436,42 +8481,27 @@ msgid "Email Settings"
 msgstr "ç?µå?é?®ä»¶è®¾ç½®"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:228
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s(å??æ¶?ç??)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:231
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (completed)"
 msgstr "%s(å®?æ??ç??)"
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:235
+#: ../e-util/e-activity.c:270
 #, c-format
-msgid "%s..."
-msgstr "%s..."
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-activity.c:240
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
 
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution é??è¯¯"
-
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution è¦å??"
-
-#: ../e-util/e-alert.c:652
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "å??é?¨é??è¯¯ï¼?è¯·æ±?äº?æ?ªç?¥ç??é??è¯¯â??%sâ??"
-
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "é?¿æ??ä¼¯è¯"
@@ -8628,12 +8658,12 @@ msgstr "æ?¥å¿?ä¿¡æ?¯ï¼?"
 msgid "Log Level"
 msgstr "æ?¥å¿?çº§å?«"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2758
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ä¿¡æ?¯"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:113
 #: ../shell/e-shell-window-actions.c:1426
 #: ../shell/e-shell-window-actions.c:1433
 #: ../shell/e-shell-window-actions.c:1440
@@ -8703,7 +8733,7 @@ msgstr "æ?¨æ??ç®?è¦?ç??å®?å??ï¼?"
 msgid "File exists \"{0}\"."
 msgstr "æ??ä»¶å·²å?å?¨â??{0}â??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:149
 msgid "_Overwrite"
 msgstr "è¦?ç??(_O)"
 
@@ -8724,104 +8754,106 @@ msgstr "GConf é??è¯¯ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "å??ç»æ??æ??ç??é??è¯¯é?½å?ªæ?¾ç¤ºå?¨ç»?ç«¯ã??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1041
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:71
 msgid "From"
 msgstr "å??ä»¶äºº"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1042
-#: ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "Reply-To"
 msgstr "å??å¤?è?³"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1044
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2401 ../mail/em-format-html.c:2463
+#: ../mail/em-format-html.c:2486 ../modules/mail/em-mailer-prefs.c:74
 msgid "Cc"
 msgstr "æ??é??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1045
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:76
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2467
+#: ../mail/em-format-html.c:2489 ../modules/mail/em-mailer-prefs.c:75
 msgid "Bcc"
 msgstr "å¯?ä»¶æ??é??"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1046
-#: ../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:77
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:422 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:76
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ä¸»é¢?"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1120
+#: ../em-format/em-format-quote.c:433 ../mail/em-format-html.c:2583
+#: ../modules/mail/em-mailer-prefs.c:1082
 msgid "Mailer"
 msgstr "é?®ä»¶ç¨?åº?"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1262
+#: ../em-format/em-format-quote.c:514 ../mail/em-composer-utils.c:1367
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½¬å??ç??ä¿¡æ?¯ --------"
 
-#: ../em-format/em-format.c:1047 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:527
-#: ../widgets/misc/e-dateedit.c:549
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:77 ../widgets/misc/e-dateedit.c:529
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1048 ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:78
 msgid "Newsgroups"
 msgstr "æ?°é?»ç»?"
 
-#: ../em-format/em-format.c:1049 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:79
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "å¤´å??"
 
-#: ../em-format/em-format.c:1429
+#: ../em-format/em-format.c:1453
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??ä»¶"
 
-#: ../em-format/em-format.c:1501
+#: ../em-format/em-format.c:1545
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "æ? æ³?è§£æ?? S/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:1659 ../em-format/em-format.c:1843
+#: ../em-format/em-format.c:1727 ../em-format/em-format.c:1924
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "æ? æ³?è§£æ?? MIME ä¿¡æ?¯ã??æ?¾ç¤ºæº?æ??æ?¬ã??"
 
-#: ../em-format/em-format.c:1669
+#: ../em-format/em-format.c:1737
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "ä¸?æ?¯æ?? multipart/encrypted ç??å? å¯?ç±»å??"
 
-#: ../em-format/em-format.c:1685
+#: ../em-format/em-format.c:1757
 msgid "Could not parse PGP/MIME message"
 msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡æ?¯"
 
-#: ../em-format/em-format.c:1686
+#: ../em-format/em-format.c:1758
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "æ? æ³?è§£æ?? PGP/MIME ä¿¡æ?¯ï¼?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:1868
+#: ../em-format/em-format.c:1949
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ??ç??ç¾å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1878 ../em-format/em-format.c:2038
+#: ../em-format/em-format.c:1962 ../em-format/em-format.c:2135
 msgid "Error verifying signature"
 msgstr "æ ¡éª?ç¾å??é??è¯¯"
 
-#: ../em-format/em-format.c:1879 ../em-format/em-format.c:2026
-#: ../em-format/em-format.c:2039
+#: ../em-format/em-format.c:1963 ../em-format/em-format.c:2122
+#: ../em-format/em-format.c:2136
 msgid "Unknown error verifying signature"
 msgstr "æ ¡éª?ç¾å??å??ç??äº?æ?ªç?¥é??è¯¯"
 
-#: ../em-format/em-format.c:2126
+#: ../em-format/em-format.c:2227
 msgid "Could not parse PGP message: "
 msgstr "æ? æ³?è§£æ?? PGP ä¿¡æ?¯ï¼?"
 
-#: ../em-format/em-format.c:2132 ../plugins/caldav/caldav-browse-server.c:203
+#: ../em-format/em-format.c:2233 ../mail/mail-ops.c:621
+#: ../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"
@@ -8941,56 +8973,62 @@ msgstr "è§?å??å??(_U)ï¼?"
 msgid "Find items that meet the following conditions"
 msgstr "æ?¥æ?¾ç¬¦å??ä¸?å??æ?¡ä»¶ç??é¡¹ç?®"
 
-#: ../filter/e-filter-rule.c:727
-msgid "A_dd Condition"
-msgstr "æ·»å? å?¨ä½?(_D)"
-
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:718
 msgid "If all conditions are met"
 msgstr "å¦?æ??æ»¡è¶³æ??æ??æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:737
+#: ../filter/e-filter-rule.c:719
 msgid "If any conditions are met"
 msgstr "å¦?æ??æ»¡è¶³ä»»ä¸?æ?¡ä»¶"
 
-#: ../filter/e-filter-rule.c:740
+#: ../filter/e-filter-rule.c:722
 msgid "_Find items:"
 msgstr "æ?¥æ?¾é¡¹ç?®(_F)ï¼?"
 
-#: ../filter/e-filter-rule.c:764
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:749
+msgid "None"
+msgstr "æ? "
+
+#: ../filter/e-filter-rule.c:750
 msgid "All related"
 msgstr "ç?¸å?³ç??å?¨é?¨"
 
-#: ../filter/e-filter-rule.c:765 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:751 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??å¤?"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:752
 msgid "Replies and parents"
 msgstr "å??å¤?å??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:767
+#: ../filter/e-filter-rule.c:753
 msgid "No reply or parent"
 msgstr "æ? å??å¤?æ??å??å§?é?®ä»¶"
 
-#: ../filter/e-filter-rule.c:770
+#: ../filter/e-filter-rule.c:756
 msgid "I_nclude threads"
 msgstr "å??å?«çº¿ç´¢(_N)"
 
-#: ../filter/e-filter-rule.c:1118 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:779
+msgid "A_dd Condition"
+msgstr "æ·»å? å?¨ä½?(_D)"
+
+#: ../filter/e-filter-rule.c:1126 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:305
 msgid "Incoming"
 msgstr "æ?¥æ?¶"
 
-#: ../filter/e-filter-rule.c:1118 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1126 ../mail/em-utils.c:306
 msgid "Outgoing"
 msgstr "å¯?å?º"
 
-#: ../filter/e-rule-editor.c:268
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "æ·»å? è§?å??"
 
-#: ../filter/e-rule-editor.c:355
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "ç¼?è¾?è§?å??"
 
@@ -9014,7 +9052,7 @@ msgstr "ç¼ºå°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "ç¼ºå°?æ??ä»¶å??ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:78
 msgid "Missing name."
 msgstr "ç¼ºå°?å??ç§°ã??"
 
@@ -9085,7 +9123,7 @@ msgstr "æ?ªæ?¥"
 msgid "months"
 msgstr "æ??"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "ç§?"
 
@@ -9101,25 +9139,25 @@ msgstr "æ?¨æ??å®?ç??æ?¶é?´"
 msgid "years"
 msgstr "å¹´"
 
-#: ../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:129
-#: ../widgets/misc/e-attachment-paned.c:134
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1055 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
+#: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:599
+#: ../mail/e-mail-attachment-bar.c:626
+#: ../widgets/misc/e-attachment-paned.c:617
 msgid "Icon View"
 msgstr "å?¾æ ?è§?å?¾"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:600
+#: ../mail/e-mail-attachment-bar.c:627
+#: ../widgets/misc/e-attachment-paned.c:618
 msgid "List View"
 msgstr "å??è¡¨è§?å?¾"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:268
 msgid "(No Subject)"
 msgstr "(æ? ä¸»é¢?)"
 
@@ -9139,7 +9177,12 @@ msgstr "è?ªæ¤å?°å??(_F)"
 msgid "Create Search _Folder"
 msgstr "å??å»ºæ??ç´¢æ??ä»¶å¤¹(_F)"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-folder-utils.c:102 ../mail/mail-ops.c:941
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "æ??ä¿¡æ?¯ä¿?å?å?°æ??ä»¶å¤¹ %s ä¸"
+
+#: ../mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
 msgstr "æ ?ç¾å??ç§°(_L)ï¼?"
 
@@ -9168,7 +9211,7 @@ msgid "_Later"
 msgstr "ç¨?å??(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:505
+#: ../modules/mail/e-mail-shell-view-actions.c:692
 msgid "Add Label"
 msgstr "æ·»å? æ ?ç¾"
 
@@ -9187,56 +9230,56 @@ msgid "Color"
 msgstr "é¢?è?²"
 
 #: ../mail/e-mail-label-tree-view.c:96
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1163
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "å§?å??"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:284
+#: ../mail/em-folder-tree-model.c:753 ../mail/em-folder-tree.c:2934
+#: ../modules/mail/e-mail-shell-view-private.c:1096
 msgid "Inbox"
 msgstr "æ?¶ä»¶ç®±"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:745
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:757
 msgid "Outbox"
 msgstr "å??ä»¶ç®±"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:759
 msgid "Sent"
 msgstr "å·²å??ç®±"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:748
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:577
+#: ../plugins/templates/templates.c:580
 msgid "Templates"
 msgstr "æ¨¡æ?¿"
 
-#: ../mail/e-mail-migrate.c:131
+#: ../mail/e-mail-migrate.c:132
 msgid "Migrating..."
 msgstr "æ£å?¨å??è¿?..."
 
-#: ../mail/e-mail-migrate.c:164
+#: ../mail/e-mail-migrate.c:165
 msgid "Migration"
 msgstr "è¿?ç§»"
 
-#: ../mail/e-mail-migrate.c:204
+#: ../mail/e-mail-migrate.c:205
 #, c-format
 msgid "Migrating '%s':"
 msgstr "å??è¿?â??%sâ??ï¼?"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:658
 msgid "Migrating Folders"
 msgstr "è¿?ç§»æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:659
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9247,7 +9290,7 @@ msgstr ""
 "\n"
 "è¯·ç¨?å??ï¼?Evolution æ£å?¨å??è¿?æ?¨ç??æ??ä»¶å¤¹..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:816
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "æ? æ³?å?¨â??%sâ??å??å»ºæ?¬å?°é?®ä»¶æ??ä»¶å¤¹ï¼?%s"
@@ -9259,38 +9302,38 @@ 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.
-#: ../mail/e-mail-reader-utils.c:109
+#: ../mail/e-mail-reader-utils.c:112
 #: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??æ¬¡è¯¢é?®"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:289 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "å¤?å?¶å?°æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:276 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:289 ../mail/em-folder-utils.c:415
 msgid "C_opy"
 msgstr "å¤?å?¶(_O)"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:791 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:689 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:791 ../mail/em-folder-utils.c:415
 msgid "_Move"
 msgstr "ç§»å?¨(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:954 ../mail/e-mail-reader.c:1070
-#: ../mail/e-mail-reader.c:1111
+#: ../mail/e-mail-reader.c:1060 ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1221
 msgid "_Do not ask me again."
 msgstr "ä¸?å??è¯¢é?®(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1116
+#: ../mail/e-mail-reader.c:1226
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ?»æ?¯å¿½ç?¥å¯¹äº?é?®ä»¶å??è¡¨ç??â??å??å¤?è?³â??å??(_A)ã??"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1319
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ä¿?å?ä¿¡æ?¯"
@@ -9301,539 +9344,540 @@ msgstr[0] "ä¿?å?ä¿¡æ?¯"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1227
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1340
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1620
 msgid "A_dd Sender to Address Book"
 msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿(_D)"
 
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1622
 msgid "Add sender to address book"
 msgstr "å°?å??ä»¶äººæ·»å? å?°å?°å??ç°¿"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1627
 msgid "Check for _Junk"
 msgstr "æ£?æ?¥å??å?¾ä¿¡æ?¯(_J)"
 
-#: ../mail/e-mail-reader.c:1501
+#: ../mail/e-mail-reader.c:1629
 msgid "Filter the selected messages for junk status"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯æ ?è®°ä¸ºå??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1634
 msgid "_Copy to Folder..."
 msgstr "å¤?å?¶å?°æ??ä»¶å¤¹(_C)..."
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1636
 msgid "Copy selected messages to another folder"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1641
 msgid "_Delete Message"
 msgstr "å? é?¤ä¿¡æ?¯(_D)"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1643
 msgid "Mark the selected messages for deletion"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯å??å? é?¤æ ?è®°"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1648
 msgid "Filter on Mailing _List..."
 msgstr "æ ¹æ?®é?®ä»¶å??è¡¨è¿?æ»¤(_L)..."
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1650
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?æ¤é?®ä»¶å??è¡¨ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1655
 msgid "Filter on _Recipients..."
 msgstr "æ ¹æ?®æ?¶ä»¶äººè¿?æ»¤(_R)..."
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1657
 msgid "Create a rule to filter messages to these recipients"
 msgstr "å??å»ºå?¯è¿?æ»¤å¯?å¾?è¿?äº?æ?¶ä»¶äººç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1662
 msgid "Filter on Se_nder..."
 msgstr "æ ¹æ?®å??ä»¶äººè¿?æ»¤(_N)..."
 
-#: ../mail/e-mail-reader.c:1536
+#: ../mail/e-mail-reader.c:1664
 msgid "Create a rule to filter messages from this sender"
 msgstr "å??å»ºå?¯è¿?æ»¤æ¤äººå¯?æ?¥ç??ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1669
 msgid "Filter on _Subject..."
 msgstr "æ ¹æ?®ä¸»é¢?è¿?æ»¤(_S)..."
 
-#: ../mail/e-mail-reader.c:1543
+#: ../mail/e-mail-reader.c:1671
 msgid "Create a rule to filter messages with this subject"
 msgstr "å??å»ºå?¯è¿?æ»¤æ¤ä¸»é¢?ä¿¡æ?¯ç??è§?å??"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1676
 msgid "A_pply Filters"
 msgstr "åº?ç?¨è¿?æ»¤è§?å??(_P)"
 
-#: ../mail/e-mail-reader.c:1550
+#: ../mail/e-mail-reader.c:1678
 msgid "Apply filter rules to the selected messages"
 msgstr "åº?ç?¨è¿?æ»¤è§?å??å?°é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1683
 msgid "_Find in Message..."
 msgstr "å?¨ä¿¡æ?¯ä¸æ?¥æ?¾(_F)..."
 
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1685
 msgid "Search for text in the body of the displayed message"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¸»ä½?ä¸æ??ç´¢æ??æ?¬"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1690
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ ?å¿?(_C)"
 
-#: ../mail/e-mail-reader.c:1564
+#: ../mail/e-mail-reader.c:1692
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "å? é?¤é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1697
 msgid "_Flag Completed"
 msgstr "æ ?å¿?ä¸ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1571
+#: ../mail/e-mail-reader.c:1699
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "è®¾ç½®é??ä¸ä¿¡æ?¯ç??è·?é??æ ?å¿?ä¸ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1704
 msgid "Follow _Up..."
 msgstr "è·?é??(_U)..."
 
-#: ../mail/e-mail-reader.c:1578
+#: ../mail/e-mail-reader.c:1706
 msgid "Flag the selected messages for follow-up"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯æ·»å? è·?é??æ ?å¿?"
 
-#: ../mail/e-mail-reader.c:1583
+#: ../mail/e-mail-reader.c:1711
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1585 ../mail/e-mail-reader.c:1592
+#: ../mail/e-mail-reader.c:1713 ../mail/e-mail-reader.c:1720
 msgid "Forward the selected message to someone as an attachment"
 msgstr "æ??é??ä¸ä¿¡æ?¯ä½?ä¸ºé??ä»¶è½¬å??ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1718
 msgid "Forward As _Attached"
 msgstr "ä½?ä¸ºé??ä»¶è½¬å??(_A)"
 
-#: ../mail/e-mail-reader.c:1597
+#: ../mail/e-mail-reader.c:1725
 msgid "_Inline"
 msgstr "åµ?å?¥(_I)"
 
-#: ../mail/e-mail-reader.c:1599 ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1727 ../mail/e-mail-reader.c:1734
 msgid "Forward the selected message in the body of a new message"
 msgstr "å?¨æ?°ä¿¡ä½?ä¸è½¬å??é??ä¸ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1732
 msgid "Forward As _Inline"
 msgstr "åµ?å?¥æ£æ??è½¬å??(_I)"
 
-#: ../mail/e-mail-reader.c:1611
+#: ../mail/e-mail-reader.c:1739
 msgid "_Quoted"
 msgstr "å¼?ç?¨(_Q)"
 
-#: ../mail/e-mail-reader.c:1613 ../mail/e-mail-reader.c:1620
+#: ../mail/e-mail-reader.c:1741 ../mail/e-mail-reader.c:1748
 msgid "Forward the selected message quoted like a reply"
 msgstr "ä»¥ç±»ä¼¼äº?å??å¤?ç??å¼?ç?¨æ?¹å¼?è½¬å??é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1746
 msgid "Forward As _Quoted"
 msgstr "ä½?æ??å¼?ç?¨è½¬å??(_Q)"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1753
 msgid "_Load Images"
 msgstr "è½½å?¥å?¾å??(_L)"
 
-#: ../mail/e-mail-reader.c:1627
+#: ../mail/e-mail-reader.c:1755
 msgid "Force images in HTML mail to be loaded"
 msgstr "å¼ºå?¶è½½å?¥ HTML é?®ä»¶ä¸ç??å?¾å??"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1760
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1762
 msgid "Mark the selected messages as important"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºé??è¦?é?®ä»¶"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:1767
 msgid "_Junk"
 msgstr "å??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:1641
+#: ../mail/e-mail-reader.c:1769
 msgid "Mark the selected messages as junk"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºå??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:1774
 msgid "_Not Junk"
 msgstr "é??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:1648
+#: ../mail/e-mail-reader.c:1776
 msgid "Mark the selected messages as not being junk"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºé??å??å?¾ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:1781
 msgid "_Read"
 msgstr "è¯»å??(_R)"
 
-#: ../mail/e-mail-reader.c:1655
+#: ../mail/e-mail-reader.c:1783
 msgid "Mark the selected messages as having been read"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1788
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1790
 msgid "Mark the selected messages as unimportant"
-msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºä¸?é??è¦?é?®ä»¶"
+msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:1795
 msgid "_Unread"
 msgstr "æ?ªè¯»(_U)"
 
-#: ../mail/e-mail-reader.c:1669
+#: ../mail/e-mail-reader.c:1797
 msgid "Mark the selected messages as not having been read"
 msgstr "æ??é??ä¸ä¿¡æ?¯æ ?è®°ä¸ºæ?ªè¯»"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:1802
 msgid "_Edit as New Message..."
 msgstr "ä½?ä¸ºæ?°ä¿¡æ?¯è¿?è¡?ç¼?è¾?(_E)..."
 
-#: ../mail/e-mail-reader.c:1676
+#: ../mail/e-mail-reader.c:1804
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨ç¼?è¾?å?¨ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯ä»¥ä¾¿ç¼?è¾?"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1809
 msgid "Compose _New Message"
 msgstr "æ?°å??æ?°ä¿¡æ?¯(_N)"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1811
 msgid "Open a window for composing a mail message"
 msgstr "æ??å¼?çª?å?£ä»¥æ?°å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:1816
 msgid "_Open in New Window"
 msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?(_O)"
 
-#: ../mail/e-mail-reader.c:1690
+#: ../mail/e-mail-reader.c:1818
 msgid "Open the selected messages in a new window"
 msgstr "å?¨æ?°çª?å?£ä¸æ??å¼?é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:1823
 msgid "_Move to Folder..."
 msgstr "ç§»è?³æ??ä»¶å¤¹(_M)..."
 
-#: ../mail/e-mail-reader.c:1697
+#: ../mail/e-mail-reader.c:1825
 msgid "Move selected messages to another folder"
 msgstr "æ??é??ä¸ç??ä¿¡æ?¯ç§»è?³å?¶å®?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:1830
 msgid "_Switch to Folder"
 msgstr "å??æ?¢å?°æ??ä»¶å¤¹(_S)"
 
-#: ../mail/e-mail-reader.c:1704
+#: ../mail/e-mail-reader.c:1832
 msgid "Display the parent folder"
 msgstr "æ?¾ç¤ºä¸?å±?æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:1837
 msgid "Switch to _next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾(_N)"
 
-#: ../mail/e-mail-reader.c:1711
+#: ../mail/e-mail-reader.c:1839
 msgid "Switch to the next tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:1844
 msgid "Switch to _previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾(_P)"
 
-#: ../mail/e-mail-reader.c:1718
+#: ../mail/e-mail-reader.c:1846
 msgid "Switch to the previous tab"
 msgstr "å??æ?¢å?°ä¸?ä¸?ä¸ªæ ?ç¾"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:1851
 msgid "Cl_ose current tab"
 msgstr "å?³é?å½?å??æ ?ç¾(_O)"
 
-#: ../mail/e-mail-reader.c:1725
+#: ../mail/e-mail-reader.c:1853
 msgid "Close current tab"
 msgstr "å?³é?å½?å??æ ?ç¾"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:1858
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?ä¿¡(_N)"
 
-#: ../mail/e-mail-reader.c:1732
+#: ../mail/e-mail-reader.c:1860
 msgid "Display the next message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:1865
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_I)"
 
-#: ../mail/e-mail-reader.c:1739
+#: ../mail/e-mail-reader.c:1867
 msgid "Display the next important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:1872
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?æ?¡çº¿ç´¢(_T)"
 
-#: ../mail/e-mail-reader.c:1746
+#: ../mail/e-mail-reader.c:1874
 msgid "Display the next thread"
 msgstr "æ?¾ç¤ºä¸?ä¸?æ?¡çº¿ç´¢"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:1879
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:1753
+#: ../mail/e-mail-reader.c:1881
 msgid "Display the next unread message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:1886
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?ä¿¡(_P)"
 
-#: ../mail/e-mail-reader.c:1760
+#: ../mail/e-mail-reader.c:1888
 msgid "Display the previous message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:1893
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?ä¿¡æ?¯(_E)"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1895
 msgid "Display the previous important message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?é??è¦?ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:1900
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯(_R)"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1902
 msgid "Display the previous unread message"
 msgstr "æ?¾ç¤ºä¸?ä¸?å°?æ?ªè¯»ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1909
 msgid "Print this message"
 msgstr "æ??å?°è¯¥ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1916
 msgid "Preview the message to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:1921
 msgid "Re_direct"
 msgstr "é??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1923
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é??ä¸ä¿¡æ?¯é??å??(é??å??)ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:1800 ../mail/mail.error.xml.h:91
+#: ../mail/e-mail-reader.c:1928 ../mail/mail.error.xml.h:97
 #: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:151
+#: ../modules/mail/e-mail-attachment-handler.c:156
 msgid "Reply to _All"
 msgstr "å??å¤?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1930
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??æ??æ??æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1807 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:1935 ../mail/mail.error.xml.h:98
 msgid "Reply to _List"
 msgstr "å??å¤?é?®ä»¶å??è¡¨(_L)"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1937
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??é?®ä»¶å??è¡¨æ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1814
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:1942
+#: ../modules/mail/e-mail-attachment-handler.c:163
 msgid "_Reply to Sender"
 msgstr "å??å¤?å??ä»¶äºº(_R)"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1944
 msgid "Compose a reply to the sender of the selected message"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??å??ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:1949
 msgid "_Save as mbox..."
 msgstr "å?¦å?ä¸º mbox æ ¼å¼?(_S)..."
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1951
 msgid "Save selected messages as an mbox file"
 msgstr "æ??é??ä¸ä¿¡æ?¯å?¦å?ä¸º mbox æ ¼å¼?æ??ä»¶"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:1956
 msgid "Search Folder from Mailing _List..."
 msgstr "å?ºäº?é?®ä»¶å??è¡¨ç??æ??ç´¢æ??ä»¶å¤¹(_L)..."
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1958
 msgid "Create a search folder for this mailing list"
 msgstr "ä¸ºæ¤é?®ä»¶å??è¡¨å??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:1963
 msgid "Search Folder from Recipien_ts..."
 msgstr "å?ºäº?æ?¶ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_T)..."
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1965
 msgid "Create a search folder for these recipients"
 msgstr "ä¸ºè¿?äº?æ?¶ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:1970
 msgid "Search Folder from Sen_der..."
 msgstr "å?ºäº?å??ä»¶äººç??æ??ç´¢æ??ä»¶å¤¹(_D)..."
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1972
 msgid "Create a search folder for this sender"
 msgstr "ä¸ºè¯¥å??ä»¶äººå??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:1977
 msgid "Search Folder from S_ubject..."
 msgstr "å?ºäº?ä¸»é¢?ç??æ??ç´¢æ??ä»¶å¤¹(_U)..."
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1979
 msgid "Create a search folder for this subject"
 msgstr "ä¸ºè¯¥ä¸»é¢?å??å»ºæ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:1984
 msgid "_Message Source"
 msgstr "ä¿¡æ?¯æº?ä»£ç ?(_M)"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1986
 msgid "Show the raw email source of the message"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??å??å§?é?®ä»¶æº?ä»£ç ?"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1998
 msgid "_Undelete Message"
 msgstr "å??æ¶?å? é?¤ä¿¡æ?¯(_U)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:2000
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?é??ä¸ä¿¡æ?¯ç??å? é?¤"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2005
 msgid "_Normal Size"
 msgstr "æ?®é??å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:2007
 msgid "Reset the text to its original size"
 msgstr "æ??æ??æ?¬é??æ?°è®¾ç½®ä¸ºå??æ?¥ç??å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2012
 msgid "_Zoom In"
 msgstr "æ?¾å¤§(_Z)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:2014
 msgid "Increase the text size"
 msgstr "å¢?å? æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2019
 msgid "Zoom _Out"
 msgstr "ç¼©å°?(_O)"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2021
 msgid "Decrease the text size"
 msgstr "å??å°?æ??æ?¬å¤§å°?"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2028
 msgid "Create R_ule"
 msgstr "å??å»ºè§?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2035
 msgid "Ch_aracter Encoding"
 msgstr "å?ç¬¦ç¼?ç ?(_A)"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2042
 msgid "F_orward As"
 msgstr "è½¬å??ä¸º(_O)"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2049
 msgid "_Group Reply"
 msgstr "å??å¤?å?¨é?¨(_G)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2056
 msgid "_Go To"
 msgstr "è½¬å?°(_G)"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2063
 msgid "Mar_k As"
 msgstr "æ ?è®°ä¸º(_K)"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2070
 msgid "_Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2077
 msgid "_Zoom"
 msgstr "ç¼©æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2102
 msgid "Mark for Follo_w Up..."
 msgstr "æ ?è®°ä¸ºè·?é??(_W)..."
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:2110
 msgid "Mark as _Important"
 msgstr "æ ?è®°ä¸ºé??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2114
 msgid "Mark as _Junk"
 msgstr "æ ?è®°ä¸ºå??å?¾(_J)"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2118
 msgid "Mark as _Not Junk"
 msgstr "æ ?è®°ä¸ºé??å??å?¾(_N)"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2122
 msgid "Mar_k as Read"
 msgstr "æ ?è®°ä¸ºå·²è¯»(_K)"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2126
 msgid "Mark as Uni_mportant"
 msgstr "æ ?è®°ä¸ºä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2130
 msgid "Mark as _Unread"
 msgstr "æ ?è®°ä¸ºæ?ªè¯»(_U)"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2166
 msgid "_Caret Mode"
 msgstr "å??æ ?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2168
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨æ?¾ç¤ºä¿¡æ?¯ç??ä¿¡ä½?ä¸æ?¾ç¤ºé?ªç??å??æ ?"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2174
 msgid "All Message _Headers"
 msgstr "å?¨é?¨ä¿¡å¤´(_H)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2176
 msgid "Show messages with all email headers"
-msgstr "æ?¾ç¤ºé?®ä»¶æ?¶æ?¾ç¤ºæ??æ??ä¿¡å¤´"
+msgstr "æ?¾ç¤ºä¿¡æ?¯æ?¶æ?¾ç¤ºæ??æ??ä¿¡å¤´"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2401
 msgid "Unable to retrieve message"
 msgstr "æ? æ³?è?·å??ä¿¡æ?¯"
 
-#: ../mail/e-mail-reader.c:2329 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2461 ../mail/mail-ops.c:1955
 #, 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:2889 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3031 ../mail/mail-config.ui.h:29
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:537
 #: ../plugins/google-account-setup/google-source.c:659
@@ -9841,56 +9885,126 @@ msgstr "æ?¶å??ä¿¡æ?¯ %s"
 msgid "Default"
 msgstr "é»?è®¤"
 
-#: ../mail/e-mail-reader.c:3037
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3181
+#: ../modules/mail/e-mail-attachment-handler.c:149
 msgid "_Forward"
 msgstr "è½¬å??(_F)"
 
-#: ../mail/e-mail-reader.c:3038
+#: ../mail/e-mail-reader.c:3182
 msgid "Forward the selected message to someone"
 msgstr "æ??é??ä¸ä¿¡æ?¯è½¬å??ç»?æ??äºº"
 
-#: ../mail/e-mail-reader.c:3057
+#: ../mail/e-mail-reader.c:3201
 msgid "Group Reply"
 msgstr "å??å¤?å?¨é?¨"
 
-#: ../mail/e-mail-reader.c:3058
+#: ../mail/e-mail-reader.c:3202
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "ä¸ºé??ä¸ä¿¡æ?¯ç??é?®ä»¶å??è¡¨æ??å?¨é?¨æ?¶ä»¶äººæ?°å??å??å¤?"
 
-#: ../mail/e-mail-reader.c:3103 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3247 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../mail/e-mail-reader.c:3136
+#: ../mail/e-mail-reader.c:3280
 #: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ä¸?ä¸?é¡¹"
 
-#: ../mail/e-mail-reader.c:3140
+#: ../mail/e-mail-reader.c:3284
 #: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ä¸?ä¸?é¡¹"
 
-#: ../mail/e-mail-reader.c:3150 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3294 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??å¤?"
 
-#: ../mail/e-mail-reader.c:3718
+#: ../mail/e-mail-reader.c:3866
 #, c-format
 msgid "Folder '%s'"
 msgstr "æ??ä»¶å¤¹ %s"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:594
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "è¾?å?¥ %s ç??å¯?ç ?"
+
+#: ../mail/e-mail-session.c:596
+msgid "Enter Passphrase"
+msgstr "è¾?å?¥å¯?ç ?"
+
+#: ../mail/e-mail-session.c:599
+#, c-format
+msgid "Enter Password for %s"
+msgstr "ä¸º %s è¾?å?¥å¯?ç ?"
+
+#: ../mail/e-mail-session.c:601
+msgid "Enter Password"
+msgstr "è¾?å?¥å¯?ç ?"
+
+#: ../mail/e-mail-session.c:646
+#, c-format
+msgid "User canceled operation."
+msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
+
+#: ../mail/e-mail-session.c:809
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "ç¼ºå°?å??é??ç?®æ ?å?°å??ï¼?ä¿¡æ?¯è½¬å??è¢«å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:818
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ? å?¯ç?¨å¸?å?·ï¼?ä¿¡æ?¯è½¬å??è¢«å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:1181 ../mail/mail-ops.c:1300
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "æ??å¼?æ??ä»¶å¤¹ %s"
+
+#: ../mail/e-mail-session.c:1197
+#, c-format
+#| msgid "Invalid folder: '%s'"
+msgid "Invalid folder: %s"
+msgstr "æ? æ??ç??æ??ä»¶å¤¹ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:479 ../mail/mail-ops.c:602
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "åº?ç?¨å¯?å?ºè¿?æ»¤å?¨å¤±è´¥ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:503 ../mail/e-mail-session-utils.c:537
+#: ../mail/mail-ops.c:619 ../mail/mail-ops.c:650
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"è¿½å? å?° %sï¼?%s å¤±è´¥\n"
+"è½¬è??è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹ã??"
+
+#: ../mail/e-mail-session-utils.c:557 ../mail/mail-ops.c:670
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹å¤±è´¥ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:822 ../mail/mail-ops.c:769
+#: ../mail/mail-ops.c:862
+msgid "Sending message"
+msgstr "å??é??ä¿¡æ?¯"
+
+#: ../mail/e-mail-tag-editor.c:291
 msgid "Flag to Follow Up"
 msgstr "è·?é??ç??æ ?å¿?"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:566 ../mail/mail-config.ui.h:67
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "ä¸?å? å¯?"
@@ -9898,7 +10012,7 @@ msgstr "ä¸?å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:570 ../mail/mail-config.ui.h:121
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -9906,17 +10020,17 @@ msgstr "TLS å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:520 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:574 ../mail/mail-config.ui.h:89
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
-#: ../mail/em-account-editor.c:607
+#: ../mail/em-account-editor.c:661
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s è®¸å?¯å??è®®"
 
-#: ../mail/em-account-editor.c:614
+#: ../mail/em-account-editor.c:668
 #, c-format
 msgid ""
 "\n"
@@ -9929,34 +10043,34 @@ msgstr ""
 "å¹¶é??ä¸å¤?é??æ¡?è¡¨æ??æ?¨æ?¥å??è¯¥å??è®®\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:901 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:955 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:985
+#: ../mail/em-account-editor.c:1039
 msgid "Never"
 msgstr "ä»?ä¸?"
 
-#: ../mail/em-account-editor.c:986
+#: ../mail/em-account-editor.c:1040
 msgid "Always"
 msgstr "æ?»æ?¯"
 
-#: ../mail/em-account-editor.c:987
+#: ../mail/em-account-editor.c:1041
 msgid "Ask for each message"
-msgstr "æ¯?å°?ä¿¡é?½è¯¢é?®"
+msgstr "æ¯?æ?¡ä¿¡æ?¯é?½è¯¢é?®"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1723 ../widgets/misc/e-account-tree-view.c:128
+#: ../mail/em-account-editor.c:1824 ../widgets/misc/e-account-tree-view.c:128
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ? "
 
-#: ../mail/em-account-editor.c:2098
+#: ../mail/em-account-editor.c:2205
 msgid "Mail Configuration"
 msgstr "é?®ä»¶é??ç½®"
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2206
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9966,7 +10080,7 @@ msgstr ""
 "\n"
 "å??å?»â??å??è¿?â??å¼?å§?ã??"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2209
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -9975,20 +10089,19 @@ msgstr ""
 "è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å§?å??å??ç?µå?é?®ä»¶å?°å??ã??ä¸?é?¢ç??â??å?¯é??â??å??ä¸?å¿?å¡«å?¥ï¼?é?¤é??æ?¨æ?³è¦?å?¨æ?¨å??"
 "å?ºç??é?®ä»¶ä¸å??å?«æ¤ä¿¡æ?¯ã??"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2261
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2211 ../mail/em-account-editor.c:2373
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶ç?µå?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2212
 msgid "Please configure the following account settings."
 msgstr "è¯·é??ç½®ä¸?å??å¸?å?·è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2107 ../mail/em-account-editor.c:2743
+#: ../mail/em-account-editor.c:2214 ../mail/em-account-editor.c:2861
 msgid "Sending Email"
 msgstr "å??é??ç?µå?é?®ä»¶"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2215
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9996,11 +10109,11 @@ msgstr ""
 "è¯·å?¨ä¸?é?¢è¾?å?¥æ?¨ç??å??ä»¶æ??å?¡å?¨ä¿¡æ?¯ã??å¦?æ??æ?¨ä¸?å¤ªç¡®å®?ç??è¯?ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??æ??è??"
 "äº?è??ç½?æ??å?¡æ??ä¾?å??ISPã??"
 
-#: ../mail/em-account-editor.c:2110
+#: ../mail/em-account-editor.c:2217
 msgid "Account Management"
 msgstr "å¸?å?·ç®¡ç??"
 
-#: ../mail/em-account-editor.c:2111
+#: ../mail/em-account-editor.c:2218
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10008,11 +10121,11 @@ msgstr ""
 "è¯·å?¨ä¸?é?¢ç??ç©ºç?½å¤?è¾?å?¥æ¤å¸?å?·ç??æ??è¿°æ?§å??ç§°ã??\n"
 "æ¤å??ç§°å°?å?ªå?¨æ?¾ç¤ºæ?¶ä½¿ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2115
+#: ../mail/em-account-editor.c:2222
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2116
+#: ../mail/em-account-editor.c:2223
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10026,52 +10139,52 @@ msgstr ""
 "\n"
 "å??å?»â??åº?ç?¨â??å?¯ä¿?å?æ?¨ç??è®¾ç½®ã??"
 
-#: ../mail/em-account-editor.c:2557
+#: ../mail/em-account-editor.c:2675
 msgid "Check for _new messages every"
-msgstr "è?ªå?¨æ£?æ?¥æ?°é?®ä»¶ç??é?´é??(_N)"
+msgstr "è?ªå?¨æ£?æ?¥æ?°ä¿¡æ?¯ç??é?´é??(_N)"
 
-#: ../mail/em-account-editor.c:2565
+#: ../mail/em-account-editor.c:2683
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2841
+#: ../mail/em-account-editor.c:2965
 msgid "Please select a folder from the current account."
 msgstr "è¯·ä»?å½?å??å¸?å?·é??æ?©ä¸?ä¸ªæ??ä»¶å¤¹ã??"
 
-#: ../mail/em-account-editor.c:3111 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3274 ../mail/mail-config.ui.h:96
 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:3156 ../mail/em-account-editor.c:3224
+#: ../mail/em-account-editor.c:3319 ../mail/em-account-editor.c:3387
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é??é¡¹"
 
-#: ../mail/em-account-editor.c:3157 ../mail/em-account-editor.c:3225
+#: ../mail/em-account-editor.c:3320 ../mail/em-account-editor.c:3388
 msgid "Checking for New Messages"
-msgstr "æ£?æ?¥æ?°é?®ä»¶"
+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:1695
+#: ../mail/em-composer-utils.c:1818
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æ?¨å?¨ %3$s ä¸?ç»? %1$s å??é??ç??å?³äº?â??%2$sâ??ç??ä¿¡æ?¯å·²è¢«é??è¯»ã??"
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1743
+#: ../mail/em-composer-utils.c:1868
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é?®ä»¶é??ç?¥ï¼?%s"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2279
 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:2199
+#: ../mail/em-composer-utils.c:2326
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10079,19 +10192,19 @@ msgstr ""
 "å?¨ ${Year}-${Month}-${Day}${AbbrevWeekdayName}ç?? ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender}å??é??ï¼?"
 
-#: ../mail/em-composer-utils.c:2343
+#: ../mail/em-composer-utils.c:2470
 msgid "-----Original Message-----"
 msgstr "-------- å??å§?ä¿¡æ?¯ --------"
 
-#: ../mail/em-composer-utils.c:2555
+#: ../mail/em-composer-utils.c:2691
 msgid "Posting destination"
 msgstr "æ??é??ç?®ç??"
 
-#: ../mail/em-composer-utils.c:2556
+#: ../mail/em-composer-utils.c:2692
 msgid "Choose folders to post the message to."
 msgstr "é??æ?©è¦?å°?ä¿¡æ?¯æ??é??å?°å?ªä¸ªæ??ä»¶å¤¹ã??"
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:333
 msgid "Select Folder"
 msgstr "é??æ?©æ??ä»¶å¤¹"
 
@@ -10208,7 +10321,7 @@ msgstr "æ?ªè®¾ç½®"
 msgid "is set"
 msgstr "å·²è®¾ç½®"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:58
 msgid "Junk"
 msgstr "å??å?¾"
 
@@ -10257,7 +10370,7 @@ msgid "Play Sound"
 msgstr "æ?æ?¾å£°é?³"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "å·²è¯»"
 
@@ -10347,154 +10460,135 @@ msgid "Add Ac_tion"
 msgstr "æ·»å? å?¨ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:125
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "æ?ªè¯»ä¿¡æ?¯æ?°ï¼?"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:130
+#: ../mail/em-folder-properties.c:129
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "æ?»ä¿¡æ?¯æ?°ï¼?"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:147
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¢?ä½¿ç?¨(%s)ï¼?"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:149
 #, c-format
 msgid "Quota usage"
 msgstr "é??é¢?ä½¿ç?¨"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:289
 msgid "Folder Properties"
 msgstr "æ??ä»¶å¤¹å±?æ?§"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
 msgstr "<å??å?»æ¤å¤?ä»¥é??æ?©æ??ä»¶å¤¹>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "å??å»º(_R)"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "æ??ä»¶å¤¹å??ç§°(_N)ï¼?"
 
 #. load store to mail component
-#: ../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:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
+#: ../mail/mail-vfolder.c:1113 ../mail/mail-vfolder.c:1185
 msgid "Search Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
 msgid "UNMATCHED"
 msgstr "ä¸?å?¹é??"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:823 ../mail/em-folder-tree-model.c:1100
 msgid "Loading..."
 msgstr "æ£å?¨è½½å?¥..."
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:200
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:624
 msgid "Folder names cannot contain '/'"
 msgstr "æ??ä»¶å¤¹å??ä¸?è?½å?«æ??å?ç¬¦â??/â??"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1162
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1401
 msgid "Mail Folder Tree"
 msgstr "é?®ä»¶æ??ä»¶å¤¹æ ?"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1737 ../mail/em-folder-utils.c:91
 #, c-format
 msgid "Moving folder %s"
 msgstr "ç§»å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1741 ../mail/em-folder-utils.c:93
 #, c-format
 msgid "Copying folder %s"
 msgstr "å¤?å?¶æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1750 ../mail/message-list.c:2176
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ??ä¿¡æ?¯ç§»è?³æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1754 ../mail/message-list.c:2178
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?°æ??ä»¶å¤¹ %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1771
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "æ? æ³?å°?ä¿¡æ?¯æ?¾å?°é¡¶çº§æ??ä»¶å¤¹å?å?¨"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:416
 msgid "Move Folder To"
 msgstr "ç§»å?¨æ??ä»¶å¤¹å?°"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:416
 msgid "Copy Folder To"
 msgstr "å¤?å?¶æ??ä»¶å¤¹å?°"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:546
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "å??å»ºæ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:724
 msgid "Create Folder"
 msgstr "å??å»ºæ??ä»¶å¤¹"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:725
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:355
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?å?¨å?ªé??å??å»ºæ??ä»¶å¤¹ï¼?"
 
-#: ../mail/em-folder-utils.c:714
+#: ../mail/em-folder-utils.c:746
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "æ? æ³?é??è®¢æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1603
 msgid "Unsigned"
 msgstr "æ?ªç¾å??"
 
@@ -10504,7 +10598,7 @@ msgid ""
 "authentic."
 msgstr "æ¤ä¿¡æ?¯æ?ªç¾å??ã??æ? æ³?ä¿?è¯?è¿?å°?ä¿¡æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1604
 msgid "Valid signature"
 msgstr "æ??æ??ç¾å??"
 
@@ -10514,7 +10608,7 @@ msgid ""
 "message is authentic."
 msgstr "æ¤ä¿¡æ?¯å·²ç¾å??ï¼?è??ä¸?ç¾å??æ?¯æ??æ??ç??ã??è¿?æ??å?³ç??è¿?å°?ä¿¡åº?è¯¥æ?¯å?¯ä¿¡ç??ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1605
 msgid "Invalid signature"
 msgstr "æ? æ??ç¾å??"
 
@@ -10524,7 +10618,7 @@ msgid ""
 "in transit."
 msgstr "æ? æ³?æ ¡éª?è¿?å°?ä¿¡ç??ç¾å??ï¼?å?¯è?½å?¨ä¼ é??ç??è¿?ç¨?ä¸é?®ä»¶è¢«ç¯¡æ?¹äº?ã??"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1606
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?å??é??è??"
 
@@ -10534,7 +10628,7 @@ msgid ""
 "cannot be verified."
 msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ? æ³?æ ¡éª?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1607
 msgid "Signature exists, but need public key"
 msgstr "ç¾å??å·²å?å?¨ï¼?ä½?é??è¦?å?¬é?¥"
 
@@ -10544,7 +10638,7 @@ msgid ""
 "public key."
 msgstr "è¿?å°?ä¿¡ç??ç¾å??æ??æ??ï¼?ä½?æ?¯æ²¡æ??ç?¸åº?ç??å?¬é?¥ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1613
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
@@ -10554,7 +10648,7 @@ msgid ""
 "the Internet."
 msgstr "è¿?å°?ä¿¡æ?ªå? å¯?ã??å?¨ Internet ä¸?ä¼ é??æ?¶æ??æ??äººé?½å?¯ä»¥ç??å?°å?¶å??å®¹ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1614
 msgid "Encrypted, weak"
 msgstr "å¼±å? å¯?"
 
@@ -10567,7 +10661,7 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä½?ä½¿ç?¨ç??æ?¯å¼±å? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±ä¸?"
 "å®?æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å¾?å?°é?¾ä½?å¹¶ä¸?æ?¯ä¸?å?¯è?½ã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1615
 msgid "Encrypted"
 msgstr "å? å¯?"
 
@@ -10577,7 +10671,7 @@ msgid ""
 "the content of this message."
 msgstr "è¿?å°?ä¿¡å·²å? å¯?ã??å¤?äººè¦?æ?³æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1616
 msgid "Encrypted, strong"
 msgstr "å¼ºå? å¯?"
 
@@ -10590,15 +10684,15 @@ msgstr ""
 "è¿?å°?ä¿¡å·²å? å¯?ï¼?ä¸?ä½¿ç?¨ç??æ?¯å¼ºå? å¯?ç®?æ³?ã??å¦?æ??å¤?äººæ?³è¦?æ?¥ç??è¿?å°?ä¿¡ç??å??å®¹ï¼?å?¯è?½è¦?è?±å¤§"
 "é??æ?¶é?´è¿?è¡?æ?´å??ç ´è§£ï¼?è¿?å??å??å?°é?¾ã??"
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:240 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æ?¥ç??è¯?ä¹¦(_V)"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:253
 msgid "This certificate is not viewable"
 msgstr "æ¤è¯?ä¹¦ä¸?å?¯æ?¥ç??"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:508
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10606,28 +10700,28 @@ msgstr ""
 "Evolution æ? æ³?æ¸²æ??æ¤ç?µå?é?®ä»¶ï¼?å??å? æ?¯è¯¥é?®ä»¶å¤ªå¤§ã??æ?¨å?¯ä»¥ä»¥æ? æ ¼å¼?æ?¹å¼?æ?¥ç??è¯¥é?®"
 "ä»¶ï¼?æ??è??ä½¿ç?¨å¤?é?¨æ??æ?¬ç¼?è¾?å?¨æ?¥ç??ã??"
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:751
 msgid "Completed on"
 msgstr "å®?æ??äº?"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:759
 msgid "Overdue:"
 msgstr "å»¶æ??ï¼?"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:763
 msgid "by"
 msgstr "å??å»ºè??ï¼?"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:980 ../mail/em-format-html-display.c:1027
 msgid "View _Unformatted"
 msgstr "æ? æ ¼å¼?æ?¥ç??(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:982
 msgid "Hide _Unformatted"
 msgstr "æ? æ ¼å¼?é??è??(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1047
 msgid "O_pen With"
 msgstr "æ??å¼?æ?¹å¼?(_P)"
 
@@ -10636,55 +10730,55 @@ msgstr "æ??å¼?æ?¹å¼?(_P)"
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d é¡µï¼?å?± %d é¡µ"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??ä¿¡æ?¯"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:362
 msgid "Formatting Message..."
 msgstr "æ£å?¨æ ¼å¼?å??ä¿¡æ?¯..."
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1447 ../mail/em-format-html.c:1457
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ?¶å??â??%sâ??"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1978
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1986
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?æ£ç¡®ç?? external-body é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2016
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "æ??å?? FTP ç«?ç?¹ (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2027
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "å?¨ç«?ç?¹â??%2$sâ??æ??å??æ?¬å?°æ??ä»¶ (%1$s) å??æ³?"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2029
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ??å??æ?¬å?°æ??ä»¶ (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2050
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "æ??å??è¿?ç¨?æ?°æ?® (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2061
 #, 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:2647
+#: ../mail/em-format-html.c:2761
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "æ¤ä¿¡æ?¯ç?± %s ä»£è¡¨ %s ç??èº«ä»½å??é??"
@@ -10695,55 +10789,106 @@ msgstr "æ¤ä¿¡æ?¯ç?± %s ä»£è¡¨ %s ç??èº«ä»½å??é??"
 msgid "No HTML stream available"
 msgstr "æ²¡æ??å?¯ç?¨ç?? HTML æµ?ã??"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "æ¤å?å?¨ä¸?æ?¯æ??è®¢é??ï¼?æ??è®¢é??æ?ªå?¯ç?¨ã??"
+#: ../mail/em-subscription-editor.c:1128
+msgid "Folder Subscriptions"
+msgstr "æ??ä»¶å¤¹è®¢é??"
+
+#: ../mail/em-subscription-editor.c:1167
+#| msgid "_Country:"
+msgid "_Account:"
+msgstr "è´¦æ?·(_A)ï¼?"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "å·²è®¢é??"
+#: ../mail/em-subscription-editor.c:1182
+#| msgid "Clear the search"
+msgid "Clear Search"
+msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "æ??ä»¶å¤¹"
+#: ../mail/em-subscription-editor.c:1200
+#| msgid "S_how only items containing:"
+msgid "Sho_w items that contain:"
+msgstr "æ?¾ç¤ºå??å?«ä»¥ä¸?å??å®¹ç??é¡¹ç?®(_W)ï¼?"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "è¯·é??æ?©æ??å?¡å?¨ã??"
+#: ../mail/em-subscription-editor.c:1239
+#| msgid "Unsubscribe from the selected folder"
+msgid "Subscribe to the selected folder"
+msgstr "è®¢é??é??å®?ç??æ??ä»¶å¤¹"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "æ²¡æ??é??ä¸æ??å?¡å?¨"
+#: ../mail/em-subscription-editor.c:1240
+#| msgid "Subscribed"
+msgid "Su_bscribe"
+msgstr "è®¢é??(_B)"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
-#, c-format
-msgid "Are you sure you want to open %d messages at once?"
+#: ../mail/em-subscription-editor.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
+msgid "Unsubscribe from the selected folder"
+msgstr "å??æ¶?å¯¹é??å®?æ??ä»¶å¤¹ç??è®¢é??"
+
+#: ../mail/em-subscription-editor.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
+msgid "_Unsubscribe"
+msgstr "é??è®¢(_U)"
+
+#: ../mail/em-subscription-editor.c:1263
+#| msgid "Collapse _all"
+msgid "Collapse all folders"
+msgstr "æ??å? æ??æ??æ??ä»¶å¤¹"
+
+#: ../mail/em-subscription-editor.c:1264
+#| msgid "Collapse _all"
+msgid "C_ollapse All"
+msgstr "å?¨é?¨æ??å? (_O)"
+
+#: ../mail/em-subscription-editor.c:1274
+#| msgid "E_xpand all"
+msgid "Expand all folders"
+msgstr "å±?å¼?æ??æ??æ??ä»¶å¤¹"
+
+#: ../mail/em-subscription-editor.c:1275
+#| msgid "E_xpand all"
+msgid "E_xpand All"
+msgstr "å?¨é?¨å±?å¼?(_X)"
+
+#: ../mail/em-subscription-editor.c:1285
+#| msgid "Refresh the folder"
+msgid "Refresh the folder list"
+msgstr "å?·æ?°æ??ä»¶å¤¹å??è¡¨"
+
+#: ../mail/em-subscription-editor.c:1297
+#| msgid "Cancel the current mail operation"
+msgid "Stop the current operation"
+msgstr "å??æ¢å½?å??æ??ä½?"
+
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:103
+#, c-format
+#| msgid "Are you sure you want to open %d messages at once?"
+#| msgid_plural "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "æ?¨ç¡®å®?è¦?ä¸?æ¬¡æ??å¼? %d å°?ä¿¡å??ï¼?"
 
-#: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:149
+#: ../modules/mailto-handler/evolution-mailto-handler.c:147
 msgid "_Do not show this message again"
 msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:315
 msgid "Message Filters"
 msgstr "é?®ä»¶è¿?æ»¤å?¨"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:871
 #, c-format
 msgid "Messages from %s"
 msgstr "æ?¥è?ª %s ç??ä¿¡æ?¯"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹(_F)"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:599
 msgid "Add Folder"
 msgstr "æ·»å? æ??ä»¶å¤¹"
 
@@ -10760,158 +10905,165 @@ msgid "\"Filter Editor\" window width"
 msgstr "â??è¿?æ»¤å?¨ç¼?è¾?å?¨â??çª?å?£å®½åº¦"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+#| msgid "\"Filter Editor\" window height"
+msgid "\"Folder Subscriptions\" window height"
+msgstr "â??æ??ä»¶å¤¹è®¢é??â??çª?å?£é«?åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+#| msgid "\"Filter Editor\" window maximize state"
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "â??æ??ä»¶å¤¹è®¢é??â??çª?å?£æ??å¤§å??ç?¶æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+#| msgid "\"Filter Editor\" window width"
+msgid "\"Folder Subscriptions\" window width"
+msgstr "â??æ??ä»¶å¤¹è®¢é??â??çª?å?£å®½åº¦"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "â??æ??ç´¢æ??ä»¶å¤¹ç¼?è¾?å?¨â??çª?å?£é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "â??æ??ç´¢æ??ä»¶å¤¹ç¼?è¾?å?¨â??çª?å?£æ??å¤§å??ç?¶æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "â??æ??ç´¢æ??ä»¶å¤¹ç¼?è¾?å?¨â??çª?å?£å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£æ??å¤§å??ç?¶æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "æ?»æ?¯è¯·æ±?é??è¯»æ?¶æ?¡"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå?¨è¯?å?«è¡¨æ??å?¾æ ?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Automatic link recognition"
 msgstr "è?ªå?¨è¯?å?«é?¾æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Check incoming mail being junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨çª?å?ºé¢?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨çª?å?ºé¢?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer Window default height"
 msgstr "ç¼?å??çª?å?£ç??é»?è®¤é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Composer Window default width"
 msgstr "ç¼?å??çª?å?£ç??é»?è®¤å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Composer load/attach directory"
 msgstr "ç¼?è¾?å?¨å? è½½/é??ä»¶ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å??ç¼© TO/CC/BCC ä¸å?°å??ç??æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "å°? TO/CC/BCC ç??æ?¾ç¤ºå?°å??æ?°å??ç¼©å?° address_count æ??æ??å®?ç??æ?°é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶ä¸?è¿?ç¨?é?®ä»¶æ??å?¡å?¨å??æ¥æ?¬å?°æ?´æ?¹ç??é¢?ç??ã??é?´é??å¿?é¡»è?³å°?ä¸º 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Custom headers to use while checking for junk."
 msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾ä¿¡æ?¯ç??ä¿¡å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "è?ªå®?ä¹?ç?¨ä»¥æ£?æ?¥å??å?¾ä¿¡æ?¯ç??ä¿¡å¤´ã??å??è¡¨å??ç´ ç??å?ç¬¦ä¸²æ ¼å¼?ä¸ºâ??ä¿¡å¤´å??=å?¼â??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to compose messages"
 msgstr "ç¼?å??ä¿¡æ?¯ç??é»?è®¤å?ç¬¦é??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to compose messages."
 msgstr "ç¼?å??ä¿¡æ?¯ç??é»?è®¤å?ç¬¦é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default charset in which to display messages"
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?è®¤å?ç¬¦é??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to display messages."
 msgstr "æ?¾ç¤ºä¿¡æ?¯ç??é»?è®¤å?ç¬¦é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default forward style"
 msgstr "é»?è®¤è½¬å??æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the Composer Window."
 msgstr "æ?°å??çª?å?£ç??é»?è®¤é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default height of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?è®¤é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "è®¢é??å¯¹è¯?æ¡?ç??é»?è®¤é«?åº¦ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default maximized state of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?è®¤æ??å¤§å??ç?¶æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default reply style"
 msgstr "é»?è®¤å??å¤?æ ·å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default value for thread expand state"
 msgstr "è¯?é¢?ç??é»?è®¤å±?å¼?ç?¶æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the Composer Window."
 msgstr "æ?°å??çª?å?£ç??é»?è®¤å®½åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the mail browser window."
 msgstr "é?®ä»¶æµ?è§?å?¨çª?å?£ç??é»?è®¤å®½åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "è®¢é??å¯¹è¯?æ¡?ç??é»?è®¤å®½åº¦ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "å?³å®?æ?¯å?¦ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥æ?¾å?°å??è¿?è¡?å??å?¾ä¿¡æ?¯è¿?æ»¤"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "å?³å®?æ?¯å?¦å?¨å?°å??ç°¿ä¸æ?¥æ?¾å??ä»¶äººç?µå?é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10922,11 +11074,11 @@ msgstr ""
 "ä¸ºè?ªå?¨è¡¥å?¨ç??å?°å??ç°¿ä¸æ?¥æ?¾ï¼?å¦?æ??è¿?ç¨?å?°å??ç°¿(å¦? LDAP)è¢«æ ?è®°ä¸ºè?ªå?¨è¡¥å?¨ç??è¯?ï¼?å?¯è?½ä¼?"
 "æ¯?è¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?ä¿¡å¤´æ£?æµ?å??å?¾ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10935,53 +11087,53 @@ msgstr ""
 "å?³å®?æ?¯å?¦ä½¿ç?¨è?ªå®?ä¹?ä¿¡å¤´æ£?æµ?å??å?¾ä¿¡æ?¯ã??å¦?æ??æ¤é??é¡¹è¢«å?¯ç?¨ä¸?ä¿¡å¤´è¢«è®¾ç½®ç??è¯?ï¼?å°?æ??é«?"
 "å??å?¾ä¿¡æ?¯æ£?æµ?é??åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "å?³å®?æ?¯å?¦å?¨ç«?ç?´è§?å?¾ä¸å¯¹â??ä¿¡æ?¯â??å??ç??â??å??ä»¶äººâ??å??â??ä¸»é¢?â??è¡?ä½¿ç?¨ç?¸å??ç??å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "é?®ä»¶å??ä½?å?¨ç?¨æ?¥å? è½½/é??å? æ??ä»¶ç??ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "ä¿?å?é?®ä»¶ç»?ä»¶æ??ä»¶ç??ç?®å½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??ä»¶å¤¹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Display only message texts not exceeding certain size"
 msgstr "ä»?æ?¾ç¤ºä¸?è¶?è¿?æ??ä¸?å¤§å°?ç??æ??æ?¬ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Do not add signature delimiter"
 msgstr "ä¸?æ·»å? ç¾å??å??é??ç¬¦"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Draw spelling error indicators on words as you type."
 msgstr "å?¨æ?¨æ??å?ç??æ?¶å??å°±æ?¾ç¤ºæ?¼å??é??è¯¯æ ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Junk folders on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯æ??ä»¶å¤¹"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty Trash folders on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºåº?ä»¶ç®±"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é??å?º Evolution æ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "é??å?º Evolution æ?¶æ¸?ç©ºåº?ä»¶ç®±ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10989,65 +11141,65 @@ msgstr ""
 "å?¨ HTML é?®ä»¶ä¸å?¯ç?¨å?¨ç?»å?¾å??ã??å¾?å¤?ç?¨æ?·æ??è§?å?¨ç?»å?¾å??å¾?ç?¦äººå¹¶ä¸?å??æ¬¢ç??é??æ??å?¾å??è??ä¸?"
 "æ?¯å?¨æ??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å?¯ç?¨å??æ ?æ¨¡å¼?ï¼?è¿?æ ·æ?¨å?¨è¯»å??é?®ä»¶æ?¶å°±è?½ç??å?°å??æ ?äº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Enable or disable magic space bar"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨é?æ?¯ç©ºæ ¼é?®"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?å°?é?®ä»¶æ ?è®°æ?¶ç??æ??ç¤ºã??"
+msgstr "ç¦?ç?¨/å?¯ç?¨å¯¹å¤?æ?¡ä¿¡æ?¯æ ?è®°æ?¶ç??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable or disable type ahead search feature"
 msgstr "å?¯ç?¨æ??ç¦?ç?¨è?ªå?¨å??è¿?å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders"
 msgstr "å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable search folders on startup."
 msgstr "å?¯å?¨æ?¶å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "å?¯ç?¨ä¾§è¾¹æ ?æ??ç´¢å??è?½æ?¥å®?ç?°æ??ä»¶å¤¹å??ç§°ç??äº?å?¨æ??ç´¢"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å?¯ç?¨ä»¥å?¨ä¿¡æ?¯é¢?è§?ã??ä¿¡æ?¯å??è¡¨å??æ??ä»¶å¤¹ä¸ä½¿ç?¨ç©ºæ ¼é?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr "å?¯ç?¨ä»?æ?¾ç¤ºä¸?è¶?è¿?â??message_text_part_limitâ??é?®å?¼ä¸å®?ä¹?ç??å¤§å°?ç??é?®ä»¶æ??æ?¬ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "å?¯ç?¨ä»¥å?¨æ??æ??æ??ä»¶å¤¹ä¸ä½¿ç?¨ç?¸ä¼¼ç??ä¿¡æ?¯å??è¡¨è§?å?¾è®¾ç½®"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å?¯ç?¨ä»¥å?¨æ??æ??æ??ä»¶å¤¹ä¸ä½¿ç?¨ç?¸ä¼¼ç??ä¿¡æ?¯å??è¡¨è§?å?¾è®¾ç½®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Enable/disable caret mode"
 msgstr "å?¯ç?¨/ç¦?ç?¨å??æ ?æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:69 ../mail/mail-config.ui.h:42
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "ä½¿ç?¨ Outlook/Gmail ç??æ?¹å¼?ç¼?ç ?æ??ä»¶å??"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11058,33 +11210,33 @@ msgstr ""
 "å??é??ç??é?®ä»¶å¸¦æ??ç?? UTF-8 ç??æ??ä»¶å??ç§°ï¼?å? ä¸ºå®?ä»¬ä¸?ç¬¦å?? RFC 2231ï¼?è??æ?¯ä½¿ç?¨äº?ä¸?æ£ç¡®"
 "ç?? RFC 2047 æ ?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Flush Outbox after filtering"
 msgstr "å?¨è¿?æ»¤ä¹?å??æ¸?ç©ºè¾?å?ºçª?å?£"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Group Reply replies to list"
 msgstr "â??ç»?å??å¤?â??æ?¯å??å¤?å?°é?®ä»¶å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane"
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Height of the message-list pane."
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é??è??å??æ??ä»¶å¤¹é¢?è§?å¹¶ç§»é?¤é??æ?©"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??ç?¨æ?·è¯?å?¾ä¸?æ¬¡æ??å¼?ç??ä¿¡æ?¯å¤§äº?ç?äº?å??å°?ï¼?å°?ä¼?è¯¢é?®ç?¨æ?·æ?¯å?¦ç??ç??è¦?è¿?ä¹?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11094,29 +11246,38 @@ msgstr ""
 "MIME ç±»å??å?¨ GNOME ç?? MIME ç±»å??æ?°æ?®åº?ä¸æ? å°?ç?? Bonobo ç»?ä»¶æ?¥ç??å?¨å°?è¢«ç?¨æ?¥æ?¾ç¤ºå?¶"
 "å??å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Ignore list Reply-To:"
 msgstr "å¿½ç?¥é?®ä»¶å??è¡¨â??å??å¤?è?³â??å??ï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr "â??è¿?æ»¤ç¼?è¾?å?¨â??çª?å?£ç??å??å§?é«?åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
+#| msgid ""
+#| "Initial height of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window vertically."
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "â??æ??ä»¶å¤¹è®¢é??â??çª?å?£ç??å??å§?é«?åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "â??æ??ç´¢æ??ä»¶å¤¹â??çª?å?£ç??å??å§?é«?åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£ç??å??å§?é«?åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£ç«?ç?´å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11127,7 +11288,23 @@ msgstr ""
 "å?¼ï¼?è¿?ä¸ªå?¼æ?¯ä¸?ä¼?è¢« Evolution ä½¿ç?¨ç??ï¼?å? ä¸ºâ??è¿?æ»¤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??å¤§å??ã??è¿?ä¸ªå?¼"
 "å?ªæ?¯ä½?ä¸ºå®?ç?°ç»?è??è??å?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:84
+#| msgid ""
+#| "Initial maximize state of the \"Filter Editor\" window. The value updates "
+#| "when the user maximizes or unmaximizes the window. Note, this particular "
+#| "value is not used by Evolution since the \"Filter Editor\" window cannot "
+#| "be maximized. This key exists only as an implementation detail."
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"â??æ??ä»¶å¤¹è®¢é??â??çª?å?£ç??æ??å¤§å??å??å§?ç?¶æ??ã??å½?ç?¨æ?·æ??å¤§å??æ??å??æ¶?æ??å¤§å??çª?å?£æ?¶ä¼?æ?´æ?°è¯¥"
+"å?¼ï¼?è¿?ä¸ªå?¼æ?¯ä¸?ä¼?è¢« Evolution ä½¿ç?¨ç??ï¼?å? ä¸ºâ??è¿?æ»¤å?¨ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??å¤§å??ã??è¿?ä¸ªå?¼"
+"å?ªæ?¯ä½?ä¸ºå®?ç?°ç»?è??è??å?å?¨ç??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11138,7 +11315,7 @@ msgstr ""
 "è¯¥å?¼ï¼?è¿?ä¸ªå?¼æ?¯ä¸?ä¼?è¢« Evolution ä½¿ç?¨ç??ï¼?å? ä¸ºâ??æ??ç´¢æ??ä»¶å¤¹ç¼?è¾?å?¨â??çª?å?£æ? æ³?æ??å¤§å??ã??"
 "è¿?ä¸ªå?¼å?ªæ?¯ä½?ä¸ºå®?ç?°ç»?è??è??å?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11150,25 +11327,34 @@ msgstr ""
 "å?¼ï¼?è¿?ä¸ªå?¼æ?¯ä¸?ä¼?è¢« Evolution ä½¿ç?¨ç??ï¼?å? ä¸ºâ??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£æ? æ³?æ??å¤§å??ã??è¿?ä¸ª"
 "å?¼å?ªæ?¯ä½?ä¸ºå®?ç?°ç»?è??è??å?å?¨ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr "â??è¿?æ»¤ç¼?è¾?å?¨â??çª?å?£ç??å??å§?å®½åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:88
+#| msgid ""
+#| "Initial width of the \"Filter Editor\" window. The value updates as the "
+#| "user resizes the window horizontally."
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "â??æ??ä»¶å¤¹è®¢é??â??çª?å?£ç??å??å§?å®½åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "â??æ??ç´¢æ??ä»¶å¤¹â??çª?å?£ç??å??å§?å®½åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "â??å??é??å??æ?¥æ?¶é?®ä»¶â??çª?å?£ç??å??å§?å®½åº¦ã??è¿?ä¸ªå?¼ä¼?å?¨ç?¨æ?·è°?æ?´çª?å?£æ°´å¹³å¤§å°?æ?¶æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11176,9 +11362,9 @@ msgid ""
 "replying."
 msgstr ""
 "ä¸?æ?®é??ç??â??å??å¤?å?¨é?¨â??è¡?ä¸ºä¸?å??ï¼?è¿?ä¸ªé??é¡¹ä½¿â??ç»?å??å¤?â??å·¥å?·æ??é?®é??è¿?æ?¨æ£å?¨å??å¤?ç??å??æ?¶å?°"
-"ç??é?®ä»¶ç??å?ªå??å¤?ç»?é?®ä»¶å??è¡¨ã??"
+"ç??ä¿¡æ?¯å?ªå??å¤?ç»?é?®ä»¶å??è¡¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11186,56 +11372,56 @@ msgid ""
 msgstr ""
 "ç¦?ç?¨/å?¯ç?¨æ°¸ä¹?å? é?¤(è??é??ç®?å??å?°ä»?ç»?æ??ä¸ç§»é?¤)æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯æ?¶ä¸?æ?å¼¹å?ºç??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
-msgstr "ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?æ¶?æ?¯ç??ç§?äººå??å¤?å??é??è?³é?®ä»¶å??è¡¨æ?¶å??å?ºè¦å??ã??"
+msgstr "ç¦?ç?¨/å?¯ç?¨ä»¥å?¨æ?¨å°?ä¿¡æ?¯ç??ç§?äººå??å¤?å??é??è?³é?®ä»¶å??è¡¨æ?¶å??å?ºè¦å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨å½?æ?¨å??é??å??å¤?ç»?è®¸å¤?äººç??æ?¶å??ç??å??å¤?ç??è¦å??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
-"å½?æ?¨æ£è¦?å??é??ä¸?ä¸ªé??è¿?é?®ä»¶å??è¡¨æ?¶å?°ç??é?®ä»¶ç??ç§?äººå??å¤?ï¼?è??é?®ä»¶å¤´ç?? Reply-To: é??å®?å??"
+"å½?æ?¨æ£è¦?å??é??ä¸?ä¸ªé??è¿?é?®ä»¶å??è¡¨æ?¶å?°ç??ä¿¡æ?¯ç??ç§?äººå??å¤?ï¼?è??é?®ä»¶å¤´ç?? Reply-To: é??å®?å??"
 "å?°äº?å??è¡¨æ?¶ï¼?ç¦?ç?¨æ??å?¯ç?¨å??å¤?ç??è¦å??æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Last time Empty Junk was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Last time Empty Trash was run"
 msgstr "ä¸?æ¬¡æ¸?ç©ºåº?ä»¶ç®±ç??æ?¶é?´ä¸ºï¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Layout style"
 msgstr "å¸?å±?æ ·å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "List of Labels and their associated colors"
 msgstr "æ ?ç¾å??å?¶å¯¹åº?é¢?è?²ç??å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "å??å?ºè¦?ä½¿ç?¨ bonobo ç»?ä»¶æ?¥ç??å?¨æ?¥ç??ç?? MIME ç±»å??"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of accepted licenses"
 msgstr "å??å?ºæ?¥å??ç??è®¸å?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "List of accounts"
 msgstr "å¸?å?·å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11243,15 +11429,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??å¸?å?·ã??æ¤å??è¡¨å??å?«äº?ç?¸å¯¹äº? /apps/evolution/mail/"
 "accounts ç??å?ç?®å½?å?½å??å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªå®?ä¹?å¤´å??è¯¥å¤´æ?¯å?¦å?¯ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of dictionary language codes used for spell checking."
 msgstr "å??å?ºç?¨æ?¥æ?¼å??æ£?æ?¥ç??å?å?¸è¯è¨?ç¼?ç ?"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -11259,15 +11445,15 @@ msgstr ""
 "å??å?ºäº? Evolution é?®ä»¶ç»?ä»¶å·²ç?¥ç??æ ?ç¾ã??å??è¡¨ä¸ç??å?ç¬¦ä¸²æ ¼å¼?å½¢å¦?â??å??ç§°:é¢?è?²â??ï¼?å?¶ä¸"
 "é¢?è?²ä½¿ç?¨äº? HTML å??å?è¿?å?¶ç¼?ç ?æ?¹å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of protocol names whose license has been accepted."
 msgstr "å??å?ºæ?¥å??å??è®®ç??å??è®®å??ç§°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Load images for HTML messages over HTTP"
 msgstr "å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP å?¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -11276,244 +11462,255 @@ msgstr ""
 "å?¨ HTML ä¿¡æ?¯ä¸è½½å?¥ HTTP(S) å?¾å??ã??å?¯ä¾?é??æ?©ç??å?¼æ??ï¼?0 - ç»?ä¸?ä»?ç½?ä¸?è½½å?¥å?¾å??ï¼?1 - "
 "å¦?æ??å??é??è??å?¨å?°å??ç°¿ä¸å??è½½å?¥å?¾å??ï¼?2 - æ?»æ?¯ä»?ç½?ä¸?è½½å?¥å?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Log filter actions to the specified log file."
 msgstr "å°?è¿?æ»¤å?¨ä½?è®°å½?å?°æ??å®?æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Logfile to log filter actions"
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Logfile to log filter actions."
 msgstr "è®°å½?è¿?æ»¤å?¨ä½?ç??æ?¥å¿?æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mail browser height"
 msgstr "é?®ä»¶æµ?è§?å?¨é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mail browser maximized"
 msgstr "é?®ä»¶æµ?è§?å?¨æ??å¤§å??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mail browser width"
 msgstr "é?®ä»¶æµ?è§?å?¨å®½åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?ä¸ºå·²ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?è¶?æ?¶è¿?å??æ ?ä¸ºå·²ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨ä¿¡æ?¯â??é¢?è§?â??ä¸æ ?å?ºå¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Message text limit for display"
 msgstr "ä¿¡æ?¯æ??æ?¬æ?¾ç¤ºé??å?¶"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "ä¿¡æ?¯æ?¾ç¤ºé£?æ ¼(â??normalâ??æ?®é??ã??â??full headersâ??å?¨é?¨é?®ä»¶å¤´ã??â??sourceâ??æº?ä»£ç ?)"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Minimum days between emptying the junk on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Minimum days between emptying the trash on exit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºåº?ä»¶ç®±ç??æ??å°?å¤©æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ??å°?æ?¶é?´ï¼?ä»¥å¤©è®¡ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "é??å?ºæ?¶æ¸?ç©ºåº?ä»¶ç®±ç??æ??å°?å¤©æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "è¦?å?¨ TO/CC/BCC ä¸æ?¾ç¤ºç??å?°å??æ?°"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr "å?¯è?½ç??å??å?¼æ??ï¼?never - ä¸?å?³é?æµ?è§?å?¨çª?å?£ always - é?®é¢?å?³é?æµ?è§?å?¨çª?å?£"
+" ask - (æ??ä»»ä½?å?¶ä»?å?¼)å°?è¯¢é?®ç?¨æ?·"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Prompt on empty subject"
 msgstr "ç©ºä¸»é¢?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¨æ?·è§?å?¾é??æ¯?æ??ä»¶å¤¹æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "ç?¨æ?·è§?å?¾å??é??æ²¡æ??ä¸»é¢?ç??é?®ä»¶æ?¶æ??ç¤ºã??"
+msgstr "ç?¨æ?·è§?å?¾å??é??æ²¡æ??ä¸»é¢?ç??ä¿¡æ?¯æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when deleting messages in search folder"
 msgstr "å? é?¤æ??ç´¢æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "å½?é?®ä»¶å??è¡¨å?«æ??ç§?äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Prompt when replying or forwarding from a mail browser whether close it"
+msgstr "å?¨ä»?é?®ä»¶æµ?è§?å?¨ä¸å??å¤?æ??è½¬å??æ?¶ï¼?æ??ç¤ºæ?¯å?¦å?³é?å®?"
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when replying privately to list messages"
 msgstr "å½?å¯¹é?®ä»¶å??è¡¨ä½?ç§?äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when replying to many recipients"
 msgstr "å½?å??å¤?ä¸ªæ?¶ä»¶äººå??å¤?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt when user expunges"
 msgstr "ç?¨æ?·é??æ¯?æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¨æ?·å?ªå¡«å?¥å¯?ä»¶æ??é??æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "å½?ç?¨æ?·è¯?å?¾ä¸?æ¬¡æ??å¼?è¶?è¿?å??å°?ä¿¡æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "å½?ç?¨æ?·è¯?å?¾ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??ç³»äººå??é?? HTML é?®ä»¶æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "å½?ç?¨æ?·è¯?å?¾å??é??æ²¡æ??æ?¶ä»¶äººæ??æ??é??ç??é?®ä»¶æ?¶æ??ç¤ºã??"
+msgstr "å½?ç?¨æ?·è¯?å?¾å??é??æ²¡æ??æ?¶ä»¶äººæ??æ??é??ç??ä¿¡æ?¯æ?¶æ??ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "å½?ç?¨æ?·æ?¯å?¦å??é??æ??å¤?ç?? HTML æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt while marking multiple messages"
 msgstr "æ ?è®°å¤?å°?ä¿¡æ?¯æ?¶æ??ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Put personalized signatures at the top of replies"
 msgstr "å?¨å??å¤?ç??é¡¶é?¨æ·»å? ä¸ªæ?§ç¾å??"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Put the cursor at the bottom of replies"
 msgstr "å°?å??æ ?ç½®äº?å??å¤?åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??è¡¨æ??ï¼?å¹¶å°?å?¶æ?¿æ?¢ä¸ºå?¾å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Recognize links in text and replace them."
 msgstr "è¯?å?«æ??æ?¬ä¸ç??é?¾æ?¥å¹¶è¿?è¡?æ?¿æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Run junk test on incoming mail."
 msgstr "å¯¹æ?¶å?°ç??é?®ä»¶è¿?è¡?å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Save directory"
 msgstr "ä¿?å?ç?®å½?"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°å?°å??è??ä¸æ??ç´¢å??ä»¶äººç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Send HTML mail by default"
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Send HTML mail by default."
 msgstr "é»?è®¤ä»¥ HTML å??é??é?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Sender email-address column in the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤º email å?°å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Server synchronization interval"
 msgstr "æ??å?¡å?¨å??æ¥é?´é??"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr "å¦?æ??æ?¨ä¸?æ?³å?¨æ?¨å??é?®ä»¶æ?¶ç¾å??ä»¥å??æ·»å? ç¾å??å??é??ç¬¦ï¼?é?£ä¹?è®¾ç½®ä¸ºç??"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?ä»¶æ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??ä»¶äººå??"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å??é??é?®ä»¶æ?¶æ?¾ç¤ºâ??Reply Toâ??(å??å¤?è?³)å??"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show Animations"
 msgstr "æ?¾ç¤ºå?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show all message headers"
-msgstr "æ?¾ç¤ºå?¨é?¨ä¿¡æ?¯å¤´"
+msgstr "æ?¾ç¤ºå?¨é?¨ä¿¡å¤´"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show all the headers when viewing a messages."
-msgstr "æ?¥ç??ä¿¡æ?¯æ?¶æ?¾ç¤ºå?¨é?¨ä¿¡æ?¯å¤´ã??"
+msgstr "æ?¥ç??ä¿¡æ?¯æ?¶æ?¾ç¤ºå?¨é?¨ä¿¡å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show animated images as animations."
 msgstr "å°?å?¨ç?»å?¾å??æ?¾ç¤ºä¸ºå?¨ç?»ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(å¸¦æ??å? é?¤çº¿)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show image animations"
 msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show original \"Date\" header value."
 msgstr "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´æ?¥æ??å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show photo of the sender"
 msgstr "æ?¾ç¤ºå??ä»¶äººç?§ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11521,7 +11718,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºå¯?ä»¶æ??é??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶æ¤"
 "å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11529,7 +11726,7 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºæ??é??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶æ¤å??"
 "è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11537,7 +11734,7 @@ msgstr ""
 "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºå??ä»¶äººå??ã??å?¨é??å®?äº?ä¸?ä¸ªæ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§"
 "å?¶æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11545,7 +11742,7 @@ msgstr ""
 "å?¨å??é??å??å®¹å?°æ?°é?»ç»?æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?ä¸ªæ?°é?»ç»?å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??"
 "ä¸æ?§å?¶æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11553,13 +11750,13 @@ msgstr ""
 "å?¨å??é??é?®ä»¶ä¿¡æ?¯æ?¶æ?¾ç¤ºâ??Reply Toâ??å??ã??å?¨é??å®?äº?ä¸?ä¸ªé?®ä»¶å¸?å?·æ?¶å?¯ä»¥å?¨æ?¥ç??è??å??ä¸æ?§å?¶"
 "æ¤å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ç??ä»¥å?¦å¤?ç??å??æ?¾ç¤ºç?µå?é?®ä»¶ç??å??é??è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11568,11 +11765,11 @@ msgstr ""
 "æ?¾ç¤ºå??å§?ç??é?®ä»¶å¤´â??Dateâ?? å?¼(å¦?æ??æ?¶å?ºä¸?å??é??ä¸?æ?¬å?°æ?¶é?´)ã??å?¦å??æ?»æ?¯æ??ç?§ç?¨æ?·å??å¥½ç??æ ¼"
 "å¼?å??æ?¬å?°æ?¶å?ºæ?¾ç¤ºé?®ä»¶å¤´â??Dateâ?? å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨ä¿¡æ?¯é??è¯»é?¢æ?¿ä¸æ?¾ç¤ºå??ä»¶äººç?§ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11588,45 +11785,37 @@ msgstr ""
 "ä½?ï¼?å®?ä¼?è¿?è¡?ç§?äººç??å??å¤?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨â??å??å¤?å?°å??è¡¨â??è¡?ä¸ºï¼?å®?å°±ä¼?å??å¤?å?°å??è¡¨ã??å¦?æ??"
 "å?å?¨ç??è¯?ï¼?å®?ä¼?æ¯?è¾? Reply-To: å?? List-Post: æ?¥å®?æ??è¯¥ç?®ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Spell check inline"
 msgstr "å??åµ?æ?¼å??æ£?æ?¥"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Spell checking color"
 msgstr "æ?¼å??æ£?æ?¥é¢?è?²"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥è¯è¨?"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤é«?åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤å®½åº¦"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Terminal font"
 msgstr "ç»?ç«¯å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The default plugin for Junk hook"
 msgstr "é»?è®¤ç??å??å?¾ä¿¡æ?¯é?©å?æ??ä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡æ¸?ç©ºå??å?¾ä¿¡æ?¯ç??æ?¶é?´ï¼?ä»¥è?ªæ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡æ¸?ç©ºåº?ä»¶ç®±ç??æ?¶é?´ï¼?ä»¥æ?°çºªå??å??ç??å¤©æ?°æ?¾ç¤ºã??"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11636,21 +11825,21 @@ msgstr ""
 "å¸?å±?æ ·å¼?å?³å®?äº?å?¨å?ªé??æ?¾ç½®ä¿¡æ?¯å??è¡¨ç??é¢?è§?é?¢æ?¿ã??â??0â??(ç»?å?¸è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨æ¶?"
 "æ?¯å??è¡¨ä¸?é?¢ã??â??1â??(ç«?ç?´è§?å?¾)ä¼?æ??é¢?è§?é?¢æ?¿æ?¾ç½®å?¨ä¿¡æ?¯å??è¡¨æ??è¾¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "The terminal font for mail display."
 msgstr "é?®ä»¶æ?¾ç¤ºç?¨ç??ç»?ç«¯å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "The variable width font for mail display."
 msgstr "ç?¨äº?æ?¾ç¤ºé?®ä»¶ç??å??å®½å?ä½?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "æ¤é??é¡¹æ??ä¸?ç§?å?¯è?½å?¼ï¼?0ï¼?é??è¯¯ï¼?1ï¼?è¦å??ï¼?2ï¼?è°?è¯?ä¿¡æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11659,7 +11848,7 @@ msgstr ""
 "æ¤é??é¡¹å?³å®?äº? Evolution ä¸æ?¾ç¤ºç??æ??å¤§æ??æ?¬é?¨å??å¤§å°?ï¼?é»?è®¤ä¸º 4096KB (4MB)ã??æ¤å?¼ä»?"
 "å?¨ force_message_limit é?®æ¿?æ´»æ?¶æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11668,7 +11857,7 @@ msgstr ""
 "è¿?æ?¯é»?è®¤ç??å??å?¾ä¿¡æ?¯æ??ä»¶ï¼?å?³ä½¿å?¯ç?¨äº?å¤?ä¸ªæ??ä»¶ã??å¦?æ??é»?è®¤å??å?ºç??æ??ä»¶è¢«ç¦?ç?¨ï¼?å®?ä¸?ä¼?"
 "ç¼ºç??å?°å?¶å®?å?¯ç?¨ç??æ??ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11676,7 +11865,7 @@ msgstr ""
 "æ¤é?®å?ªè¢«è¯»å??ä¸?æ¬¡å¹¶å?¨è¯»å??å??è¢«é??è®¾ä¸º falseã??å®?å??æ¶?é??ä¸å??è¡¨ä¸ç??é?®ä»¶å¹¶ç§»é?¤ç?¸åº?æ??"
 "ä»¶å¤¹ç??é¢?è§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11686,7 +11875,7 @@ msgstr ""
 "æ¤é?®åº?å??å?«æ??å®?è?ªå®?ä¹?é?®ä»¶å¤´ç?? XML ç»?æ??å??è¡¨ï¼?ä»¥å??æ?¯å?¦æ?¾ç¤ºè¿?äº?é?®ä»¶å¤´ã??XML ç»?æ??ç??"
 "æ ¼å¼?ä¸ºï¼?&lt;å?¯ç?¨ç??é?®ä»¶å¤´&gt; - è®¾ä¸º enabled å??å?¨é?®ä»¶è§?å?¾ä¸æ?¾ç¤ºè¯¥é?®ä»¶å¤´ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11695,23 +11884,23 @@ msgstr ""
 "æ¤é??é¡¹ä¸? lookup_addressbook é?®å?¼ç?¸å?³ï¼?ç?¨äº?å?³å®?æ?¯å?¦æ?¥è¯¢æ?¬å?°å?°å??ç°¿ä»¥é?¿å??æ?¨è®¤è¯?"
 "ç??äººç»?æ?¨å??é?®ä»¶è??è¢«å??å?¾é?®ä»¶è¿?æ»¤å?¨ç»?è¿?æ»¤æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "This option would help in improving the speed of fetching."
 msgstr "æ¤é??é¡¹è?½å¸®å?©æ??é«?è?·å??ä¿¡æ?¯ç??é??åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "è®¾å®?é»?è®¤ä¿¡æ?¯è§?å?¾ä¸è¦?æ?¾ç¤ºç??å?°å??æ?°ï¼?è¶?è¿?ç??é?¨å??æ?¾ç¤ºä¸ºâ??...â??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "æ¤è®¾ç½®æ??å®?äº?é»?è®¤æ??å?µä¸?çº¿ç´¢æ?¯è¢«å±?å¼?è¿?æ?¯è¢«æ??å? ã??é??è¦?é??å?¯ Evolutionã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11720,93 +11909,91 @@ msgstr ""
 "æ¤è®¾ç½®æ??å®?äº?é»?è®¤æ??å?µä¸?æ?¯å?¦å°?çº¿ç´¢æ??çº¿ç´¢ä¸ç??æ??æ?°ä¿¡æ?¯è??ä¸?æ?¯ä¿¡æ?¯æ?¥æ??æ??åº?ã??é??è¦?é??"
 "å?¯ Evolutionã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Thread the message-list based on Subject"
 msgstr "å?ºäº?ä¸»é¢?æ??çº¿ç´¢ç¼?æ??ä¿¡æ?¯å??è¡¨"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Timeout for marking message as seen"
 msgstr "å°?ä¿¡æ?¯æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Timeout for marking message as seen."
 msgstr "å°?ä¿¡æ?¯æ ?ä¸ºå·²ç??ç??è¶?æ?¶æ?¶é?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "UID string of the default account."
 msgstr "é»?è®¤å¸?å?·ç?? UID å?ç¬¦ä¸²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "å½?ä½¿ç?¨è¡?å??æ?¼å??æ£?æ?¥æ?¶ï¼?é??è¯¯æ?¼å??å??è¯?ç??ä¸?å??çº¿ç??é¢?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use SpamAssassin daemon and client"
 msgstr "ä½¿ç?¨å??å?¾å??æ??å®?æ?¤ç¨?åº?å??å®¢æ?·"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "ä½¿ç?¨ SpamAssassin å®?æ?¤ç¨?åº?å??å®¢æ?·ç«¯(spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Use custom fonts"
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Use custom fonts for displaying mail."
 msgstr "ä½¿ç?¨è?ªå®?ä¹?å?ä½?æ?¾ç¤ºé?®ä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ä¹?ä½¿ç?¨æ?¬å?°å??å?¾ä¿¡æ?¯æµ?è¯?(æ?  DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:211
 #, fuzzy
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
-msgstr ""
-"å½?å??å¤?é?®ä»¶ç??æ?¶å??ï¼?ç?¨æ?·å°?å?¨å??æ ?æ??å¤?ç??ä½?ç½®å¾?å?°æ??æ??ç??è£?å¤?ã??è¿?å?³å®?äº?å??æ ?æ?¯æ?¾å?¨é?®"
-"ä»¶ç??é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
+msgstr "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶å??æ ?ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?ä¸ªé??é¡¹å?³å®?äº?å??å¤?æ?¶å??æ ?"
+"ä½?äº?é?®ç®±é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:212
 #, fuzzy
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
-msgstr ""
-"å½?å??å¤?é?®ä»¶ç??æ?¶å??ï¼?ç?¨æ?·å°?å?¨ç¾å??æ??å¤?ç??ä½?ç½®å¾?å?°æ??æ??ç??è£?å¤?ã??è¿?å?³å®?äº?ç¾å??æ?¯æ?¾å?¨é?®"
-"ä»¶ç??é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
+msgstr "ç?¨æ?·å¸¸ä¸ºå??å¤?ä¿¡æ?¯æ?¶ç¾å??ä½?ç½®ä¸?å®?è??æ?¼ç?«ã??è¿?ä¸ªé??é¡¹å?³å®?äº?å??å¤?æ?¶ç¾å??"
+"ä½?äº?é?®ç®±é¡¶é?¨è¿?æ?¯åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Variable width font"
 msgstr "å??å®½å?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é»?è®¤å¯¹æ??æ??ä¿¡æ?¯æ·»å? é??è¯»æ?¶æ?¡è¯·æ±?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ç¦?ç?¨æ??å?¯ç?¨ä¾§è¾¹æ ?ä¸æ??ä»¶å¤¹å??ç??ç??ç?¥æ?¾ç¤º"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "æ?¯å?¦å?¨ä¿¡æ?¯ä¸?å??å?« In-Reply-To æ?? References å¤´æ?¶å¼ºå?¶æ??ä¸»é¢?ç¼?æ??çº¿ç´¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä»¥çº¿ç´¢ä¸ç??æ??æ?°ä¿¡æ?¯æ?¥æ??åº?çº¿ç´¢"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11815,102 +12002,100 @@ msgstr ""
 "å?¨è¿?æ»¤ç»?æ??å??æ?¯å?¦å?·æ?°å??ä»¶ç®±ã??ä»?å?¨ä½¿ç?¨è¿?ä»»ä½?â??è½¬å??ç»?â??è¿?æ»¤å?¨è¡?ä¸ºå¹¶ä¸?å?¨ä¸?æ¬¡è°?ç?¨å¤§"
 "çº¦ä¸?å??é??å??è¿?è¡?å??ä»¶ç®±å?·æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Width of the message-list pane"
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Width of the message-list pane."
 msgstr "ä¿¡æ?¯å??è¡¨é?¢æ?¿ç??é«?åº¦ã??"
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 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:964
+#: ../mail/importers/elm-importer.c:337 ../mail/importers/pine-importer.c:413
+#: ../modules/mail/e-mail-shell-view.c:1030
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "é?®ä»¶"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:378
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm å¯¼å?¥å?¨"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:379
 msgid "Import mail from Elm."
 msgstr "ä»? Elm å¯¼å?¥é?®ä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "ç?®ç??æ??ä»¶å¤¹(_D)ï¼?"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "Select folder"
 msgstr "é??æ?©æ??ä»¶å¤¹"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:317
 msgid "Select folder to import into"
 msgstr "é??æ?©è¦?å¯¼å?¥å?°å?ªä¸ªæ??ä»¶å¤¹"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ä¸»é¢?"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "æ?¥è?ª"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley é?®ç®±(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å¯¼å?¥ Berkeley é?®ç®±æ ¼å¼?æ??ä»¶å¤¹"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "å¯¼å?¥é?®ç®±"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../mail/importers/mail-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:565
+#: ../plugins/pst-import/pst-importer.c:474
+#: ../plugins/pst-import/pst-importer.c:583
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ£å?¨å¯¼å?¥â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:304
 #, c-format
 msgid "Scanning %s"
 msgstr "æ£å?¨æ?«æ?? %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "å¯¼å?¥ Pine æ?°æ?®"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:418
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Address Book"
 msgstr "å?°å??ç°¿"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:460
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine å¯¼å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:461
 msgid "Import mail from Pine."
 msgstr "ä»? Pine å¯¼å?¥é?®ä»¶ã??"
 
@@ -11934,512 +12119,473 @@ msgstr "ä¸»é¢?æ?¯ %s"
 msgid "%s mailing list"
 msgstr "%s é?®ä»¶å??è¡¨"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "æ·»å? è¿?æ»¤è§?å??"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
-#, c-format
-msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+#. Translators: The first %s is name of the affected
+#. * filter rule(s), the second %s is URI of the removed
+#. * folder. For more than one filter rule is each of
+#. * them on a separate line, with four spaces in front
+#. * of its name, without quotes.
+#: ../mail/mail-autofilter.c:475
+#, fuzzy, c-format
+#| msgid ""
+#| "The filter rule \"%s\" has been updated, because it used just removed "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following filter rules\n"
+#| "%s have been updated, because they used just removed folder\n"
+#| "\"%s\"."
+msgid ""
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"å·²ç»?æ?´æ?°äº?è¿?æ»¤å?¨è§?å??â??%sâ??ï¼?å? ä¸ºå®?ä½¿ç?¨äº?å??å??å? é?¤ç??æ??ä»¶å¤¹\n"
-"â??%sâ??ã??"
-
-#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
-#: ../mail/mail-config.ui.h:2
-msgid "(Not Recommended)"
-msgstr "(ä¸?æ?¨è??)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(æ³¨æ??ï¼?é??è¦?é??å?¯åº?ç?¨ç¨?åº?)"
+"ä»¥ä¸?è¿?æ»¤è§?å??\n"
+"%s å·²ç»?ä¿®æ?¹ï¼?ä»¥ç?¨äº?å? é?¤æ??ä»¶å¤¹\n"
+"\"%s\"ã??"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "å¸?å?·ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
 msgstr "æ·»å? æ?°ç¾å??(_W)..."
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "å½?ä½¿ç?¨è¯¥å¸?å?·æ?¶æ?»æ?¯å??é??ç¾å??ä¿¡æ?¯(_W)"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+#| msgid "Prompt when mailing list redirects private reply back to list"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "å??è®¸é?®ä»¶å??è¡¨å°?ç§?äººå??å¤?é??å®?å??å?°å??è¡¨(_M)"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶ä¹?å¯¹è?ªèº«å? å¯?(_F)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "æ?»æ?¯æ??é??å?°(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "æ?»æ?¯å¯?ä»¶æ??é??å?°(_B)ï¼?"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ?¶æ?»æ?¯ä¿¡ä»»æ??ç??å¯?é?¥ç?¯ä¸ç??å¯?é?¥(_T)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "å½?å??é??å? å¯?é?®ä»¶æ?¶æ?»æ?¯å¯¹è?ªèº«å? å¯?(_M)"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "è¯·æ±?é??è¯»æ?¶æ?¡(_D)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "åº?ç?¨å??æ ·ç??æ?¥ç??è®¾ç½®å?°æ??æ??æ??ä»¶å¤¹(_v)"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1020
 msgid "Authentication"
 msgstr "èº«ä»½éª?è¯?"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå?¨æ??å?¥è¡¨æ??å?¾å??(_E)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å?ç¬¦é??(_H)ï¼?"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "æ£?æ?¥æ?¯æ??ç??ç±»å??(_E)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "æ£?æ?¥è?ªå®?ä¹?ä¿¡å¤´ä»¥å?¤å?«å??å?¾ä¿¡æ?¯(_S)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "æ£?æ?¥æ?¶å?°ç??é?®ä»¶æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯(_M)"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "å?¨æ??è¾?å?¥æ?¶è¿?è¡?æ?¼å??æ£?æ?¥(_T)"
 
-#: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "æ£?æ?¥æ?¶å?°ç??ä¿¡æ?¯æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯"
-
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:21
 msgid "Cle_ar"
 msgstr "æ¸?é?¤(_A)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:22
 msgid "Clea_r"
 msgstr "æ¸?é?¤(_R)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:23
 msgid "Color for _misspelled words:"
 msgstr "ç»?é??è¯¯æ?¼å??ç??å??è¯?ç??è?²(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:24
 msgid "Composing Messages"
 msgstr "æ?°å??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:25
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "é??ç½®"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:26
 msgid "Confirm _when expunging a folder"
 msgstr "é??æ¯?æ??ä»¶å¤¹æ?¶ç¡®è®¤(_W)"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:27
+#| msgid "Configuration"
+msgid "Confirmations"
+msgstr "é??ç½®"
+
+#: ../mail/mail-config.ui.h:30
 msgid "Default Behavior"
 msgstr "é»?è®¤è¡?ä¸º"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:31
 msgid "Default character e_ncoding:"
 msgstr "é»?è®¤å?ç¬¦ç¼?ç ?(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:32
 msgid "Delete Mail"
 msgstr "å? é?¤é?®ä»¶"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "é??å?ºæ?¶å? é?¤å??å?¾ä¿¡æ?¯(_X)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "å¯¹å¯?å?ºç??ä¿¡æ?¯è¿?è¡?æ?°å?ç¾å??(é»?è®¤)(_U)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:36
 msgid "Displayed Message Headers"
 msgstr "æ?¾ç¤ºä¿¡å¤´"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "å¦?æ??æ??æ?¬è¶?å?ºå¤§å°?é??å?¶ä¸?æ?¾ç¤ºä¿¡æ?¯(_Z)"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:37
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "å¦?æ??ä¿¡æ?¯å??é??è??å?¨å?°å??ç°¿ä¸å??ä¸?æ ?è®°ä¸ºå??å?¾ä¿¡æ?¯(_K)"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:38
 msgid "Do not quote"
 msgstr "ä¸?å¼?ç?¨"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:39
 msgid "Drafts _Folder:"
 msgstr "è??ç¨¿æ??ä»¶å¤¹(_F)ï¼?"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:40
 msgid "Email _Address:"
 msgstr "ç?µå?é?®ä»¶å?°å??(_A)ï¼?"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:41
 msgid "Empty trash folders on e_xit"
 msgstr "é??å?ºæ?¶æ¸?ç©ºå·²å? é?¤é?®ä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "å?¯ç?¨é?æ?¯ç©ºæ ¼é?®(_P)"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹(_R)"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:43
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?è¯?ä¹¦(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:44
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¯?å?ºç??ä¿¡æ?¯(é»?è®¤)(_G)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "ç?å®½(_X)ï¼?"
+#: ../mail/mail-config.ui.h:45
+msgid "F_all back to threading messages by subject"
+msgstr "é»?è®¤æ??ç?§ä¸»é¢?å¯¹çº¿ç´¢ä¸ç??ä¿¡æ?¯æ??åº?(_A)"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:46
+#| msgid "Fix_ed width Font:"
+msgid "Fix_ed Width Font:"
 msgstr "ç?å®½å?ä½?(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "å?ä½?å±?æ?§"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:47
 msgid "Format messages in _HTML"
 msgstr "ç?¨ HTML æ ¼å¼?å??ä¿¡æ?¯(_H)"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:48
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:50
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "å¦?æ??å?¯è?½ï¼?ç»?å??å¤?å?ªå??å¤?ç»?é?®ä»¶å??è¡¨ã??"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:51
 msgid "HTML Messages"
 msgstr "HTML ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:52
 msgid "H_TTP Proxy:"
 msgstr "HTTP ä»£ç??æ??å?¡å?¨(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:53
 msgid "Headers"
 msgstr "ä¿¡å¤´"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:54
 msgid "Highlight _quotations with"
 msgstr "çª?å?ºæ?¾ç¤ºå¼?ç?¨(_Q)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:55
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "å¿½ç?¥é?®ä»¶å??è¡¨ç??â??å??å¤?è?³â??å??æ?°"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:56
 msgid "Inline"
 msgstr "åµ?å?¥"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:57
 msgid "Inline (Outlook style)"
 msgstr "åµ?å?¥(Outlook é£?æ ¼)"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:59 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ ?ç¾"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:60
 msgid "Languages Table"
 msgstr "è¯è¨?è¡¨"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:61
 msgid "Loading Images"
 msgstr "è½½å?¥å?¾å??"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:62
 msgid "Mail Headers Table"
 msgstr "é?®ä»¶å¤´è¡¨"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:63
 msgid "Mailbox location"
 msgstr "é?®ä»¶ç®±ä½?ç½®"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:64
 msgid "Message Display"
 msgstr "ä¿¡æ?¯æ?¾ç¤º"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "ä¿¡æ?¯å?ä½?"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:65
 msgid "Message Receipts"
 msgstr "å·²è¯»å??æ?§"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:66
 msgid "No _Proxy for:"
 msgstr "ä¸?ä½¿ç?¨ä»£ç??ç??æ??å?µ(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr "æ³¨æ??ï¼?ç?´å?°æ?¨ç¬¬ä¸?æ¬¡è¿?æ?¥ç??æ?¶å??ï¼?æ??ä¼?è¯¢é?®å¯?ç ?ã??"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:68
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°å?¹é??ç??è?ªå®?ä¹?å??å?¾ä¿¡å¤´ï¼?æ¤é??é¡¹å°?è¢«è¦?ç??ã??"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:69
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "å?¯é??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:71
 msgid "Or_ganization:"
 msgstr "ç»?ç»?(_G)ï¼?"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:72
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG é?®æ ?è¯?(_K)ï¼?"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:73
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:75
 msgid "Port:"
 msgstr "ç«¯å?£ï¼?"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "å??é??å?ªæ??å¯?ä»¶æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯æ?¶æ??ç¤º(_O)"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:76
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "GNU å®?å?¨å?«å£«(PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "æ??å?°å?ä½?"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "å½?é?®ä»¶å??è¡¨é??å®?å??ç§?äººå??å¤?å?°å??è¡¨æ?¶æ??ç¤º"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "å½?å??é?®ä»¶å??è¡¨ä¿¡æ?¯å??é??ç§?äººå??å¤?æ?¶æ??ç¤º(_L)"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "å½?å??é??å??å¤?è?³å¤?ä¸ªæ?¶ä»¶äººæ?¶æ??ç¤º(_M)"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:78
 msgid "Proxy Settings"
 msgstr "ä»£ç??è®¾ç½®"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:79
 msgid "Quoted"
 msgstr "å¼?ç?¨"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:80
 msgid "Re_member password"
 msgstr "è®°ä½?å¯?ç ?(_M)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:81
 msgid "Re_ply-To:"
 msgstr "å??å¤?å?°(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:82
 msgid "Remember _password"
 msgstr "è®°ä½?å¯?ç ?(_P)"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:83
+#| msgid "Replies and parents"
+msgid "Replies and Forwards"
+msgstr "å??å¤?å??è½¬å??"
+
+#: ../mail/mail-config.ui.h:84
 msgid "Required Information"
 msgstr "é??è¦?ç??ä¿¡æ?¯"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:85
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:86
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:87
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:88
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:90
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ¤æ¬¡ç¼?è¯?ç?? Evolution ä¸?æ?¯æ?? SSL"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:91
 msgid "S_earch for sender photograph only in local address books"
 msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ??ç´¢å??ä»¶äººç?§ç??(_E)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:92
 msgid "S_elect..."
 msgstr "é??æ?©(_E)..."
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:93
 msgid "S_end message receipts:"
 msgstr "å??é??ä¿¡æ?¯æ?¶æ?¡(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:94
 msgid "S_tandard Font:"
 msgstr "æ ?å??å?ä½?(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:95
 msgid "Secure MIME (S/MIME)"
 msgstr "å®?å?¨ MIME(S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "é??æ?©è??ç¨¿æ??ä»¶å¤¹"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:97
 msgid "Select HTML fixed width font"
 msgstr "é??æ?© HTML å?ºå®?å®½åº¦å?ä½?"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å?ºå®?å®½åº¦å?ä½?"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:98
 msgid "Select HTML variable width font"
 msgstr "é??æ?© HTML å??å®½åº¦å?ä½?"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å??å®½åº¦å?ä½?"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "é??æ?©å??å?¾ä¿¡æ?¯æ??ä»¶å¤¹"
+#: ../mail/mail-config.ui.h:99
+msgid "Sender Photograph"
+msgstr "å??é??è??ç?§ç??"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "é??æ?©å·²å??æ??ä»¶å¤¹"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:101
+#| msgid "Prompt when sending private replies to mailing _list messages"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "å??é?®ä»¶å??è¡¨é?®ç®±å??é??ç§?äººå??å¤?æ?¶(_P)"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "é??æ?©åº?ä»¶ç®±æ??ä»¶å¤¹"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+#| msgid "_Prompt when sending messages with an empty subject line"
+msgid "Sending a message with an _empty subject line"
+msgstr "å??é??å¸¦ç©ºä¸»é¢?è¡?ç??ä¿¡æ?¯æ?¶(_E)"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "å??é??è??ç?§ç??"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "å??é??å?ªå¡«å??äº?å¯?ä»¶æ??é??æ?¶ä»¶äººç??ä¿¡æ?¯æ?¶(_B)"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "å??é??é?®ä»¶"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+#| msgid "Send reply to all recipients?"
+msgid "Sending a reply to a large _number of recipients"
+msgstr "å??å¾?å¤?æ?¶ä»¶äººå??é??å??å¤?æ?¶(_N)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:108
 msgid "Sent _Messages Folder:"
 msgstr "å·²å??é??ä¿¡æ?¯æ??ä»¶å¤¹(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "å??é??ä¿¡æ?¯å¹¶ä¿?å?è??ç¨¿"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:109
 msgid "Ser_ver requires authentication"
 msgstr "æ??å?¡å?¨é??è¦?è®¤è¯?(_V)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:110
 msgid "Server Configuration"
 msgstr "æ??å?¡å?¨é??ç½®"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:111
 msgid "Server _Type:"
 msgstr "æ??å?¡å?¨ç±»å??(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:112
 msgid "Si_gning algorithm:"
 msgstr "ç¾å??å?½æ?°(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:113
 msgid "Sig_natures"
 msgstr "ç¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:114
 msgid "Sig_ning certificate:"
 msgstr "ç¾å??è¯?ä¹¦(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:115
 msgid "Signat_ure:"
 msgstr "ç¾å??(_U)ï¼?"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:116
 msgid "Signatures"
 msgstr "ç¾å??"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:117
 msgid "Signing _algorithm:"
 msgstr "ç¾å??å?½æ?°(_A)ï¼?"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:118
+#| msgid "Local Folders"
+msgid "Special Folders"
+msgstr "ç?¹æ®?æ??ä»¶å¤¹"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Spell Checking"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:120
 msgid "Start _typing at the bottom on replying"
 msgstr "å??å¤?æ?¶å?¨åº?é?¨å¼?å§?æ??å?(_T)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:122
 msgid "T_ype:"
 msgstr "ç±»å??(_Y)ï¼?"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "å?¨æ¤å??å?ºç??è¯è¨?å??æ? äº?æ?¨æ??å®?è£?ç??å?å?¸ã??"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:124
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12448,12 +12594,13 @@ msgstr ""
 "æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "é¡¶é?¨å??å¤?é??é¡¹"
+#: ../mail/mail-config.ui.h:127
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr "ä¸ºäº?å¸®å?©é?¿å??ç?µå?é?®ä»¶æ??å¤?å??é?®é¢?ï¼?å?¨é??å??ä»¥ä¸?å?¾é??ç??æ??ä½?å??è¯·æ±?ç¡®è®¤ï¼?"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12461,166 +12608,145 @@ msgstr ""
 "è¾?å?¥æ?¨æ?³è¦?ç»?æ¤å¸?å?·èµ·ç??å??å?ã??\n"
 "å¦?ï¼?â??å·¥ä½?â??æ??â??ç§?äººâ??"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:130
 msgid "Us_ername:"
 msgstr "ç?¨æ?·å??(_E)ï¼?"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:131
 msgid "Use Authe_ntication"
 msgstr "ä½¿ç?¨èº«ä»½éª?è¯?(_N)"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:132
+#| msgid "User_name:"
+msgid "User _Name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "å??å®½(_A)ï¼?"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:133
 msgid "_Add Signature"
 msgstr "æ·»å? ç¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:134
 msgid "_Always load images from the Internet"
 msgstr "æ?»æ?¯ä»? Internet ä¸?è½½å?¥å?¾å??(_A)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:135
 msgid "_Authentication Type"
 msgstr "èº«ä»½éª?è¯?ç±»å??(_A)"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:136
 msgid "_Default junk plugin:"
 msgstr "é»?è®¤ç??å??å?¾ä¿¡æ?¯æ??ä»¶(_D)ï¼?"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:137
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥è¿?æ?¥å?° Internet(_D)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:138
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?è¦?ç¾å??ä¼?è®®è¯·æ±?(å?? Outlook å?¼å®¹)(_D)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:139
 msgid "_Forward style:"
 msgstr "è½¬å??æ?¹å¼?(_F)ï¼?"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:140
 msgid "_Junk Folder:"
 msgstr "å??å?¾ä¿¡æ?¯æ??ä»¶å¤¹(_J)ï¼?"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:141
+#| msgid "_Keep Signature above the original message on replying"
+msgid "_Keep signature above the original message on replying"
 msgstr "å??å¤?æ?¶ä¿?ç??å??å§?ä¿¡æ?¯ç??ç¾å??(_K)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:142
 msgid "_Languages"
 msgstr "è¯è¨?(_L)"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:143
+#| msgid "_Load images in messages from contacts"
+msgid "_Load images only in messages from contacts"
 msgstr "è½½å?¥æ?¥è?ªè??ç³»äººç??é?®ä»¶ä¸ç??å?¾å??(_L)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:144
 msgid "_Lookup in local address book only"
 msgstr "ä»?å?¨æ?¬å?°å?°å??ç°¿ä¸æ?¥é??(_L)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:145
 msgid "_Make this my default account"
 msgstr "ä½¿å®?æ??ä¸ºæ??ç??é»?è®¤å¸?å?·(_M)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:146
 msgid "_Manual proxy configuration:"
 msgstr "æ??å?¨ä»£ç??æ??å?¡å?¨é??ç½®(_M)ï¼?"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»å??ç?(_M)"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:148
 msgid "_Never load images from the Internet"
 msgstr "ç»?ä¸?ä»? Internet è½½å?¥å?¾å??(_N)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:149
 msgid "_Path:"
 msgstr "è·¯å¾?(_P)ï¼?"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "å??é??ç»?ä¸?æ?³æ?¥æ?¶ HTML ç??è??ç³»äººæ?¶æ??ç¤º(_P)"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "å??é??ç©ºä¸»é¢?è¡?ç??ä¿¡æ?¯æ?¶æ??ç¤º(_P)"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "å??å¤?é£?æ ¼(_R)ï¼?"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "è??æ?¬(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??(_S)ï¼?"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
+#: ../mail/mail-config.ui.h:157
+#| msgid "Show animated images as animations."
+msgid "_Show animated images"
+msgstr "æ?¾ç¤ºå?¨æ??å?¾å??(_S)"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
-msgstr "å?¨ç?µå?é?®ä»¶é¢?è§?ä¸æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
+msgstr "å?¨ä¿¡æ?¯é¢?è§?ä¸æ?¾ç¤ºå??é??è??ç??ç?§ç??(_S)"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "å?ªæ?¾ç¤ºæ?¶ä»¶äºº/æ??é??/å¯?ä»¶æ??é??å¤´ä¸ç??å??(_S)"
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:159
 msgid "_Trash Folder:"
 msgstr "åº?ä»¶ç®±æ??ä»¶å¤¹(_T)ï¼?"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "ä½¿ç?¨å®?å?¨è¿?æ?¥(_U)ï¼?"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "ä½¿ç?¨é»?è®¤å?¼(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨ä¸?å?¶å®?åº?ç?¨ç¨?åº?ç?¸å??ç??å?ä½?(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "ä¸ªå?°å??"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:164 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:165
 msgid "color"
 msgstr "é¢?è?²"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:166
 msgid "description"
 msgstr "æ??è¿°"
 
@@ -12645,78 +12771,58 @@ msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "å?¨é?¨æ??å? (_A)"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "æ?°å?ç¾å??"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "ä¸?è¦?è½¬å??"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "å±?å¼?å?¨é?¨(_E)"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "å? å¯?"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "æ??ä»¶å¤¹è®¢é??"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "è·?é??"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "ç»?æ?¨ç??ä¿¡æ?¯"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "è½¬å??"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "è®¸å?¯å??è®®"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "ä¸?å¿?å??å¤?"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "å?¨é?¨å??å¤?"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "å??é¡¾"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "æ??å?¡å?¨(_E)ï¼?"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "å?ªå?¨é¡¹ç?®å??å?«è¿?äº?æ?¶æ?¾ç¤ºï¼?(_S)"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "æ??ç´¢æ??ä»¶å¤¹æ?¥æº?"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "å®?å?¨ä¿¡æ?¯"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "æ??å®?æ??ä»¶å¤¹"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12724,328 +12830,249 @@ msgstr ""
 "æ?¨é??ä¸è¿?è¡?è·?é??ç??ä¿¡æ?¯å·²ç»?å?¨ä¸?é?¢å??å?ºã??\n"
 "è¯·ä»?â??æ ?å¿?â??è??å??ä¸é??æ?©è·?é??æ??ä½?ã??"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "æ?¥å??å??è®®(_A)"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "å»¶æ??äºº(_D)ï¼?"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "æ ?å¿?(_F)ï¼?"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "é??ä¸æ¤å¤?ä»¥è¡¨æ??æ?¨æ?¥å??è®¸å?¯å??è®®(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:791
 #, c-format
 msgid "Pinging %s"
 msgstr "æ?¥éª? %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "è¿?æ»¤é??ä¸ç??ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:224
 msgid "Fetching Mail"
 msgstr "æ?¶å??é?®ä»¶"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "åº?ç?¨å¯?å?ºè¿?æ»¤å?¨å¤±è´¥ï¼?%s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"è¿½å? å?° %sï¼?%s å¤±è´¥\n"
-"è½¬è??è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹ã??"
-
-#: ../mail/mail-ops.c:654
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "è¿½å? å?°æ?¬å?°â??å·²å??â??æ??ä»¶å¤¹å¤±è´¥ï¼?%s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "å??é??ä¿¡æ?¯"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:780
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "å??é??ç¬¬%då°?ä¿¡ï¼?å?±%då°?"
+msgstr "æ£å?¨å??é??ç¬¬ %d å°?ä¿¡ï¼?å?± %d å°?"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:827
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "å?¨ç¬¬%då°?ä¿¡å¤±è´¥ï¼?å?±%då°?"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:829 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:831 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "æ??ä¿¡æ?¯ä¿?å?å?°æ??ä»¶å¤¹ %s ä¸"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1027
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "æ£å?¨ç§»å?¨ä¿¡æ?¯è?³ %s"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:1027
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "æ??ä¿¡æ?¯å¤?å?¶å?° %s"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1146
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "å?¨â??%sâ??ä¸æ?«æ??æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1258
 msgid "Forwarded messages"
 msgstr "è½¬å??ç??ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "æ??å¼?æ??ä»¶å¤¹ %s"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1373
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "æ£å?¨è?·å??æ??ä»¶å?  %s ç??é??é¢?ä¿¡æ?¯"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Opening store '%s'"
 msgstr "æ??å¼?å?å?¨ %s"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "å? é?¤æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1659
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "å?å?¨æ??ä»¶å¤¹â??%sâ??"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1723
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "é??æ¯?å¹¶å?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1724
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?å?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1780
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "å?·æ?°æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "é??æ¯?æ??ä»¶å¤¹ %s"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1865
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?ç©ºâ??%sâ??ä¸ç??åº?ä»¶ç®±"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1866
 msgid "Local Folders"
 msgstr "æ?¬å?°æ??ä»¶å¤¹"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2088
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "æ?¶å?? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2180
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "ä¿?å? %d å°?ä¿¡"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2276
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?¨å°?ä¿¡æ?¯ä¿?å?å?° %s æ?¶å??ç??é??è¯¯ï¼?\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "ä¿?å?é??ä»¶"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
-#, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"æ? æ³?å??å»ºè¾?å?ºæ??ä»¶ï¼?%sï¼?\n"
-" %s"
-
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "æ? æ³?å??æ?°æ?®ï¼?"
-
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2433
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "æ?å¼?ä¸? %s ç??è¿?æ?¥"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2433
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°è¿?æ?¥å?° %s"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2527
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æ£å?¨å??å¤?è?±æ?ºä½¿ç?¨å¸?å?·â??%sâ??"
 
-#: ../mail/mail-ops.c:2636
+#: ../mail/mail-ops.c:2616
 msgid "Checking Service"
 msgstr "æ£?æ?¥æ??å?¡"
 
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:435
 msgid "Send & Receive Mail"
 msgstr "å??é??å??æ?¥æ?¶é?®ä»¶"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "æ£å?¨æ?´æ?°..."
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?..."
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "æ£?æ?¥æ?°é?®ä»¶"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "è¾?å?¥ %s ç??å¯?ç ?"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "è¾?å?¥å¯?ç ?"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "ä¸º %s è¾?å?¥å¯?ç ?"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "è¾?å?¥å¯?ç ?"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "ç?¨æ?·å·±å??æ¶?æ??ä½?ã??"
-
-#: ../mail/mail-session.c:724
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "ç¼ºå°?å??é??ç?®æ ?å?°å??ï¼?é?®ä»¶è½¬å??è¢«å??æ¶?ã??"
-
-#: ../mail/mail-session.c:733
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ? å?¯ç?¨å¸?å?·ï¼?é?®ä»¶è½¬å??è¢«å??æ¶?ã??"
-
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "æ? æ³?å??å»ºè?±æ?ºç?®å½?â??%sâ??ï¼?%s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "è¯?å?¾å°?é?®ä»¶ç§»è?³é?? mbox æº? %s"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½¬å??ç??ä¿¡æ?¯ - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "è½¬å??ç??ä¿¡æ?¯"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "æ? æ??ç??æ??ä»¶å¤¹ï¼?%s"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "è®¾ç½®æ??ç´¢æ??ä»¶å¤¹ï¼?%s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?°â??%s:%sâ??ç??æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?°â??%sâ??ç??æ??ç´¢æ??ä»¶å¤¹"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:702
+#, fuzzy, c-format
+#| msgid ""
+#| "The Search Folder \"%s\" has been updated, because it used just removed "
+#| "folder\n"
+#| "\"%s\"."
+#| msgid_plural ""
+#| "The following Search Folders\n"
+#| "%s have been updated, because they used just removed folder\n"
+#| "\"%s\"."
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"æ??ç´¢æ??ä»¶å¤¹â??%sâ??å·²ç»?è¢«æ?´æ?°ï¼?å? ä¸ºå®?ä½¿ç?¨äº?è¢«ç§»é?¤ç??æ??ä»¶å¤¹\n"
-"â??%sâ??"
+"ä»¥ä¸?æ??ç´¢æ??ä»¶å¤¹\n"
+"%s å·²ç»?ä¿®æ?¹ï¼?ä»¥ç?¨äº?å? é?¤æ??ä»¶å¤¹\n"
+"\"%s\"ã??"
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1238
 msgid "Edit Search Folder"
 msgstr "ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1350
 msgid "New Search Folder"
 msgstr "æ?°å»ºæ??ç´¢æ??ä»¶å¤¹"
 
@@ -13236,118 +13263,129 @@ msgstr ""
 "Lock ç?¯å?¯è?½ä¸ºå¼?ã??"
 
 #: ../mail/mail.error.xml.h:43
+#| msgid "Close this window"
+msgid "Close message window."
+msgstr "å?³é?ä¿¡æ?¯çª?å?£ã??"
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "æ? æ³?ä¿?å?ç¾å??æ??ä»¶ã??"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "å? é?¤æ??ç´¢æ??ä»¶å¤¹â??{0}â??ä¸ç??ä¿¡æ?¯å??ï¼?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do _Not Disable"
 msgstr "ä¸?ç¦?ç?¨(_N)"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do _Not Send"
 msgstr "ä¸?å??é??(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do _Not Synchronize"
 msgstr "ä¸?å??æ¥(_D)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¨æ?³è¦?å??æ¥é?£äº?æ ?è®°ä¸ºç¦»çº¿ä½¿ç?¨ç??æ??ä»¶å¤¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?æ??æ??æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "æ?¨å¸?æ??ä¿?å?æ?´æ?¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "è¾?å?¥å¯?ç ?ã??"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "è½½å?¥è¿?æ»¤å?¨å®?ä¹?é??è¯¯ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "æ?§è¡?æ??ä½?æ?¶å?ºé??ã??"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "Error while {0}."
 msgstr "{0} æ?¶å?ºé??ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but cannot overwrite it."
 msgstr "æ??ä»¶å?å?¨ä½?æ? æ³?è¦?ç??ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:61
 msgid "File exists but is not a regular file."
 msgstr "æ??ä»¶å?å?¨ä½?ä¸?æ?¯æ?®é??æ??ä»¶ã??"
 
-#: ../mail/mail.error.xml.h:61
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:63
+#| msgid "The attachment does not contain a valid calendar message"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "â??{0}â??æ??ä»¶å¤¹ä¸æ²¡æ??é??å¤?ä¿¡æ?¯ã??"
+
+#: ../mail/mail.error.xml.h:64
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?æ?¨å°?æ? æ³?æ?¢å¤?è¿?äº?ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??ä»¶å¤¹ï¼?å?¶ä¸ç??å?¨é?¨å??å®¹å??å?¶å?æ??ä»¶å¤¹å??å®¹å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨å? é?¤æ??ä»¶å¤¹ï¼?å?¶ä¸ç??å?¨é?¨å??å®¹å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å?¨é?¨ä»£ç??æ??å?¡å?¨å¸?å?·é?½å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å??å?¶å?¨é?¨ä»£ç??æ??å?¡å?¨ä¿¡æ?¯å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??æ?¨ç»§ç»ç??è¯?ï¼?å¸?å?·ä¿¡æ?¯å°?è¢«æ°¸ä¹?å? é?¤ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??æ?¨é??å?ºï¼?è¿?äº?ä¿¡æ?¯å°?ä¼?ç?å?° Evolution ä¸?æ¬¡å?¯å?¨æ??ä¼?å??å?ºã??"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "Ignore"
 msgstr "å¿½ç?¥"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 msgid "Invalid authentication"
 msgstr "æ? æ??ç??èº«ä»½éª?è¯?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Mail Deletion Failed"
 msgstr "é?®ä»¶å? é?¤å¤±è´¥"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Mail filters automatically updated."
 msgstr "é?®ä»¶è¿?æ»¤å?¨å·²è?ªå?¨æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13358,27 +13396,37 @@ msgstr ""
 "ä¸ªé?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??ä¸ºäº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?è¯¥è?³å°?å¡«å?¥"
 "ä¸?ä¸ª To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Missing folder."
 msgstr "ç¼ºå°?æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
+#| msgid "Never"
+msgid "N_ever"
+msgstr "ä»?ä¸?(_E)"
+
+#: ../mail/mail.error.xml.h:80
+#| msgid "Could not create message."
+msgid "No duplicate messages found."
+msgstr "æ²¡æ??æ?¾å?°é??å¤?ä¿¡æ?¯ã??"
+
+#: ../mail/mail.error.xml.h:81
 msgid "No sources selected."
 msgstr "æ²¡æ??é??ä¸æº?ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:82
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?æ¬¡æ??å¼?å¤ªå¤?å°?ä¿¡å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:83
 msgid "Please check your account settings and try again."
 msgstr "è¯·æ£?æ?¥æ?¨ç??å¸?å?·è®¾ç½®ï¼?ç?¶å??å??è¯?ä¸?æ¬¡ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:84
 msgid "Please enable the account or send using another account."
 msgstr "è¯·å?¯ç?¨å¸?å?·æ??è??ä½¿ç?¨å?¶å®?å¸?å?·å??é??ã??"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:85
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13386,7 +13434,7 @@ msgstr ""
 "è¯·å?¨ To: ä¸è¾?å?¥æ??æ??ç??ç?µå?é?®ä»¶å?°å??ã??æ?¨å?¯ä»¥å??å?»è¾?å?¥æ¡?æ??è¾¹ç?? To: æ??é?®æ?¥æ??ç´¢ç?µå?"
 "é?®ä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13395,65 +13443,69 @@ msgstr ""
 "è¯·ç¡®å®?ä¸?å??æ?¶ä»¶äººæ?¿æ??å¹¶ä¸?è?½å¤?æ?¥æ?¶ HTML é?®ä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:88
 msgid "Please provide an unique name to identify this signature."
 msgstr "è¯·æ??ä¾?æ¤ç¾å??ç??å?¯ä¸?æ ?è¯?å??ç§°ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:89
 msgid "Please wait."
 msgstr "è¯·ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:90
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "å??è¿?æ?§ç??é?®ä»¶æ??ä»¶å¤¹â??{0}â??å?ºç?°é?®é¢?ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:91
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "æ?¥è¯¢æ??å?¡å?¨æ??æ?¯æ??ç??èº«ä»½éª?è¯?ç®?æ³?å??è¡¨ã??"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:92
 msgid "Read receipt requested."
 msgstr "é??è¯»æ?¶æ?¡å·²è¯·æ±?ã??"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:93
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "ç??ç??è¦?å? é?¤æ??ä»¶å¤¹â??{0}â??å??å?¶å?¨é?¨å?æ??ä»¶å¤¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:94
 msgid "Really delete folder \"{0}\"?"
 msgstr "ç??è¦?å? é?¤æ??ä»¶å¤¹â??{0}â??ï¼?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:95
+msgid "Remove duplicate messages?"
+msgstr "ç§»é?¤é??å¤?ç??ä¿¡æ?¯ï¼?"
+
+#: ../mail/mail.error.xml.h:96
 msgid "Reply _Privately"
 msgstr "ç§?äººå??å¤?(_P)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:99
 msgid "Search Folders automatically updated."
 msgstr "æ??ç´¢æ??ä»¶å¤¹å·²è?ªå?¨æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:100
 msgid "Send private reply?"
 msgstr "å??é??ç§?äººå??å¤?ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:101
 msgid "Send reply to all recipients?"
 msgstr "å??é??å??å¤?ç»?æ??æ??æ?¶ä»¶äººï¼?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:102
 msgid "Signature Already Exists"
 msgstr "ç¾å??å·²ç»?å?å?¨"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:103
 msgid "Synchronize folders locally for offline usage?"
 msgstr "å??æ¥æ??ä»¶å¤¹å?°æ?¬å?°ä»¥è?±æ?ºä½¿ç?¨å??ï¼?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "æ?¨æ? æ³?é??å?½å??ã??ç§»å?¨æ??å? é?¤è¦?è®© Evolution æ£å¸¸è¿?ä½?æ??é??ç??ç³»ç»?æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13468,7 +13520,7 @@ msgstr ""
 "ä¸ªé?®ä»¶å¤´ï¼?å°?å?¨æ?¨ç??ä¿¡æ?¯ä¸å??å?ºæ?¨ç??å?¨é?¨æ?¶ä»¶äººã??ä¸ºäº?é?¿å??è¿?ç§?æ??å?µï¼?æ?¨åº?è¯¥è?³å°?å¡«å?¥"
 "ä¸?ä¸ª To: æ?? CC: æ?¶ä»¶äººã??"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13476,7 +13528,7 @@ msgstr ""
 "ä¸?å??æ?¥æ?¶è??ä¸?è?½è¢«è¯?å?«ä¸ºæ??æ??ç??ç?µå?é?®ä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13484,71 +13536,71 @@ msgstr ""
 "ä¸?å??æ?¥æ?¶è??ä¸?è?½è¢«è¯?å?«ä¸ºæ??æ??ç??ç?µå?é?®ä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:112
 msgid "The script file must exist and be executable."
 msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?å?¨ä¸?å?¯æ?§è¡?ã??"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "æ¤æ??ä»¶å¤¹å?¯è?½å·²ç»?é??å¼?æ·»å? äº?ã??å¦?æ??é??è¦?ç??è¯?ï¼?è¯·è½¬å?°æ??ç´¢æ??ä»¶å¤¹ç¼?è¾?å?¨æ?¾å¼?æ·»å? ã??"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "æ? æ³?å??é??æ¤ä¿¡æ?¯ï¼?å? ä¸ºæ?¨æ??é??æ?©ç?¨æ?¥å??é??ç??å¸?å?·æ?ªå?¯ç?¨"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "æ? æ³?å??é??æ¤ä¿¡æ?¯ï¼?å? ä¸ºæ?¨æ²¡æ??æ??å®?ä»»ä½?æ?¶ä»¶äºº"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "æ¤æ??å?¡å?¨ä¸?æ?¯æ??æ¤ç±»å??ç??èº«ä»½éª?è¯?ï¼?ä¹?å?¯è?½æ ¹æ?¬ä¸?æ?¯æ??èº«ä»½éª?è¯?ã??"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:118
 msgid "This signature has been changed, but has not been saved."
 msgstr "ç¾å??å·²ç»?æ?´æ?¹ï¼?ä½?å°?æ?ªä¿?å?ã??"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "è¿?å°?æ??é??ä¸æ??ä»¶å¤¹å??å?¶å?æ??ä»¶å¤¹ä¸ç??å?¨é?¨ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»ã??"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:120
 msgid "This will mark all messages as read in the selected folder."
 msgstr "è¿?å°?æ??é??ä¸æ??ä»¶å¤¹ä¸ç??å?¨é?¨ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»ã??"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to connect to the GroupWise server."
 msgstr "æ? æ³?è¿?æ?¥å?° GroupWise æ??å?¡å?¨ã??"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "æ? æ³?æ??å¼?æ¤å¸?å?·ç??è??ç¨¿æ??ä»¶å¤¹ã??ä½¿ç?¨ç³»ç»?ç??è??ç¨¿æ??ä»¶å¤¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:123
 msgid "Unable to read license file."
 msgstr "æ? æ³?è¯»å??è®¸å?¯æ??ä»¶ã??"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:124
 msgid "Use _Default"
 msgstr "ä½¿ç?¨é»?è®¤å?¼(_D)"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:125
 msgid "Use default drafts folder?"
 msgstr "ä½¿ç?¨é»?è®¤ç??è??ç¨¿æ??ä»¶å¤¹å??ï¼?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13558,7 +13610,12 @@ msgstr ""
 "ä»¶ã??\n"
 "æ?¨ç??ç??æ?³è¦?è¿?ä¹?å??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:128
+#| msgid "Would you like to accept it?"
+msgid "Would you like to close the message window?"
+msgstr "æ?¨æ?³å?³é?ä¿¡æ?¯çª?å?£å??ï¼?"
+
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13567,7 +13624,7 @@ msgstr ""
 "æ?¨æ£å?¨ç»?ä¸?å°?é??è¿?é?®ä»¶å??è¡¨æ?¶å?°ç??é?®ä»¶å??é??ä¸?ä¸ªç§?ä¸?ç??å??å¤?ï¼?è??é?®ä»¶å??è¡¨æ£è¯?å?¾é??å®?å??"
 "æ?¨ç??å??å¤?å??é?®ä»¶å??è¡¨ã??æ?¨ç¡®å®?è¦?ç»§ç»ä¹?ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13576,37 +13633,37 @@ msgstr ""
 "æ?¨æ£å?¨å??å¤?ä¸?å°?é??è¿?é?®ä»¶å??è¡¨æ?¶å?°ç??é?®ä»¶ï¼?ä½?æ?¯æ?¨æ£ç§?ä¸?ç??å??å¤?ç»?å??ä»¶äººï¼?è??ä¸?æ?¯é?®ä»¶"
 "å??è¡¨ã??æ?¨ç¡®å®?è¦?è¿?ä¹?å??ä¹?ï¼?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "æ?¨æ£è¦?å??å¤?ä¸ªæ?¶ä»¶äººå??å¤?ä¿¡æ?¯ï¼?æ?¨ç¡®å®?è¦?å??å¤?å?¶ä¸ç??æ??æ??äººå??ï¼?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:132
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ?¨æ²¡æ??è¶³å¤?ç??æ??é??å? é?¤æ¤é?®ä»¶ã??"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:133
 msgid "You have not filled in all of the required information."
 msgstr "æ?¨æ²¡æ??å¡«å?¥æ??é??ç??å?¨é?¨ä¿¡æ?¯ã??"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æ?¨æ??æ?ªå??é??ä¿¡æ?¯ï¼?æ?¨ä»?ç?¶æ?³è¦?é??å?ºå??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:135
 msgid "You may not create two accounts with the same name."
 msgstr "æ?¨ä¸?è?½å??å»ºä¸¤ä¸ªå??å??å¸?å?·ã??"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "You must name this Search Folder."
 msgstr "æ?¨å¿?é¡»ä¸ºæ¤æ??ç´¢æ??ä»¶å¤¹å?½å??ã??"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:137
 msgid "You must specify a folder."
 msgstr "æ?¨å¿?é¡»æ??å®?æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13615,127 +13672,142 @@ msgstr ""
 "æ?¨å¿?é¡»ä¸?æ¬¡è?³å°?æ??å®?ä¸?ä¸ªæ??ä»¶å¤¹ä½?ä¸ºæº?ã??\n"
 "æ??è??é??ä¸?é??æ?©æ??ä»¶å¤¹ï¼?æ??è??é??ä¸å?¨é?¨æ?¬å?°æ??ä»¶å¤¹å??/æ??å?¨é?¨è¿?ç¨?æ??ä»¶å¤¹ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:140
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æ?¨ä»¥â??{0}â??ç??èº«ä»½ç?»å½?å?°æ??å?¡å?¨â??{0}â??å¤±è´¥ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:141
+#| msgid "Always"
+msgid "_Always"
+msgstr "æ?»æ?¯(_A)"
+
+#: ../mail/mail.error.xml.h:142
 msgid "_Append"
 msgstr "è¿½å? (_A)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:143
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
 #: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "ç¦?ç?¨(_D)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:144
 msgid "_Discard changes"
 msgstr "ä¸¢å¼?æ?´æ?¹(_D)"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../mail/mail.error.xml.h:145
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 msgid "_Empty Trash"
 msgstr "æ¸?ç©ºåº?ä»¶ç®±(_E)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:146
 msgid "_Expunge"
 msgstr "é??æ¯?(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:147
+#| msgid "No"
+msgid "_No"
+msgstr "å?¦(_N)"
+
+#: ../mail/mail.error.xml.h:148
 msgid "_Open Messages"
 msgstr "æ??å¼?ä¿¡æ?¯(_O)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:151
 msgid "_Send Receipt"
 msgstr "å??é??å·²è¯»å??æ?§(_S)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:152
 msgid "_Synchronize"
 msgstr "å??æ¥(_S)"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:153
+#| msgid "Yes"
+msgid "_Yes"
+msgstr "æ?¯(_Y)"
+
+#: ../mail/message-list.c:1175
 msgid "Unseen"
 msgstr "æ?ªç??"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1176
 msgid "Seen"
 msgstr "å·²ç??"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1177
 msgid "Answered"
 msgstr "å·²ç?å¤?"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1178
 msgid "Forwarded"
 msgstr "å·²è½¬å??"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1179
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å°?æ?ªç??ä¿¡æ?¯"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1180
 msgid "Multiple Messages"
 msgstr "å¤?å°?ä¿¡"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1184
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1185
 msgid "Lower"
 msgstr "è¾?ä½?"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1189
 msgid "Higher"
 msgstr "è¾?é«?"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1190
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1799 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1806 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1815
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤©%p%l:%M"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1827
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1835
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p%l:%M"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1837
 msgid "%b %d %Y"
 msgstr "%Yå¹´%mæ??%dæ?¥"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2603
 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:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4410 ../mail/message-list.c:4819
 msgid "Generating message list"
 msgstr "ç??æ??ä¿¡æ?¯å??è¡¨"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4641
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²¡æ??ä¿¡æ?¯æ»¡è¶³æ?¨ç??æ??ç´¢æ?¡ä»¶ã??ç?¨â??æ??ç´¢â??è??å??ç??â??æ¸?é?¤â??è??å??é¡¹æ¸?é?¤"
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4643
 msgid "There are no messages in this folder."
 msgstr "æ¤æ??ä»¶å¤¹ä¸æ²¡æ??ä¿¡æ?¯ã??"
 
@@ -13773,27 +13845,27 @@ msgid "Subject - Trimmed"
 msgstr "ä¸»é¢? - è¢«æ?ªæ?"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Body contains"
 msgstr "é?®ä»¶ä½?å?«æ??"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Message contains"
 msgstr "ä¿¡æ?¯å?«æ??"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Sender contains"
 msgstr "å??ä»¶äººå?«æ??"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Subject contains"
 msgstr "ä¸»é¢?å?«æ??"
 
@@ -13826,15 +13898,15 @@ msgstr ""
 "é??æ?©æ¤é??é¡¹æ??å?³ç??æ?¨ç??æ??å?¡å?¨æ?¢ä¸?æ?¯æ?? SSL ä¹?ä¸?æ?¯æ?? TLSã??å?¯è?½å¯¼è?´ç??ç»?æ??å°?æ?¯æ?¨ç??è¿?"
 "æ?¥ä¸?å¤ªå®?å?¨ï¼?æ?¨ä¹?æ??äº?å??å?°å®?å?¨æ¼?æ´?ç??æ?»å?»ã??"
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:609
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "å?¨ç??æ?¥å??çºªå¿µæ?¥æ?¥å??ä¸ä½¿ç?¨(_U)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:645
 msgid "Copy _book content locally for offline operation"
 msgstr "å°?å?°å??ç°¿å??å®¹å¤?å?¶å?°æ?¬å?°ä»¥è¿?è¡?è?±æ?ºæ??ä½?(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:753
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -13843,7 +13915,7 @@ msgstr ""
 "è¿?æ?¯ LDAP æ??å?¡å?¨ä¸?ç??ç«¯å?£ï¼?Evolution å°?è¯?å?¾è¿?æ?¥å?°æ?¨æ??ç»?å?ºç??æ ?å??ç«¯å?£å??è¡¨ã??å¦?æ??"
 "æ?¨ä¸?æ¸?æ¥?è¦?æ??å®?ç??ç«¯å?£ï¼?è¯·è¯¢é?®æ?¨ç??ç³»ç»?ç®¡ç??å??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:827
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13852,7 +13924,7 @@ msgstr ""
 "è¿?æ?¯ Evolution ç?¨æ?¥è®¤è¯?æ?¨ç??æ?¹æ³?ã??è¯·æ³¨æ??è?¥å?¨æ¤è®¾å®?ä¸ºâ??ç?µå?é?®ä»¶å?°å??â??å??é??è¦?æ?¨å?·æ??"
 "å¯¹ LDAP æ??å?¡å?¨ç??å?¿å??è®¿é?®æ??é??ã??"
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:902
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13863,29 +13935,29 @@ msgstr ""
 "æ??ç´¢å?ºç¡?ä¸?æ??å±?ç??å?¨é?¨é¡¹ã??æ??ç´¢è??å?´è?¥ä¸ºâ??ä¸?çº§â??ï¼?å??å?ªä¼?å??å?«æ?¨æ??å®?ç??æ??ç´¢å?ºç¡?ä¹?ä¸?ä¸?"
 "çº§ç??é¡¹ç?®ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1018
 msgid "Server Information"
 msgstr "æ??å?¡å?¨ä¿¡æ?¯"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1023
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ç»?è??"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1024
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ??ç´¢"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1026
 msgid "Downloading"
 msgstr "ä¸?è½½"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1232
 msgid "Address Book Properties"
 msgstr "å?°å??ç°¿å±?æ?§"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1234
 msgid "New Address Book"
 msgstr "æ?°å?°å??ç°¿"
 
@@ -13964,16 +14036,16 @@ 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:162
-#: ../modules/mail/em-mailer-prefs.c:1141
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1103
 msgid "_Table column:"
 msgstr "è¡¨å??(T)ï¼?"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "è?ªå?¨è¡¥å?¨"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ?»æ?¯æ?¾ç¤ºè?ªå?¨è¡¥å?¨ç??è??ç³»äººç??å?°å??(_S)"
 
@@ -14071,7 +14143,7 @@ msgstr "æ?´æ?¹é??ä¸å?°å??è??ç??å±?æ?§"
 #: ../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
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Rename..."
 msgstr "é??å?½å??(_R)..."
 
@@ -14160,7 +14232,7 @@ msgstr "æ??ä½?(_A)"
 #: ../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:1094
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "_Preview"
 msgstr "é¢?è§?(_P)"
 
@@ -14192,7 +14264,7 @@ msgstr "æ?¾ç¤ºè??ç³»äººé¢?è§?çª?å?£"
 #: ../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:1188
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
 msgid "_Classic View"
 msgstr "å??ç±»è§?å?¾(_C)"
 
@@ -14203,7 +14275,7 @@ msgstr "å?¨è??ç³»äººå??è¡¨ä¸?æ?¹æ?¾ç¤ºè??ç³»äººé¢?è§?"
 #: ../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:1195
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "_Vertical View"
 msgstr "ç«?ç?´è§?å?¾(_V)"
 
@@ -14229,8 +14301,8 @@ msgstr "æ? å?¹é??"
 #: ../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
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
-#: ../shell/e-shell-content.c:462
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../shell/e-shell-content.c:466
 msgid "Advanced Search"
 msgstr "é«?çº§æ??ç´¢"
 
@@ -14392,25 +14464,25 @@ msgstr "å??ç??"
 msgid "I_mport"
 msgstr "å¯¼å?¥(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "é??æ?©ä¸?ä¸ªæ?¥å??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "é??æ?©ä¸?ä¸ªä»»å?¡å??è¡¨"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "å¯¼å?¥å?°æ?¥å??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "å¯¼å?¥å?°ä»»å?¡(_M)"
 
 #. Create the Webcal source group
 #: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-cal-shell-migrate.c:181
 #: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
 #: ../modules/calendar/e-task-shell-backend.c:94
@@ -14467,20 +14539,21 @@ msgid "Create a new calendar"
 msgstr "å??å»ºæ?°æ?¥å??"
 
 #: ../modules/calendar/e-cal-shell-backend.c:717
-#: ../plugins/itip-formatter/itip-formatter.c:2669
+#: ../plugins/itip-formatter/itip-formatter.c:2776
 msgid "Calendar and Tasks"
 msgstr "æ?¥å??å??ä»»å?¡"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:171
-#: ../modules/calendar/e-memo-shell-sidebar.c:165
-#: ../modules/calendar/e-task-shell-sidebar.c:165
 #, c-format
+#| msgid ""
+#| "Error on %s\n"
+#| "%s"
 msgid ""
-"Error on %s\n"
+"Error on %s: %s\n"
 "%s"
 msgstr ""
-"%s é??è¯¯ï¼?\n"
-" %s"
+"%s å?ºé??ï¼?%s\n"
+"%s"
 
 #: ../modules/calendar/e-cal-shell-sidebar.c:239
 msgid "Loading calendars"
@@ -14495,7 +14568,7 @@ msgid "Calendar Selector"
 msgstr "æ?¥å??é??æ?©å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1032
+#: ../modules/calendar/e-cal-shell-sidebar.c:1034
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "å?¨ %s æ??å¼?æ?¥å??"
@@ -14907,6 +14980,16 @@ msgstr "å¤?å¿?å??è¡¨(_S)"
 msgid "Create a new memo list"
 msgstr "å??å»ºæ?°å¤?å¿?å??è¡¨"
 
+#: ../modules/calendar/e-memo-shell-sidebar.c:165
+#: ../modules/calendar/e-task-shell-sidebar.c:165
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s é??è¯¯ï¼?\n"
+" %s"
+
 #: ../modules/calendar/e-memo-shell-sidebar.c:233
 msgid "Loading memos"
 msgstr "è½½å?¥å¤?å¿?"
@@ -14986,14 +15069,14 @@ msgstr "æ??å?°å¤?å¿?å??è¡¨"
 msgid "Preview the list of memos to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??å¤?å¿?å??è¡¨"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:418
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d ä¸ªå¤?å¿?"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:422
+#: ../modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d selected"
 msgstr "é??ä¸ %d ä¸ª"
@@ -15152,26 +15235,26 @@ msgstr "æ??å?°ä»»å?¡å??è¡¨"
 msgid "Preview the list of tasks to be printed"
 msgstr "é¢?è§?è¦?æ??å?°ç??ä»»å?¡å??è¡¨"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:466
 msgid "Expunging"
 msgstr "é??æ¯?"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:569
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d ä¸ªä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "å? é?¤ä»»å?¡"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "å? é?¤ä»»å?¡"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:359
 #, c-format
 msgid "%d attached messages"
 msgstr "%d ä¸ªé??å? ç??ä¿¡æ?¯"
@@ -15183,444 +15266,469 @@ msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ? "
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "æ?°å??ä¸?å°?æ?°ä¿¡"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?®ä»¶æ??ä»¶å¤¹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "å??å»ºæ?°é?®ä»¶æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:493
 msgid "Mail Accounts"
 msgstr "é?®ä»¶å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:501
 msgid "Mail Preferences"
 msgstr "é?®ä»¶é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:509
 msgid "Composer Preferences"
 msgstr "ç¼?å??å?¨é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-backend.c:513
+#: ../modules/mail/e-mail-shell-backend.c:517
 msgid "Network Preferences"
 msgstr "ç½?ç»?é¦?é??é¡¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:880
-#: ../modules/mail/e-mail-shell-view.c:883
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../modules/mail/e-mail-shell-view-actions.c:521
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgstr "â??%sâ??æ??ä»¶å¤¹ä¸å??å?« %d æ?¡é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?æ?³å? é?¤å??ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:522
+#, c-format
+#| msgid "Are you sure you want to delete this memo?"
+msgid ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr "â??%sâ??æ??ä»¶å¤¹å??å?« %d å°?é??å¤?ä¿¡æ?¯ã??æ?¨ç¡®å®?è¦?å? é?¤å®?ä»¬å??ï¼?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
+#: ../modules/mail/e-mail-shell-view.c:943
 msgid "_Disable Account"
 msgstr "ç¦?ç?¨å¸?å?·(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "Disable this account"
 msgstr "ç¦?ç?¨è¿?ä¸ªå¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:889
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??æ??ä»¶å¤¹ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "C_reate Search Folder From Search..."
 msgstr "ä»?å¤´å??å»ºæ??ç´¢æ??ä»¶å¤¹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:901
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è½½ä¿¡æ?¯ä»¥ç¦»çº¿ä½¿ç?¨(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:1131
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è½½æ ?è®°ä¸ºç¦»çº¿ä½¿ç?¨ç??å¸?å?·å??æ??ä»¶å¤¹ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç©ºå??ä»¶ç®±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "_Copy Folder To..."
 msgstr "æ??ä»¶å¤¹å¤?å?¶å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Copy the selected folder into another folder"
 msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹å¤?å?¶å?°å?¶å®?æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?å? é?¤æ¤æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "E_xpunge"
 msgstr "é??æ¯?(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "ä»?è¯¥æ??ä»¶å¤¹æ°¸ä¹?å? é?¤æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:936
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Mar_k All Messages as Read"
 msgstr "æ??å?¨é?¨ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Mark all messages in the folder as read"
 msgstr "å°?æ¤æ??ä»¶å¤¹ä¸ç??æ??æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:943
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "_Move Folder To..."
 msgstr "æ??ä»¶å¤¹ç§»è?³(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Move the selected folder into another folder"
 msgstr "æ??é??ä¸ç??æ??ä»¶å¤¹ç§»è?³å?¶å®?æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "_New..."
 msgstr "æ?°å»º(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "Create a new folder for storing mail"
 msgstr "å??å»ºå?å?¨é?®ä»¶ç??æ?°æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å±?æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Refresh the folder"
 msgstr "å?·æ?°æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹æ¤æ??ä»¶å¤¹ç??å??ç§°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#| msgid "_Edit message"
+msgid "Remo_ve duplicate messages"
+msgstr "ç§»é?¤é??å¤?ä¿¡æ?¯(_V)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#| msgid "Select all visible messages"
+msgid "Remove all duplicate messages"
+msgstr "ç§»é?¤æ??æ??é??å¤?æ¶?æ?¯"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select Message _Thread"
 msgstr "é??æ?©ä¿¡æ?¯çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "Select all messages in the same thread as the selected message"
 msgstr "æ??å??ä¸?çº¿ç´¢ä¸ç??æ??æ??ä¿¡æ?¯é??æ?©ä¸ºé??ä¸ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Select Message S_ubthread"
 msgstr "é??æ?©ä¿¡æ?¯å?çº¿ç´¢(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:987
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Select all replies to the currently selected message"
 msgstr "é??æ?©å½?å??é??ä¸ä¿¡æ?¯ç??æ??æ??å??å¤?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
-msgid "_Unsubscribe"
-msgstr "é??è®¢(_U)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:994
-msgid "Unsubscribe from the selected folder"
-msgstr "å??æ¶?å¯¹é??å®?æ??ä»¶å¤¹ç??è®¢é??"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Empty _Trash"
 msgstr "æ¸?ç©ºåº?ä»¶ç®±(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??å¸?å?·ä¸ç??æ??æ??å·²å? é?¤ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1241
 msgid "_New Label"
 msgstr "æ?°å»ºæ ?ç¾(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "N_one"
 msgstr "æ? (_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#| msgid "_Subscriptions..."
+msgid "_Manage Subscriptions"
+msgstr "ç®¡ç??è®¢é??(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è®¢é??æ??é??è®¢è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??ä»¶å¤¹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?å½?å??é?®ä»¶æ??ä½?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
 msgid "Collapse All _Threads"
 msgstr "æ??å? å?¨é?¨çº¿ç´¢(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Collapse all message threads"
 msgstr "æ??å? å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "E_xpand All Threads"
 msgstr "å±?å¼?å?¨é?¨çº¿ç´¢(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Expand all message threads"
 msgstr "å±?å¼?å?¨é?¨ä¿¡æ?¯çº¿ç´¢"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_Message Filters"
 msgstr "ä¿¡æ?¯è¿?æ»¤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Create or edit rules for filtering new mail"
 msgstr "å??å»ºæ??ç¼?è¾?è¿?æ»¤æ?°é?®ä»¶ç??è§?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Search F_olders"
 msgstr "æ??ç´¢æ??ä»¶å¤¹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Create or edit search folder definitions"
 msgstr "å??å»ºæ??ç¼?è¾?æ??ç´¢æ??ä»¶å¤¹å®?ä¹?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Subscriptions..."
 msgstr "è®¢é??(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "è®¢é??æ??é??è®¢è¿?ç¨?æ??å?¡å?¨ä¸?ç??æ??ä»¶å¤¹"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "F_older"
 msgstr "æ??ä»¶å¤¹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_Label"
 msgstr "æ ?ç¾(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
 msgid "_New Folder..."
 msgstr "æ?°å»ºæ??ä»¶å¤¹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
+#: ../modules/mail/e-mail-shell-view-actions.c:1404
 msgid "Show Message _Preview"
 msgstr "æ?¾ç¤ºä¿¡æ?¯é¢?è§?(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "Show message preview pane"
 msgstr "æ?¾ç¤ºä¿¡æ?¯é¢?è§?çª?å?£"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "Show _Deleted Messages"
 msgstr "æ?¾ç¤ºå? é?¤ç??ä¿¡æ?¯(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1414
 msgid "Show deleted messages with a line through them"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸æ?¾ç¤ºå? é?¤äº?ç??ä¿¡æ?¯(å¸¦æ??å? é?¤çº¿)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1167
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "_Group By Threads"
 msgstr "æ??çº¿ç´¢å??ç»?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1169
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "Threaded message list"
 msgstr "æ??çº¿ç´¢æ??å??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1190
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Show message preview below the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨ä¸?æ?¹æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1197
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Show message preview alongside the message list"
 msgstr "å?¨ä¿¡æ?¯å??è¡¨æ??æ?¾ç¤ºä¿¡æ?¯é¢?è§?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "All Messages"
 msgstr "å?¨é?¨ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1465
 msgid "Important Messages"
 msgstr "é??è¦?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1472
 msgid "Last 5 Days' Messages"
 msgstr "å??äº?å¤©ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Messages Not Junk"
 msgstr "ä¸?æ?¯å??å?¾ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Messages with Attachments"
 msgstr "æ??é??ä»¶ç??ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "No Label"
 msgstr "æ? æ ?ç¾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Read Messages"
 msgstr "å·²è¯»ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Recent Messages"
 msgstr "æ??è¿?ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Unread Messages"
 msgstr "æ?ªè¯»ä¿¡æ?¯"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "Subject or Addresses contain"
 msgstr "ä¸»é¢?æ??å?°å??å?«æ??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1323
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "All Accounts"
 msgstr "å?¨é?¨å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "Current Account"
 msgstr "å½?å??å¸?å?·"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1590
 msgid "Current Folder"
 msgstr "å½?å??æ??ä»¶å¤¹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1024
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é??ä¸ %d ä¸ªï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1001
+#: ../modules/mail/e-mail-shell-view-private.c:1035
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d å°?å·²å? é?¤"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1048
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å°?è??ç¨¿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "ï¼?%d å°?æ?ªè¯»ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1081
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "æ?»å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:562
 msgid "All Account Search"
 msgstr "å?¨é?¨å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:686
+#: ../modules/mail/e-mail-shell-view.c:745
 msgid "Account Search"
 msgstr "å¸?å?·æ??ç´¢"
 
-#: ../modules/mail/e-mail-shell-view.c:881
+#: ../modules/mail/e-mail-shell-view.c:941
 msgid "Proxy _Logout"
 msgstr "ä»£ç??æ??å?¡å?¨æ³¨é??(_L)"
 
-#: ../modules/mail/em-account-prefs.c:133
+#: ../modules/mail/em-account-prefs.c:217
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸?å?·å?©æ??"
 
-#: ../modules/mail/em-account-prefs.c:182
+#: ../modules/mail/em-account-prefs.c:266
 msgid "Account Editor"
 msgstr "å¸?å?·ç¼?è¾?å?¨"
 
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../modules/mail/em-composer-prefs.c:497
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:211
 msgid "Enabled"
 msgstr "å·²å?¯ç?¨"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:501
 msgid "Language(s)"
 msgstr "è¯è¨?"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Every time"
 msgstr "æ¯?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Once per day"
 msgstr "æ¯?å¤©ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per week"
 msgstr "æ¯?å?¨ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?æ¬¡"
 
-#: ../modules/mail/em-mailer-prefs.c:201
+#: ../modules/mail/em-mailer-prefs.c:173
 msgid "Add Custom Junk Header"
 msgstr "æ·»å? è?ªå®?ä¹?å??å?¾ä¿¡æ?¯å¤´"
 
-#: ../modules/mail/em-mailer-prefs.c:209
+#: ../modules/mail/em-mailer-prefs.c:181
 msgid "Header Name:"
 msgstr "ä¿¡å¤´å??ç§°ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:210
+#: ../modules/mail/em-mailer-prefs.c:182
 msgid "Header Value Contains:"
 msgstr "ä¿¡å¤´å?¼å?«æ??ï¼?"
 
-#: ../modules/mail/em-mailer-prefs.c:310
+#: ../modules/mail/em-mailer-prefs.c:282
 msgid "Header"
 msgstr "é¡µç??"
 
-#: ../modules/mail/em-mailer-prefs.c:314
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Contains Value"
 msgstr "å??å?«å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:707 ../modules/mail/em-mailer-prefs.c:778
+#: ../modules/mail/em-mailer-prefs.c:678 ../modules/mail/em-mailer-prefs.c:749
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "%s æ??ä»¶å?¯ç?¨ï¼?äº?è¿?å?¶æ??ä»¶å·²ç»?å®?è£?ã??"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:715 ../modules/mail/em-mailer-prefs.c:787
+#: ../modules/mail/em-mailer-prefs.c:686 ../modules/mail/em-mailer-prefs.c:758
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s æ??ä»¶ä¸?å?¯ç?¨ã??è¯·æ£?æ?¥è½¯ä»¶å??æ?¯å?¦å·²å®?è£?ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:751
+#: ../modules/mail/em-mailer-prefs.c:722
 msgid "No junk plugin available"
 msgstr "æ²¡æ??å?¯ç?¨ç??å??å?¾ä¿¡æ?¯æ??ä»¶"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/mail/em-mailer-prefs.c:1105
 msgid "_Date header:"
 msgstr "æ?¥æ??å¤´ï¼?(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1106
 msgid "Show _original header value"
 msgstr "æ?¾ç¤ºå??å§?é?®ä»¶å¤´å?¼(_o)"
 
@@ -15633,10 +15741,39 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å?¯å?¨ Evolution ç??æ?¶å??ï¼?æ£?æ?¥å®?æ?¯å?¦æ?¯é»?è®¤é?®ä»¶ç¨?åº?ã??"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:139
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æ?¨æ?¯å?¦æ?³è¦?å°? Evolution è®¾ç½®ä¸ºæ?¨ç??é»?è®¤ç?µå?é?®ä»¶å®¢æ?·ç«¯ï¼?"
 
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "ä½?è??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "æ??ä»¶ç®¡ç??å?¨"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "æ³¨æ??ï¼?æ??äº?æ?´æ?¹ç?´å?°é??æ?°å?¯å?¨å??æ??ç??æ??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "æ¦?è§?"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "æ??ä»¶"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "æ??ä»¶(_P)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "å?¯ç?¨å??ç¦?ç?¨æ??ä»¶"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "æ?¨å¥½ Python"
@@ -15653,39 +15790,39 @@ msgstr "Python æµ?è¯?æ??ä»¶"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python Eplugin å? è½½å?¨æµ?è¯?æ??ä»¶ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:275
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 msgid "Please select the information that you would like to import:"
 msgstr "è¯·é??æ?©æ?¨å¸?æ??å¯¼å?¥ç??ä¿¡æ?¯ï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:307
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "ä»? %sï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:318
-#: ../modules/startup-wizard/evolution-startup-wizard.c:415
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "å¯¼å?¥æ??ä»¶"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "å¯¼å?¥è¢«å??æ¶?ã??ç?¹å?»â??å??è¿?â??ç»§ç»"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:411
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "å¯¼å?¥å·²å®?æ??ã??ç?¹å?»â??å??è¿?â??ç»§ç»"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:471
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "Evolution è®¾ç½®å?©æ??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "æ¬¢è¿?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:482
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15711,8 +15848,13 @@ msgid ""
 "body"
 msgstr "ä¿¡æ?¯ä¸»ä½?ä¸ç??ç?¨äº?é??ä»¶æ??é??æ??ä»¶ç??çº¿ç´¢å??è¡¨"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "ä¸?å??æ?¾ç¤ºæ¤ä¿¡æ?¯(_D)ã??"
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:410
 msgid "Keywords"
 msgstr "å?³é?®å?"
 
@@ -15751,15 +15893,18 @@ msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?®ä»¶ä¿¡æ?¯é??æ?æ?¾é?³é¢?é??ä»¶"
 
 #: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#| msgid "Select name of the Evolution backup file"
+msgid "Select name of the Evolution back up file"
 msgstr "é??æ?© Evolution å¤?ä»½æ??ä»¶å??ç§°"
 
 #: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
+#| msgid "_Restart Evolution after backup"
+msgid "_Restart Evolution after back up"
 msgstr "å¤?ä»½å??é??æ?°å?¯å?¨ Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#| msgid "Select name of the Evolution backup file to restore"
+msgid "Select name of the Evolution back up file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç?? Evolution å¤?ä»½æ??ä»¶å??ç§°"
 
 #: ../plugins/backup-restore/backup-restore.c:230
@@ -15767,8 +15912,12 @@ msgid "_Restart Evolution after restore"
 msgstr "æ?¢å¤?å??é??æ?°å?¯å?¨ Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:298
+#| msgid ""
+#| "You can restore Evolution from your backup. It can restore all the Mails, "
+#| "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+#| "settings, mail filters etc."
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
@@ -15776,7 +15925,8 @@ msgstr ""
 "å®?è¿?è?½æ?¢å¤?æ?¨ç??æ??æ??ç??ä¸ªäººè®¾ç½®å??é?®ä»¶è¿?æ»¤å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
+#| msgid "_Restore Evolution from the backup file"
+msgid "_Restore Evolution from the back up file"
 msgstr "ä»?å¤?ä»½æ??ä»¶ä¸æ?¢å¤? Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:312
@@ -15788,134 +15938,145 @@ msgid "Choose a file to restore"
 msgstr "é??æ?©è¦?æ?¢å¤?ç??æ??ä»¶"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
+#| msgid "Restore from backup"
+msgid "Restore from back up"
 msgstr "ä»?å¤?ä»½ä¸æ?¢å¤?"
 
 #: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "å¤?ä»½Evolutionè®¾ç½®(_B)..."
+#| msgid "Backing up Evolution Data"
+msgid "_Back up Evolution Data..."
+msgstr "å¤?ä»½ Evolution æ?°æ?®(_B)..."
 
 #: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
-msgstr "å¤?ä»½å??æ?¢å¤? Evolution ç??æ?°æ?®å??è®¾ç½®å?°ä¸?ä¸ªå½?æ¡£æ??ä»¶"
+#| msgid "Backup Evolution data and settings to an archive file"
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "å¤?ä»½ Evolution ç??æ?°æ?®å??è®¾ç½®å?°ä¸?ä¸ªå½?æ¡£æ??ä»¶"
 
 #: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "æ?¢å¤?Evolutionè®¾ç½®(_R)..."
+#| msgid "Restoring Evolution Data"
+msgid "R_estore Evolution Data..."
+msgstr "æ?¢å¤? Evolution æ?°æ?®(_E)..."
 
 #: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "ä»?å½?æ¡£æ??ä»¶å¤?ä»½å??æ?¢å¤? Evolution ç??æ?°æ?®å??è®¾ç½®"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
+#: ../plugins/backup-restore/backup.c:80
+#| msgid "Backup Evolution directory"
+msgid "Back up Evolution directory"
 msgstr "å¤?ä»½ Evolution ç?®å½?"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:82
 msgid "Restore Evolution directory"
 msgstr "æ?¢å¤? Evolution ç?®å½?"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:84
+#| msgid "Check Evolution Backup"
+msgid "Check Evolution Back up"
 msgstr "æ£?æ?¥ Evolution å¤?ä»½"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:86
 msgid "Restart Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:88
 msgid "With Graphical User Interface"
 msgstr "å¸¦å?¾å½¢ç?¨æ?·ç??é?¢"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:290
+#: ../plugins/backup-restore/backup.c:400
 msgid "Shutting down Evolution"
 msgstr "å?³é? Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:297
 msgid "Backing Evolution accounts and settings"
 msgstr "å¤?ä»½ Evolution ç??å¸?å?·å??è®¾ç½®"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:305
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "å¤?ä»½ Evolution æ?°æ?®(é?®ä»¶ã??è??ç³»äººã??æ?¥å??ã??ä»»å?¡ã??å¤?å¿?)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:318
+#| msgid "Backup complete"
+msgid "Back up complete"
 msgstr "å¤?ä»½å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:323
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restarting Evolution"
 msgstr "é??æ?°å?¯å?¨ Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:404
 msgid "Back up current Evolution data"
 msgstr "å¤?ä»½å½?å?? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:410
+#| msgid "Extracting files from backup"
+msgid "Extracting files from back up"
 msgstr "ä»?å¤?ä»½ä¸æ??å??æ??ä»¶"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:467
 msgid "Loading Evolution settings"
 msgstr "è½½å?¥ Evolution ç??è®¾ç½®"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:482
+#| msgid "Removing temporary backup files"
+msgid "Removing temporary back up files"
 msgstr "å? é?¤ä¸´æ?¶å¤?ä»½æ??ä»¶"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:492
 msgid "Ensuring local sources"
 msgstr "ç¡®ä¿?æ?¬å?°æº?"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:679
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ£å?¨å¤?ä»½å?°æ??ä»¶å¤¹ %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:684
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "æ£å?¨ä»?æ??ä»¶å¤¹ %s ä¸æ?¢å¤?"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:706
+#| msgid "Evolution Backup"
+msgid "Evolution Back up"
 msgstr "Evolution å¤?ä»½"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:706
 msgid "Evolution Restore"
 msgstr "Evolution æ?¢å¤?"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:747
 msgid "Backing up Evolution Data"
 msgstr "æ£å?¨å¤?ä»½ Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:748
 msgid "Please wait while Evolution is backing up your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨å¤?ä»½æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:750
 msgid "Restoring Evolution Data"
 msgstr "æ£å?¨æ?¢å¤? Evolution æ?°æ?®"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:751
 msgid "Please wait while Evolution is restoring your data."
 msgstr "è¯·ç¨?å??ï¼?Evolution æ£å?¨æ?¢å¤?æ?¨ç??æ?°æ?®ã??"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:769
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "è¿?å?¯è?½è¦?è?±ä¸?ç?¹æ?¶é?´ï¼?å??å?³äº?æ?¨å¸?å?·ä¸ç??æ?°æ?®æ?»é??ã??"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+#| msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "å¤?ä»½å??æ?¢å¤?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+#| msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "å¤?ä»½å??æ?¢å¤? Evolution ç??æ?°æ?®å??è®¾ç½®ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -15923,12 +16084,15 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "æ?¨ç¡®å®?è¦?å?³é? Evolution å??ï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
+"Are you sure you want to restore Evolution from the selected back up file?"
 msgstr "æ?¨ç¡®å®?æ?³è¦?ä»?é??ä¸ç??å¤?ä»½æ??ä»¶ä¸æ?¢å¤? Evolution å??ï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+#| msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "å?³é?å¹¶å¤?ä»½ Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -15940,31 +16104,41 @@ msgid "Insufficient Permissions"
 msgstr "æ??é??ä¸?å¤?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+#| msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "æ? æ??ç?? Evolution å¤?ä»½æ??ä»¶"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
-msgstr "è¯·é??æ?©è¦?æ?¢å¤?ç??æ??æ??å¤?ä»½æ??ä»¶ã??"
+#| msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
+msgstr "è¯·é??æ?©ä¸?ä¸ªæ??æ??ç??å¤?ä»½æ??ä»¶è¿?è¡?æ?¢å¤?ã??"
 
 #: ../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:9
+#| msgid ""
+#| "To backup your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding."
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up 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."
 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."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "è¦?æ?¢å¤?æ?¨ç??æ?°æ?®å??è®¾ç½®ï¼?æ?¨å¿?é¡»å??å?³é? Evolutionã??è¯·å?¨å¤?ç??å??ç¡®è®¤æ?¨ä¿?å?äº?æ??æ??æ?ªä¿?"
 "å?ç??æ?°æ?®ã??è¿?ä¼?å? é?¤æ??æ??æ?¨å½?å?? Evolution ç??æ?°æ?®å??è®¾ç½®ï¼?å¹¶ä»?æ?¨ç??å¤?ä»½ä¸æ?¢å¤?ã??"
@@ -16018,33 +16192,33 @@ msgstr ""
 "å?¨æ?¨å??å¤?é?®ä»¶æ?¶è?ªå?¨ç?¨å§?å??å??ç?µå?é?®ä»¶å?°å??å¡«å?¥æ?¨ç??å?°å??ç°¿ã??å??æ?¶è¿?å°?å¡«å?¥æ?¨å¥½å??å??è¡¨"
 "ç??å?³æ?¶é??è®¯è??ç³»ä¿¡æ?¯ã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter ä¸?å?¯ç?¨ï¼?è¯·å??å®?è£?å®?ã??"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¯å?¨ %s æ?¶å?ºé??ï¼?%sã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å?è¿?ç¨?ä¸?å??åº?ï¼?æ??æ»è¿?ç¨?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "ç?å¾? Bogofilter å?è¿?ç¨?ä¸æ?ï¼?ä¸æ¢..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å»ºç«?å?° Bogofilter ç??ç®¡é??å¤±è´¥ï¼?é??è¯¯ä»£ç ?ï¼?%d"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "å°?ä¿¡æ?¯æ??æ?¬è½¬æ?¢ä¸º _Unicode"
 
@@ -16173,6 +16347,13 @@ msgstr "_URLï¼?"
 msgid "Use _SSL"
 msgstr "ä½¿ç?¨ _SSL"
 
+#: ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
+msgid "User_name:"
+msgstr "ç?¨æ?·å??(_N)ï¼?"
+
 #: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "æµ?è§?æ??å?¡å?¨ä»¥æ?¥æ?¾æ?¥å??(_E)"
@@ -16330,11 +16511,11 @@ msgstr "å¦?æ??å?¯ä»¥ï¼?æ·»å? ä¸?ä¸ªå?°å?¾æ?¥æ?¾ç¤ºè??ç³»äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "è??ç³»äººå?°å?¾"
 
-#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/dbx-import/dbx-importer.c:233
 msgid "Select folder to import OE folder into"
 msgstr "é??æ?©è¦?å°? Outlook Express æ??ä»¶å¤¹å¯¼å?¥å?°å?ªä¸ªæ??ä»¶å¤¹"
 
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "å¯¼å?¥ Outlook Express æ?°æ?®"
 
@@ -16404,7 +16585,7 @@ msgid "Protected"
 msgstr "å??ä¿?æ?¤ç??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Secret"
 msgstr "æ?ºå¯?"
 
@@ -16437,7 +16618,7 @@ msgid "Key"
 msgstr "é?®"
 
 #: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/templates/templates.c:416
 msgid "Values"
 msgstr "å?¼"
 
@@ -16459,7 +16640,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?®ä»¶ç¼?è¾?å?¨ä¸æ??é?®æ?¶è?ªå?¨å?¯å?¨æ??æ?¬ç¼?è¾?å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:129
 msgid "Automatically launch when a new mail is edited"
 msgstr "å?¨ç¼?è¾?æ?°é?®ä»¶æ?¶è?ªå?¨å?¯å?¨"
 
@@ -16471,11 +16652,11 @@ msgstr "é»?è®¤å¤?é?¨ç¼?è¾?å?¨"
 msgid "The default command that must be used as the editor."
 msgstr "é»?è®¤å?½ä»¤å¿?é¡»ç?¨ä½?ç¼?è¾?å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:118
 msgid "Command to be executed to launch the editor: "
 msgstr "è°?ç?¨ç¼?è¾?å?¨è¦?æ?§è¡?ç??å?½ä»¤ï¼?"
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:119
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16483,8 +16664,8 @@ msgstr ""
 "Emacs åº?ä½¿ç?¨â??xemacsâ??\n"
 "VI åº?ä½¿ç?¨â??gvim -fâ??"
 
-#: ../plugins/external-editor/external-editor.c:382
-#: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:385
+#: ../plugins/external-editor/external-editor.c:387
 msgid "Compose in External Editor"
 msgstr "å?¨å¤?é?¨ç¼?è¾?å?¨ä¸å??ä½?"
 
@@ -16606,8 +16787,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:548
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "æ?ªç?¥é??è¯¯ã??"
 
@@ -16659,12 +16840,12 @@ msgstr "æ??æ?¶æ?¥å??"
 msgid "Rese_nd Meeting..."
 msgstr "é??æ?°å??é??ä¼?è®®(_N)..."
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:355
 msgid "Create folder"
 msgstr "å??å»ºæ??ä»¶å¤¹"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16689,11 +16870,11 @@ msgstr ""
 "å??å?»â??åº?ç?¨â??å?¯å®?è£?å?±äº«æ??ä»¶å¤¹\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "å®?è£?å?±äº«æ??ä»¶å¤¹"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "å?±äº«æ??ä»¶å¤¹å®?è£?"
 
@@ -16723,7 +16904,7 @@ msgid "_Junk List"
 msgstr "å??å?¾æµ?è¯?(_J)"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
@@ -16746,6 +16927,11 @@ msgstr "é?®ä»¶æ??å??æ?¶å??"
 msgid "Insert Send options"
 msgstr "æ??å?¥å??é??é??é¡¹"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "æ?¶ä»¶äººå°?æ?¥æ?¶å?°ä¸?å??é??ç?¥ã??\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "ä¸º GroupWise ä¿¡æ?¯æ·»å? å??é??é??é¡¹"
@@ -16862,30 +17048,22 @@ msgstr "è?ªå®?ä¹?é??ç?¥ä¿¡æ?¯(_U)"
 msgid "Con_tacts..."
 msgstr "è??ç³»äºº(_T)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "å?±äº«æ??ä»¶å¤¹é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "æ?¶ä»¶äººå°?æ?¥æ?¶å?°ä¸?å??é??ç?¥ã??\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "ç?¨æ?·ï¼?"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "æ?ªå?±äº«(_N)"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
 msgstr "å?±äº«å¯¹è±¡(_S)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "å?±äº«(_S)"
-
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "è®¿é?®æ??é??"
@@ -16939,106 +17117,110 @@ msgstr "å¸?å?·å??"
 msgid "Proxy Login"
 msgstr "ä»£ç??æ??å?¡å?¨ç?»å½?"
 
-#: ../plugins/groupwise-features/proxy-login.c:208
-#: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè¾?å?¥ %s ç??å¯?ç ?(ç?¨æ?· %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "ä»£ç??æ??å?¡å?¨æ ?ç¾ä»?å½?å¸?å?·è??æ?ºæ?¶æ??å?¯ç?¨ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:704
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "ä»£ç??æ??å?¡å?¨æ ?ç¾ä»?å½?å¸?å?·å?¯ç?¨æ?¶æ??å?¯ç?¨ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "ä»£ç??æ??å?¡å?¨"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "æ·»å? ç?¨æ?·"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "é«?çº§å??é??é??é¡¹"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "ç?¨æ?·"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:319
 msgid "Enter the users and set permissions"
 msgstr "è¾?å?¥ç?¨æ?·å??è®¾å®?æ??é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:420
 msgid "Sharing"
 msgstr "å?±äº«"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "è?ªå®?ä¹?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "æ·»å? "
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/share-folder.c:738
+msgid "Modify"
+msgstr "ä¿®æ?¹"
+
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "ä¿¡æ?¯ç?¶æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "ä¸»é¢?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "å??ä»¶äººï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "å??å»ºæ?¥æ??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "æ?¶ä»¶äººï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "å·²æ??é??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "å·²æ??å¼?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "å·²æ?¥å??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "å·²å? é?¤ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "å·²æ??ç»?ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "å·²å®?æ??ï¼?"
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "æ?ªæ??é??ï¼?"
 
@@ -17103,194 +17285,194 @@ msgstr "IMAP ç?¹æ?§"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:486
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "è½½å?¥æ?¥å??â??%sâ??å¤±è´¥(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:650
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "æ?¥å??â??%sâ??ä¸ç??ä¸?ä¸ªçº¦ä¼?ä¸?æ¤ä¼?è®®å?²çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:686
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å?¨æ?¥å??â??%sâ??ä¸æ?¾å?°äº?çº¦ä¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find any calendars"
 msgstr "æ? æ³?æ?¾å?°ä»»ä½?æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:792
 msgid "Unable to find this meeting in any calendar"
 msgstr "æ? æ³?å?¨ä»»ä½?æ?¥å??ä¸æ?¾å?°æ¤ä¼?è®®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this task in any task list"
 msgstr "æ? æ³?å?¨ä»»ä½?ä»»å?¡å??è¡¨ä¸æ?¾å?°æ¤ä»»å?¡"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this memo in any memo list"
 msgstr "æ? æ³?å?¨ä»»ä½?å¤?å¿?å??è¡¨ä¸æ?¾å?°æ¤å¤?å¿?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:876
 msgid "Opening the calendar. Please wait.."
 msgstr "æ£å?¨æ??å¼?æ?¥å??ï¼?è¯·ç¨?å??..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:879
 msgid "Searching for an existing version of this appointment"
 msgstr "æ??ç´¢æ¤çº¦ä¼?ç??å·²æ??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1162
 msgid "Unable to parse item"
 msgstr "æ? æ³?å??æ??é¡¹ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "æ? æ³?å°?é¡¹ç?®å??é??å?°æ?¥å??â??%sâ??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1263
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå¾?å®?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1272
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²æ??ç»?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1277
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å°?æ?¥å??â??%sâ??å??é??ä¸ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "ç»?ç»?è??å·²ç»?å? é?¤äº?ä»£ç??äºº %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1378
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å·²ç»?ä»£ç??äººå??é??äº?å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1380
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "æ? æ³?ç»?ä»£ç??äººå??é??å??æ¶?é??ç?¥"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1491
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "å?ºå¸è??ç?¶æ??æ? æ³?æ?´æ?°ï¼?å??å? æ?¯ç?¶æ??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1520
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "æ? æ³?æ?´æ?°å?ºå¸è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 msgid "Attendee status updated"
 msgstr "å?ºå¸è??ç?¶æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1550
 msgid "Meeting information sent"
 msgstr "ä¼?è®®ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1553
 msgid "Task information sent"
 msgstr "ä»»å?¡ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1556
 msgid "Memo information sent"
 msgstr "å¤?å¿?ä¿¡æ?¯å·²å??é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1565
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "æ? æ³?å??é??ä¼?è®®ä¿¡æ?¯ï¼?ä¼?è®®ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1568
 msgid "Unable to send task information, the task does not exist"
 msgstr "æ? æ³?å??é??ä»»å?¡ä¿¡æ?¯ï¼?ä»»å?¡ä¸?å?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1571
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "æ? æ³?å??é??å¤?å¿?ä¿¡æ?¯ï¼?å¤?å¿?ä¸?å?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1636
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1641
 msgid "Save Calendar"
 msgstr "ä¿?å?æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
-#: ../plugins/itip-formatter/itip-formatter.c:1597
+#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "The calendar attached is not valid"
 msgstr "é??å? ç??æ?¥å??æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1694
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "ä¿¡æ?¯å£°æ??å?¶å??å?«æ?¥å??ï¼?ä½?æ?¥å??ä¸?æ?¯æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1638
-#: ../plugins/itip-formatter/itip-formatter.c:1666
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../plugins/itip-formatter/itip-formatter.c:1745
+#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1882
 msgid "The item in the calendar is not valid"
 msgstr "æ?¥å??é¡¹æ? æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1746
+#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1883
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "ä¿¡æ?¯ç??ç¡®å??å?«æ?¥å??ï¼?ä½?æ?¯æ?¥å??ä¸?å??å?«äº?ä»¶ã??ä»»å?¡æ??å¿?/é?²ä¿¡æ?¯"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1680
+#: ../plugins/itip-formatter/itip-formatter.c:1787
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??æ?¥å??å??å?«å¤?ä¸ªé¡¹ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1788
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?å¤?ç??è¿?äº?å?¨é?¨é¡¹ç?®ï¼?åº?è¯¥ä¿?å?æ??ä»¶å¹¶å¯¼å?¥æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2454
+#: ../plugins/itip-formatter/itip-formatter.c:2561
 msgid "This meeting recurs"
 msgstr "æ¤ä¼?è®®é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2457
+#: ../plugins/itip-formatter/itip-formatter.c:2564
 msgid "This task recurs"
 msgstr "æ¤ä»»å?¡é??ç?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2460
+#: ../plugins/itip-formatter/itip-formatter.c:2567
 msgid "This memo recurs"
 msgstr "æ¤å¤?å¿?é??ç?°"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2801
 msgid "_Delete message after acting"
 msgstr "æ??ä½?å??å? é?¤ä¿¡æ?¯(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2704
-#: ../plugins/itip-formatter/itip-formatter.c:2737
+#: ../plugins/itip-formatter/itip-formatter.c:2811
+#: ../plugins/itip-formatter/itip-formatter.c:2844
 msgid "Conflict Search"
 msgstr "å?²çª?æ??ç´¢"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2719
+#: ../plugins/itip-formatter/itip-formatter.c:2826
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é??æ?©è¦?æ??ç´¢å?²çª?ä¼?è®®ç??æ?¥å??"
 
@@ -17655,7 +17837,7 @@ msgstr "å¼?å§?æ?¥æ??ï¼?"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "å¼?å§?æ?¶é?´ï¼?"
 
@@ -17665,7 +17847,7 @@ msgstr "ç»?æ??æ?¥æ??ï¼?"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "ç»?æ??æ?¶é?´ï¼?"
 
@@ -17724,41 +17906,41 @@ msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "æ³¨é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "å??å¤?å??ä»¶äºº(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "ç»?å?ºå¸è??å??é??æ?´æ?°(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "åº?ç?¨å?°å?¨é?¨å®?ä¾?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "å°?æ?¶é?´æ?¾ç¤ºä¸ºç©ºé?²(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "ç»§æ?¿æ??ç¤º(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "ä»»å?¡(_T)ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "å¤?å¿?(_M)ï¼?"
 
@@ -17788,84 +17970,76 @@ msgid "Beep or play sound file."
 msgstr "å??å?ºå??ç??ä¸?å£°æ??æ?æ?¾å£°é?³æ??ä»¶ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "é?ªç??é??ç?¥å?ºå??å?¾æ ?ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "å?¯ç?¨ D-Bus ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "å?¯ç?¨é??ç?¥å?ºå?¾æ ?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶ç??æ?? D-Bus ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "æ?°ä¿¡æ?¯å?°è¾¾æ?¶ï¼?æ¤å?¼å¦?æ??ä¸º trueï¼?å??å??é??ï¼?å?¦å??æ?æ?¾å£°é?³æ??ä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "ä¸?å?¨ beep æ¨¡å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?æ?¾ä¸»é¢?ç??å£°é?³æ??ä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "å??æ?¶å¼¹å?ºä¿¡æ?¯å??å?¾æ ?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶å?¨é??ç?¥å?ºæ?¾ç¤ºæ?°é?®ä»¶å?¾æ ?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "å¾?æ?æ?¾ç??å£°é?³æ??ä»¶å??ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "ä¸?å?¨ beep æ¨¡å¼?ä¸?æ?¶æ?°é?®ä»¶å?°è¾¾è¦?æ?æ?¾ç??å£°é?³æ??ä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "ä½¿ç?¨å£°é?³ä¸»é¢?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?¯æ?æ?¾å£°é?³æ??ä»¶è¿?æ?¯å??ä¸?ä¸?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?¯å?¦å?¨å?¾æ ?ä¸?æ?¾ç¤ºä¿¡æ?¯"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "æ?¯å?¦é?ªç??å?¾æ ?ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶ç®±æ??ä»¶å¤¹ä¸ç??æ?°ä¿¡æ?¯ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:369
+#: ../plugins/mail-notification/mail-notification.c:351
 msgid "Evolution's Mail Notification"
 msgstr "Evolution é?®ä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:373
 msgid "Mail Notification Properties"
 msgstr "é?®ä»¶é??ç?¥å±?æ?§"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:506
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17877,66 +18051,62 @@ msgstr[0] "æ?¨å?¨ %2$s ä¸æ?¶å?°äº? %1$d å°?æ?°é?®ä»¶ã??"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:518
 #, 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:552
+#: ../plugins/mail-notification/mail-notification.c:531
 #, c-format
 msgid "Subject: %s"
 msgstr "ä¸»é¢?ï¼?%s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:541
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨æ?¶å?°äº? %d å°?æ?°é?®ä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:558
+#: ../plugins/mail-notification/mail-notification.c:565
 msgid "New email"
 msgstr "æ?°ç?µå?é?®ä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:626
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å?ºæ?¾ç¤ºå?¾æ ?(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
-
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:656
 msgid "Popup _message together with the icon"
 msgstr "å??æ?¶å¼¹å?ºå?¾æ ?å??ä¿¡æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:843
 msgid "_Play sound when new messages arrive"
 msgstr "æ?°é?®ä»¶å?°è¾¾æ?¶æ?æ?¾å£°é?³(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:873
 msgid "_Beep"
 msgstr "å??é??(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:886
 msgid "Use sound _theme"
 msgstr "ä½¿ç?¨å£°é?³ä¸»é¢?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:905
 msgid "Play _file:"
 msgstr "æ?æ?¾æ??ä»¶(_F)ï¼?"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:916
 msgid "Select sound file"
 msgstr "é??æ?©å£°é?³æ??ä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:974
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶ç®±ä¸ç??æ?°ä¿¡æ?¯(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:983
 msgid "Generate a _D-Bus message"
 msgstr "ç??æ?? _D-Bus ä¿¡æ?¯"
 
@@ -17954,21 +18124,21 @@ msgstr "å½?æ?°ç??é?®ä»¶ä¿¡æ?¯å?°è¾¾æ?¶æ??ç¤ºæ?¨ã??"
 msgid "Created from a mail by %s"
 msgstr "è¢«%sä»?é?®ä»¶å??å»º"
 
-#: ../plugins/mail-to-task/mail-to-task.c:489
+#: ../plugins/mail-to-task/mail-to-task.c:490
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "é??å®?ç??æ?¥å??å·²ç»?å??å?«â??%sâ??äº?ä»¶ã??æ?¨æ?³ç¼?è¾?æ?§ç??äº?ä»¶å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:492
+#: ../plugins/mail-to-task/mail-to-task.c:493
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "é??å®?ç??ä»»å?¡å??è¡¨å·²ç»?å??å?«â??%sâ??ä»»å?¡ã??æ?¨æ?³ç¼?è¾?æ?§ç??ä»»å?¡å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -17978,7 +18148,7 @@ msgstr "é??å®?ç??å¤?å¿?å??è¡¨å·²ç»?å??å?«â??%sâ??å¤?å¿?ã??æ?¨æ?³ç¼?è¾?æ?§ç??å¤?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:515
+#: ../plugins/mail-to-task/mail-to-task.c:516
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -17987,7 +18157,7 @@ msgstr "é??å®?ç??æ?¥å??å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??äº?ä»¶ã??æ?¨ä»?ç?¶è¦?å??å»ºä¸?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -17996,7 +18166,7 @@ msgstr "é??å®?ç??ä»»å?¡å??è¡¨å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??ä»»å?¡ã??æ?¨ä»?ç?¶è¦?å??
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:527
+#: ../plugins/mail-to-task/mail-to-task.c:528
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18005,7 +18175,7 @@ msgstr "é??å®?ç??å¤?å¿?å??è¡¨å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??å¤?å¿?ã??æ?¨ä»?ç?¶è¦?å??
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18017,7 +18187,7 @@ msgstr[0] "é??å®?ç??æ?¥å??å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??äº?ä»¶ã??æ?¨ä»?ç?¶è¦?å??å»º
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:557
+#: ../plugins/mail-to-task/mail-to-task.c:558
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18029,7 +18199,7 @@ msgstr[0] "é??å®?ç??ä»»å?¡å??è¡¨å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??ä»»å?¡ã??æ?¨ä»?ç?¶è¦?
 #. Translators: Codewise it is impossible to provide separate strings for all
 #. combinations of singular and plural. Please translate it in the way that you
 #. feel is most appropriate for your language.
-#: ../plugins/mail-to-task/mail-to-task.c:566
+#: ../plugins/mail-to-task/mail-to-task.c:567
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18038,76 +18208,76 @@ msgid_plural ""
 "like to create new memos anyway?"
 msgstr[0] "é??å®?ç??å¤?å¿?å??è¡¨å·²ç»?å??å?«ç»?å®?é?®ä»¶ç??å¤?å¿?ã??æ?¨ä»?ç?¶è¦?å??å»ºä¸?ä¸ªæ?°å¤?å¿?å??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:626
 msgid "[No Summary]"
 msgstr "[æ²¡æ??æ¦?è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:636
+#: ../plugins/mail-to-task/mail-to-task.c:637
 msgid "Invalid object returned from a server"
 msgstr "ä»?ä¸?ä¸ªæ??å?¡å?¨ä¸?è¿?å??äº?æ? æ??ç??å¯¹è±¡"
 
-#: ../plugins/mail-to-task/mail-to-task.c:707
+#: ../plugins/mail-to-task/mail-to-task.c:708
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨å¤?ç??æ?¶å?ºç?°äº?ä¸?ä¸ªé??è¯¯ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:737
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "æ? æ³?æ??å¼?æ?¥å??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:743
+#: ../plugins/mail-to-task/mail-to-task.c:744
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??å»ºäº?ä»¶ã??è¯·é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:746
+#: ../plugins/mail-to-task/mail-to-task.c:747
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??å»ºä»»å?¡ã??è¯·é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:749
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "é??ä¸ç??æº?æ?¯å?ªè¯»ç??ï¼?å? æ¤ä¸?è?½å?¨æ¤å??å»ºå¤?å¿?å½?ã??è¯·é??æ?©å?¶å®?ç??æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:956
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "è?½è?·å??æº?å??è¡¨ã?? %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "å??å»ºä¸?ä¸ªäº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1077
 msgid "Create a new event from the selected message"
 msgstr "ä»?é??æ?©ç??ä¿¡æ?¯ä¸å??å»ºä¸?ä¸ªæ?°ç??äº?ä»¶"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "å??å»ºä¸?ä¸ªå¤?å¿?(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a new memo from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°å¤?å¿?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "å??å»ºä¸?ä¸ªä»»å?¡(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1091
 msgid "Create a new task from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°ä»»å?¡"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "å??å»ºä¸?ä¸ªä¼?è®®(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°ä¼?è®®"
 
@@ -18115,55 +18285,55 @@ msgstr "ç?¨æ??é??é?®ä»¶å??å»ºæ?°ä¼?è®®"
 msgid "Convert a mail message to a task."
 msgstr "è½¬æ?¢ä¸?ä¸ªé?®ä»¶ä¿¡æ?¯æ??ä¸ºä¸?ä¸ªä»»å?¡ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "è?·å¾?å??è¡¨å?æ¡£(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "Get an archive of the list this message belongs to"
 msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??è¡¨ç??å?æ¡£"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "è?·å¾?å??è¡¨ç?¨æ³?ä¿¡æ?¯(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "è?·å??è¿?å°?ä¿¡æ??å±?é?®ä»¶å??è¡¨ç??ç?¨æ³?ä¿¡æ?¯"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "è??ç³»å??è¡¨æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "è??ç³»è¿?å°?ä¿¡æ??å±?é?®ä»¶å??è¡¨ç??æ??æ??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "æ??é??å?°å??è¡¨(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "ç»?è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨æ??é??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "è®¢é??å??è¡¨(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "è®¢é??è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "é??è®¢å??è¡¨(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "é??è®¢è¿?å°?ä¿¡æ??å±?ç??é?®ä»¶å??è¡¨"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "é?®ä»¶å??è¡¨(_L)"
 
@@ -18259,15 +18429,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "æ?¨æ?¯æ?³è¦?å?ªæ ?è®°å½?å??æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯ï¼?è¿?æ?¯ä¹?å??æ?¬å?æ??ä»¶å¤¹ä¸ç??ä¿¡æ?¯ï¼?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "å?¨å½?å??æ??ä»¶å¤¹å??å?æ??ä»¶å¤¹(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "å?ªå?¨å½?å??æ??ä»¶å¤¹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»(_S)"
 
@@ -18279,40 +18449,6 @@ msgstr "å?¨é?¨æ ?ä¸ºå·²è¯»"
 msgid "Mark all messages in a folder as read."
 msgstr "å°?æ¤æ??ä»¶å¤¹ä¸ç??æ??æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»ã??"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "ç®¡ç??æ?¨ç?? Evolution æ??ä»¶ã??"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "æ??ä»¶ç®¡ç??å?¨"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "ä½?è??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "æ³¨æ??ï¼?æ??äº?æ?´æ?¹ç?´å?°é??æ?°å?¯å?¨å??æ??ç??æ??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "æ¦?è§?"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "æ??ä»¶"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "æ??ä»¶(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "å?¯ç?¨å??ç¦?ç?¨æ??ä»¶"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18326,39 +18462,39 @@ msgstr "é¦?é??çº¯æ??æ?¬"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä½?ä¸ºçº¯æ??æ?¬æ?¥æ?¥ç??é?®ä»¶ä¿¡æ?¯ï¼?ç??è?³å?¨å®?ä»¬å??å?« HTML å??å®¹æ?¶ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Show HTML if present"
 msgstr "é¦?é?? HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:214
 msgid "Let Evolution choose the best part to show."
 msgstr "è®©Evolutioné??æ?©æ??å¥½ç??é?¨å??æ?¾ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid "Show plain text if present"
 msgstr "å¦?æ??å?¯ç?¨å??æ?¾ç¤ºçº¯æ??æ?¬"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:215
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??å?ºï¼?é?£ä¹?æ?¾ç¤ºçº¯æ??æ?¬é?¨å??ï¼?å?¦å??è®©Evolutioné??æ?©å¥½ç??é?¨å??æ?¾ç¤ºï¼?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid "Only ever show plain text"
 msgstr "ä»?æ?¾ç¤ºçº¯æ??æ?¬"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:216
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??è¯·æ±?ï¼?æ?»æ?¯æ?¾ç¤ºæ??æ?¬é?¨å??è??æ??å?¶ä»?é?¨å??ä½?ä¸ºé??ä»¶"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:263
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "æ?¾ç¤ºæ?¯æ??ç??HTMLé?¨å??ä½?ä¸ºé??ä»¶(_s)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:283
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -18382,35 +18518,35 @@ msgstr "Outlook PST å¯¼å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook ä¸ªäººæ??ä»¶å¤¹(.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:312
 msgid "_Mail"
 msgstr "é?®ä»¶(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:324
 msgid "Destination folder:"
 msgstr "ç?®ç??æ??ä»¶å¤¹ï¼?"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:330
 msgid "_Address Book"
 msgstr "å?°å??ç°¿(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:337
 msgid "A_ppointments"
 msgstr "çº¦ä¼?(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:343 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "ä»»å?¡(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "_Journal entries"
 msgstr "æ?¥è®°é¡¹(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:364
 msgid "Importing Outlook data"
 msgstr "å¯¼å?¥ Outlook æ?°æ?®"
 
@@ -18568,55 +18704,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ä¸?è?½å??å¸?æ?¥å??ï¼?æ?¥å??å??ç«¯å·²ç»?ä¸?å?å?¨äº?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "New Location"
 msgstr "æ?°å»ºä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:480
 msgid "Edit Location"
 msgstr "ç¼?è¾?ä½?ç½®"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "æ?ªæ?¾å?° SpamAssassinï¼?ä»£ç ?ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "å??å»ºç®¡é??å¤±è´¥ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork å??å?ºé??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin å?è¿?ç¨?æ²¡æ??å??åº?ï¼?å?³é?ä¸..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "ç?å¾?å??æ¢ SpamAssassin å?è¿?ç¨?ï¼?ç»?æ¢ä¸..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "SpamAssassin ç??ç®¡é??å?ºé??ï¼?é??è¯¯ç ?ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ä¸?å?¯ç?¨ï¼?è¯·å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "è¿?å°?è®©å??å?¾å??æ??æ?´å?¯é? ï¼?ä½?ç¨?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "å??å?«è¿?ç¨?æµ?è¯?(_N)"
 
@@ -18753,23 +18889,6 @@ msgstr "ä¿?å?é??ä¸ç??å¤?å¿?å??è¡¨å?°ç£?ç??"
 msgid "Save the selected task list to disk"
 msgstr "ä¿?å?é??ä¸ç??ä»»å?¡å??è¡¨å?°ç£?ç??"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "é??è¿?ä¸»é¢?æ?¥æ??åº?é?®ä»¶ä¿¡æ?¯ã??"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "ä¸»é¢?çº¿ç´¢"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "å?ºäº?ä¸»é¢?æ??çº¿ç´¢ç¼?æ??ä¿¡æ?¯å??è¡¨"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "é»?è®¤æ??ç?§ä¸»é¢?å¯¹çº¿ç´¢ä¸ç??ä¿¡æ?¯æ??åº?(_A)"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -18780,15 +18899,15 @@ msgstr "ç?¨äº?æ¨¡æ?¿æ??ä»¶ä»¥æ?¿æ?¢é?®ä»¶å??å®¹ç??é?®/å?¼å¯¹å??è¡¨ã??"
 msgid "Drafts based template plugin"
 msgstr "å?ºäº?è??ç¨¿ç??æ¨¡æ?¿å??æ??ä»¶"
 
-#: ../plugins/templates/templates.c:620
+#: ../plugins/templates/templates.c:625
 msgid "No Title"
 msgstr "æ? æ ?é¢?"
 
-#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:732
 msgid "Save as _Template"
 msgstr "å?¦å?ä¸ºæ¨¡æ?¿(_T)"
 
-#: ../plugins/templates/templates.c:693
+#: ../plugins/templates/templates.c:734
 msgid "Save as Template"
 msgstr "å?¦å?ä¸ºæ¨¡æ?¿"
 
@@ -18808,26 +18927,26 @@ msgstr "åµ?å?¥ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "å?¨é?®ä»¶ä¿¡æ?¯é??ç?´æ?¥æ?¥ç?? vCardsã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:182
+#: ../plugins/vcard-inline/vcard-inline.c:267
 msgid "Show Full vCard"
 msgstr "æ?¾ç¤ºå®?æ?´ vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:185
 msgid "Show Compact vCard"
 msgstr "æ?¾ç¤ºç´§å?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:246
 msgid "There is one other contact."
 msgstr "æ??å?¦å¤? 1 ä¸ªè??ç³»äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:255
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "æ??å?¦å¤? %d ä¸ªè??ç³»äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:275
+#: ../plugins/vcard-inline/vcard-inline.c:276
 msgid "Save in Address Book"
 msgstr "ä¿?å?è?³å?°å??ç°¿"
 
@@ -19005,7 +19124,7 @@ msgstr "ä¾§è¾¹æ ?å?¯è§?"
 msgid "Skip development warning dialog"
 msgstr "è·³è¿?å¼?å??è¦å??å¯¹è¯?æ¡?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:338
 msgid "Start in offline mode"
 msgstr "ä»¥è?±æ?ºæ¨¡å¼?å?¯å?¨"
 
@@ -19154,11 +19273,11 @@ msgstr "çª?å?£æ??é?®æ ·å¼?"
 msgid "Window buttons are visible"
 msgstr "çª?å?£æ??é?®å?¯è§?"
 
-#: ../shell/e-shell-content.c:523 ../shell/e-shell-content.c:524
+#: ../shell/e-shell-content.c:527 ../shell/e-shell-content.c:528
 msgid "Searches"
 msgstr "æ??ç´¢"
 
-#: ../shell/e-shell-content.c:566
+#: ../shell/e-shell-content.c:570
 msgid "Save Search"
 msgstr "ä¿?å?æ??ç´¢"
 
@@ -19166,31 +19285,31 @@ msgstr "ä¿?å?æ??ç´¢"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:924
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "æ?¾ç¤º(_W)ï¼?"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:955
+#: ../shell/e-shell-searchbar.c:971
 msgid "Sear_ch:"
 msgstr "æ??ç´¢(_C)ï¼?"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1016
+#: ../shell/e-shell-searchbar.c:1034
 msgid "i_n"
 msgstr "å?¨(_N) "
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vff)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "å?¨é?¨æ??ä»¶(*)"
 
@@ -19474,39 +19593,39 @@ msgstr "å½?å??è§?å?¾ä¸ºè?ªå®?ä¹?è§?å?¾"
 msgid "Change the page settings for your current printer"
 msgstr "æ?´æ?¹å½?å??æ??å?°æ?ºç??é¡µé?¢è®¾ç½®"
 
-#: ../shell/e-shell-window-actions.c:2183
+#: ../shell/e-shell-window-actions.c:2197
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ?¢å?° %s"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2410
 msgid "Execute these search parameters"
 msgstr "æ?§è¡?è¿?äº?æ??ç´¢å??æ?°"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:588
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:419
+#: ../shell/e-shell-window.c:424
 msgid "New"
 msgstr "æ?°å»º"
 
-#: ../shell/e-shell.c:229
+#: ../shell/e-shell.c:248
 msgid "Preparing to go offline..."
 msgstr "æ£å?¨å??å¤?ç¦»çº¿..."
 
-#: ../shell/e-shell.c:279
+#: ../shell/e-shell.c:301
 msgid "Preparing to go online..."
 msgstr "æ£å?¨å??å¤?ä¸?çº¿..."
 
-#: ../shell/e-shell.c:338
+#: ../shell/e-shell.c:363
 msgid "Preparing to quit..."
 msgstr "æ£å?¨å??å¤?é??å?º..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:187
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19538,7 +19657,7 @@ msgstr ""
 "\n"
 "æ??ä»¬å¸?æ??æ?¨å°½æ??äº«å??æ??ä»¬å?ªå??å·¥ä½?ç??æ??æ??ï¼?æ??ä»¬ä¹?ç?å??ç?¼æ??ç??æ?¨ç??æ??è§?ï¼?\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:211
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19546,62 +19665,82 @@ msgstr ""
 "æ??è°¢\n"
 "Evolution å?¢é??\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:218
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??é??ç?¥æ??"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:334
 msgid "Start Evolution activating the specified component"
 msgstr "å?¯å?¨ Evolution å¹¶æ¿?æ´»æ??å®?ç»?ä»¶"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:336
 msgid "Apply the given geometry to the main window"
 msgstr "åº?ç?¨ç»?å®?ç??å? ä½?å??æ?°å?°ä¸»çª?å?£"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:340
 msgid "Start in online mode"
 msgstr "ä»¥è??æ?ºæ¨¡å¼?å?¯å?¨"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:342
+#| msgid "Whether the network is available"
+msgid "Ignore network availability"
+msgstr "å¿½ç?¥ç½?ç»?æ?¯å?¦å?¯ç?¨"
+
+#: ../shell/main.c:344
 msgid "Start in \"express\" mode"
 msgstr "ä»¥â??å¿«é??â??æ¨¡å¼?å?¯å?¨"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:347
 msgid "Forcibly shut down Evolution"
 msgstr "å¼ºå?¶å?³é?æ??æ?? Evolution"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:350
 msgid "Send the debugging output of all components to a file."
 msgstr "æ??æ??æ??æ??å??ç??è°?è¯?è¾?å?ºå??é??å?°ä¸?ä¸ªæ??ä»¶ä¸ã??"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:352
 msgid "Disable loading of any plugins."
 msgstr "ç¦?æ¢è½½å?¥ä»»ä½?æ??ä»¶ã??"
 
-#: ../shell/main.c:345
+#: ../shell/main.c:354
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "ç¦?ç?¨é?®ä»¶ã??è??ç³»äººå??ä»»å?¡ç??é¢?è§?é?¢æ?¿ã??"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:358
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å¯¼å?¥URIsæ??è??æ??ä»¶å??ä½?ä¸ºå?©ä½?ç??å??æ?°"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:360
 msgid "Request a running Evolution process to quit"
 msgstr "è¯·æ±?æ£å?¨è¿?è¡?ç?? Evolution è¿?ç¨?é??å?º"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:513 ../shell/main.c:521
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution ä¸ªäººä¿¡æ?¯ç®¡ç??å??é?®ä»¶å®¢æ?·"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:583
 #, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%sï¼?ä¸?è?½å??æ?¶ä½¿ç?¨ --online å?? --offlineã??\n"
-"  æ?´å¤?ä¿¡æ?¯è¯·ä½¿ç?¨ %s --helpã??\n"
+"  è¿?è¡? %s --help äº?è§£æ?´å¤?ä¿¡æ?¯ã??\n"
+
+#: ../shell/main.c:589
+#, c-format
+#| msgid ""
+#| "%s: --online and --offline cannot be used together.\n"
+#| "  Use %s --help for more information.\n"
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%sï¼?ä¸?è?½å??æ?¶ä½¿ç?¨ --force-online å?? --offlineã??\n"
+"  è¿?è¡? %s --help äº?è§£æ?´å¤?ä¿¡æ?¯ã??\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -19681,27 +19820,27 @@ msgstr "æ??ä»¶ä¸?æ?¯ä¸?ä¸ªæ??æ??ç?? .desktop æ??ä»¶"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "æ? æ³?è¯?å?«ç??æ¡?é?¢æ??ä»¶ç??æ?¬â??%sâ??"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "å?¯å?¨ %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "åº?ç?¨ç¨?åº?å?¨å?½ä»¤è¡?ä¸?ä¸?æ?¥å??æ??æ¡£"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "æ? æ³?è¯?å?«ç??è°?ç?¨é??é¡¹ï¼?%d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "ä¸?è?½ä¼ é??æ??æ¡£ç??URIs(ç»?ä¸?èµ?æº?å®?ä½?ç¬¦)å?°ä¸?ä¸ª'ç±»å??=é?¾æ?¥'æ¡?é?¢é¡¹ç?®"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯ä¸?ä¸ªå?¯å? è½½ç??æ?¡ç?®"
@@ -20016,11 +20155,12 @@ msgstr "æ?¨æ?¥æ??è¯?æ??è¿?äº?äººç??æ??ä»¶å??è¯?ä¹¦ï¼?"
 msgid "Your Certificates"
 msgstr "æ?¨ç??è¯?ä¹¦"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
 msgstr "å¤?ä»½(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
 msgstr "ç¼?è¾? CA ä¿¡ä»»(_E)"
 
@@ -20347,7 +20487,7 @@ msgstr "å®?ä¹?â??%sâ??ç??è§?å?¾"
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "ä¿?å?å½?å??è§?å?¾"
 
@@ -20375,7 +20515,7 @@ msgstr "è§?å?¾ç±»å??"
 msgid "Type of view:"
 msgstr "è§?å?¾ç±»å??ï¼?"
 
-#: ../widgets/misc/e-account-manager.c:351
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "é»?è®¤(_F)"
 
@@ -20387,15 +20527,15 @@ msgstr "å??è®®"
 msgid "Attachment Properties"
 msgstr "é??ä»¶å±?æ?§"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "æ??ä»¶å??(_F)ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:365
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME  ç±»å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:373
+#: ../widgets/misc/e-attachment-dialog.c:375
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè®®è?ªå?¨æ?¾ç¤ºé??ä»¶(_S)"
@@ -20431,12 +20571,12 @@ msgstr "è½½å?¥"
 msgid "Saving"
 msgstr "ä¿?å?"
 
-#: ../widgets/misc/e-attachment-paned.c:98
+#: ../widgets/misc/e-attachment-paned.c:97
 msgid "Hide Attachment _Bar"
 msgstr "é??è??é??ä»¶æ ?(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:100
-#: ../widgets/misc/e-attachment-paned.c:631
+#: ../widgets/misc/e-attachment-paned.c:99
+#: ../widgets/misc/e-attachment-paned.c:632
 msgid "Show Attachment _Bar"
 msgstr "æ?¾ç¤ºé??ä»¶æ ?(_B)"
 
@@ -20455,40 +20595,40 @@ msgstr[0] "ä¿?å?é??ä»¶"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:608
-#: ../widgets/misc/e-attachment.c:1785 ../widgets/misc/e-attachment.c:2327
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:351
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "å?¨é?¨ä¿?å?(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:377
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
 msgstr "æ·»å? é??ä»¶(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:401
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "é??è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:408
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "å?¨é?¨é??è??(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:415
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "åµ?å?¥æ?¥ç??(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:422
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "åµ?å?¥æ?¥ç??(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:739
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "ä½¿ç?¨â??%sâ??æ??å¼?"
 
-#: ../widgets/misc/e-attachment-view.c:742
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s ä¸æ??å¼?é??ä»¶"
@@ -20501,55 +20641,55 @@ msgstr "å?¨ %s ä¸æ??å¼?é??ä»¶"
 msgid "Attached message"
 msgstr "é??å? ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "ä¸?ä¸ªå·²ç»?å? è½½ç??æ??ä½?æ£å?¨è¿?è¡?"
 
-#: ../widgets/misc/e-attachment.c:1836 ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "ä¸ªå·²ç»?ä¿?å?ç??æ??ä½?æ£å?¨è¿?è¡?"
 
-#: ../widgets/misc/e-attachment.c:1928
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ä¸?è?½å? è½½â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:1931
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ä¸?è?½å? è½½é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2207
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ä¸?è?½æ??å¼?â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2210
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ä¸?è?½æ??å¼?é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2645
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "é??ä»¶å??å®¹æ?ªè½½å?¥"
 
-#: ../widgets/misc/e-attachment.c:2721
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ä¸?è?½ä¿?å?â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2724
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "æ? æ³?ä¿?å?é??ä»¶"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl å? å??å?»æ?¥æ??å¼?ä¸?ä¸ªé?¾æ?¥"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1258
+#: ../widgets/misc/e-calendar-item.c:1261
 msgid "%B %Y"
 msgstr "%Yå¹´%B"
 
@@ -20561,96 +20701,96 @@ msgstr "æ??å??"
 msgid "Character Encoding"
 msgstr "å?ç¬¦ç¼?ç ?"
 
-#: ../widgets/misc/e-charset-combo-box.c:120
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "è¾?å?¥è¦?ä½¿ç?¨ç??å?ç¬¦é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:339
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
 msgstr "å?¶å®?..."
 
-#: ../widgets/misc/e-dateedit.c:505
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "æ?¥æ??å??æ?¶é?´"
 
-#: ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "è¾?å?¥æ?¥æ??ç??æ??æ?¬æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:548
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "å??å?»æ¤æ??é?®å?¯æ?¾ç¤ºæ?¥å??"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:596
 msgid "Drop-down combination box to select time"
 msgstr "é??æ?©æ?¶é?´ç??ç»?å??æ¡?"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:668
 msgid "No_w"
 msgstr "ç?°å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:674
 msgid "_Today"
 msgstr "ä»?å¤©(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:680
+#: ../widgets/misc/e-dateedit.c:682
 msgid "_None"
 msgstr "æ? (_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1685 ../widgets/misc/e-dateedit.c:1917
+#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1920
 msgctxt "date"
 msgid "None"
 msgstr "æ? "
 
-#: ../widgets/misc/e-dateedit.c:1812
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "æ? æ??ç??æ?¥æ??å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1856
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "æ? æ??ç??æ?¶é?´å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:252
 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:266
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "æ??ä»¶å??(_I)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "æ??ä»¶ç±»å??(_T)ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:916
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "é??æ?©æ¤å¯¼å?¥ç??ç?®ç??ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "é??æ?©è¦?è¿?è¡?ç??å¯¼å?¥å?¨ç±»å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "ä»?æ?§ç??ç¨?åº?ä¸å¯¼å?¥æ?°æ?®å??è®¾ç½®(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "å¯¼å?¥å??ä¸ªæ??ä»¶(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20660,37 +20800,37 @@ msgstr ""
 "ç?°å?¯å¯¼å?¥ç??è®¾ç½®ã??å¦?æ??æ?¨æ?³è¦?å??è¯?ä¸?æ¬¡ï¼?è¯·å??å?»â??ä¸?ä¸?æ¥â??æ??é?®ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:773
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "å??æ¶?å¯¼å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:915
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "é¢?è§?è¦?å¯¼å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:921
-#: ../widgets/misc/e-import-assistant.c:934
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1350
-#: ../widgets/misc/e-import-assistant.c:1359
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "å¯¼å?¥æ?°æ?®"
 
-#: ../widgets/misc/e-import-assistant.c:929
+#: ../widgets/misc/e-import-assistant.c:925
 msgid "Select what type of file you want to import from the list."
 msgstr "é??æ?©æ?¨æ?³ä»?å??è¡¨å¯¼å?¥ç??ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1274
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Evolution å¯¼å?¥å?©æ??"
 
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "å¯¼å?¥ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:1302
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20699,27 +20839,27 @@ msgstr ""
 "æ¬¢è¿?ä½¿ç?¨ Evolution å¯¼å?¥å?©æ??ã??\n"
 "æ?¬å?©æ??å°?å?¨ç¨?æ??å¯¼æ?¨å°?å¤?é?¨æ??ä»¶å¯¼å?¥ Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1316
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "å¯¼å?¥å?¨ç±»å??"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "é??æ?©è¦?å¯¼å?¥ç??ä¿¡æ?¯"
 
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "é??æ?©ä¸?ä¸ªæ??ä»¶"
 
-#: ../widgets/misc/e-import-assistant.c:1345
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "å??å?»â??åº?ç?¨â??ä»¥ä¾¿å¼?å§?å°?æ??ä»¶å¯¼å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:557
+#: ../widgets/misc/e-map.c:538
 msgid "World Map"
 msgstr "ä¸?ç??å?°å?¾"
 
-#: ../widgets/misc/e-map.c:559
+#: ../widgets/misc/e-map.c:540
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20739,52 +20879,52 @@ msgstr "Evolution ç?®å??è?±æ?ºã??å??å?»è¯¥æ??é?®å?¯è??æ?ºå·¥ä½?ã??"
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "å? ä¸ºç½?ç»?ä¸?å?¯ç?¨ï¼?æ??ä»¥ Evolution ç?®å??è?±æ?ºã??"
 
-#: ../widgets/misc/e-preferences-window.c:278
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution é¦?é??é¡¹"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "å?¹é??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:557
+#: ../widgets/misc/e-search-bar.c:560
 msgid "Close the find bar"
 msgstr "å?³é?æ?¥æ?¾æ ?"
 
-#: ../widgets/misc/e-search-bar.c:565
+#: ../widgets/misc/e-search-bar.c:568
 msgid "Fin_d:"
 msgstr "æ?¥æ?¾(_D)ï¼?"
 
-#: ../widgets/misc/e-search-bar.c:577
+#: ../widgets/misc/e-search-bar.c:580
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ??ç´¢"
 
-#: ../widgets/misc/e-search-bar.c:600
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Previous"
 msgstr "ä¸?ä¸?é¡¹(_P)"
 
-#: ../widgets/misc/e-search-bar.c:606
+#: ../widgets/misc/e-search-bar.c:610
 msgid "Find the previous occurrence of the phrase"
 msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??å??ä¸?ä¸ªä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:623
 msgid "_Next"
 msgstr "ä¸?ä¸?é¡¹(_N)"
 
-#: ../widgets/misc/e-search-bar.c:622
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Find the next occurrence of the phrase"
 msgstr "å¯»æ?¾è¯¥è¯?å?¥å?ºç?°ç??ä¸?ä¸?ä¸ªä½?ç½®"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:642
 msgid "Mat_ch case"
 msgstr "å¤§å°?å??å?¹é??(_C)"
 
-#: ../widgets/misc/e-search-bar.c:660
+#: ../widgets/misc/e-search-bar.c:670
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°è¾¾é¡µé?¢åº?é?¨ï¼?ç§»å?°é¡¶é?¨ç»§ç»"
 
-#: ../widgets/misc/e-search-bar.c:682
+#: ../widgets/misc/e-search-bar.c:692
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°è¾¾é¡µé?¢é¡¶é?¨ï¼?ç§»å?°åº?é?¨ç»§ç»"
 
@@ -20809,132 +20949,154 @@ msgid "Delivery Options"
 msgstr "å??é??é??é¡¹"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+#| msgid "_Until"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "ç?´å?°(_U)"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+#| msgid "_After"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "ç»?è¿?(_A)"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+#| msgid "days"
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "å¤©"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+#| msgid "Wi_thin"
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "å°?äº?(_T)"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+#| msgid "days"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "å¤©"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "ç?¬å®¶"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "å¸¸è§?é??é¡¹(_R)"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "å·²è¯»å??æ?§"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "ä¼?å??çº§"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "è¯·æ±?å??å¤?(_E)"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "è¿?å??é??ç?¥"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ç?¶æ??è·?è¸ª(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "æ ?å??"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ç?¶æ??è·?è¸ª"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "ç»?å¯?"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "æ?¥å??æ?¶(_P)ï¼?"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "å®?æ??æ?¶(_M)ï¼?"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "æ??ç»?æ?¶(_N)ï¼?"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "å°?äº?(_T)"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_After"
-msgstr "ä¹?å??(_A)"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "å?¨é?¨ä¿¡æ?¯(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "å??ç±»(_C)ï¼?"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "æ?¨è¿?ä¿¡æ?¯æ??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "å·²æ??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "è®¾ç½®è¿?æ??æ?¶é?´(_S)"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "_Until"
-msgstr "ç?´å?°(_U)"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "æ?¹ä¾¿æ?¶(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "æ??å¼?æ?¶(_W)ï¼?"
 
-#: ../widgets/misc/e-signature-editor.c:136
-#: ../widgets/misc/e-signature-editor.c:524
-#: ../widgets/misc/e-signature-manager.c:353
-#: ../widgets/misc/e-signature-script-dialog.c:220
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+#| msgid "None"
+msgctxt "send-options"
+msgid "None"
+msgstr "æ? "
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:526
+#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../widgets/misc/e-signature-editor.c:213
+#: ../widgets/misc/e-signature-editor.c:215
 msgid "_Save and Close"
 msgstr "ä¿?å?å¹¶å?³é?(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:391
+#: ../widgets/misc/e-signature-editor.c:393
 msgid "Edit Signature"
 msgstr "ç¼?è¾?ç¾å??"
 
-#: ../widgets/misc/e-signature-editor.c:406
+#: ../widgets/misc/e-signature-editor.c:408
 msgid "_Signature Name:"
 msgstr "ç¾å??(_S)ï¼?"
 
-#: ../widgets/misc/e-signature-manager.c:298
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "æ·»å? ç¾å??è??æ?¬"
 
-#: ../widgets/misc/e-signature-manager.c:363
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "ç¼?è¾?ç¾å??è??æ?¬"
 
-#: ../widgets/misc/e-signature-manager.c:579
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "æ·»å? è??æ?¬(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20943,11 +21105,11 @@ msgstr ""
 "æ¤è??æ?¬ç??è¾?å?ºå°?ç?¨äº?æ?¨ç??ç¾å??ã??æ?¨æ??å®?ç??å??ç§°å°?å?ªä¼?\n"
 "ç?¨äº?æ?¾ç¤ºã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "è??æ?¬(_C)ï¼?"
 
-#: ../widgets/misc/e-signature-script-dialog.c:344
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?¯æ?§è¡?ã??"
 
@@ -20955,41 +21117,41 @@ msgstr "è??æ?¬æ??ä»¶å¿?é¡»å?¯æ?§è¡?ã??"
 msgid "Click here to go to URL"
 msgstr "å??å?»æ¤å¤?è½¬å?° URL"
 
-#: ../widgets/misc/e-web-view.c:374
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "å¤?å?¶é?¾æ?¥ä½?ç½®(_C)"
 
-#: ../widgets/misc/e-web-view.c:376
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "å°?é?¾æ?¥å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../widgets/misc/e-web-view.c:384
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥(_O)"
 
-#: ../widgets/misc/e-web-view.c:386
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "å?¨æµ?è§?å?¨ä¸æ??å¼?é?¾æ?¥"
 
-#: ../widgets/misc/e-web-view.c:394
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "å¤?å?¶ç?µå?é?®ä»¶å?°å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:423 ../widgets/misc/e-web-view.c:1078
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "é??ä¸å?¨é?¨æ??æ?¬å??å?¾å??"
 
-#: ../widgets/misc/e-web-view.c:855 ../widgets/misc/e-web-view.c:857
-#: ../widgets/misc/e-web-view.c:859
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "å??å?»ä»¥å?¼å?« %s"
 
-#: ../widgets/misc/e-web-view.c:861
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "å??å?»å?¯é??è??/æ?¾ç¤ºå?°å??"
 
-#: ../widgets/misc/e-web-view.c:863
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "å??å?»ä»¥æ??å¼? %s"
@@ -21008,7 +21170,7 @@ msgstr "æ?¥å??ï¼?ä»? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "Evolution æ?¥å??é¡¹ç?®"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "å¼¹å?ºå??è¡¨"
 
@@ -21035,34 +21197,34 @@ msgstr "æ?¶é?´å¿?é¡»é??ç?¨æ ¼å¼?ï¼?%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ç?¾å??æ¯?å?¼å¿?é??å?¨ 0 å?° 100 ä¹?é?´ï¼?å?« 0 å?? 100"
 
-#: ../widgets/table/e-table-click-to-add.c:595
+#: ../widgets/table/e-table-click-to-add.c:598
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "å??å?»å?¯æ·»å? "
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(å??åº?)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(é??åº?)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "æ?ªå??ç»?"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "æ?¾ç¤ºå??"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "å?¯ç?¨å??"
 
@@ -21071,7 +21233,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨å??(_V)ï¼?"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Ascending"
 msgstr "å??åº?"
 
@@ -21084,7 +21246,7 @@ msgid "Clear _All"
 msgstr "å?¨é?¨æ¸?é?¤(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1704
 msgid "Descending"
 msgstr "é??åº?"
 
@@ -21161,7 +21323,7 @@ msgstr "è¦?å?¨æ?¨ç??è¡¨æ ¼ä¸æ·»å? å??ï¼?è¯·å°?å?¶æ??æ?³å?°æ?¨æ?³è¦?å?¶å?ºç?°ç??
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21173,71 +21335,71 @@ msgstr[0] "%sï¼?%s (%d é¡¹)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d é¡¹)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1548
 msgid "Customize Current View"
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1569
 msgid "Sort _Ascending"
 msgstr "å??åº?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1572
 msgid "Sort _Descending"
 msgstr "é??åº?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1575
 msgid "_Unsort"
 msgstr "æ?ªæ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1578
 msgid "Group By This _Field"
 msgstr "æ??è¯¥å??å??ç»?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1581
 msgid "Group By _Box"
 msgstr "æ??æ?¹æ¡?å??ç»?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1585
 msgid "Remove This _Column"
 msgstr "å? é?¤è¯¥å??(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1588
 msgid "Add a C_olumn..."
 msgstr "æ·»å? ä¸?å??(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "A_lignment"
 msgstr "å¯¹é½?(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "B_est Fit"
 msgstr "æ??ä½³å?¹é??(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1598
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??å??(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Custo_mize Current View..."
 msgstr "è?ªå®?ä¹?å½?å??è§?å?¾(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1661
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1679
 msgid "_Custom"
 msgstr "è?ªå®?ä¹?(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "å¼¹å?ºå?å¯¹è±¡"
 
@@ -21273,14 +21435,212 @@ msgstr "å??å?»"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2538
 msgid "Select All"
 msgstr "å?¨é??"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2550
 msgid "Input Methods"
 msgstr "è¾?å?¥æ³?"
 
+#~ msgid "Unable to reconstruct message from autosave file"
+#~ msgstr "æ? æ³?ä»?è?ªå?¨ä¿?å?ç??æ??ä»¶é??å»ºä¿¡æ?¯"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "æ? æ³?å??å»ºç¼?è¾?å?¨çª?å?£ã??"
+
+#~ msgid ""
+#~ "Unable to activate the HTML editor control.\n"
+#~ "\n"
+#~ "Please make sure that you have the correct version of gtkhtml and "
+#~ "libgtkhtml installed."
+#~ msgstr ""
+#~ "æ? æ³?æ¿?æ´» HTML ç¼?è¾?å?¨ç»?ä»¶ã??\n"
+#~ "è¯·ç¡®å®?æ?¨ç?? gtkhtml å?? libgtkhtml æ??å®?è£?ç??ç??æ?¬æ£ç¡®ã??"
+
+#~ msgid "Unable to activate the address selector control."
+#~ msgstr "æ? æ³?æ¿?æ´»å?°å??é??æ?©æ?§å?¶ã??"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">è¯¦æ??ï¼?</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨æ?¥æ?¶</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">æ£å?¨å??é??</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Google å¸?å?·è®¾ç½®ï¼?</span>"
+
+#~ msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+#~ msgstr "<span size=\"large\" weight=\"bold\">Yahoo å¸?å?·è®¾ç½®ï¼?</span>"
+
+#~ msgid "%s..."
+#~ msgstr "%s..."
+
+#~ msgid "Evolution Error"
+#~ msgstr "Evolution é??è¯¯"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Evolution è¦å??"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "å??é?¨é??è¯¯ï¼?è¯·æ±?äº?æ?ªç?¥ç??é??è¯¯â??%sâ??"
+
+#~ msgid "This store does not support subscriptions, or they are not enabled."
+#~ msgstr "æ¤å?å?¨ä¸?æ?¯æ??è®¢é??ï¼?æ??è®¢é??æ?ªå?¯ç?¨ã??"
+
+#~ msgid "Folder"
+#~ msgstr "æ??ä»¶å¤¹"
+
+#~ msgid "Please select a server."
+#~ msgstr "è¯·é??æ?©æ??å?¡å?¨ã??"
+
+#~ msgid "No server has been selected"
+#~ msgstr "æ²¡æ??é??ä¸æ??å?¡å?¨"
+
+#~ msgid "Default height of the subscribe dialog."
+#~ msgstr "è®¢é??å¯¹è¯?æ¡?ç??é»?è®¤é«?åº¦ã??"
+
+#~ msgid "Default width of the subscribe dialog."
+#~ msgstr "è®¢é??å¯¹è¯?æ¡?ç??é»?è®¤å®½åº¦ã??"
+
+#~ msgid "Subscribe dialog default height"
+#~ msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤é«?åº¦"
+
+#~ msgid "Subscribe dialog default width"
+#~ msgstr "è®¢é??å¯¹è¯?æ¡?é»?è®¤å®½åº¦"
+
+#~ msgid "(Not Recommended)"
+#~ msgstr "(ä¸?æ?¨è??)"
+
+#~ msgid "(Note: Requires restart of the application)"
+#~ msgstr "(æ³¨æ??ï¼?é??è¦?é??å?¯åº?ç?¨ç¨?åº?)"
+
+#~ msgid "Checks incoming mail messages to be Junk"
+#~ msgstr "æ£?æ?¥æ?¶å?°ç??ä¿¡æ?¯æ?¯å?¦æ?¯å??å?¾ä¿¡æ?¯"
+
+#~ msgid "Do not display messages when text si_ze exceeds"
+#~ msgstr "å¦?æ??æ??æ?¬è¶?å?ºå¤§å°?é??å?¶ä¸?æ?¾ç¤ºä¿¡æ?¯(_Z)"
+
+#~ msgid "Enable Magic S_pacebar"
+#~ msgstr "å?¯ç?¨é?æ?¯ç©ºæ ¼é?®(_P)"
+
+#~ msgid "Enable Sea_rch Folders"
+#~ msgstr "å?¯ç?¨æ??ç´¢æ??ä»¶å¤¹(_R)"
+
+#~ msgid "Fi_xed-width:"
+#~ msgstr "ç?å®½(_X)ï¼?"
+
+#~ msgid "Font Properties"
+#~ msgstr "å?ä½?å±?æ?§"
+
+#~ msgid "KB"
+#~ msgstr "KB"
+
+#~ msgid "Message Fonts"
+#~ msgstr "ä¿¡æ?¯å?ä½?"
+
+#~ msgid ""
+#~ "Note: you will not be prompted for a password until you connect for the "
+#~ "first time"
+#~ msgstr "æ³¨æ??ï¼?ç?´å?°æ?¨ç¬¬ä¸?æ¬¡è¿?æ?¥ç??æ?¶å??ï¼?æ??ä¼?è¯¢é?®å¯?ç ?ã??"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "æ??å?°å?ä½?"
+
+#~ msgid "Prompt when sending replies to _many recipients"
+#~ msgstr "å½?å??é??å??å¤?è?³å¤?ä¸ªæ?¶ä»¶äººæ?¶æ??ç¤º(_M)"
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "é??æ?©è??ç¨¿æ??ä»¶å¤¹"
+
+#~ msgid "Select HTML fixed width font for printing"
+#~ msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å?ºå®?å®½åº¦å?ä½?"
+
+#~ msgid "Select HTML variable width font for printing"
+#~ msgstr "é??æ?©ç?¨äº?æ??å?°ç?? HTML å??å®½åº¦å?ä½?"
+
+#~ msgid "Select Junk Folder"
+#~ msgstr "é??æ?©å??å?¾ä¿¡æ?¯æ??ä»¶å¤¹"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "é??æ?©å·²å??æ??ä»¶å¤¹"
+
+#~ msgid "Select Trash Folder"
+#~ msgstr "é??æ?©åº?ä»¶ç®±æ??ä»¶å¤¹"
+
+#~ msgid "Sending Mail"
+#~ msgstr "å??é??é?®ä»¶"
+
+#~ msgid "Sent and Draft Messages"
+#~ msgstr "å??é??ä¿¡æ?¯å¹¶ä¿?å?è??ç¨¿"
+
+#~ msgid "Top Posting Option"
+#~ msgstr "é¡¶é?¨å??å¤?é??é¡¹"
+
+#~ msgid "V_ariable-width:"
+#~ msgstr "å??å®½(_A)ï¼?"
+
+#~ msgid "_Mark messages as read after"
+#~ msgstr "æ??ä¿¡æ?¯æ ?è®°ä¸ºå·²è¯»å??ç?(_M)"
+
+#~ msgid "_Show image animations"
+#~ msgstr "æ?¾ç¤ºå?¾å??å?¨ç?»(_S)"
+
+#~ msgid "_Shrink To / Cc / Bcc headers to "
+#~ msgstr "å?ªæ?¾ç¤ºæ?¶ä»¶äºº/æ??é??/å¯?ä»¶æ??é??å¤´ä¸ç??å??(_S)"
+
+#~ msgid "addresses"
+#~ msgstr "ä¸ªå?°å??"
+
+#~ msgid "S_erver:"
+#~ msgstr "æ??å?¡å?¨(_E)ï¼?"
+
+#~ msgid "Saving attachment"
+#~ msgstr "ä¿?å?é??ä»¶"
+
+#~ msgid ""
+#~ "Cannot create output file: %s:\n"
+#~ " %s"
+#~ msgstr ""
+#~ "æ? æ³?å??å»ºè¾?å?ºæ??ä»¶ï¼?%sï¼?\n"
+#~ " %s"
+
+#~ msgid "Could not write data: "
+#~ msgstr "æ? æ³?å??æ?°æ?®ï¼?"
+
+#~ msgid "_Backup Evolution Settings..."
+#~ msgstr "å¤?ä»½Evolutionè®¾ç½®(_B)..."
+
+#~ msgid "R_estore Evolution Settings..."
+#~ msgstr "æ?¢å¤?Evolutionè®¾ç½®(_R)..."
+
+#~ msgid "_Sharing"
+#~ msgstr "å?±äº«(_S)"
+
+#~ msgid "Blink icon in notification area."
+#~ msgstr "é?ªç??é??ç?¥å?ºå??å?¾æ ?ã??"
+
+#~ msgid "Whether the icon should blink or not."
+#~ msgstr "æ?¯å?¦é?ªç??å?¾æ ?ã??"
+
+#~ msgid "B_link icon in notification area"
+#~ msgstr "é?ªç??é??ç?¥å?ºå?¾æ ?(_L)"
+
+#~ msgid "Manage your Evolution plugins."
+#~ msgstr "ç®¡ç??æ?¨ç?? Evolution æ??ä»¶ã??"
+
+#~ msgid "Sort mail message threads by subject."
+#~ msgstr "é??è¿?ä¸»é¢?æ?¥æ??åº?é?®ä»¶ä¿¡æ?¯ã??"
+
+#~ msgid "Subject Threading"
+#~ msgstr "ä¸»é¢?çº¿ç´¢"
+
+#~ msgid "Thread messages by subject"
+#~ 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 "
@@ -22038,9 +22398,6 @@ msgstr "è¾?å?¥æ³?"
 #~ msgid "Network Available"
 #~ msgstr "ç½?ç»?å?¯ç?¨"
 
-#~ msgid "Whether the network is available"
-#~ msgstr "ç½?ç»?æ?¯å?¦å?¯ç?¨"
-
 #~ msgid "Online"
 #~ msgstr "å?¨çº¿"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]