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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Tue, 29 Mar 2011 13:05:13 +0000 (UTC)
commit b939f3f4af28682121cb4b0643bbeb780a72e33c
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Mar 29 21:04:58 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 4146 +++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 4654 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 4042 insertions(+), 4758 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2f3d336..8e55249 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,32 +7,27 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
-#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.91.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:15+0800\n"
-"PO-Revision-Date: 2011-02-23 19:16+0800\n"
+"Project-Id-Version: evolution 3.1.0\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n";
+"POT-Creation-Date: 2011-03-21 19:04+0000\n"
+"PO-Revision-Date: 2011-03-29 21:03+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ï¼?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è?¯çµ¡äººæª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "æ¤è?¯çµ¡äººç??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?å? å?¥å??æ¨£ä½?å??ç??æ?°å?¡ç??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -52,10 +47,7 @@ msgid "Category editor not available."
 msgstr "å??é¡?ç·¨è¼¯å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr "è«?æª¢æ?¥ä¾?ç¢ºå®?ä½ ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?ä½ ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??å??å??å¤§å°?å¯«ï¼?ä½ å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
 
 #: ../addressbook/addressbook.error.xml.h:9
@@ -67,10 +59,7 @@ msgid "Could not remove address book."
 msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr "ç?®å??ä½ å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?ä½ ç?? GroupWise å¸¸ç?¨è?¯çµ¡äººå?? Groupwise å??äººè?¯çµ¡äººè³?æ??å¤¾ã??"
 
 #: ../addressbook/addressbook.error.xml.h:12
@@ -78,7 +67,8 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:34
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_N)"
 
@@ -92,7 +82,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
@@ -113,15 +103,11 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??å¤ªå¤§ã??ä½ æ?¯å?¦è¦?æ?¹è®?å¤§å°?å¾?æ??å?²å?å®?ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
 msgstr "æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
 #: ../addressbook/addressbook.error.xml.h:23
@@ -133,9 +119,7 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨æ²?æ??ä»»ä½?å»ºè°ç??æ??å°?å?ºç¤?ã??"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??ä¼ºæ??å?¨å??ç¨±å?¯è?½æ?¼é?¯ï¼?æ??ä½ ç??ç¶²çµ¡é?£ç·?å·²ç¶?å??æ¢ã??"
 
 #: ../addressbook/addressbook.error.xml.h:26
@@ -163,16 +147,11 @@ msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??æ?´æ?¹ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "ä½ æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??ä½ æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
 msgstr "ä½ æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
 
 #: ../addressbook/addressbook.error.xml.h:34
@@ -180,18 +159,16 @@ msgid "You do not have permission to delete contacts in this address book."
 msgstr "ä½ æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤é??å??é??è¨?é??ä¸ç??è?¯çµ¡äººã??"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "ä½ å·²ç¶?ä¿®æ?¹æ¤è?¯çµ¡äººã??è¦?å?²å?é??äº?æ?´æ?¹ï¼?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ {0} ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:613
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:610
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -215,8 +192,8 @@ msgid "_Use as it is"
 msgstr "å°?å®?è¦?ç?º(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/e-calendar-view.c:2080
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
@@ -226,8 +203,9 @@ msgstr "é?±å¹´ç´?å¿µæ?¥"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/e-calendar-view.c:2077
+#: ../capplet/anjal-settings-main.c:116
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
@@ -262,10 +240,11 @@ msgstr "è?¯çµ¡äººç·¨è¼¯å?¨"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:498
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
-#: ../addressbook/gui/widgets/eab-contact-display.c:848
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:494
+#: ../addressbook/gui/widgets/eab-contact-display.c:502
+#: ../addressbook/gui/widgets/eab-contact-display.c:844
+#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "é?»å?é?µä»¶"
 
@@ -279,7 +258,7 @@ msgstr "å?¨å??(_N)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:72
+#: ../addressbook/gui/widgets/eab-contact-display.c:68
 msgid "Home"
 msgstr "ä½?å®¶"
 
@@ -314,17 +293,17 @@ msgstr "ç¶²å??(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/camel-gw-listener.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:454
+#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "å??è¨»"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:73
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "å?¶ä»?"
 
@@ -350,8 +329,8 @@ msgstr "ç¶²å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Work"
 msgstr "å·¥ä½?"
 
@@ -376,7 +355,7 @@ msgid "_Blog:"
 msgstr "é?¨è?½æ ¼(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:884
+#: ../calendar/gui/dialogs/event-page.c:881
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -458,42 +437,42 @@ msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:522
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:524
+#: ../addressbook/gui/widgets/eab-contact-display.c:520
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:527
+#: ../addressbook/gui/widgets/eab-contact-display.c:523
 msgid "Skype"
 msgstr "Skype"
 
@@ -638,7 +617,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:656
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
 msgid "Contact List Editor"
 msgstr "è?¯çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -663,24 +642,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:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Members"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:904
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1157
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
 msgid "Error modifying list"
 msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
 msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -699,9 +678,7 @@ msgid "Duplicate Contact Detected"
 msgstr "å?µæ¸¬å?°é??è¤?ç??è?¯çµ¡äºº"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr "æ¤è?¯çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨æ?¼æ¤è³?æ??å¤¾ã??ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
@@ -736,7 +713,8 @@ msgid "Merge Contact"
 msgstr "å??ä½µè?¯çµ¡äºº"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../modules/calendar/e-cal-shell-view-actions.c:1693
@@ -755,22 +733,22 @@ msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "No contacts"
 msgstr "æ²?æ??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??è?¯çµ¡äºº"
 msgstr[1] "%d å??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:342
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
+#: ../addressbook/gui/widgets/e-addressbook-model.c:756
 msgid "Search Interrupted"
 msgstr "æ??å°?è¢«ä¸æ?·"
 
@@ -778,55 +756,55 @@ msgstr "æ??å°?è¢«ä¸æ?·"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å?¡ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ä½ ç¢ºå®?è¦?å?ªé?¤é??å??è?¯çµ¡äºº (%s)ï¼?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -841,16 +819,16 @@ msgstr[1] ""
 "é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "ç¢ºå®?è¦?é¡¯ç¤ºé??è£?æ??æ??ç??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "_Don't Display"
 msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
 msgid "Display _All Contacts"
 msgstr "é¡¯ç¤ºæ??æ??ç??è?¯çµ¡äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -887,7 +865,7 @@ msgid "Categories"
 msgstr "å??é¡?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -936,22 +914,22 @@ msgid "Journal"
 msgstr "æ?¥èª?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Mobile Phone"
 msgstr "æµ?å??é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:513
+#: ../addressbook/gui/widgets/eab-contact-display.c:509
 msgid "Nickname"
 msgstr "ç¶²å??"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:601
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -986,7 +964,7 @@ msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -1124,86 +1102,86 @@ msgstr "è?¯çµ¡äºº: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å?¡ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 msgid "Copy _Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:178
-#: ../widgets/misc/e-web-view.c:395
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../widgets/misc/e-web-view.c:397
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:185
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:404
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:428
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:424
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Video Chat"
 msgstr "è¦?å??äº¤è«?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:547
 #: ../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:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:427
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:568
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
@@ -1211,61 +1189,52 @@ msgstr "ç¶²èª?"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 #: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-backend.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-backend.c:112
 #: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
 msgstr "å??äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:829
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:870
+#: ../addressbook/gui/widgets/eab-contact-display.c:866
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../addressbook/gui/widgets/eab-contact-display.c:875
 msgid "Blog"
 msgstr "é?¨è?½æ ¼"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1059
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥ä¾?é?¢ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??ç?®é??æ??å??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+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:117
-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."
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??ä½ æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:126
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??è¡¨ç¤ºä½ è¼¸å?¥é?¯èª¤ç??URIï¼?æ??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:134
@@ -1351,7 +1320,8 @@ msgstr "å?¡ç??æª¢è¦?æ¨¡å¼?"
 #: ../addressbook/importers/evolution-ldif-importer.c:519
 #: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:764
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "å?¯å?¥â?¦"
 
@@ -1441,9 +1411,7 @@ msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??æ¥æ¨¡å¼?å?¯å?º"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:73
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "é??å??æ¥æ¨¡å¼?ä¸?ï¼?ä¸?å??è¼¸å?ºæª?æ¡?ä¸ç??å?¡ç??æ?¸ç?®ï¼?é ?è¨å¤§å°?æ?¯ 100ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:75
@@ -1451,8 +1419,7 @@ msgid "NUMBER"
 msgstr "æ?¸é??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "æ??ä»¤å??å¼?æ?¸é?¯èª¤ï¼?è«?ä½¿ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:151
@@ -1473,28 +1440,20 @@ msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?äº?æ??ã??"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?æ??ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°ä½ ç??ç´?æ??å?¯ä»¥è®?ä½ ç?¥é??é??å??ç´?æ??å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°ä½ ç??å·¥ä½?å?¯ä»¥è®?ä½ ç?¥é??é??å??å·¥ä½?å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1506,9 +1465,7 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤å??å¿?é??ä¸ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1516,13 +1473,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?å·¥ä½?ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤æ??è°ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1632,14 +1587,11 @@ msgid "Editor could not be loaded."
 msgstr "ç?¡æ³?è¼?å?¥ç·¨è¼¯å?¨ã??"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "é?»å?é?µä»¶é??è«?æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??æ?¥å??æ¤å·¥ä½?ã??"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "é?»å?é?µä»¶é??è«?å?½æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??å??è¦?ã??"
 
 #: ../calendar/calendar.error.xml.h:41
@@ -1661,45 +1613,31 @@ msgid "Error on {0}: {1}"
 msgstr "{0} ç?¼ç??é?¯èª¤ï¼?{1}"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è°å·²ç¶?å??æ¶?ã??"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??è©²å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??è¨±å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:51
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤ç´?æ??å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤å·¥ä½?å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
 #: ../calendar/calendar.error.xml.h:54
@@ -1787,10 +1725,7 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?çµ¦å??è??è??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:75
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
 msgstr "ä½ æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
 #: ../calendar/calendar.error.xml.h:76
@@ -1826,7 +1761,8 @@ msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ä½ ç??å·¥ä½?ã??"
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/e-composer-actions.c:313
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
@@ -1835,7 +1771,8 @@ msgid "_Save Changes"
 msgstr "å?²å?æ?´æ?¹(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
@@ -1845,7 +1782,7 @@ msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
 #: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1779
+#: ../calendar/gui/e-meeting-store.c:1776
 #: ../plugins/caldav/caldav-browse-server.c:921
 #: ../plugins/google-account-setup/google-source.c:439
 #: ../plugins/publish-calendar/publish-calendar.c:332
@@ -1869,8 +1806,10 @@ msgstr[1] "å°?æ??"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../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
+#: ../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:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
@@ -1893,8 +1832,8 @@ msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1631
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®:"
@@ -1903,7 +1842,8 @@ msgstr "ä½?ç½®:"
 msgid "Snooze _time:"
 msgstr "å¿½ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:887
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../e-util/e-alert.c:896
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
@@ -1914,7 +1854,8 @@ msgstr "å»¶æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../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:376
 msgid "hours"
@@ -1927,39 +1868,41 @@ msgstr "ç´?æ??ç??å?°é»?"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../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
+#: ../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:375
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1494
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1504
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1548
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "ä½ æ?? %d å??é¬§é?´"
 msgstr[1] "ä½ æ?? %d å??é¬§é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1770
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1971,11 +1914,10 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1776
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -1988,7 +1930,7 @@ msgstr ""
 "\n"
 "ä½ ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1791
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -1997,7 +1939,8 @@ msgid "invalid time"
 msgstr "å¤±æ??æ??é??"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:393
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2006,7 +1949,8 @@ msgstr[0] "%d æ??"
 msgstr[1] "%d æ??"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:399
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2017,7 +1961,8 @@ msgstr[1] "%d å??"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2045,13 +1990,16 @@ msgstr "é?±æª¢è¦?"
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ä»»ä½?æ¬?ä½?"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "é??ä»¶"
 
@@ -2061,72 +2009,91 @@ msgstr "é??ä»¶"
 msgid "Attendee"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æ¸é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772
+#: ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 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
+#: ../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
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../widgets/misc/e-attachment-tree-view.c:522
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "ä¸?å?å?¨"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "å?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:497
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
-#: ../calendar/gui/e-task-table.c:496 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:761
+#: ../calendar/gui/e-cal-model.c:768
+#: ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
@@ -2134,34 +2101,44 @@ msgstr "é?±æ??æ?§"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "æ??è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æ??è¦?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ä¸?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ?¯"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ä¸?æ?¯"
 
@@ -2194,7 +2171,7 @@ msgid "Add Alarm"
 msgstr "æ?°å¢?é¬§é?´"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "é¬§é?´"
 
@@ -2210,7 +2187,8 @@ msgstr "è?ªé?¸é¬§é?´è?²é?³"
 msgid "Mes_sage:"
 msgstr "è¨?æ?¯(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "é?¸é ?"
 
@@ -2298,11 +2276,12 @@ msgstr "é¡?å??:"
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:232
+#: ../mail/mail-config.ui.h:152
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../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:282
+#: ../widgets/misc/e-signature-script-dialog.c:280
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
@@ -2325,7 +2304,8 @@ msgstr "é¡?è?²(_R):"
 #: ../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:200 ../mail/mail-config.ui.h:51
+#: ../mail/em-folder-properties.c:200
+#: ../mail/mail-config.ui.h:51
 #: ../modules/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
@@ -2411,226 +2391,240 @@ msgstr "%s  ä½ å·²ç¶?å??äº?äº?æ?´æ?¹ã??æ?¾æ£?é??äº?æ?´æ?¹ä¸¦ä¸?æ?´æ?°é??å??ç·¨
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:445
 #, c-format
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:260
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:540
+#: ../calendar/gui/dialogs/comp-editor.c:535
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:655
+#: ../calendar/gui/dialogs/comp-editor.c:650
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:662
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:664
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:670
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:677
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:693
+#: ../calendar/gui/dialogs/comp-editor.c:688
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:814
+#: ../calendar/gui/dialogs/comp-editor.c:809
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Click here to close the current window"
 msgstr "æ??é??è£?ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017 ../mail/e-mail-browser.c:136
+#: ../calendar/gui/dialogs/comp-editor.c:1012
+#: ../mail/e-mail-browser.c:132
 #: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../widgets/misc/e-focus-tracker.c:114
+#: ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:414
+#: ../widgets/misc/e-web-view.c:1068
 msgid "Copy the selection"
 msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024 ../mail/e-mail-browser.c:143
+#: ../calendar/gui/dialogs/comp-editor.c:1019
+#: ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1059
+#: ../widgets/misc/e-focus-tracker.c:107
+#: ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1062
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1026
 #: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:128
+#: ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 msgid "Click here to view help available"
 msgstr "æ??é??è£?ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045 ../mail/e-mail-browser.c:150
+#: ../calendar/gui/dialogs/comp-editor.c:1040
+#: ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1071
+#: ../widgets/misc/e-focus-tracker.c:121
+#: ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1074
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 msgid "Click here to save the current window"
 msgstr "æ??é??è£?ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/e-mail-browser.c:157
+#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../widgets/misc/e-focus-tracker.c:135
+#: ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "_Classification"
 msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:171
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:167
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094 ../mail/e-mail-browser.c:164
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 #: ../shell/e-shell-window-actions.c:1594
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 #: ../composer/e-composer-actions.c:336
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../mail/e-mail-browser.c:174
+#: ../shell/e-shell-window-actions.c:1629
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 #: ../composer/e-composer-actions.c:285
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Click here to attach a file"
 msgstr "æ??é??è£?ä»¥é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1142
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161
+#: ../calendar/gui/dialogs/comp-editor.c:1156
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1175
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1177
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1187
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1201
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1230
 #: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1940
+#: ../calendar/gui/dialogs/comp-editor.c:1936
 #: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "é??å? "
@@ -2746,147 +2740,148 @@ msgstr "å§?è¨?çµ¦ï¼?"
 msgid "Enter Delegate"
 msgstr "è¼¸å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Alarms"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£?ä»¥è¨å®?æ??å??æ¶?é??å??äº?ä»¶ç??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "é¡¯ç¤ºæ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??é¡¯ç¤ºç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "å°?æ¤é ?è¨ç?ºé?±æ??æ?§äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../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:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314
+#: ../calendar/gui/print.c:3172
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:384
 #: ../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:585
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "æ??å?°é??å??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:768
+#: ../calendar/gui/dialogs/event-page.c:765
 msgid "Event's start time is in the past"
 msgstr "äº?ä»¶ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:809
+#: ../calendar/gui/dialogs/event-page.c:806
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:810
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:825
-#: ../calendar/gui/dialogs/event-page.c:2783
+#: ../calendar/gui/dialogs/event-page.c:822
+#: ../calendar/gui/dialogs/event-page.c:2780
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:892
+#: ../calendar/gui/dialogs/event-page.c:889
 #: ../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:939
+#: ../calendar/gui/dialogs/event-page.c:936
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:938
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1155
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1161
+#: ../calendar/gui/dialogs/event-page.c:1158
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1332
-#: ../calendar/gui/dialogs/memo-page.c:674
-#: ../calendar/gui/dialogs/task-page.c:908
+#: ../calendar/gui/dialogs/event-page.c:1329
+#: ../calendar/gui/dialogs/memo-page.c:671
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1342
+#: ../calendar/gui/dialogs/event-page.c:1339
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1365
+#: ../calendar/gui/dialogs/event-page.c:1362
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1372
+#: ../calendar/gui/dialogs/event-page.c:1369
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:715
-#: ../calendar/gui/dialogs/task-page.c:970
+#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/memo-page.c:712
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??äººå·²ç¶?æ²?æ??å¸³è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1542
-#: ../calendar/gui/dialogs/memo-page.c:721
-#: ../calendar/gui/dialogs/task-page.c:976
+#: ../calendar/gui/dialogs/event-page.c:1539
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1567
-#: ../calendar/gui/dialogs/task-page.c:1000
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2657
+#: ../calendar/gui/dialogs/event-page.c:2654
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -2897,47 +2892,47 @@ 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:2701
-#: ../calendar/gui/dialogs/memo-page.c:934
-#: ../calendar/gui/dialogs/task-page.c:1790
+#: ../calendar/gui/dialogs/event-page.c:2698
+#: ../calendar/gui/dialogs/memo-page.c:931
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ä½ æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:3012
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:3018
+#: ../calendar/gui/dialogs/event-page.c:3015
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:3024
+#: ../calendar/gui/dialogs/event-page.c:3021
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:3043
+#: ../calendar/gui/dialogs/event-page.c:3040
 msgid "Customize"
 msgstr "è?ªé?¸"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3049
+#: ../calendar/gui/dialogs/event-page.c:3046
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "å?°æ??è??(_N)â?¦"
 
@@ -2961,7 +2956,7 @@ msgstr "é¬§é?´(_A)"
 #: ../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:346
+#: ../widgets/misc/e-attachment-dialog.c:343
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
@@ -3008,35 +3003,40 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/memo-editor.c:105
+#: ../calendar/gui/print.c:3176
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "æ??å?°é??å??å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:340
+#: ../calendar/gui/dialogs/memo-page.c:337
 msgid "Memo's start date is in the past"
 msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/memo-page.c:378
+#: ../calendar/gui/dialogs/memo-page.c:375
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:382
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:895
+#: ../calendar/gui/dialogs/memo-page.c:892
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1066 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2399
-#: ../mail/em-format-html.c:2464 ../mail/em-format-html.c:2488
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1063
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052
+#: ../mail/em-format-html.c:2396
+#: ../mail/em-format-html.c:2461
+#: ../mail/em-format-html.c:2485
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -3055,7 +3055,7 @@ msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:425
+#: ../calendar/gui/dialogs/task-page.c:422
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç¾£çµ?(_G):"
@@ -3096,21 +3096,21 @@ msgstr "æ¤ä¾?é ?å??ä»¥å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:566
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:898
+#: ../calendar/gui/dialogs/recurrence-page.c:895
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:938
+#: ../calendar/gui/dialogs/recurrence-page.c:935
 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:968
+#: ../calendar/gui/dialogs/recurrence-page.c:965
 msgid "on"
 msgstr "ç??"
 
@@ -3118,7 +3118,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "first"
 msgstr "ä¸?"
 
@@ -3127,7 +3127,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:1032
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "second"
 msgstr "äº?"
 
@@ -3135,7 +3135,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:1037
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "third"
 msgstr "ä¸?"
 
@@ -3143,7 +3143,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:1042
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fourth"
 msgstr "å??"
 
@@ -3151,7 +3151,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:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "fifth"
 msgstr "ç¬¬äº?"
 
@@ -3159,13 +3159,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:1052
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 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:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -3173,7 +3173,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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -3181,7 +3181,7 @@ msgstr "1æ?¥è?³10æ?¥"
 #. * 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:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -3189,48 +3189,48 @@ msgstr "11æ?¥è?³20æ?¥"
 #. * 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:1094
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "21st to 31st"
 msgstr "21æ?¥è?³31æ?¥"
 
 #. 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
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "day"
 msgstr "å¤©"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
@@ -3238,31 +3238,31 @@ 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:1248
+#: ../calendar/gui/dialogs/recurrence-page.c:1245
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1422
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2126
+#: ../calendar/gui/dialogs/recurrence-page.c:2123
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2170
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2348
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -3274,7 +3274,8 @@ msgstr "æ¯?"
 msgid "Exceptions"
 msgstr "ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
+#: ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "é ?è¦½"
 
@@ -3332,82 +3333,101 @@ msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:352
+#: ../calendar/gui/dialogs/task-details-page.c:374
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../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:600
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225
+#: ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:3262
+#: ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180
+#: ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:599 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3259
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1232 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:516
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1228
+#: ../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:292
-#: ../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:598
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:435
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:786
+#: ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221
+#: ../calendar/gui/e-task-table.c:594
 #: ../calendar/gui/print.c:3256
 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:321
-#: ../calendar/gui/e-task-table.c:522 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1230 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1226
+#: ../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:319
-#: ../calendar/gui/e-cal-model.c:1525 ../calendar/gui/e-task-table.c:521
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1231
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1521
+#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1227
 #: ../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:302
-#: ../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:597
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:433
+#: ../calendar/gui/e-cal-model-tasks.c:707
+#: ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3253
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -3423,17 +3443,19 @@ 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:1833
+#: ../calendar/gui/e-calendar-view.c:1831
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.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 "æ?ªæ??å®?"
@@ -3451,58 +3473,59 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "ç¶²é ?(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ç??æ??è©³ç´°è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£?æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:122
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:328
+#: ../calendar/gui/print.c:3174
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "å·¥ä½?è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:376
+#: ../calendar/gui/dialogs/task-editor.c:373
 msgid "Print this task"
 msgstr "æ??å?°é??é ?å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:339
 msgid "Task's start date is in the past"
 msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task's due date is in the past"
 msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:378
+#: ../calendar/gui/dialogs/task-page.c:375
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:382
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/task-page.c:433
+#: ../calendar/gui/dialogs/task-page.c:430
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:881
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1747
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
@@ -3595,42 +3618,44 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../filter/e-filter-rule.c:667
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:194
 msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:257
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "æ?ªæ¢æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "ç¶²é ?ï¼?"
 
@@ -3657,16 +3682,17 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-task-table.c:570
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:575
+#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-task-table.c:571
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:655
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3677,44 +3703,51 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:705
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
+#: ../calendar/gui/e-cal-model-tasks.c:1061
+#: ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1030
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1027
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
+#: ../calendar/gui/e-cal-model-tasks.c:1061
+#: ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:774
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:1109
+#: ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
 #: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1527
+#: ../calendar/gui/e-cal-model.c:1523
 msgid "Recurring"
 msgstr "é?±æ??æ?§æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1529
+#: ../calendar/gui/e-cal-model.c:1525
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2647
+#: ../calendar/gui/e-cal-model.c:2643
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
@@ -3754,107 +3787,116 @@ msgstr "é??å§?æ?¥æ??"
 #: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:582
+#: ../widgets/misc/e-attachment-tree-view.c:580
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:428
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Paste events from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:463 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:261
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:859
-#: ../calendar/gui/e-task-table.c:1088
+#: ../calendar/gui/e-calendar-view.c:653
+#: ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1084
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1782
 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:1928 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:763
+#: ../calendar/gui/e-calendar-view.c:1926
+#: ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:759
 #, 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:1932 ../calendar/gui/e-memo-table.c:547
-#: ../calendar/gui/e-task-table.c:766
+#: ../calendar/gui/e-calendar-view.c:1930
+#: ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1948 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946
+#: ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1979
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3867,17 +3909,17 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:748
+#: ../calendar/gui/e-day-view-time-item.c:745
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:769
+#: ../calendar/gui/e-day-view-time-item.c:766
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:786
+#: ../calendar/gui/e-day-view-time-item.c:783
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
@@ -3885,8 +3927,8 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-day-view-time-item.c:813
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:316
 #: ../modules/calendar/e-calendar-preferences.c:251
 msgid "Select..."
 msgstr "é?¸æ??â?¦"
@@ -3897,10 +3939,12 @@ 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:844 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:212 ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:208
+#: ../calendar/gui/print.c:1866
 msgid "%A %d %B"
-msgstr "%B %d %A"
+msgstr "%B%dæ?¥%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -3908,41 +3952,49 @@ 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:848 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:221
+#: ../calendar/gui/e-day-view-top-item.c:845
+#: ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
-msgstr "%b %d (%a)"
+msgstr "%b%dæ?¥ (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. 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:852 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:235
+#: ../calendar/gui/e-day-view-top-item.c:849
+#: ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
-msgstr "%b %d"
+msgstr "%b%dæ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002
+#: ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:939
+#: ../calendar/gui/print.c:2363
+#: ../calendar/gui/print.c:2383
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:925
+#: ../calendar/gui/print.c:941
+#: ../calendar/gui/print.c:2368
+#: ../calendar/gui/print.c:2385
 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:2600
+#: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
@@ -3964,56 +4016,68 @@ msgid "Resources"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1021
+#: ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1089
+#: ../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:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:131
 #: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:133
 #: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "æ??è°å®¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1027 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:166
 #: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1037
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1034
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
@@ -4028,16 +4092,17 @@ msgstr "å?°æ??è??"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "é?²è¡?ä¸"
 
-#: ../calendar/gui/e-meeting-store.c:1766
+#: ../calendar/gui/e-meeting-store.c:1763
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %2$s å?¨ä¼ºæ??å?¨ %1$s ä¸?å?å??ç©ºé??/å¿?ç¢?è³?è¨?ç??å¯?ç¢¼ "
 
-#: ../calendar/gui/e-meeting-store.c:1775
+#: ../calendar/gui/e-meeting-store.c:1772
 #, c-format
 msgid "Failure reason: %s"
 msgstr "å¤±æ??å??å? ï¼?%s"
@@ -4045,16 +4110,16 @@ msgstr "å¤±æ??å??å? ï¼?%s"
 #. 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:431
-#: ../calendar/gui/e-meeting-time-sel.c:2382
+#: ../calendar/gui/e-meeting-time-sel.c:2380
 msgid "%A, %B %d, %Y"
-msgstr "%Y, %B %d (%A)"
+msgstr "%Y, %B%dæ?¥ (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:435
-#: ../calendar/gui/e-meeting-time-sel.c:2413
+#: ../calendar/gui/e-meeting-time-sel.c:2411
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4064,63 +4129,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:584
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:629
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:664
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:695
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:717
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:775
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:815
+#: ../calendar/gui/e-meeting-time-sel.c:813
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -4148,8 +4213,8 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:423
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../calendar/gui/e-memo-table.c:419
+#: ../modules/calendar/e-cal-shell-content.c:469
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -4157,38 +4222,41 @@ msgstr "æ??å?¡"
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:504 ../calendar/gui/e-task-table.c:727
+#: ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:723
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:807
+#: ../calendar/gui/e-memo-table.c:585
+#: ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "é??å§?:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:825
+#: ../calendar/gui/e-memo-table.c:604
+#: ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:724
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:730
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:736
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -4200,56 +4268,58 @@ 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:549
+#: ../calendar/gui/e-task-table.c:545
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:646 ../calendar/gui/print.c:2159
+#: ../calendar/gui/e-task-table.c:642
+#: ../calendar/gui/print.c:2159
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-cal-shell-content.c:430
 #: ../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:444
 #: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/camel-gw-listener.c:428
+#: ../plugins/groupwise-features/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:949
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:955
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:965
+#: ../calendar/gui/e-task-table.c:961
 msgid "Paste tasks from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:967
 #: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:977
+#: ../calendar/gui/e-task-table.c:973
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:327
 msgid "Select Timezone"
 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:229 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:225
+#: ../calendar/gui/print.c:1847
 msgid "%d %B"
-msgstr "%d %B"
+msgstr "%B%dæ?¥"
 
 #: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
@@ -4305,7 +4375,8 @@ msgstr "ç§»è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:148
+#: ../calendar/gui/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4314,7 +4385,8 @@ msgstr[1] "å®?æ?? %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:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:153
+#: ../calendar/gui/ea-week-view.c:150
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?ä»¶ã??"
 
@@ -4351,7 +4423,7 @@ msgstr "Gnome è¡?äº?æ??"
 #: ../calendar/gui/ea-gnome-calendar.c:197
 #: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
-msgstr "%Y, %b %d (%A)"
+msgstr "%Yå¹´%b%dæ?¥ (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
@@ -4360,7 +4432,7 @@ msgstr "%Y, %b %d (%A)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
-msgstr "%Y, %b %d (%a)"
+msgstr "%Yå¹´%b%dæ?¥ (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:226
 #: ../calendar/gui/ea-gnome-calendar.c:232
@@ -4371,7 +4443,7 @@ msgstr "%Y, %b %d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1052
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
-msgstr "%Y, %b %d"
+msgstr "%Yå¹´%b%dæ?¥"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -4460,7 +4532,8 @@ msgstr "é?¸æ??ä»?å¤©(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
+#: ../calendar/gui/itip-utils.c:422
+#: ../calendar/gui/itip-utils.c:477
 #: ../calendar/gui/itip-utils.c:573
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
@@ -4469,19 +4542,23 @@ msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:811
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:814
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:663
+#: ../calendar/gui/itip-utils.c:817
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:666
+#: ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
@@ -4514,7 +4591,8 @@ msgstr "æ?«æ??æ?¥å??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:768
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -4800,11 +4878,13 @@ msgstr "% å·²å®?æ??"
 msgid "In progress"
 msgstr "æ£å?¨é?²è¡?"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "å¤§æ?¼"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "å°?æ?¼"
 
@@ -6550,7 +6630,7 @@ msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
@@ -6566,7 +6646,8 @@ msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:308
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Configure Evolution"
 msgstr "è¨å®? Evolution"
 
@@ -6602,7 +6683,8 @@ msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
@@ -6694,57 +6776,55 @@ msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "è¼¸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¼¸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../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"
+#: ../composer/e-composer-header-table.c:41
+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:1006
+#: ../composer/e-composer-header-table.c:1004
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1013
 msgid "_Reply-To:"
 msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1017
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1022
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1032
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1036
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1045
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:127
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
@@ -6770,33 +6850,29 @@ msgstr "å?²å?è??ç¨¿"
 
 #: ../composer/e-msg-composer.c:784
 #, c-format
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç½²è?æ?¸"
 
 #: ../composer/e-msg-composer.c:793
 #, c-format
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?è?æ?¸(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1675
+#: ../composer/e-msg-composer.c:2058
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:4134
+#: ../composer/e-msg-composer.c:4116
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4839
+#: ../composer/e-msg-composer.c:4821
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
 msgstr "é??è£?æ??ä¸?äº?é??ä»¶è¦?ä¸?è¼?ã??å?³é??æ¤é?µä»¶å°?ç?¡æ³?ä¸?ä½µå¯?å?ºæ?¥ä¸?ä¾?ç??é??ä»¶"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -6816,9 +6892,7 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "å?¨å¯?ä¿¡æ??ç?¼ç??é?¯èª¤ã??ä½ è¦?å¦?ä½?ç¹¼çº?ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "ç¢ºå®?è¦?æ?¾æ£?æ£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -6830,17 +6904,11 @@ msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid ""
-"Because you are working offline, the message will be 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."
+msgid "Because you are working offline, the message will be 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."
+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:11
@@ -6872,9 +6940,7 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å?è?³è?ªå??å?²å?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
 #: ../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."
+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:19
@@ -6885,14 +6951,13 @@ 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 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21
+#: ../mail/mail.error.xml.h:117
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??"
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
 msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å¾?å?¯è?½æ²?æ??å?²å?ã??"
 
 #: ../composer/mail-composer.error.xml.h:23
@@ -7031,17 +7096,11 @@ msgid "Sending"
 msgstr "å?³é??ä¸"
 
 #: ../capplet/settings/mail-account-view.c:590
-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. "
-"If we can't do it automatically you'll need your server details as well."
+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. If we can't do it automatically you'll need your server details as well."
 msgstr "è¦?ä½¿ç?¨é??å??é?»å?é?µä»¶ç¨?å¼?ä½ é??è¦?å??è¨å®?ä¸?å??å¸³è??ã??è«?å?¨ä¸?é?¢æ??ä¾?ä½ ç??é?»å?é?µä»¶ä½?å??å??å¯?ç¢¼ï¼?æ??å??æ??å??è©¦ä¸¦æ?¾å?ºæ??æ??ç??è¨å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ¥é©?ï¼?ä½ å°±é??è¦?ä½¿ç?¨è?ªå·±å¸³è??ç??ä¼ºæ??å?¨è©³ç´°è³?æ??ã??"
 
 #: ../capplet/settings/mail-account-view.c:592
-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 "
-"entered but you may need to change them."
+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 entered but you may need to change them."
 msgstr "æ?±æ?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºä½ ç??é?µä»¶è¨å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??ä»¥ä½ å??å??è¼¸å?¥ç??è©³ç´°è³?æ??å??è©¦é??å§?ï¼?ä½?æ?¯ä½ ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
 
 #: ../capplet/settings/mail-account-view.c:594
@@ -7049,9 +7108,7 @@ msgid "You can specify more options to configure the account."
 msgstr "ä½ å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?è¨å®?é??å??å¸³è??ç??é?¸é ?ã??"
 
 #: ../capplet/settings/mail-account-view.c:596
-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."
+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."
 msgstr "ç?¾å?¨æ??å??é??è¦?ä½ ç??è¨å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?å??è©¦ç??æ¸¬é?¨å??è¨å®?ï¼?ä½?æ?¯ä½ æ??è©²æª¢æ?¥å®?å??ä»¥é?²è¡?ç¢ºèª?ã??"
 
 #: ../capplet/settings/mail-account-view.c:597
@@ -7059,13 +7116,12 @@ msgid "You can specify your default settings for your account."
 msgstr "ä½ å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?è¨è¨å®?å?¼ã??"
 
 #: ../capplet/settings/mail-account-view.c:598
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+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:613
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2214
+#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2212
 msgid "Identity"
 msgstr "èº«å??"
 
@@ -7117,7 +7173,7 @@ msgid "Back - Receiving options"
 msgstr "ä¸?ä¸?æ¥ - æ?¥æ?¶é?¸é ?"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3045
+#: ../mail/em-account-editor.c:3043
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
@@ -7158,10 +7214,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
 
 #: ../capplet/settings/mail-account-view.c:784
-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 "
-"correct."
+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 correct."
 msgstr "Yahoo è¡?äº?æ??æ??å?½å??ç?º å??å?_å§?æ°?ã??æ??å??å·²å??è©¦çµ?æ??é??å??è¡?äº?æ??ç??å??ç¨±ã??å? æ¤è«?ç¢ºèª?å®?ï¼?å¦?æ??æ??é?¯èª¤è«?é??æ?°è¼¸å?¥è¡?äº?æ??ç??å??ç¨±ã??"
 
 #: ../capplet/settings/mail-account-view.c:793
@@ -7190,19 +7243,24 @@ msgid "Evolution account assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1725
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:353
+#: ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163
+#: ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1721
+#: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-backend.c:103
 #: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-backend.c:92
 #: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
@@ -7232,7 +7290,8 @@ msgstr "è¡?äº?æ??äº?ä»¶é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution é¬§é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:955
+#: ../data/evolution.desktop.in.in.h:1
+#: ../mail/e-mail-browser.c:952
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7242,7 +7301,8 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3
+#: ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?ä»¶"
 
@@ -7259,36 +7319,36 @@ msgid "Email Settings"
 msgstr "é?»å?é?µä»¶è¨å®?å?¼"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:223
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ï¼?å·²å??æ¶?ï¼?"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ï¼?å·²å®?æ??ï¼? "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (æ£å?¨ç?å¾?)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (æ£å?¨å??æ¶?)"
 
-#: ../e-util/e-activity.c:239
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:244
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
@@ -7350,12 +7410,16 @@ msgid "Western European, New"
 msgstr "è¿?ä»£è¥¿æ?èª?ç³»"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:85
+#: ../e-util/e-charset.c:87
+#: ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "ç¹?é«?"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:91
+#: ../e-util/e-charset.c:93
+#: ../e-util/e-charset.c:95
 #: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "ç°¡é«?"
@@ -7379,7 +7443,8 @@ msgid "Today"
 msgstr "ä»?å¤©"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??å¤©"
 
@@ -7387,22 +7452,80 @@ msgstr "æ??å¤©"
 msgid "Yesterday"
 msgstr "æ?¨å¤©"
 
-#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
-#. ngettext is used to be able to define different translations for different days of week, where
-#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
-#: ../e-util/e-datetime-format.c:215
-#, c-format
-msgid "Next %a"
-msgid_plural "Next %a"
-msgstr[0] "ä¸?%a"
-msgstr[1] "ä¸?%a"
-
-#: ../e-util/e-datetime-format.c:292 ../e-util/e-datetime-format.c:302
-#: ../e-util/e-datetime-format.c:311
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:217
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "ä¸?é?±ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:223
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "ä¸?é?±äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:229
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "ä¸?é?±ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:235
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "ä¸?é?±å??"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:241
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "ä¸?é?±äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:247
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "ä¸?é?±å?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:253
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "ä¸?é?±æ?¥"
+
+#: ../e-util/e-datetime-format.c:335
+#: ../e-util/e-datetime-format.c:345
+#: ../e-util/e-datetime-format.c:354
 msgid "Use locale default"
 msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
 
-#: ../e-util/e-datetime-format.c:508
+#: ../e-util/e-datetime-format.c:551
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
@@ -7423,7 +7546,8 @@ msgstr "æ£å?¨å¯«å?¥ã??%sã??"
 msgid "Writing \"%s\" to %s"
 msgstr "æ£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426
+#: ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:378
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -7438,8 +7562,7 @@ msgid "The printing system reported the following details about the error:"
 msgstr "æ??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ¤é?¯èª¤ç??è©³ç´°è³?è¨?ï¼?"
 
 #: ../e-util/e-print.c:170
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
 #: ../e-util/e-signature.c:707
@@ -7466,7 +7589,8 @@ msgstr "è¦?è¦?å¯«å®??"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
@@ -7487,58 +7611,77 @@ msgstr "GConf é?¯èª¤ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:328 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:283
+#: ../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:70
 msgid "From"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2400 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2397
+#: ../mail/em-format-html.c:2465
+#: ../mail/em-format-html.c:2488
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2401 ../mail/em-format-html.c:2472
-#: ../mail/em-format-html.c:2494 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2398
+#: ../mail/em-format-html.c:2469
+#: ../mail/em-format-html.c:2491
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:333 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:427
+#: ../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:75
 #: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ä¸»æ?¨"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2588
+#: ../em-format/em-format-quote.c:438
+#: ../mail/em-format-html.c:2585
 #: ../modules/mail/em-mailer-prefs.c:1119
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1159
+#: ../em-format/em-format-quote.c:519
+#: ../mail/em-composer-utils.c:1179
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
+#: ../em-format/em-format.c:1056
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:76
+#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1057
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾£çµ?"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1058
+#: ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "é?¢è²?"
@@ -7548,165 +7691,172 @@ msgstr "é?¢è²?"
 msgid "%s attachment"
 msgstr "%s é??ä»¶"
 
-#: ../em-format/em-format.c:1559
+#: ../em-format/em-format.c:1566
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1741 ../em-format/em-format.c:1935
+#: ../em-format/em-format.c:1748
+#: ../em-format/em-format.c:1942
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1751
+#: ../em-format/em-format.c:1758
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1771
+#: ../em-format/em-format.c:1778
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1772
+#: ../em-format/em-format.c:1779
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1960
+#: ../em-format/em-format.c:1967
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½ç½²æ ¼å¼?"
 
-#: ../em-format/em-format.c:1973 ../em-format/em-format.c:2145
+#: ../em-format/em-format.c:1980
+#: ../em-format/em-format.c:2159
 msgid "Error verifying signature"
 msgstr "æª¢é©?ç°½ç½²ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1974 ../em-format/em-format.c:2132
+#: ../em-format/em-format.c:1981
 #: ../em-format/em-format.c:2146
+#: ../em-format/em-format.c:2160
 msgid "Unknown error verifying signature"
 msgstr "æª¢é©?ç°½ç½²ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2237
+#: ../em-format/em-format.c:2251
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?è§£æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2243 ../mail/em-folder-tree.c:660
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2257
+#: ../mail/em-folder-tree.c:656
+#: ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+msgstr "%Y-%b-%d"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:282
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -7714,70 +7864,73 @@ msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:666
+#: ../filter/e-filter-rule.c:662
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/e-filter-rule.c:696
+#: ../filter/e-filter-rule.c:692
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:717
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:718
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:721
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:750
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:751
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:752
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:753
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:754
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:757
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:786
+#: ../filter/e-filter-rule.c:782
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1130
+#: ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:316
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1130
+#: ../mail/em-utils.c:317
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
-#: ../filter/e-rule-editor.c:267
+#: ../filter/e-rule-editor.c:263
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/e-rule-editor.c:353
+#: ../filter/e-rule-editor.c:349
 msgid "Edit Rule"
 msgstr "ç·¨è¼¯è¦?å??"
 
@@ -7801,7 +7954,8 @@ msgstr "ç¼ºå°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "ç¼ºå°?æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "ç¼ºå°?å??ç¨±ã??"
 
@@ -7857,7 +8011,8 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??æ¿¾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11
+#: ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
@@ -7894,48 +8049,52 @@ msgstr "ä½ æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1053 ../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
+#: ../mail/e-mail-attachment-bar.c:86
+#: ../mail/e-mail-attachment-bar.c:91
+#: ../mail/em-format-html-display.c:1122
+#: ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:124
+#: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:604
+#: ../widgets/misc/e-attachment-paned.c:619
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:606
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:1405
+#: ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1405
 #: ../shell/e-shell-window-actions.c:1412
 #: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:282
 msgid "(No Subject)"
 msgstr "(æ²?æ??ä¸»æ?¨)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:62
 msgid "_Add to Address Book..."
 msgstr "å? å?¥å?°é??è¨?é??(_A)â?¦"
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:69
 msgid "_To This Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:76
 msgid "_From This Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:85
 msgid "Create Search _Folder"
 msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
 
@@ -7944,44 +8103,44 @@ msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
 msgid "Saving message to folder '%s'"
 msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-label-dialog.c:222
+#: ../mail/e-mail-label-dialog.c:219
 msgid "_Label name:"
 msgstr "æ¨?ç±¤å??ç¨±(_L):"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:37
 msgid "I_mportant"
 msgstr "é??è¦?(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:38
 msgid "_Work"
 msgstr "å·¥ä½?(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:39
 msgid "_Personal"
 msgstr "å??äºº(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:40
 msgid "_To Do"
 msgstr "å¾?è¾¦äº?é ?(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:41
 msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
-#: ../mail/e-mail-label-manager.c:165
+#: ../mail/e-mail-label-manager.c:161
 #: ../modules/mail/e-mail-shell-view-actions.c:627
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:212
 msgid "Edit Label"
 msgstr "ç·¨è¼¯æ¨?ç±¤"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:346
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -7989,11 +8148,11 @@ msgstr ""
 "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?\n"
 "æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:84
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/e-mail-label-tree-view.c:96
+#: ../mail/e-mail-label-tree-view.c:94
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1296
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
@@ -8002,29 +8161,35 @@ msgstr "é¡?è?²"
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:741 ../mail/em-folder-tree.c:3144
+#: ../mail/e-mail-local.c:35
+#: ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:738
+#: ../mail/em-folder-tree.c:3138
 #: ../modules/mail/e-mail-shell-view-private.c:1118
 #: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:733
+#: ../mail/e-mail-local.c:36
+#: ../mail/em-folder-tree-model.c:730
 #: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:745
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-tree-model.c:742
 #: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "å¯?ä»¶å?£"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:747
+#: ../mail/e-mail-local.c:38
+#: ../mail/em-folder-tree-model.c:744
 #: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:736
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:733
 #: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
@@ -8050,8 +8215,7 @@ msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
 #: ../mail/e-mail-migrate.c:661
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8064,7 +8228,7 @@ msgstr ""
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ç?¡æ³?å?¨ã??%sã??å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:566
+#: ../mail/e-mail-notebook-view.c:562
 msgid "Please select a folder"
 msgstr "è«?é?¸æ??è³?æ??å¤¾"
 
@@ -8076,11 +8240,13 @@ msgstr "è«?é?¸æ??è³?æ??å¤¾"
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:306
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306
+#: ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
@@ -8088,34 +8254,33 @@ msgstr "è¤?è£½(_O)"
 #. %d with count of duplicate messages.
 #: ../mail/e-mail-reader.c:523
 #, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
+msgid "Folder '%s' contains %d duplicate message. Are you sure you want to delete it?"
+msgid_plural "Folder '%s' contains %d duplicate messages. Are you sure you want to delete them?"
 msgstr[0] "è³?æ??å¤¾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??ä½ ç¢ºå®?è¦?å?ªé?¤å®?ï¼?"
 msgstr[1] "è³?æ??å¤¾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??ä½ ç¢ºå®?è¦?å?ªé?¤å®?å??ï¼?"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:986
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:986
+#: ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1421
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1467
 msgid "_Do not ask me again."
 msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1472
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
 
-#: ../mail/e-mail-reader.c:1575
+#: ../mail/e-mail-reader.c:1581
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "å?²å?é?µä»¶"
@@ -8127,7 +8292,7 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1596
+#: ../mail/e-mail-reader.c:1602
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
@@ -8135,660 +8300,672 @@ msgid_plural "Messages"
 msgstr[0] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1876
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1878
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1883
 msgid "Check for _Junk"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1885
 msgid "Filter the selected messages for junk status"
 msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1890
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)â?¦"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1892
 msgid "Copy selected messages to another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1897
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1899
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1904
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)â?¦"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1918
 msgid "Filter on Se_nder..."
 msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)â?¦"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1920
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1925
 msgid "Filter on _Subject..."
 msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1927
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1932
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1934
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1939
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)â?¦"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1941
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1946
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1948
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1953
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1955
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1960
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1962
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1967
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1963 ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Attached"
 msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1981
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1977 ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Inline"
 msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1995
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1991 ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2004
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:2002
 msgid "Forward As _Quoted"
 msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2009
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2011
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2016
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2023
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2030
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2037
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2044
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2046
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2051
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2053
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2058
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)â?¦"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2065
 msgid "Compose _New Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2067
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2072
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2074
 msgid "Open the selected messages in a new window"
 msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2079
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)â?¦"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2081
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2086
 msgid "_Switch to Folder"
 msgstr "å??æ??è?³è³?æ??å¤¾(_S)"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the parent folder"
 msgstr "é¡¯ç¤ºä¸?å±¤è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2093
 msgid "Switch to _next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2095
 msgid "Switch to the next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2100
 msgid "Switch to _previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2102
 msgid "Switch to the previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2107
 msgid "Cl_ose current tab"
 msgstr "é??é??ç?®å??ç??å??é ?(_O)"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2109
 msgid "Close current tab"
 msgstr "é??é??ç?®å??ç??å??é ?"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2114
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the next message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2121
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the next important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2128
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2130
 msgid "Display the next thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2135
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2137
 msgid "Display the next unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2142
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2144
 msgid "Display the previous message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2149
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2151
 msgid "Display the previous important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2156
 msgid "Previous T_hread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_H)"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2158
 msgid "Display the previous thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2163
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2165
 msgid "Display the previous unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2172
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2179
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2184
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2186
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2191
 msgid "Remo_ve Attachments"
 msgstr "ç§»é?¤é??ä»¶(_V)"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2193
 msgid "Remove attachments"
 msgstr "ç§»é?¤é??ä»¶"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2198
 msgid "Remove Du_plicate Messages"
 msgstr "ç§»é?¤é??è¤?ç??é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2200
 msgid "Checks selected messages for duplicates"
 msgstr "æª¢æ?¥é?¸å??ç??é?µä»¶æ?¯å?¦æ??é??è¤?"
 
-#: ../mail/e-mail-reader.c:2199 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2205
+#: ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2207
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:2206 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2212
+#: ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2214
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:2213
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2219
+#: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2221
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2226
 msgid "_Save as mbox..."
 msgstr "å?²å?æ?? mbox(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2228
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2233
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2235
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2240
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)â?¦"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2242
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2247
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)â?¦"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2249
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2254
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2256
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2261
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2263
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2275
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2277
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2282
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2284
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2289
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2291
 msgid "Increase the text size"
 msgstr "å°?æ??å?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2296
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2298
 msgid "Decrease the text size"
 msgstr "å°?æ??å?ç¸®å°?"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2305
 msgid "Create R_ule"
 msgstr "å»ºç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2312
 msgid "Ch_aracter Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼(_A)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2319
 msgid "F_orward As"
 msgstr "è½?å¯?ç?º(_O)"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2326
 msgid "_Group Reply"
 msgstr "ç¾£çµ?å??è¦?(_G)"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2333
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2340
 msgid "Mar_k As"
 msgstr "æ¨?ç¤ºæ??(_K)"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2347
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2354
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2379
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)â?¦"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2387
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2391
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../mail/e-mail-reader.c:2395
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2393
+#: ../mail/e-mail-reader.c:2399
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2403
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2407
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2451
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2453
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2459
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é (_H)"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2461
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../mail/e-mail-reader.c:2693
+#: ../mail/e-mail-reader.c:2699
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2755 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2761
+#: ../mail/mail-ops.c:2068
 #, 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:3373 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3379
+#: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../widgets/misc/e-account-tree-view.c:249
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/e-mail-reader.c:3544
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3550
+#: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "è½?å¯?(_F)"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3551
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:3564
+#: ../mail/e-mail-reader.c:3570
 msgid "Group Reply"
 msgstr "ç¾£çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3565
+#: ../mail/e-mail-reader.c:3571
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?çµ¦é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3610 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3616
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:3643
+#: ../mail/e-mail-reader.c:3649
 #: ../modules/calendar/e-cal-shell-view-actions.c:1311
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3647
+#: ../mail/e-mail-reader.c:3653
 #: ../modules/calendar/e-cal-shell-view-actions.c:1304
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3657 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3663
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:4292
+#: ../mail/e-mail-reader.c:4298
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-session.c:647
+#: ../mail/e-mail-session.c:643
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:645
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/e-mail-session.c:652
+#: ../mail/e-mail-session.c:648
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/e-mail-session.c:654
+#: ../mail/e-mail-session.c:650
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/e-mail-session.c:705
+#: ../mail/e-mail-session.c:703
 #, c-format
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/e-mail-session.c:875
+#: ../mail/e-mail-session.c:873
 #, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
+msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:884
+#: ../mail/e-mail-session.c:882
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:1287 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1286
+#: ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-session.c:1303
+#: ../mail/e-mail-session.c:1302
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "ç?¡æ??ç??è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:490
+#: ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??æ¿¾å?¨ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:514
+#: ../mail/e-mail-session-utils.c:548
+#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8797,12 +8974,14 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??è³?æ??å¤¾ã??"
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:568
+#: ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:779
+#: ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
@@ -8822,13 +9001,14 @@ msgstr "ä¸æ?·è??ã??%sã??ç??é?£ç·?"
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/e-mail-tag-editor.c:294
+#: ../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:567 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:564
+#: ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -8836,7 +9016,8 @@ 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:571 ../mail/mail-config.ui.h:126
+#: ../mail/em-account-editor.c:568
+#: ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -8844,40 +9025,43 @@ 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:575 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:572
+#: ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:838 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:835
+#: ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:919
+#: ../mail/em-account-editor.c:916
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:920
+#: ../mail/em-account-editor.c:917
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:921
+#: ../mail/em-account-editor.c:918
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1703 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1701
+#: ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2090
+#: ../mail/em-account-editor.c:2088
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2089
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8887,36 +9071,34 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2094
-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 "
-"information in email you send."
+#: ../mail/em-account-editor.c:2092
+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 information in email you send."
 msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥ä½ ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??ä½ å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2259
+#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2257
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2095
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2099 ../mail/em-account-editor.c:2759
+#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2757
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2100
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
+#: ../mail/em-account-editor.c:2098
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
 msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??ä½ ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²çµ¡æ??å??ä¾?æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2102 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2100
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "å¸³è??è³?è¨?"
 
-#: ../mail/em-account-editor.c:2103
+#: ../mail/em-account-editor.c:2101
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8924,11 +9106,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2105
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2106
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8942,70 +9124,71 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/em-account-editor.c:2573
+#: ../mail/em-account-editor.c:2571
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2579
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2864
+#: ../mail/em-account-editor.c:2862
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??å¸³è??ç??è³?æ??å¤¾ã??"
 
-#: ../mail/em-account-editor.c:3174 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3172
+#: ../mail/mail-config.ui.h:98
 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:3220 ../mail/em-account-editor.c:3288
+#: ../mail/em-account-editor.c:3218
+#: ../mail/em-account-editor.c:3286
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:3221 ../mail/em-account-editor.c:3289
+#: ../mail/em-account-editor.c:3219
+#: ../mail/em-account-editor.c:3287
 msgid "Checking for New Messages"
 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 mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1154
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
+#: ../mail/em-composer-utils.c:1173
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:1164
+#: ../mail/em-composer-utils.c:1184
 msgid "-----Original Message-----"
 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:1821
+#. 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:1851
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ä½ å¯?çµ¦ %s ä¸»æ?¨ã??%sã?? (%s) ç??é?µä»¶å·²è¢«é?±è®?ã??"
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1871
+#: ../mail/em-composer-utils.c:1905
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2291
+#: ../mail/em-composer-utils.c:2356
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?ä»¶è??"
 
-#: ../mail/em-composer-utils.c:2715
+#: ../mail/em-composer-utils.c:2787
 msgid "Posting destination"
 msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
 
-#: ../mail/em-composer-utils.c:2716
+#: ../mail/em-composer-utils.c:2788
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:341
+#: ../mail/em-filter-folder-element.c:339
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
@@ -9122,7 +9305,8 @@ msgstr "æ?ªè¨å®?"
 msgid "is set"
 msgstr "è¨å®?"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -9171,11 +9355,13 @@ msgid "Play Sound"
 msgstr "æ?æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "å·²è®?"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æ?¶ä»¶è??"
 
@@ -9203,11 +9389,13 @@ msgstr "å?³å??å°?æ?¼"
 msgid "Run Program"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "å??æ?¸"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "å¯?ä»¶è??"
 
@@ -9289,7 +9477,7 @@ msgstr "é??å?¶ç?¨é??"
 msgid "Folder Properties"
 msgstr "è³?æ??å¤¾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??å¤¾>"
 
@@ -9302,62 +9490,72 @@ msgid "Folder _name:"
 msgstr "è³?æ??å¤¾å??ç¨±(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
+#: ../mail/em-folder-tree-model.c:147
+#: ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1164
+#: ../mail/mail-vfolder.c:1239
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:172
+#: ../mail/em-folder-tree-model.c:174
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:811 ../mail/em-folder-tree-model.c:1088
+#: ../mail/em-folder-tree-model.c:808
+#: ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸â?¦"
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:197
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:625
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
 
-#: ../mail/em-folder-tree.c:1248
+#: ../mail/em-folder-tree.c:1245
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1484
+#: ../mail/em-folder-tree.c:1482
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:1940 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1938
+#: ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1944 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1942
+#: ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1953 ../mail/message-list.c:2247
+#: ../mail/em-folder-tree.c:1951
+#: ../mail/message-list.c:2243
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1957 ../mail/message-list.c:2249
+#: ../mail/em-folder-tree.c:1955
+#: ../mail/message-list.c:2245
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1976
+#: ../mail/em-folder-tree.c:1974
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
@@ -9386,134 +9584,123 @@ msgstr "å»ºç«?è³?æ??å¤¾"
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html.c:1601
 msgid "Unsigned"
 msgstr "æ?ªç°½ç½²"
 
-#: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:84
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "æ¤é?µä»¶æ?ªç°½ç½²ã??ä¸?ä¿?è?æ¤é?µä»¶å·²é©?è?ã??"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1602
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: ../mail/em-format-html-display.c:85
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "æ¤é?µä»¶å·²ç°½ç½²è??ä¸?æ??æ??ï¼?è¡¨ç¤ºå®?é??å¸¸æ??å?¯è?½æ?¯é©?è?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1603
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½ç½²"
 
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: ../mail/em-format-html-display.c:86
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "é?µä»¶ç??ç°½ç½²ç?¡æ³?æª¢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??è¢«æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1604
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½ç½²æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:91
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../mail/em-format-html-display.c:87
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½ç½²ï¼?ä½?æ?¯é?µä»¶ç??å¯?ä»¶è??ç?¡æ³?æª¢é©?ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1605
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç½²å?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?ç¢¼å??"
 
-#: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../mail/em-format-html-display.c:88
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½ç½²ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??å¯?ç¢¼å??ã??"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html.c:1611
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+#: ../mail/em-format-html-display.c:95
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1612
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
+#: ../mail/em-format-html-display.c:96
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1613
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: ../mail/em-format-html-display.c:97
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "æ¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??äººé?£ä»¥æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1614
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:102
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+#: ../mail/em-format-html-display.c:98
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:236
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æª¢è¦?è?æ?¸(_V)"
 
-#: ../mail/em-format-html-display.c:251
+#: ../mail/em-format-html-display.c:249
 msgid "This certificate is not viewable"
 msgstr "æ¤è?æ?¸ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:506
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
+#: ../mail/em-format-html-display.c:538
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
 msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??ä½ å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
 
-#: ../mail/em-format-html-display.c:749
+#: ../mail/em-format-html-display.c:804
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:812
 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:761
+#: ../mail/em-format-html-display.c:816
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:1047
+#: ../mail/em-format-html-display.c:1094
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:1049
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1114
 msgid "O_pen With"
 msgstr "ä»¥â?¦é??å??(_O)"
 
@@ -9522,120 +9709,122 @@ msgstr "ä»¥â?¦é??å??(_O)"
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:161
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:364
+#: ../mail/em-format-html.c:360
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶â?¦"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1445
+#: ../mail/em-format-html.c:1455
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1976
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1987
+#: ../mail/em-format-html.c:1984
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:2017
+#: ../mail/em-format-html.c:2014
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2028
+#: ../mail/em-format-html.c:2025
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:2030
+#: ../mail/em-format-html.c:2027
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2051
+#: ../mail/em-format-html.c:2048
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2062
+#: ../mail/em-format-html.c:2059
 #, 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:2766
+#: ../mail/em-format-html.c:2763
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s ä»£è¡¨ %s å¯?å?º"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:82
+#: ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "æ²?æ?? HTML ä¸²æµ?å?¯ç?¨"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1105
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1144
 msgid "_Account:"
 msgstr "å¸³è??(_A):"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1159
 msgid "Clear Search"
 msgstr "æ¸?é?¤æ??å°?"
 
-#: ../mail/em-subscription-editor.c:1179
+#: ../mail/em-subscription-editor.c:1177
 msgid "Sho_w items that contain:"
 msgstr "é¡¯ç¤ºé ?ç?®å??å?«(_W):"
 
-#: ../mail/em-subscription-editor.c:1218
+#: ../mail/em-subscription-editor.c:1216
 msgid "Subscribe to the selected folder"
 msgstr "è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1217
 msgid "Su_bscribe"
 msgstr "è¨?é?±(_B)"
 
-#: ../mail/em-subscription-editor.c:1230
+#: ../mail/em-subscription-editor.c:1228
 #: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1231
+#: ../mail/em-subscription-editor.c:1229
 #: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../mail/em-subscription-editor.c:1242
+#: ../mail/em-subscription-editor.c:1240
 msgid "Collapse all folders"
 msgstr "æ?¶æ?ºæ??æ??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1243
+#: ../mail/em-subscription-editor.c:1241
 msgid "C_ollapse All"
 msgstr "å?¨é?¨æ?¶æ?º(_O)"
 
-#: ../mail/em-subscription-editor.c:1253
+#: ../mail/em-subscription-editor.c:1251
 msgid "Expand all folders"
 msgstr "å±?é??æ??æ??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1254
+#: ../mail/em-subscription-editor.c:1252
 msgid "E_xpand All"
 msgstr "å?¨é?¨å±?é??(_X)"
 
-#: ../mail/em-subscription-editor.c:1264
+#: ../mail/em-subscription-editor.c:1262
 msgid "Refresh the folder list"
 msgstr "é??æ?°æ?´ç??è³?æ??å¤¾æ¸?å?®"
 
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1274
 msgid "Stop the current operation"
 msgstr "å??æ¢ç?®å??ç??æ??ä½?"
 
@@ -9655,11 +9844,11 @@ msgstr[1] "ä½ ç¢ºå®?è¦?ä¸?æ¬¡é??å?? %d å°?é?µä»¶ï¼?"
 msgid "_Do not show this message again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:326
+#: ../mail/em-utils.c:328
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:882
+#: ../mail/em-utils.c:904
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
@@ -9668,7 +9857,7 @@ msgstr "ä¾?è?ª %s ç??é?µä»¶"
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:613
+#: ../mail/em-vfolder-rule.c:610
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??å¤¾"
 
@@ -9730,9 +9919,7 @@ msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??ä¸é¡¯ç¤ºç??æ??é??(ç§?)ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+msgid "Asks whether to close the message window when the user forwards or replies to the message shown in the window"
 msgstr "ç?¶ä½¿ç?¨è??è½?å¯?æ??å??è¦?è¦?çª?ä¸é¡¯ç¤ºç??é?µä»¶æ??è©¢å??æ?¯å?¦è¦?é??é??é?µä»¶è¦?çª?"
 
 #: ../mail/evolution-mail.schemas.in.h:16
@@ -9784,15 +9971,11 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?ç¸®å?¨ TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+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:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+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:30
@@ -9800,9 +9983,7 @@ msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:32
@@ -9854,9 +10035,7 @@ msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨é??åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å?é?µä»¶ä½?å??"
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -9864,11 +10043,7 @@ msgid "Determines whether to lookup in address book for sender email"
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??"
 
 #: ../mail/evolution-mail.schemas.in.h:46
-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 "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
+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 can be slow, if remote address books (like LDAP) are marked for autocompletion."
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:47
@@ -9876,16 +10051,11 @@ msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶"
 
 #: ../mail/evolution-mail.schemas.in.h:48
-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 "
-"checking speed."
+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 checking speed."
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+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:50
@@ -9929,9 +10099,7 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾è³?æ??å¤¾"
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
 msgstr "å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??ä»£æ?¿ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:61
@@ -9959,21 +10127,15 @@ msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??è¨±äº?å??å¼?æ??å°?è³?æ??å¤¾å??ç¨±ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr "å??ç?¨æ¤é?¸é ?å?¯å?¨é?µä»¶é ?è¦½ã??é?µä»¶æ¸?å?®å??è³?æ??å¤¾ä¸ä½¿ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
+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:70
@@ -9988,16 +10150,13 @@ msgstr "å??ç?¨æ¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??å¤¾ä½¿ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:74
-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, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+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, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
 msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å?ç¬¦æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:75
@@ -10025,16 +10184,11 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+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 "å¦?æ??ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??ä½¿ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:82
-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 "
-"in GNOME's MIME type database may be used for displaying content."
+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 in GNOME's MIME type database may be used for displaying content."
 msgstr "å¦?æ??æ²?æ??å?§ç½®æª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£?é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:83
@@ -10042,124 +10196,75 @@ msgid "Ignore list Reply-To:"
 msgstr "å¿½ç?¥é??ä¿¡è«?å£? Reply-To:"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+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:85
-msgid ""
-"Initial height of the \"Folder Subscriptions\" 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:86
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
+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:87
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+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:88
-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 \"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."
 msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:89
-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."
+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:90
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
+msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
+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:93
-msgid ""
-"Initial width of the \"Folder Subscriptions\" 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:94
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
+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:95
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+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:96
-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 "
-"which you happened to receive the copy of the message to which you're "
-"replying."
+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 which you happened to receive the copy of the message to which you're replying."
 msgstr "æ??å?¥æ?¼ä¸?è?¬ç??ã??å??è¦?å?¨é?¨ã??è¡?ç?ºï¼?é??å??é?¸é ?æ??è®?ã??ç¾£çµ?å??è¦?ã??å·¥å?·å??æ??é??å??è©¦å?ªå??ä¿¡å?°é??ä¿¡è«?å£?ï¼?ä¹?å°±æ?¯ä½ æ?¶å?°è¦?å??è¦?ç??é??å°?ä¿¡ç??ä¾?æº?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
 msgstr "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:98
-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."
+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 "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??ç¤ºè¦å??ä½ æ£å??è©¦å??è¦?ç§?äººä¿¡ä»¶çµ¦é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+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:100
-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"
+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: æ¨?é æ??å°?ä½ ç??å??ä¿¡é??æ?°å°?å??è?³é??ä¿¡è«?å£?ä¸?ç??æ??æ??æ??å?¡"
 
 #: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
+msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
 msgstr "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??ç¤ºè¦å??ä½ æ£å??è©¦å?³é??é?µä»¶çµ¦æ²?æ??è¼¸å?¥é?»å?é?µä»¶å?°å??ç??æ?¶ä»¶è??"
 
 #: ../mail/evolution-mail.schemas.in.h:102
@@ -10196,9 +10301,7 @@ msgid "List of accounts"
 msgstr "å¸³è??æ¸?å?®"
 
 #: ../mail/evolution-mail.schemas.in.h:110
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:111
@@ -10210,9 +10313,7 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å?æª¢æ?¥ç??å?å?¸èª?è¨?ç¢¼æ¸?å?®ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:113
-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."
+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."
 msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:114
@@ -10224,10 +10325,7 @@ msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
 #: ../mail/evolution-mail.schemas.in.h:116
-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 "
-"contacts. \"2\" - Always load images off the net."
+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 contacts. \"2\" - Always load images off the net."
 msgstr "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²çµ¡è¼?å?¥å??ç??ã??ã??1ã??â?? å¦?æ??æ?¯å?¨è?¯çµ¡äººè£?ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²çµ¡è¼?å?¥å??ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:117
@@ -10312,9 +10410,7 @@ msgid "Path where picture gallery should search for its content"
 msgstr "å??ç??é??ç?¨ä¾?æ??å°?å?§å®¹ç??è·¯å¾?"
 
 #: ../mail/evolution-mail.schemas.in.h:137
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+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:138
@@ -10330,8 +10426,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦æ¸?ç©ºè³?æ??å¤¾æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:142
@@ -10363,9 +10458,7 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:149
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+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:150
@@ -10425,9 +10518,7 @@ msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
 #: ../mail/evolution-mail.schemas.in.h:164
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
+msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
 msgstr "è¨ç?º TRUE è¡¨ç¤ºå?¨ä½ æ?°å¯«é?µä»¶æ??ä¸?æ?³å?¨ç°½å??æª?å??å? å?¥ç°½å??æª?å??é??ç¬¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:165
@@ -10487,46 +10578,31 @@ msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
 #: ../mail/evolution-mail.schemas.in.h:179
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr "å¼µè²¼å?°æ?°è??ç¾£çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:183
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:184
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??ä¸ä»¥å??é?¢ç??æ¬?ä½?é¡¯ç¤ºå¯?ä»¶è??ç??é?»å?é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:185
-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 "
-"format and local time zone."
+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 format and local time zone."
 msgstr "é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æª?é ï¼?è?¥æ??å??ä¸?å??æ??æ??ä½¿ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??å¥½ç??æ ¼å¼?å??æ?¬å?°æ??å??é¡¯ç¤ºã??æ?¥æ??ã??æª?é ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:186
@@ -10534,14 +10610,7 @@ msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?æ ¼ä¸é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:187
-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. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+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. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one."
 msgstr "æ??äº?é??ä¿¡è«?å£?æ??è¨å®? Reply-To: æ¨?é ä¾?èª¤å°?ä½¿ç?¨è??å?³é??å??è¦?ç??ä¿¡ä»¶å?°è«?å£?ä¸?ï¼?å?³ä½¿ä½¿ç?¨è??å·²è¦?æ±? Evolution é?²è¡?ç§?äººå??è¦?ä¹?ä¸?æ¨£ã??å°?é??å??é?¸é ?è¨ç?º TRUE æ??å??è©¦å¿½ç?¥ Reply-To: æ¨?é ï¼?å? æ¤ Evolution å°±è?½æ ¹æ??ä½ æ??è¦?æ±?ç??è¡?å??ã??å¦?æ??ä½ ä½¿ç?¨ç§?äººå??è¦?å??ä½?ï¼?å®?å°±æ??é?²è¡?å??ä¿¡çµ¦å??äººç??å??ä½?ï¼?è??å¦?æ??ä½ ä½¿ç?¨ã??å??è¦?å?°è«?å£?ã??å??ä½?ï¼?å®?ä¹?æ??ç?§å??ã??å®?ç??é??ä½?æ?¹å¼?æ?¯æ¯?å°? Reply-To: æ¨?é å?? List-Post: æ¨?é ï¼?å¦?æ??æ??ç??è©±ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:188
@@ -10565,21 +10634,15 @@ msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:193
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:194
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?å?®å??æ?¶ç?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:195
-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 "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+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 message list. \"1\" (Vertical View) places the preview pane next to the message list."
 msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?µä»¶æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:196
@@ -10587,21 +10650,15 @@ msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:197
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
 msgstr "å?¨è½?å¯?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?èªªæ??æ?¥ä¸?ä¾?æ?¯è½?å¯?ç??é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:198
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+msgid "The text that is inserted when replying to a message (top posting), saying that the original message follows."
 msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?ç½®é ?å¼µè²¼ï¼?ï¼?èªªæ??æ?¥ä¸?ä¾?æ?¯å??å§?é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+msgid "The text that is inserted when replying to a message, attributing the message to the original author."
 msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?èªªæ??é?µä»¶ç??å??ä½?è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:200
@@ -10609,44 +10666,27 @@ msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??é??åº¦å?å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:201
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+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:202
-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 "
-"is used only when 'force_message_limit' key is activated."
+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 is used only when 'force_message_limit' key is activated."
 msgstr "é??è£?æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯é¡¯ç¤ºç??æ??å¤§å®¹é??ï¼?ä»¥ KB ç?ºå?®ä½?æ??å®?ã??é ?è¨å?¼ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??è¨å®?é?µæ??æ??æ??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:203
-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 "
-"to the other available plugins."
+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 to the other available plugins."
 msgstr "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£?å??å?ºç??é ?è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:204
-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."
+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."
 msgstr "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:205
-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;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
+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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "æ¤å¯?ç¢¼å??æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªé?¸æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
 #: ../mail/evolution-mail.schemas.in.h:206
-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 "
-"mail sent by known contacts from junk filtering."
+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 mail sent by known contacts from junk filtering."
 msgstr "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥è?¯çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:207
@@ -10654,29 +10694,19 @@ msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+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:209
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Requires a restart to apply."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?è¨ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??é??è¦?é??æ?°å??å??æ??è?½å¥?ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:210
-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 "
-"restart."
+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 restart."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?æ ¹æ??æ¯?å??é?µä»¶ç¾£çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??æ ¹æ??é?µä»¶ç??æ?¥æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:211
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder."
 msgstr "é??å??æ?¸å?¼å?¯ä»¥æ?¯ç©ºå?ä¸²ï¼?ä»£è¡¨è¦?ä½¿ç?¨ç³»çµ±å??ç??è³?æ??å¤¾ï¼?é??å¸¸è¨å®?å?¨ ~/Picturesã??é??å??è³?æ??å¤¾ä¹?æ??å?¨è·¯å¾?æ??å??ä¸?å?å?¨ç??è³?æ??å¤¾æ??ä½¿ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:212
@@ -10724,17 +10754,11 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:223
-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."
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
 msgstr "ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??æ¸¸æ¨?å??å?¨ä½?è??ã??é??æ??æ±ºå®?æ¸¸æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:224
-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."
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
 msgstr "ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??æ±ºå®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:225
@@ -10746,16 +10770,11 @@ msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?è¨å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
 #: ../mail/evolution-mail.schemas.in.h:227
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
+msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
 msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ??æ??ä½¿ç?¨ä¸å¸³è??ç??æ?°é?µä»¶è??ä¸?ç®¡ã??æª¢æ?¥æ?°é?µä»¶æ?¼æ¯? X å??é??ã??é?¸é ?ã??é??å??é?¸é ?å?ªè?½å??ã??send_recv_on_startã??é?¸é ?ä¸?èµ·ä½¿ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
 msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ?°é?µä»¶ã??é??ä¹?å??å?«å¯?å?ºå¯?ä»¶å?£ä¸ç??é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:229
@@ -10763,9 +10782,7 @@ msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+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:231
@@ -10773,10 +10790,7 @@ msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦æ ¹æ??é?µä»¶ç¾£çµ?ä¸æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
 #: ../mail/evolution-mail.schemas.in.h:232
-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 "
-"one minute after the last action invocation."
+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 one minute after the last action invocation."
 msgstr "æ?¯å?¦å?¨é??æ¿¾å®?å¾?æ¸?ç©ºå¯?ä»¶å?£ã??å¯?ä»¶å?£ç??æ¸?ç©ºå?ªç?¨å?¨ç?¶ä½¿ç?¨äº?ä»»ä½?ã??è½?å¯?è?³ã??é??æ¿¾å?¨å??ä½?ï¼?ä¸¦ä¸?å?¨é??å??å??ä½?å¾?å¤§ç´?ä¸?å??é??é??å§?é?²è¡?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:233
@@ -10791,7 +10805,8 @@ msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é??åº¦ã??"
 msgid "Importing Elm data"
 msgstr "è¼¸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../mail/importers/elm-importer.c:339
+#: ../mail/importers/pine-importer.c:415
 #: ../modules/mail/e-mail-shell-view.c:1044
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:511
@@ -10807,19 +10822,19 @@ msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
 #: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "ç?®ç??ç«¯è³?æ??å¤¾(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:237
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:238
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
@@ -10848,9 +10863,9 @@ msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:574
-#: ../plugins/pst-import/pst-importer.c:482
-#: ../plugins/pst-import/pst-importer.c:591
+#: ../plugins/dbx-import/dbx-importer.c:593
+#: ../plugins/pst-import/pst-importer.c:480
+#: ../plugins/pst-import/pst-importer.c:589
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ£å?¨å?¯å?¥ã??%sã??"
@@ -10882,7 +10897,8 @@ msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238
+#: ../mail/mail-autofilter.c:280
 #, c-format
 msgid "Mail from %s"
 msgstr "é?µä»¶ä¾?è?ª %s "
@@ -11136,7 +11152,8 @@ msgstr "è¡?å?§"
 msgid "Inline (Outlook style)"
 msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
@@ -11368,9 +11385,7 @@ msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
 #: ../mail/mail-config.ui.h:128
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
 #: ../mail/mail-config.ui.h:129
@@ -11384,9 +11399,7 @@ msgstr ""
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
 #: ../mail/mail-config.ui.h:132
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
+msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
 msgstr "è¦?é?¿å??é?»å?é?µä»¶å?ºç?¾æ??å¤?æ??ä»¤äººé?£å ªç??æ??æ³?ï¼?å?¨é?²è¡?ä¸?å??å·²æ ¸å??å??ä½?æ??è©¢å??ä½¿ç?¨è??ä»¥å??å¾?ç¢ºèª?ï¼?"
 
 #: ../mail/mail-config.ui.h:133
@@ -11489,7 +11502,8 @@ msgstr "å?½ä»¤ç¨¿(_S):"
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160
+#: ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S):"
@@ -11519,11 +11533,13 @@ msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168
+#: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
@@ -11631,7 +11647,7 @@ msgstr "æ¨?å¹?(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:793
+#: ../mail/mail-folder-cache.c:789
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11654,11 +11670,13 @@ msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??ç¬¬ %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
+#: ../mail/mail-ops.c:833
+#: ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
+#: ../mail/mail-ops.c:835
+#: ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
@@ -11773,27 +11791,28 @@ msgstr "æ£å?¨ç§»é?¤é??ä»¶"
 msgid "File \"%s\" has been removed."
 msgstr "æª?æ¡?ã??%sã??å·²ç¶?è¢«ç§»é?¤ã??"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?â?¦"
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:436
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:451
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:568
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "æ?´æ?°ä¸â?¦"
 
-#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
+#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?â?¦"
 
-#: ../mail/mail-send-recv.c:902
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
@@ -11840,8 +11859,7 @@ msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 #: ../mail/mail-vfolder.c:718
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -11887,29 +11905,22 @@ msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{1}ã??ç??è³?æ??å¤¾å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "ä½?æ?¼ã??{1}ã??ç??é??ç©ºç?½è³?æ??å¤¾å·²ç¶?å?å?¨ã??\n"
 "\n"
 "ä½ å?¯ä»¥é?¸æ??å¿½ç?¥æ¤è³?æ??å¤¾ã??è¦?å¯«æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?çµ¦ {0}ï¼?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{0}ã??ç??ç°½å??æª?å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±ã??"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??ç¾©ç??ä¸»æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??é?µä»¶å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../mail/mail.error.xml.h:12
@@ -11921,20 +11932,15 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ï¼?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ä»¥å??å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:15
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr "è¦?æ°¸ä¹?ç§»é?¤æ??æ??è³?æ??å¤¾ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:16
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "ç¢ºå®?è¦?æ°¸ä¹?ç§»é?¤è³?æ??å¤¾ã??{0}ã??ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:17
@@ -12010,9 +12016,7 @@ msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
 #: ../mail/mail.error.xml.h:35
-msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
 msgstr "ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨ä½ å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?ä½¿ç?¨å®?ã??"
 
 #: ../mail/mail.error.xml.h:36
@@ -12041,9 +12045,7 @@ msgstr "ä¸?è?½è¨å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
 # (Abel) é?µç?¤ç??é?µæ??å¥½ä¸?è¯äº?
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
 msgstr "è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?ä½ å?¯è?½æ??äº? Caps Lockã??"
 
 #: ../mail/mail.error.xml.h:43
@@ -12071,9 +12073,7 @@ msgid "Do _Not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_N)"
 
 #: ../mail/mail.error.xml.h:50
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:51
@@ -12105,13 +12105,9 @@ msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../mail/mail.error.xml.h:60
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local mail must be migrated to the new format before Evolution can proceed. Do you want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring the data is safely migrated. Please make sure there is enough disk space if you choose to migrate now."
 msgstr ""
 "é ?è¨ç??æ?¬å?°ç«¯å?²å?å??å·²ç¶?å¾? mbox æ?¹è®?ç?º Maildir æ ¼å¼?ã??å?¨ Evolution ç¹¼çº?å??ä½ ç??æ?¬å?°ç«¯é?µä»¶å¿?é ?è½?æ??ç?ºæ?°ç??æ ¼å¼?ã??ä½ ç?¾å?¨æ?¯å?¦è¦?è½?æ??ï¼?\n"
 "\n"
@@ -12143,14 +12139,11 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:70
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "å¦?æ??ä½ å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹å??å?è³?æ??å¤¾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:71
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??ä½ é?¸æ??å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?å¤±ã??"
 
 #: ../mail/mail.error.xml.h:72
@@ -12170,9 +12163,7 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?å¸³è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "å¦?æ??ä½ é?¸æ??çµ?æ??ï¼?å??æ¬¡å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:77
@@ -12192,11 +12183,7 @@ msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??æ¿¾å?¨è?ªå??æ?´æ?°ã??"
 
 #: ../mail/mail.error.xml.h:81
-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 "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
+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 your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr "å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
 #: ../mail/mail.error.xml.h:82
@@ -12228,15 +12215,12 @@ msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??ä½¿ç?¨å?¶ä»?å¸³è??å?³é??ã??"
 
 #: ../mail/mail.error.xml.h:90
-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."
+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."
 msgstr "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??ä½ å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
 
 #: ../mail/mail.error.xml.h:91
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "è«?ç¢ºå®?ä»¥ä¸?æ?¶ä»¶è??å¸?æ??ä¸¦ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å?é?µä»¶ï¼?\n"
@@ -12299,19 +12283,14 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ¥è³?æ??å¤¾ä»¥ä¾?é?¢ç·?ä½¿ç?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:109
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"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 in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "å?³é??ç??è?¯çµ¡äººæ¸?å?®æ?¯è¨å®?æ??é?±è??æ¸?å?®æ?¶ä»¶è??ã??\n"
 "\n"
@@ -12346,20 +12325,15 @@ msgstr ""
 "é??è¦?æ??ï¼?è«?ç§»è?³æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ï¼?ä»¥æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
 #: ../mail/mail.error.xml.h:121
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "å? ç?ºä½ æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??å¸³è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:122
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºä½ æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶"
 
 #: ../mail/mail.error.xml.h:123
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´æ¤é©?è?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è?ã??"
 
 #: ../mail/mail.error.xml.h:124
@@ -12367,9 +12341,7 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "æ¤ç°½ç½²å·²ç¶?æ?´æ?¹ï¼?ä½?å°?æ?ªå?²å?ã??"
 
 #: ../mail/mail.error.xml.h:125
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "é??æ??å°?æ¨?ç¤ºé?¸å®?ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
 #: ../mail/mail.error.xml.h:126
@@ -12381,9 +12353,7 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 #: ../mail/mail.error.xml.h:128
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "ç?¡æ³?é??å??æ¤å¸³è??ç??è??ç¨¿è³?æ??å¤¾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??ç¨¿è³?æ??å¤¾ä»£æ?¿ï¼?"
 
 #: ../mail/mail.error.xml.h:129
@@ -12400,8 +12370,7 @@ msgstr "ä½¿ç?¨é ?è¨ç??è??ç¨¿è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:132
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "è¦å??ï¼?å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶å°?æ??è?ªä½ ç??æ?¬å?°æ??é? ç«¯è³?æ??å¤¾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
@@ -12412,23 +12381,15 @@ msgid "Would you like to close the message window?"
 msgstr "ä½ æ?³è¦?é??é??é?µä»¶è¦?çª?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:135
-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 "
-"you sure you want to proceed?"
+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 you sure you want to proceed?"
 msgstr "ä½ æ£ä»¥ç§?äººå??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯é??å??é??ä¿¡è«?å£?å??è©¦å°?ä½ ç??å??ä¿¡å°?å??è«?å£?ã??ä½ ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:136
-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 "
-"proceed?"
+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 proceed?"
 msgstr "ä½ æ£å?¨å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯ä½ ä»¥ç§?äººå??è¦?æ?¹å¼?å¯?çµ¦å??å¯?ä»¶è??ï¼?è??é??å¯?å??é??ä¿¡è«?å£?ã??ä½ ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:137
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+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:138
@@ -12458,8 +12419,7 @@ msgstr "ä½ å¿?é ?æ??å®?ä¸?å??è³?æ??å¤¾ã??"
 #: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "ä½ å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??å¤¾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??å¤¾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??å¤¾ã??æ??æ??é? ç«¯è³?æ??å¤¾æ??äº?è??ç??é?¸ã??"
@@ -12523,92 +12483,94 @@ msgstr "å??æ¥å??(_S)"
 msgid "_Yes"
 msgstr "æ?¯(_Y)"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1215
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1216
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1221
+#: ../mail/message-list.c:1217
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1218
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1219
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1220
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1224
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1225
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1233
+#: ../mail/message-list.c:1229
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1234
+#: ../mail/message-list.c:1230
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1853 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1849
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1856
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:1865
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:1877
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1885
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %p %l:%M"
+msgstr "%b%dæ?¥ %p %l:%M"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:1887
 msgid "%b %d %Y"
-msgstr "%Y %b %d"
+msgstr "%Y %b%dæ?¥"
 
-#: ../mail/message-list.c:2675
+#: ../mail/message-list.c:2672
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
-#: ../mail/message-list.c:2833 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2830
+#: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4501 ../mail/message-list.c:4925
+#: ../mail/message-list.c:4506
+#: ../mail/message-list.c:4930
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4740
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
+#: ../mail/message-list.c:4745
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4742
+#: ../mail/message-list.c:4747
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -12637,7 +12599,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:568
 msgid "Size"
 msgstr "å¤§å°?"
 
@@ -12675,22 +12637,15 @@ msgid "Subject or Addresses contains"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
 #: ../modules/addressbook/addressbook-config.c:205
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
 
 #: ../modules/addressbook/addressbook-config.c:207
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??ä½ ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
 
 #: ../modules/addressbook/addressbook-config.c:209
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
 msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?ä½ ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºä½ ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
 #: ../modules/addressbook/addressbook-config.c:608
@@ -12702,25 +12657,15 @@ msgid "Copy _book content locally for offline operation"
 msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
 
 #: ../modules/addressbook/addressbook-config.c:751
-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 "
-"port you should specify."
+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 port you should specify."
 msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢ä½ ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£ä½ æ??è©²æ??å®?ç??å? ã??"
 
 #: ../modules/addressbook/addressbook-config.c:825
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
 msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?ä½ ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??ä½ ç?? LDAP ä¼ºæ??å?¨ã??"
 
 #: ../modules/addressbook/addressbook-config.c:900
-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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
+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 your search base. A search scope of \"one\" will only include the entries one level beneath your base."
 msgstr "æ??å°?ç¯?å??æ??å®?ç¾©ä½ æ?³å¾?ç¶²çµ¡ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??ã??subã??(å?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
 
 #: ../modules/addressbook/addressbook-config.c:1016
@@ -12794,23 +12739,15 @@ msgid "Show preview pane"
 msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
+msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view."
 msgstr "ã??è?¯çµ¡äººã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
+msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
 msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨è?¯çµ¡äººæ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®æ??é??ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?ç¬¦æ?¸ç?®ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
@@ -12822,9 +12759,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
 msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??è?¯çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
@@ -12846,50 +12781,50 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??è?¯çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:94
 #: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP ä¼ºæ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:276
 msgctxt "New"
 msgid "_Contact"
 msgstr "è?¯çµ¡äºº(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-backend.c:278
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:283
 msgctxt "New"
 msgid "Contact _List"
 msgstr "è?¯çµ¡äººæ¸?å?®(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-backend.c:285
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:293
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-backend.c:295
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:312
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:105
 #: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:322
 msgid "Certificates"
 msgstr "è?æ?¸"
 
@@ -13098,7 +13033,7 @@ msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:966
 #: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:637
+#: ../shell/e-shell-content.c:634
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
@@ -13202,9 +13137,7 @@ msgid "Search _filter:"
 msgstr "æ??å°?é??æ¿¾å?¨(_F):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
 msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -13366,7 +13299,7 @@ msgid "Template:"
 msgstr "æ¨£æ?¿:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æ??é??"
 
@@ -13496,8 +13429,7 @@ msgid "Calendars to run alarms for"
 msgstr "å?·è¡?é¬§é?´ç??è¡?äº?æ??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??ä¸ç?¨ä¾?ç¹ªè£½ Marcus Bains ç·?ç??è?²å½©(ç??ç©ºè¡¨ç¤ºä½¿ç?¨é ?è¨å?¼)ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
@@ -13601,9 +13533,7 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
@@ -13655,15 +13585,11 @@ msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
@@ -13679,21 +13605,15 @@ msgid "Position of the task preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?è¦½è¡?äº?æ??ä¹?é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
@@ -13777,9 +13697,7 @@ msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
 msgstr "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
@@ -13799,48 +13717,32 @@ msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
+msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view."
 msgstr "ã??è¡?äº?æ??ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
+msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view."
 msgstr "ã??å??å¿?é??ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
+msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view."
 msgstr "ã??å·¥ä½?ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
 msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? \"America/New York\"ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
 msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å??å¿?é??æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å·¥ä½?æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
@@ -13848,9 +13750,7 @@ msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??ç¬¬äº?æ??å??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
 msgstr "é??è£?å?¯ä½¿ç?¨ä¸?ç¨®æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
@@ -13871,9 +13771,7 @@ msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
+msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥æ??é??ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
@@ -13883,8 +13781,7 @@ msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??da
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
@@ -13920,9 +13817,7 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "æ?¯å?¦å£?ç¸®æ??æª¢è¦?ä¸ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸ç??é?±å?è??é?±æ?¥ç½®æ?¼ä¸?å??ç©ºä½?ä¸ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
@@ -13930,8 +13825,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??ä¸ç¹ªå?º Marcus Bains ç·?ï¼?ä»£è¡¨ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -13967,8 +13861,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -14003,104 +13896,104 @@ msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:271
+#: ../modules/calendar/e-cal-attachment-handler.c:267
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "å?¯å?¥(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:352
+#: ../modules/calendar/e-cal-attachment-handler.c:348
 msgid "Select a Calendar"
 msgstr "é?¸æ??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:379
+#: ../modules/calendar/e-cal-attachment-handler.c:375
 msgid "Select a Task List"
 msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:389
+#: ../modules/calendar/e-cal-attachment-handler.c:385
 msgid "I_mport to Calendar"
 msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:396
+#: ../modules/calendar/e-cal-attachment-handler.c:392
 msgid "I_mport to Tasks"
 msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:107
 #: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:94
 #: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
 msgstr "å?¨ç¶²ç«?ä¸?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:109
 #: ../plugins/calendar-weather/calendar-weather.c:121
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-backend.c:196
 #: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:421
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-backend.c:423
 #: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:428
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgid "Create a new all-day appointment"
 msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:435
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgid "Create a new meeting request"
 msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:445
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:447
 #: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../modules/calendar/e-cal-shell-backend.c:750
 #: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:225
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:640
+#: ../modules/calendar/e-cal-shell-sidebar.c:636
 msgid "_New Calendar..."
 msgstr "æ?°å¢?è¡?äº?æ??(_N)â?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:657
+#: ../modules/calendar/e-cal-shell-sidebar.c:653
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1000
+#: ../modules/calendar/e-cal-shell-sidebar.c:998
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14112,10 +14005,7 @@ msgid "Print"
 msgstr "å??å?°"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
 msgstr "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??ä½ ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
 
 #. Translators: This is the first part of the sentence:
@@ -14398,7 +14288,7 @@ msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-backend.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
@@ -14464,7 +14354,7 @@ msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-backend.c:282
 #: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
@@ -14502,40 +14392,40 @@ msgstr "æ??å?»å??æ?¥æ??(_M):"
 msgid "_Date only:"
 msgstr "å?ªæ??æ?¥æ??(_D):"
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:281
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:290
 msgid "Create a new shared memo"
 msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-backend.c:300
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:220
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:582
+#: ../modules/calendar/e-memo-shell-sidebar.c:578
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:887
+#: ../modules/calendar/e-memo-shell-sidebar.c:885
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14629,40 +14519,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:280
 msgctxt "New"
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:289
 msgid "Create a new assigned task"
 msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:299
 #: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:220
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:582
+#: ../modules/calendar/e-task-shell-sidebar.c:578
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:887
+#: ../modules/calendar/e-task-shell-sidebar.c:885
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -14674,8 +14564,7 @@ msgstr "æ??å?°å·¥ä½?"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
@@ -14797,49 +14686,49 @@ msgid "Delete Task"
 msgstr "å?ªé?¤å·¥ä½?"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:382
 #, c-format
 msgid "%d attached messages"
 msgstr "%d å??é??å? ç??é?µä»¶"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
+#: ../modules/mail/e-mail-junk-hook.c:90
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:187
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "é?µä»¶è¨?æ?¯(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:189
+#: ../modules/mail/e-mail-shell-backend.c:185
 msgid "Compose a new mail message"
 msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:193
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??å¤¾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Create a new mail folder"
 msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-backend.c:498
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:506
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??å¥½è¨å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:514
+#: ../modules/mail/e-mail-shell-backend.c:510
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:522
+#: ../modules/mail/e-mail-shell-backend.c:518
 msgid "Network Preferences"
 msgstr "ç¶²çµ¡å??å¥½è¨å®?"
 
@@ -14995,7 +14884,7 @@ msgid "Send queued items in all accounts"
 msgstr "å?³é??å?¨æ??æ??å¸³è??å?§å¾?é??ç??é ?ç?®"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../widgets/misc/e-activity-proxy.c:306
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -15212,18 +15101,18 @@ msgstr "å¸³è??æ??å°?"
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:215
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:264
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
 #: ../modules/mail/em-composer-prefs.c:502
 #: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -15268,16 +15157,17 @@ msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:693
+#: ../modules/mail/em-mailer-prefs.c:766
 #, 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:701 ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:701
+#: ../modules/mail/em-mailer-prefs.c:775
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
 
 #: ../modules/mail/em-mailer-prefs.c:739
@@ -15298,8 +15188,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "æª¢æ?¥ Evolution æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å??å?? Evolution æ??ï¼?æª¢æ?¥å®?æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?ã??"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:143
@@ -15321,9 +15210,7 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
+msgid "Evolution will return to online mode once a network connection is established."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
@@ -15372,12 +15259,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../widgets/misc/e-import-assistant.c:392
 msgid "Please select the information that you would like to import:"
 msgstr "è«?é?¸æ??ä½ æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../widgets/misc/e-import-assistant.c:548
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
@@ -15405,8 +15292,7 @@ msgstr "æ¡è¿?ä½¿ç?¨"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:498
 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"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -15423,9 +15309,7 @@ msgid "Local Address Books"
 msgstr "æ?¬å?°ç«¯é??è¨?é??"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "è®?é??ä»¶æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®"
 
 #. Check buttons
@@ -15439,9 +15323,7 @@ msgid "Keywords"
 msgstr "é??é?µå?"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
 msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??ä»¶ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??ä»¶ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -15489,10 +15371,7 @@ msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-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, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
 msgstr "ä½ å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??è?¯çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??ä½ æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:330
@@ -15642,8 +15521,7 @@ 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 back up file?"
+msgid "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
@@ -15671,20 +15549,15 @@ msgid "The selected folder is not writable."
 msgstr "é?¸å??ç??è³?æ??å¤¾ç?¡æ³?å¯«å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid ""
-"To back up your data and settings, you must first close Evolution. Please "
-"make sure that you save any unsaved data before proceeding."
+msgid "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 back "
-"up."
+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 back up."
 msgstr "è¦?é??å??ä½ ç??è³?æ??å??è¨å®?å?¼ï¼?ä½ å¿?é ?å??é??é?? Evolutionã??è«?ç¢ºå®?ä½ å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤ä½ ç?®å?? Evolution æ??æ??ç??è³?æ??å??è¨å®?å?¼ï¼?ä¸¦å¾?ä½ ç??å??ä»½é??å??å®?å??ã??"
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:685
+#: ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??è?¯çµ¡äºº"
@@ -15724,9 +15597,7 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
 msgstr ""
 "ä¸?ç?¨å??å¤§è²»å?¨ç« ç®¡ç??ä½ ç??é??è¨?é??äº?ã??\n"
 "\n"
@@ -15767,9 +15638,7 @@ msgid "Convert mail messages to Unicode"
 msgstr "å°?é?µä»¶è½?æ??ç?º Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16060,7 +15929,7 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?é¡¯ç¤ºè?¯çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "è?¯çµ¡äººç??å?°å??"
 
-#: ../plugins/dbx-import/dbx-importer.c:258
+#: ../plugins/dbx-import/dbx-importer.c:273
 msgid "Importing Outlook Express data"
 msgstr "æ£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
@@ -16109,10 +15978,7 @@ msgid "List of Custom Headers"
 msgstr "è?ªé?¸æ¨?é ç??æ¸?å?®"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
 msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯ä½ å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªé?¸æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªé?¸æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
@@ -16241,9 +16107,7 @@ msgid "Editor not launchable"
 msgstr "ç·¨è¼¯å?¨ç?¡æ³?å??å??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?ä½ é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16251,15 +16115,11 @@ msgid "External editor still running"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸ã??å?ªè¦?è©²ç·¨è¼¯å?¨ä»?å?¨ä½¿ç?¨ï¼?é?µä»¶ç·¨è¼¯å?¨è¦?çª?å°±ä¸?è?½é??é??ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
 msgstr "ä¸?è?½å??å??å?¨ä½ å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?å??è©¦è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
@@ -16267,9 +16127,7 @@ msgid "Insert Face picture by default"
 msgstr "é ?è¨æ??å?¥å¤§é ç?§"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
+msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
 msgstr "æ?¯å?¦é ?è¨å?¨å¤?å¯?é?µä»¶ä¸æ??å?¥å¤§é ç?§ã??å?¨æ ¸å??é??å??é?¸é ?ä¹?å??å¿?é ?å??è¨å®?å¥½ç?¸ç??ï¼?å?¦å??ä¸?æ??æ??ä»»ä½?æ??æ??ã??"
 
 #: ../plugins/face/face.c:286
@@ -16340,8 +16198,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
@@ -16361,17 +16219,17 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:453
 msgid "Checklist"
 msgstr "æª¢æ?¥æ¸?å?®"
 
 #. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:507
+#: ../plugins/groupwise-features/camel-gw-listener.c:513
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:527
+#: ../plugins/groupwise-features/camel-gw-listener.c:533
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?è?æ?¸å¤±æ??ã??\n"
 
@@ -16485,9 +16343,7 @@ msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
 #: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??ä½ ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
 #: ../plugins/groupwise-features/mail-retract.c:111
@@ -16538,9 +16394,7 @@ msgid "Invalid user"
 msgstr "ç?¡æ??ç??ä½¿ç?¨è??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
 msgstr "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥ä½ ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
@@ -16596,9 +16450,7 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
@@ -16680,7 +16532,7 @@ msgid "Proxy"
 msgstr "ä»£ç??ä¼ºæ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:239
 msgid "Account Name"
 msgstr "å¸³è??å??ç¨±"
 
@@ -16819,8 +16671,7 @@ msgstr "å?ºæ?¬è??é??ä¿¡è«?å£?æª?é (é ?è¨å?¼)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æ??ä¾?å?¨ä¸?å??æ¨?æº?æª?é ä»¥å¤?ä½ æ?³è¦?æ?¥æ?¶ç??é¡?å¤?æª?é ã??\n"
@@ -16994,9 +16845,7 @@ msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1704
 #: ../plugins/itip-formatter/itip-formatter.c:1715
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1755
@@ -17008,9 +16857,7 @@ msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 #: ../plugins/itip-formatter/itip-formatter.c:1756
 #: ../plugins/itip-formatter/itip-formatter.c:1784
 #: ../plugins/itip-formatter/itip-formatter.c:1893
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
+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:1797
@@ -17018,9 +16865,7 @@ msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1798
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2460
@@ -17251,9 +17096,7 @@ msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
+msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:400
@@ -17338,15 +17181,12 @@ msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
+msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
+msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:492
@@ -17553,8 +17393,7 @@ msgid "This meeting has been delegated"
 msgstr "é??å??æ??è°å·²å§?æ´¾"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?ä»¶äººå? å?¥ç?ºå?°æ??è??ï¼?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -17574,9 +17413,7 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??ç?¢ç?? D-BUS è¨?æ?¯ã??"
 
 #: ../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."
+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:6
@@ -17623,7 +17460,7 @@ msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??ç¤ºä¸?å½?å?ºè¨?æ?¯ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:398
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17640,64 +17477,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../plugins/mail-notification/mail-notification.c:410
 #, 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:415
+#: ../plugins/mail-notification/mail-notification.c:423
 #, c-format
 msgid "Subject: %s"
 msgstr "ä¸»æ?¨ï¼?%s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:433
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:438
 #: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:457
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:498
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:536
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:715
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:753
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:766
 msgid "Use sound _theme"
 msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:785
 msgid "Play _file:"
 msgstr "æ?æ?¾æª?æ¡?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:796
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:855
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -17715,163 +17552,133 @@ 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?"
+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?"
+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 "
-"old memo?"
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
 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
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+#: ../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?"
 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
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+#: ../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?"
 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
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
+#: ../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?"
 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
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
+#: ../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?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
 #. 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
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
+#: ../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?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
 #. 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
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
+#: ../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?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
 msgstr[0] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 msgstr[1] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../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
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+#: ../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
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+#: ../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
-msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+#: ../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:955
+#: ../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:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "å»ºç«?äº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../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:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "å»ºç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../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:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "å»ºç«?å·¥ä½?(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../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:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "å»ºç«?æ??è°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
 
@@ -17945,11 +17752,9 @@ msgstr "ç?¡æ³?ä½¿ç?¨å??ä½?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
 "å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??ä½ å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹è®?ã??\n"
 "\n"
@@ -17968,9 +17773,7 @@ msgid "Posting not allowed"
 msgstr "ä¸?å??è¨±å¼µè²¼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
 msgstr "å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?è?¯çµ¡è«?å£?ç??ç®¡ç??è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -17979,8 +17782,7 @@ msgstr "å?³é??é?µä»¶å?°é??ä¿¡è«?å£?ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -17999,9 +17801,7 @@ msgstr ""
 "æª?é ï¼? {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
 msgstr "é??å°?é?µä»¶æ²?æ??å??å?«æ¤å??ä½?æ??é??ç??æª?é è³?è¨?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18017,9 +17817,7 @@ msgid "Also mark messages in subfolders?"
 msgstr "æ?¯å?¦ä¹?æ¨?è¨?å?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
 msgstr "ä½ è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ã??"
 
 #: ../plugins/mark-all-read/mark-all-read.c:193
@@ -18055,39 +17853,35 @@ msgstr "å??å¥½ç´?æ??å?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä»¥ç´?æ??å?æ?¹å¼?æª¢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å?å??é¡¯ç¤ºå®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
+#: ../plugins/prefer-plain/prefer-plain.c:242
+msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "å¦?æ??æ??ç´?æ??å?ç??é?¨å??å°±é¡¯ç¤ºå®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å?é¡¯ç¤º"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
+#: ../plugins/prefer-plain/prefer-plain.c:243
+msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å?ç??é?¨å??ä¸¦å¾?å?¶ä»?ç??é?¨å??è£½ä½?é??ä»¶ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:290
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??é¡¯ç¤ºç?ºé??ä»¶(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:310
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -18111,35 +17905,36 @@ msgstr "Outlook PST å?¯å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "_Mail"
 msgstr "é?µä»¶(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:327
+#: ../plugins/pst-import/pst-importer.c:325
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:333
+#: ../plugins/pst-import/pst-importer.c:331
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:340
+#: ../plugins/pst-import/pst-importer.c:338
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:346 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:344
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "å·¥ä½?(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:367
+#: ../plugins/pst-import/pst-importer.c:365
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
@@ -18196,11 +17991,11 @@ msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
+#: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
 msgstr "ç?¡æ³?å»ºç«?ç?¼å¸?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
 msgstr "ç?¼å¸?è¡?äº?æ??è³?è¨?(_P)"
 
@@ -18298,11 +18093,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼å¸?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?ç«¯ç¨?å¼?å·²ä¸?å?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:475
+#: ../plugins/publish-calendar/url-editor-dialog.c:484
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:477
+#: ../plugins/publish-calendar/url-editor-dialog.c:486
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
@@ -18488,9 +18283,7 @@ msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å?è?³ç£?ç¢?"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -18610,8 +18403,7 @@ msgid "Enable express mode"
 msgstr "å??ç?¨å¿«é??æ¨¡å¼?"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "ç?¶å?å??äº?è?¯ç¶²ä¸?ç?? HTTP/ å®?å?¨å¼? HTTP æ??å??ç?¨ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -18639,11 +18431,7 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "å??å??æ??é ?è¨é¡¯ç¤ºç??å??ä»¶ç?¸é?? ID æ??å?¥å??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr "å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
@@ -18659,9 +18447,7 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
 msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
@@ -18669,8 +18455,7 @@ msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "è¦?å??æ¥è?³ç£?ç¢?ç??è³?æ??å¤¾ï¼?å?¶è·¯å¾?æ¸?å?® (ä¾?é?¢ç·?ä½¿ç?¨)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -18702,11 +18487,7 @@ msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
 msgstr "é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
@@ -18717,7 +18498,8 @@ msgstr "é¡¯ç¤ºå?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -18726,9 +18508,7 @@ msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
@@ -18752,9 +18532,7 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "å?´é??æ¬?ç??é ?è¨é??åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
@@ -18770,37 +18548,24 @@ msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
 msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
 msgstr "è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??æ ¹æ?? GNOME å·¥å?·å??è¨å®?å?¼æ±ºå®?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr "é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?ç¬¦å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??å¸¶æ??å?ç¶²çµ¡é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -18841,8 +18606,7 @@ msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
@@ -18857,11 +18621,12 @@ msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:698 ../shell/e-shell-content.c:699
+#: ../shell/e-shell-content.c:695
+#: ../shell/e-shell-content.c:696
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:741
+#: ../shell/e-shell-content.c:738
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
@@ -18869,19 +18634,19 @@ 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:938
+#: ../shell/e-shell-searchbar.c:935
 msgid "Sho_w:"
 msgstr "é¡¯ç¤º(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:968
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1031
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
@@ -18897,7 +18662,7 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
-#: ../shell/e-shell-view.c:286
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "å?²å?ä½¿ç?¨è??ä»?é?¢ç??æ??"
 
@@ -19186,19 +18951,19 @@ msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:434
+#: ../shell/e-shell-window.c:438
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/e-shell.c:261
+#: ../shell/e-shell.c:257
 msgid "Preparing to go offline..."
 msgstr "æº?å??é?²å?¥é?¢ç·?â?¦"
 
-#: ../shell/e-shell.c:314
+#: ../shell/e-shell.c:310
 msgid "Preparing to go online..."
 msgstr "æº?å??é?²å?¥ä¸?ç·?â?¦"
 
-#: ../shell/e-shell.c:376
+#: ../shell/e-shell.c:372
 msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??â?¦"
 
@@ -19253,9 +19018,7 @@ msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../shell/main.c:365
-msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "å??å?? Evolution æ??ä»¥æ??å®?ç??å??ä»¶é¡¯ç¤ºã??å?¯ç?¨ç??é?¸é ?æ??ã??mailã??ã??ã??calendarã??ã??ã??contactsã??ã??ã??tasksã??å??ã??memosã??"
 
 #: ../shell/main.c:369
@@ -19299,7 +19062,8 @@ msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:557
+#: ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
@@ -19334,16 +19098,11 @@ msgid "Continue Anyway"
 msgstr "å¼·å?¶ç¹¼çº?"
 
 #: ../shell/shell.error.xml.h:4
-msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
 msgstr "Evolution ä¸?å??æ?¯æ?´å¾? {0} ç??ç?´æ?¥å??ç´?ã??ç?¶è??è®?é??ç??æ?¹æ³?æ?¯ä½ å?¯ä»¥å??è©¦å??å??ç´?å?° Evolution 2ï¼?æ?¥ç??å??å??ç´?å?° Evolution 3ã??"
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
 msgstr "é?ºå¿?ä½ ç??å¯?ç¢¼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?ç¢¼ã??å?¨ä¸?æ¬¡é??è¦?ä½¿ç?¨å¯?ç¢¼æ??å°?æ??æ??ç¤ºä½ è¼¸å?¥ã??"
 
 #: ../shell/shell.error.xml.h:7
@@ -19362,28 +19121,27 @@ msgstr "é?ºå¿?(_F)"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
 "å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨å??è??è³?æ??ã??\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
+#: ../shell/test/e-test-shell-backend.c:56
 msgctxt "New"
 msgid "_Test Item"
 msgstr "æ¸¬è©¦é ?ç?®(_T)"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
 msgid "Test _Source"
 msgstr "æ¸¬è©¦ä¾?æº?(_S)"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦ä¾?æº?"
 
@@ -19422,31 +19180,31 @@ msgstr "ä¸?è?½å?³é??æ??ä»¶ URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:224
 msgid "Disable connection to session manager"
 msgstr "å??ç?¨å?°ä½?æ¥é??æ®µç®¡ç??ç¨?å¼?ç??é?£ç·?"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?å??å?«å·²å?²å?çµ?æ??ç??æª?æ¡?"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "FILE"
 msgstr "æª?æ¡?"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "Specify session management ID"
 msgstr "æ??å®?ä½?æ¥é??æ®µç®¡ç?? ID"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:251
 msgid "Session management options:"
 msgstr "ä½?æ¥é??æ®µç®¡ç??é?¸é ?ï¼?"
 
-#: ../smclient/eggsmclient.c:255
+#: ../smclient/eggsmclient.c:252
 msgid "Show session management options"
 msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
 
@@ -19462,17 +19220,11 @@ msgstr ""
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "å? ç?ºä½ ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "å? ç?ºä½ ä¸?ä¿¡ä»»ç?¼å?ºæ¤è?æ?¸ç??è?æ?¸å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??ä½ å°?ä¸?ä¿¡ä»»æ¤è?æ?¸ç??æ??æ??æ?§ã??"
 
 #: ../smime/gui/certificate-manager.c:148
@@ -19506,7 +19258,8 @@ msgstr "è?æ?¸å??ç¨±"
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370
+#: ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
@@ -19590,12 +19343,11 @@ msgid "Backup _All"
 msgstr "å?¨é?¨å??ä»½(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
 msgstr "ä¿¡ä»»æ¤æ ¸è?æ©?é??ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?ä½ æ??è©²å??æª¢æ?¥å®?ç??è?æ?¸ä»¥å??å®?ç??æ?¿ç?å??ç¨?åº?ã??"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "è?æ?¸"
 
@@ -19683,11 +19435,13 @@ msgstr "çµ?ç¹?å?®ä½? (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL ç?¨æ?¶ç«¯è?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨è?æ?¸"
 
@@ -19720,8 +19474,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "ä½ å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??è?æ?¸ï¼?å?¯ä»¥è?å?¥ä½ ç??èº«å??:"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è?æ?¸ï¼?å?¯ä»¥è?å?¥é??äº?æ ¸è?æ©?é??:"
 
 #: ../smime/gui/smime-ui.ui.h:41
@@ -19745,7 +19498,8 @@ msgstr "ç·¨è¼¯æ ¸è?æ©?é?? (CA) ä¿¡ä»»åº¦(_E)"
 msgid "Certificate already exists"
 msgstr "è?æ?¸å·²ç¶?å?å?¨"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228
+#: ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -19839,11 +19593,13 @@ msgstr "ä¸»æ?¨å?¬é??å¯?ç¢¼å??æ¼?ç®?æ³?"
 msgid "Subject's Public Key"
 msgstr "ä¸»æ?¨ç??å?¬é??å¯?ç¢¼å??"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:815
+#: ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:836
+#: ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
@@ -19887,7 +19643,8 @@ msgstr "CRL ç°½ç½²è??"
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
@@ -19906,7 +19663,8 @@ msgstr "å»¶ä¼¸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "è?æ?¸ç°½ç½²æ¼?ç®?æ³?"
 
@@ -19946,7 +19704,8 @@ msgstr "æ ¹æ??å?¬å?¸(_C)"
 msgid "_Address Cards"
 msgstr "å?°å??å?¡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æ¸?å?®æª¢è¦?(_L)"
 
@@ -20033,8 +19792,7 @@ msgstr "æ??å??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
@@ -20060,7 +19818,7 @@ msgstr "å®?ç¾©æª¢è¦?"
 msgid "Define Views for \"%s\""
 msgstr "å®?ç¾©ã??%sã??ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:109
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
@@ -20092,36 +19850,36 @@ msgstr "æª¢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-account-manager.c:352
+#: ../widgets/misc/e-account-manager.c:349
 msgid "De_fault"
 msgstr "é ?è¨å?¼(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:270
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment-dialog.c:307
+#: ../widgets/misc/e-attachment-dialog.c:304
 msgid "Attachment Properties"
 msgstr "é??ä»¶å?§å®¹"
 
-#: ../widgets/misc/e-attachment-dialog.c:329
+#: ../widgets/misc/e-attachment-dialog.c:326
 msgid "_Filename:"
 msgstr "æª?æ¡?å??ç¨±(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:364
+#: ../widgets/misc/e-attachment-dialog.c:361
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:372
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-dialog.c:369
+#: ../widgets/misc/e-attachment-store.c:556
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:100
+#: ../widgets/misc/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:152
+#: ../widgets/misc/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "è¨ç?ºè??æ?¯(_B)"
 
@@ -20139,42 +19897,43 @@ msgstr "å?³é??è?³(_S)â?¦"
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??ä»¶å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:545
+#: ../widgets/misc/e-attachment-icon-view.c:158
+#: ../widgets/misc/e-attachment-tree-view.c:543
 msgid "Loading"
 msgstr "è¼?å?¥ä¸"
 
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:557
+#: ../widgets/misc/e-attachment-icon-view.c:170
+#: ../widgets/misc/e-attachment-tree-view.c:555
 msgid "Saving"
 msgstr "å?²å?ä¸"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:93
 msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:637
+#: ../widgets/misc/e-attachment-paned.c:95
+#: ../widgets/misc/e-attachment-paned.c:635
 msgid "Show Attachment _Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:521
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "Add Attachment"
 msgstr "å? å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment-store.c:524
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:587
+#: ../widgets/misc/e-attachment-store.c:610
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å?é??ä»¶"
 msgstr[1] "å?²å?é??ä»¶"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
+#: ../widgets/misc/e-attachment-store.c:639
+#: ../widgets/misc/e-attachment.c:1806
+#: ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20216,48 +19975,50 @@ msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:1849
+#: ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
 
-#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
+#: ../widgets/misc/e-attachment.c:1857
+#: ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1955
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2234
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2669
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2748
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
@@ -20276,159 +20037,154 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#: ../widgets/misc/e-charset-combo-box.c:92
 msgid "Character Encoding"
 msgstr "å?ç¬¦ç·¨ç¢¼"
 
-#: ../widgets/misc/e-charset-combo-box.c:119
+#: ../widgets/misc/e-charset-combo-box.c:115
 msgid "Enter the character set to use"
 msgstr "è¼¸å?¥è¦?ä½¿ç?¨ç??å?ç¬¦é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:338
+#: ../widgets/misc/e-charset-combo-box.c:335
 msgid "Other..."
 msgstr "å?¶å®?â?¦"
 
-#: ../widgets/misc/e-dateedit.c:504
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:525
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:547
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:669
 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:677
 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:1689 ../widgets/misc/e-dateedit.c:1921
+#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1816
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1860
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:249
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+#: ../widgets/misc/e-import-assistant.c:245
+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:262
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:272
 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:286
+#: ../widgets/misc/e-import-assistant.c:461
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:329
+#: ../widgets/misc/e-import-assistant.c:905
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:354
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:362
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:370
 msgid "Import a _single file"
 msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:526
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+#: ../widgets/misc/e-import-assistant.c:522
+msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
 msgstr "Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??ä½ æ?³å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:762
 msgid "_Cancel Import"
 msgstr "å??æ¶?å?¯å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:904
 msgid "Preview data to be imported"
 msgstr "é ?è¦½é??è¦?å?¯å?¥ç??è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1343
-#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Data"
 msgstr "å?¯å?¥è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:918
 msgid "Select what type of file you want to import from the list."
 msgstr "é?¸æ??ä½ æ?³è¦?å¾?æ¸?å?®ä¸å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:1267
-#: ../widgets/misc/e-import-assistant.c:1301
+#: ../widgets/misc/e-import-assistant.c:1260
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1277
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Import Location"
 msgstr "è¼¸å?¥ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:1295
+#: ../widgets/misc/e-import-assistant.c:1288
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"With this assistant you will be guided through the process of importing external files into Evolution."
 msgstr ""
 "æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?ä½ å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid "Importer Type"
 msgstr "è¼¸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1310
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
@@ -20437,72 +20193,70 @@ msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
 #: ../widgets/misc/e-map.c:869
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
 msgstr "ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?ä¾?é?¸æ??æ??å??ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:23
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:26
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:29
 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:275
 msgid "Evolution Preferences"
 msgstr "Evolution å??å¥½è¨å®?"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:75
 #, c-format
 msgid "Matches: %d"
 msgstr "ç¬¦å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:560
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:568
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:620
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:642
+#: ../widgets/misc/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "å??å??å¤§å°?å¯«(_C)"
 
-#: ../widgets/misc/e-search-bar.c:670
+#: ../widgets/misc/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
 
-#: ../widgets/misc/e-search-bar.c:692
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
 
@@ -20641,38 +20395,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:563
-#: ../widgets/misc/e-signature-manager.c:352
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:134
+#: ../widgets/misc/e-signature-editor.c:560
+#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "å?²å?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:430
+#: ../widgets/misc/e-signature-editor.c:427
 msgid "Edit Signature"
 msgstr "ç·¨è¼¯ç°½å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:445
+#: ../widgets/misc/e-signature-editor.c:442
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??ç¨±(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:297
+#: ../widgets/misc/e-signature-manager.c:293
 msgid "Add Signature Script"
 msgstr "æ?°å¢?ç°½ç½²å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:362
+#: ../widgets/misc/e-signature-manager.c:358
 msgid "Edit Signature Script"
 msgstr "ç·¨è¼¯ç°½ç½²å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:580
+#: ../widgets/misc/e-signature-manager.c:577
 msgid "Add _Script"
 msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:264
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20682,11 +20436,11 @@ msgstr ""
 "ç°½å??æª?ã??ä½ æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:309
 msgid "S_cript:"
 msgstr "å?½ä»¤ç¨¿(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:340
 msgid "Script file must be executable."
 msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 
@@ -20694,41 +20448,43 @@ msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 msgid "Click here to go to URL"
 msgstr "æ??é??è£?ä»¥ç§»è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:373
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Copy Link Location"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:377
 msgid "Copy the link to the clipboard"
 msgstr "è¤?è£½é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:383
+#: ../widgets/misc/e-web-view.c:385
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:387
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??è¦½å?¨ä¸é??å??æ¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:393
+#: ../widgets/misc/e-web-view.c:395
 msgid "_Copy Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:424
+#: ../widgets/misc/e-web-view.c:1080
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:864
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
 
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:866
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??è£?é?±è??/è§£é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:868
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -20780,11 +20536,13 @@ msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
 msgid "click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
@@ -21080,16 +20838,19 @@ msgstr "è¼¸å?¥æ³?"
 #~ msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
 #~ msgid "Every day"
+
 #~ msgid_plural "Every %d days"
 #~ msgstr[0] "æ¯?å¤©"
 #~ msgstr[1] "æ¯? %d å¤©"
 
 #~ msgid "Every week"
+
 #~ msgid_plural "Every %d weeks"
 #~ msgstr[0] "æ¯?é?±"
 #~ msgstr[1] "æ¯? %d é?±"
 
 #~ msgid "Every week on "
+
 #~ msgid_plural "Every %d weeks on "
 #~ msgstr[0] "æ¯?é?±æ?¼"
 #~ msgstr[1] "æ¯? %d é?±æ?¼"
@@ -21104,16 +20865,19 @@ msgstr "è¼¸å?¥æ³?"
 #~ msgstr "%s %s æ?¥æ?¼ "
 
 #~ msgid "every month"
+
 #~ msgid_plural "every %d months"
 #~ msgstr[0] "æ¯?æ??"
 #~ msgstr[1] "æ¯? %d æ??"
 
 #~ msgid "Every year"
+
 #~ msgid_plural "Every %d years"
 #~ msgstr[0] "æ¯?å¹´"
 #~ msgstr[1] "æ¯? %d å¹´"
 
 #~ msgid "a total of %d time"
+
 #~ msgid_plural "a total of %d times"
 #~ msgstr[0] "ç¸½å?± %d æ¬¡"
 #~ msgstr[1] "ç¸½å?± %d æ¬¡"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2be43b0..e5c2977 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,34 +7,27 @@
 # Abel Cheung <abelcheung gmail com>, 2006.
 # Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
-#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.91.91\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:15+0800\n"
-"PO-Revision-Date: 2011-02-20 11:46+0800\n"
+"Project-Id-Version: evolution 3.1.0\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n";
+"POT-Creation-Date: 2011-03-21 19:04+0000\n"
+"PO-Revision-Date: 2011-03-29 13:48+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
-"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ï¼?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?é?£çµ¡äººæª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??é??è¨?"
-"é??ã??"
+msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
+msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ï¼?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?é?£çµ¡äººæª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
+msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
 msgstr "æ¤é?£çµ¡äººç??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?å? å?¥å??æ¨£ä½?å??ç??æ?°å??ç??å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:4
@@ -54,13 +47,8 @@ msgid "Category editor not available."
 msgstr "å??é¡?ç·¨è¼¯å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"è«?æª¢æ?¥ä¾?ç¢ºå®?æ?¨ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?æ?¨ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??"
-"å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
+msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "è«?æª¢æ?¥ä¾?ç¢ºå®?æ?¨ç??å¯?ç¢¼æ?¼æ³?æ£ç¢ºï¼?è??ä¸?æ?¨ä½¿ç?¨ç??æ?¯æ?¯æ?´ç??ç?»å?¥æ?¹æ³?ã??è«?è¨?å¾?è¨±å¤?å¯?ç¢¼æ??å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½å??å??äº?å¤§å¯«é??å®?é?µã??"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -71,21 +59,16 @@ msgid "Could not remove address book."
 msgstr "ç?¡æ³?ç§»é?¤é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"ç?®å??æ?¨å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? "
-"GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?æ?¨ç?? GroupWise å¸¸ç?¨é?£çµ¡äººå?? Groupwise å??äººé?£çµ¡äºº"
-"è³?æ??å¤¾ã??"
+msgid "Currently you can only access the GroupWise System Address Book from Evolution. Please use some other GroupWise mail client once to get your GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "ç?®å??æ?¨å?ªè?½å?å?? Evolution ä¸ç?? GroupWise ç³»çµ±é??è¨?é??ã??è«?ä½¿ç?¨ä¸?æ¬¡å?¶ä»?ç?? GroupWise é?µä»¶å®¢æ?¶ç«¯ï¼?ä»¥å??å¾?æ?¨ç?? GroupWise å¸¸ç?¨é?£çµ¡äººå?? Groupwise å??äººé?£çµ¡äººè³?æ??å¤¾ã??"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:34
+#: ../mail/mail.error.xml.h:46
 msgid "Do _Not Delete"
 msgstr "ä¸?è¦?å?ªé?¤(_N)"
 
@@ -99,7 +82,7 @@ msgstr "ç?¡æ³?é©?è? LDAP ä¼ºæ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
@@ -120,18 +103,12 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??å¤ªå¤§ã??æ?¨æ?¯å?¦è¦?æ?¹è®?å¤§å°?å¾?æ??å?²å?å®?ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢"
-"ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
+msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
+msgstr "æ¤ LDAP ä¼ºæ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ¤å??è?½ï¼?æ??å?¯è?½è¨å®?é?¯èª¤ã??è«?æ´½è©¢ç®¡ç??å?¡ï¼?ç?è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
@@ -142,9 +119,7 @@ msgid "This address book server does not have any suggested search bases."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨æ²?æ??ä»»ä½?å»ºè°ç??æ??å°?å?ºç¤?ã??"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
+msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
 msgstr "æ¤é??è¨?é??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??ä¼ºæ??å?¨å??ç¨±å?¯è?½æ?¼é?¯ï¼?æ??æ?¨ç??ç¶²è·¯é?£ç·?å·²ç¶?å??æ¢ã??"
 
 #: ../addressbook/addressbook.error.xml.h:26
@@ -172,39 +147,28 @@ msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å?æ??å??ç??è®?æ?´ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"æ?¨æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??æ?¨"
-"æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
+msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
+msgstr "æ?¨æ£å?¨å??è©¦å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?ç§»é?¤ã??æ?¨æ?³è¦?å?²å?ä¸?å??å?¯æ?¬ä¾?ä»£æ?¿å??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??"
-"è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
+msgstr "æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??å¤ª"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "æ?¨æ²?æ??è¶³å¤ ç??æ¬?é??å?ªé?¤é??å??é??è¨?é??ä¸ç??é?£çµ¡äººã??"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
+msgid "You have made modifications to this contact. Do you want to save these changes?"
 msgstr "æ?¨å·²ç¶?ä¿®æ?¹æ¤é?£çµ¡äººã??è¦?å?²å?é??äº?è®?æ?´ï¼?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨ {0} ç??é?£çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:613
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../mail/em-vfolder-rule.c:610
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
@@ -228,8 +192,8 @@ msgid "_Use as it is"
 msgstr "å°?å®?è¦?ç?º(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/e-calendar-view.c:2080
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "é?±å¹´ç´?å¿µæ?¥"
 
@@ -239,8 +203,9 @@ msgstr "é?±å¹´ç´?å¿µæ?¥"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../calendar/gui/e-calendar-view.c:2079 ../capplet/anjal-settings-main.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../calendar/gui/e-calendar-view.c:2077
+#: ../capplet/anjal-settings-main.c:116
 #: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
@@ -275,10 +240,11 @@ msgstr "é?£çµ¡äººç·¨è¼¯å?¨"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:498
-#: ../addressbook/gui/widgets/eab-contact-display.c:506
-#: ../addressbook/gui/widgets/eab-contact-display.c:848
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:494
+#: ../addressbook/gui/widgets/eab-contact-display.c:502
+#: ../addressbook/gui/widgets/eab-contact-display.c:844
+#: ../plugins/groupwise-features/junk-settings.c:409
+#: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "é?»å?é?µä»¶"
 
@@ -292,7 +258,7 @@ msgstr "å?¨å??(_N)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:72
+#: ../addressbook/gui/widgets/eab-contact-display.c:68
 msgid "Home"
 msgstr "ä½?å®¶"
 
@@ -327,17 +293,17 @@ msgstr "æ?±ç¨±(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:260
-#: ../plugins/groupwise-features/camel-gw-listener.c:423
-#: ../plugins/groupwise-features/camel-gw-listener.c:448
-#: ../plugins/groupwise-features/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/camel-gw-listener.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:454
+#: ../plugins/groupwise-features/camel-gw-listener.c:570
 msgid "Notes"
 msgstr "å??è¨»"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:73
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
-#: ../calendar/gui/e-calendar-view.c:1785
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "å?¶ä»?"
 
@@ -363,8 +329,8 @@ msgstr "ç¶²å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:71
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/widgets/eab-contact-display.c:67
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
 msgid "Work"
 msgstr "å·¥ä½?"
 
@@ -389,7 +355,7 @@ msgid "_Blog:"
 msgstr "é?¨è?½æ ¼(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:884
+#: ../calendar/gui/dialogs/event-page.c:881
 #: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
@@ -471,42 +437,42 @@ msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:167
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
-#: ../addressbook/gui/widgets/eab-contact-display.c:523
+#: ../addressbook/gui/widgets/eab-contact-display.c:519
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:169
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:521
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:522
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-display.c:524
+#: ../addressbook/gui/widgets/eab-contact-display.c:520
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
+#: ../addressbook/gui/widgets/eab-contact-display.c:518
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-display.c:527
+#: ../addressbook/gui/widgets/eab-contact-display.c:523
 msgid "Skype"
 msgstr "Skype"
 
@@ -651,7 +617,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:656
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:652
 msgid "Contact List Editor"
 msgstr "é?£çµ¡äººæ¸?å?®ç·¨è¼¯å?¨"
 
@@ -676,24 +642,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:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Members"
 msgstr "é?£çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:904
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1319
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1316
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1157
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1153
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1167
 msgid "Error modifying list"
 msgstr "ç·¨è¼¯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1181
 msgid "Error removing list"
 msgstr "ç§»é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -712,9 +678,7 @@ msgid "Duplicate Contact Detected"
 msgstr "å?µæ¸¬å?°é??è¤?ç??é?£çµ¡äºº"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid ""
-"The name or email of this contact already exists in this folder.  Would you "
-"like to add it anyway?"
+msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
 msgstr "æ¤é?£çµ¡äººç??å??ç¨±æ??é?»å?é?µä»¶å?°å??å·²ç¶?å?å?¨æ?¼æ¤è³?æ??å¤¾ã??ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
@@ -749,7 +713,8 @@ msgid "Merge Contact"
 msgstr "å??ä½µé?£çµ¡äºº"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
 #: ../modules/calendar/e-cal-shell-view-actions.c:1693
@@ -768,22 +733,22 @@ msgstr "é?»å?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??ç¨±å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:149
+#: ../addressbook/gui/widgets/e-addressbook-model.c:145
 msgid "No contacts"
 msgstr "æ²?æ??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:153
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??é?£çµ¡äºº"
 msgstr[1] "%d å??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:327
+#: ../addressbook/gui/widgets/e-addressbook-model.c:342
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:740
+#: ../addressbook/gui/widgets/e-addressbook-model.c:756
 msgid "Search Interrupted"
 msgstr "æ??å°?è¢«ä¸æ?·"
 
@@ -791,55 +756,55 @@ msgstr "æ??å°?è¢«ä¸æ?·"
 msgid "Error modifying card"
 msgstr "ç·¨è¼¯å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:624
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../addressbook/gui/widgets/e-addressbook-view.c:630
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:636
 msgid "Paste contacts from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:646
+#: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:652
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äºº (%s)ï¼?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -854,16 +819,16 @@ msgstr[1] ""
 "é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "ç¢ºå®?è¦?é¡¯ç¤ºé??è£¡æ??æ??ç??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "_Don't Display"
 msgstr "ä¸?è¦?é¡¯ç¤º(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
 msgid "Display _All Contacts"
 msgstr "é¡¯ç¤ºæ??æ??ç??é?£çµ¡äºº(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Assistant"
 msgstr "å?©ç??"
 
@@ -900,7 +865,7 @@ msgid "Categories"
 msgstr "å??é¡?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:544
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Company"
 msgstr "å?¬å?¸"
 
@@ -949,22 +914,22 @@ msgid "Journal"
 msgstr "æ?¥èª?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Manager"
 msgstr "ä¸»ç®¡"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Mobile Phone"
 msgstr "è¡?å??é?»è©±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:513
+#: ../addressbook/gui/widgets/eab-contact-display.c:509
 msgid "Nickname"
 msgstr "æ?±ç¨±"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:601
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Note"
 msgstr "å??è¨»"
 
@@ -999,7 +964,7 @@ msgid "Role"
 msgstr "è§?è?²"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Spouse"
 msgstr "é??å?¶"
 
@@ -1137,86 +1102,86 @@ msgstr "é?£çµ¡äºº: "
 msgid "evolution minicard"
 msgstr "Evolution è¿·ä½ å??ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:172
 msgid "Copy _Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:178
-#: ../widgets/misc/e-web-view.c:395
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
+#: ../widgets/misc/e-web-view.c:397
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../widgets/misc/e-web-view.c:402
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:185
-#: ../widgets/misc/e-web-view.c:402
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:404
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:428
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:424
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
 msgid "List Members"
 msgstr "æ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Department"
 msgstr "é?¨é??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:546
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Profession"
 msgstr "è?·æ¥"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Video Chat"
 msgstr "è¦?è¨?äº¤è«?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:547
 #: ../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:497
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:427
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:568
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../addressbook/gui/widgets/eab-contact-display.c:548
+#: ../calendar/gui/dialogs/event-editor.c:123
+#: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:549
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
 msgid "Phone"
 msgstr "é?»è©±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Fax"
 msgstr "å?³ç??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Address"
 msgstr "å?°å??"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 msgid "Home Page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:568
 msgid "Web Log"
 msgstr "ç¶²èª?"
 
@@ -1224,66 +1189,52 @@ msgstr "ç¶²èª?"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 #: ../capplet/settings/mail-capplet-shell.c:361
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../modules/addressbook/e-book-shell-backend.c:112
 #: ../modules/addressbook/e-book-shell-migrate.c:143
-#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-backend.c:128
 #: ../modules/calendar/e-cal-shell-migrate.c:161
-#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:117
-#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-backend.c:112
 #: ../modules/calendar/e-task-shell-migrate.c:128
 msgid "Personal"
 msgstr "å??äºº"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:833
+#: ../addressbook/gui/widgets/eab-contact-display.c:829
 msgid "Job Title"
 msgstr "è?·ç¨±"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:870
+#: ../addressbook/gui/widgets/eab-contact-display.c:866
 msgid "Home page"
 msgstr "é¦?é ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:879
+#: ../addressbook/gui/widgets/eab-contact-display.c:875
 msgid "Blog"
 msgstr "é?¨è?½æ ¼"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1059
-#: ../widgets/misc/e-web-view.c:852
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:77
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥"
-"ä¾?é?¢ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??ç?®é??æ??å??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
+msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
+msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?ä»¥ä¾?é?¢ç·?ä½¿ç?¨ã??è«?æ?¼ä¸?ç·?æ¨¡å¼?å??æ¬¡è®?å??ç?®é??æ??å??ä»¥ä¸?è¼?å®?ç??å?§å®¹ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:104
 #, 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 æ?¯å?¦å?å?¨è??ä¸?æ¬?é??å·²è¨å®?å?¯ä»¥å?å??å®?ã??"
+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:117
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?"
-"å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
+msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr "æ¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution ä½¿ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?ä»¶ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:126
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
+msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??è¡¨ç¤ºæ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??ä¼ºæ??å?¨ç?¡æ³?é?£ç·?ã??"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:134
@@ -1369,7 +1320,8 @@ msgstr "å??ç??æª¢è¦?æ¨¡å¼?"
 #: ../addressbook/importers/evolution-ldif-importer.c:519
 #: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
-#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:764
+#: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "å?¯å?¥â?¦"
 
@@ -1459,9 +1411,7 @@ msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??æ¥æ¨¡å¼?å?¯å?º"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:73
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+msgid "The number of cards in one output file in asynchronous mode, default size 100."
 msgstr "é??å??æ¥æ¨¡å¼?ä¸?ï¼?ä¸?å??è¼¸å?ºæª?æ¡?ä¸ç??å??ç??æ?¸ç?®ï¼?é ?è¨å¤§å°?æ?¯ 100ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:75
@@ -1469,8 +1419,7 @@ msgid "NUMBER"
 msgstr "æ?¸é??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:137
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "æ??ä»¤å??å¼?æ?¸é?¯èª¤ï¼?è«?ä½¿ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:151
@@ -1491,30 +1440,20 @@ msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?"
-"äº?æ??ã??"
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
+msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¸¦ä¸?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è¡?äº?æ??æª¢è¦?ç??å?´é??æ¬?ä¸é?¸æ??ä¸?å??ç??è¡?äº?æ??ã??"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
+msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?æ??ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°æ?¨ç??ç´?æ??å?¯ä»¥è®?æ?¨ç?¥é??é??å??ç´?æ??å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:6
-msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
+msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
 msgstr "æ?°å¢?æ??æ??ç¾©ç??æ??è¦?å?°æ?¨ç??å·¥ä½?å?¯ä»¥è®?æ?¨ç?¥é??é??å??å·¥ä½?å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../calendar/calendar.error.xml.h:7
@@ -1526,9 +1465,7 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤å??å¿?é??ä¸ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1536,13 +1473,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤é??äº?å·¥ä½?ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤ç´?æ??ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "æ??å?ªé?¤æ¤æ??è°ç??æ??æ??è³?è¨?è??ä¸?ç?¡æ³?å¾©å??ã??"
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1652,14 +1587,11 @@ msgid "Editor could not be loaded."
 msgstr "ç?¡æ³?è¼?å?¥ç·¨è¼¯å?¨ã??"
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "é?»å?é?µä»¶é??è«?æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??æ?¥å??æ¤å·¥ä½?ã??"
 
 #: ../calendar/calendar.error.xml.h:40
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "é?»å?é?µä»¶é??è«?å?½æ??å?³é??çµ¦æ??æ??å??è??è??ä¸¦è®?ä»?å??å??è¦?ã??"
 
 #: ../calendar/calendar.error.xml.h:41
@@ -1681,45 +1613,31 @@ msgid "Error on {0}: {1}"
 msgstr "{0} ç?¼ç??é?¯èª¤ï¼?{1}"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è°å·²ç¶?å??æ¶?ã??"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??è©²å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
 #: ../calendar/calendar.error.xml.h:49
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??è¨±å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
 #: ../calendar/calendar.error.xml.h:51
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "é??è£¡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤ç´?æ??å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
+msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "é??è£¡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??ä»¶ã??å?²å?æ¤å·¥ä½?å°?æ??å¤±å?»é??äº?é??ä»¶ã??"
 
 #: ../calendar/calendar.error.xml.h:54
@@ -1807,13 +1725,8 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?çµ¦å??è??è??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:75
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
-msgstr ""
-"æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??"
-"è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
+msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
+msgstr "æ?¨æ£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise ä¼ºæ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??å¥½ç??è§£æ±ºæ?¹æ¡?æ?¯å°?è©²ä¼ºæ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
@@ -1848,7 +1761,8 @@ msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?ä½¿ç?¨æ?¨ç??å·¥ä½?ã??"
 msgid "_Discard Changes"
 msgstr "æ?¾æ£?è®?æ?´(_D)"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:313
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/e-composer-actions.c:313
 msgid "_Save"
 msgstr "å?²å?(_S)"
 
@@ -1857,7 +1771,8 @@ msgid "_Save Changes"
 msgstr "å?²å?è®?æ?´(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:158
+#: ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:158
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
@@ -1867,7 +1782,7 @@ msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
 #: ../calendar/common/authentication.c:53
-#: ../calendar/gui/e-meeting-store.c:1779
+#: ../calendar/gui/e-meeting-store.c:1776
 #: ../plugins/caldav/caldav-browse-server.c:921
 #: ../plugins/google-account-setup/google-source.c:439
 #: ../plugins/publish-calendar/publish-calendar.c:332
@@ -1891,8 +1806,10 @@ msgstr[1] "å°?æ??"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:126
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../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
+#: ../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:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
@@ -1915,8 +1832,8 @@ msgstr "å?¨é?¨è§£é?¤(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1631
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1641
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1632
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1642
 #: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®:"
@@ -1925,7 +1842,8 @@ msgstr "ä½?ç½®:"
 msgid "Snooze _time:"
 msgstr "å¿½ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:887
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../e-util/e-alert.c:896
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "è§£é?¤(_D)"
@@ -1936,7 +1854,8 @@ msgstr "å»¶æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../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:376
 msgid "hours"
@@ -1949,39 +1868,41 @@ msgstr "ç´?æ??ç??å?°é»?"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../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
+#: ../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:375
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1486
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1613
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1494
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1495
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1504
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1505
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1548
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1549
 #, c-format
 msgid "You have %d alarm"
 msgid_plural "You have %d alarms"
 msgstr[0] "æ?¨æ?? %d å??é¬§é?´"
 msgstr[1] "æ?¨æ?? %d å??é¬§é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1770
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1774
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1741
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1745
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1993,11 +1914,10 @@ msgstr ""
 "é??å?ºé?»å?é?µä»¶ã??  Evolution æ??é¡¯ç¤º\n"
 "æ?®é??ç??æ??é??å°?è©±ç??ä¾?ä»£æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1776
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -2010,7 +1930,7 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1791
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1795
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -2019,7 +1939,8 @@ msgid "invalid time"
 msgstr "å¤±æ??æ??é??"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/alarm-notify/util.c:69
+#: ../calendar/gui/e-alarm-list.c:393
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2028,7 +1949,8 @@ msgstr[0] "%d æ??"
 msgstr[1] "%d æ??"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/alarm-notify/util.c:75
+#: ../calendar/gui/e-alarm-list.c:399
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2039,7 +1961,8 @@ msgstr[1] "%d å??"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:405
+#: ../calendar/gui/alarm-notify/util.c:79
+#: ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2067,13 +1990,16 @@ msgstr "é?±æª¢è¦?"
 msgid "Month View"
 msgstr "æ??æª¢è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "ä»»ä½?æ¬?ä½?"
 
-#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3
+#: ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5
+#: ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "é??ä»¶"
 
@@ -2083,72 +2009,91 @@ msgstr "é??ä»¶"
 msgid "Attendee"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5
+#: ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6
+#: ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "æ¸é¡?"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7
+#: ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:772
+#: ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/memotypes.xml.h:6
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 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
+#: ../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
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/misc/e-attachment-tree-view.c:524
+#: ../widgets/misc/e-attachment-tree-view.c:522
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9
+#: ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10
+#: ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "ä¸?å?å?¨"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11
+#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "å?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "æ??è°å?¬é??äºº"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:497
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ç§?äºº"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
-#: ../calendar/gui/e-task-table.c:496 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+#: ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:761
+#: ../calendar/gui/e-cal-model.c:768
+#: ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
@@ -2156,34 +2101,44 @@ msgstr "é?±æ??æ?§"
 #: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
 #: ../plugins/save-calendar/csv-format.c:363
 msgid "Summary"
 msgstr "æ??è¦?"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "æ??è¦?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ä¸?å??å?«"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27
+#: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "æ?¯"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ä¸?æ?¯"
 
@@ -2216,7 +2171,7 @@ msgid "Add Alarm"
 msgstr "æ?°å¢?é¬§é?´"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "é¬§é?´"
 
@@ -2232,7 +2187,8 @@ msgstr "è?ªè¨?é¬§é?´è?²é?³"
 msgid "Mes_sage:"
 msgstr "è¨?æ?¯(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "é?¸é ?"
 
@@ -2320,11 +2276,12 @@ msgstr "é¡?å??:"
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:152
+#: ../calendar/gui/dialogs/calendar-setup.c:232
+#: ../mail/mail-config.ui.h:152
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../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:282
+#: ../widgets/misc/e-signature-script-dialog.c:280
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
@@ -2347,7 +2304,8 @@ msgstr "é¡?è?²(_R):"
 #: ../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:200 ../mail/mail-config.ui.h:51
+#: ../mail/em-folder-properties.c:200
+#: ../mail/mail-config.ui.h:51
 #: ../modules/addressbook/addressbook-config.c:1010
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
 #: ../plugins/itip-formatter/itip-formatter.c:2818
@@ -2433,226 +2391,240 @@ msgstr "%s  æ?¨å·²ç¶?å??äº?äº?è®?æ?´ã??æ?¾æ£?é??äº?è®?æ?´ä¸¦ä¸?æ?´æ?°é??å??ç·¨
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??ç·¨è¼¯å?¨ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:448
+#: ../calendar/gui/dialogs/comp-editor-page.c:445
 #, c-format
 msgid "Validation error: %s"
 msgstr "ç¢ºèª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:260
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:540
+#: ../calendar/gui/dialogs/comp-editor.c:535
 msgid "Could not update object"
 msgstr "ç?¡æ³?æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:655
+#: ../calendar/gui/dialogs/comp-editor.c:650
 msgid "Edit Appointment"
 msgstr "ç·¨è¼¯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:662
+#: ../calendar/gui/dialogs/comp-editor.c:657
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:664
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:670
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:672
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Task - %s"
 msgstr "å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:677
+#: ../calendar/gui/dialogs/comp-editor.c:672
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:693
+#: ../calendar/gui/dialogs/comp-editor.c:688
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:814
+#: ../calendar/gui/dialogs/comp-editor.c:809
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1005
 msgid "Click here to close the current window"
 msgstr "æ??é??è£¡ä»¥é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1017 ../mail/e-mail-browser.c:136
+#: ../calendar/gui/dialogs/comp-editor.c:1012
+#: ../mail/e-mail-browser.c:132
 #: ../shell/e-shell-window-actions.c:1433
-#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
+#: ../widgets/misc/e-focus-tracker.c:114
+#: ../widgets/misc/e-focus-tracker.c:552
+#: ../widgets/misc/e-web-view.c:414
+#: ../widgets/misc/e-web-view.c:1068
 msgid "Copy the selection"
 msgstr "è¤?è£½é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1024 ../mail/e-mail-browser.c:143
+#: ../calendar/gui/dialogs/comp-editor.c:1019
+#: ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1440
-#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1059
+#: ../widgets/misc/e-focus-tracker.c:107
+#: ../widgets/misc/e-focus-tracker.c:547
+#: ../widgets/misc/e-web-view.c:1062
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1031
+#: ../calendar/gui/dialogs/comp-editor.c:1026
 #: ../shell/e-shell-window-actions.c:1447
-#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
+#: ../widgets/misc/e-focus-tracker.c:128
+#: ../widgets/misc/e-focus-tracker.c:562
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/comp-editor.c:1033
 msgid "Click here to view help available"
 msgstr "æ??é??è£¡ä»¥æª¢è¦?å?¯ç?¨ç??èªªæ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1045 ../mail/e-mail-browser.c:150
+#: ../calendar/gui/dialogs/comp-editor.c:1040
+#: ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1482
-#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1071
+#: ../widgets/misc/e-focus-tracker.c:121
+#: ../widgets/misc/e-focus-tracker.c:557
+#: ../widgets/misc/e-web-view.c:1074
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1066
+#: ../calendar/gui/dialogs/comp-editor.c:1061
 msgid "Click here to save the current window"
 msgstr "æ??é??è£¡ä»¥å?²å?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/e-mail-browser.c:157
+#: ../calendar/gui/dialogs/comp-editor.c:1068
+#: ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1552
-#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
+#: ../widgets/misc/e-focus-tracker.c:135
+#: ../widgets/misc/e-focus-tracker.c:567
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1075
 msgid "_Classification"
 msgstr "æ¸é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:171
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+#: ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:167
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../shell/e-shell-window-actions.c:1580
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094 ../mail/e-mail-browser.c:164
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1587
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "æª?æ¡?(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 #: ../shell/e-shell-window-actions.c:1594
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 #: ../composer/e-composer-actions.c:336
 msgid "_Options"
 msgstr "é?¸é ?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1629 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../mail/e-mail-browser.c:174
+#: ../shell/e-shell-window-actions.c:1629
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 #: ../composer/e-composer-actions.c:285
 msgid "_Attachment..."
 msgstr "é??ä»¶(_A)â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Click here to attach a file"
 msgstr "æ??é??è£¡ä»¥é??ä»¶"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1142
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1144
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1152
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161
+#: ../calendar/gui/dialogs/comp-editor.c:1156
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "_Private"
 msgstr "ç§?äºº(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1170
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Classify as private"
 msgstr "æ¸é¡?ç?ºç§?äºº"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1175
+#: ../calendar/gui/dialogs/comp-editor.c:1170
 msgid "_Confidential"
 msgstr "æ©?å¯?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1177
+#: ../calendar/gui/dialogs/comp-editor.c:1172
 msgid "Classify as confidential"
 msgstr "æ¸é¡?ç?ºæ©?å¯?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "R_ole Field"
 msgstr "è§?è?²æ¬?ä½?(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1187
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1193
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1195
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1201
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1203
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1230
 #: ../composer/e-composer-private.c:73
 msgid "Recent _Documents"
 msgstr "æ??è¿?ä½¿ç?¨æ??ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1940
+#: ../calendar/gui/dialogs/comp-editor.c:1936
 #: ../composer/e-composer-actions.c:504
 msgid "Attach"
 msgstr "é??å? "
@@ -2768,147 +2740,148 @@ msgstr "å§?è¨?çµ¦ï¼?"
 msgid "Enter Delegate"
 msgstr "è¼¸å?¥ä»£è¡¨"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:212
 msgid "_Alarms"
 msgstr "é¬§é?´(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£¡ä»¥è¨å®?æ??å??æ¶?é??å??äº?ä»¶ç??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
 msgstr "é¡¯ç¤ºæ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??é¡¯ç¤ºç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Make this a recurring event"
 msgstr "å°?æ¤é ?è¨ç?ºé?±æ??æ?§äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:240
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../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:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
 msgstr "å?¨å¤©äº?ä»¶(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:252
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:261
 msgid "_Free/Busy"
 msgstr "ç©ºé??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:263
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ¤å?°æ??è??ç??ç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3172
+#: ../calendar/gui/dialogs/event-editor.c:314
+#: ../calendar/gui/print.c:3172
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:384
 #: ../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:585
+#: ../calendar/gui/dialogs/event-editor.c:582
 msgid "Print this event"
 msgstr "å??å?°é??å??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:768
+#: ../calendar/gui/dialogs/event-page.c:765
 msgid "Event's start time is in the past"
 msgstr "äº?ä»¶ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:809
+#: ../calendar/gui/dialogs/event-page.c:806
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:810
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯äº?ä»¶ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:825
-#: ../calendar/gui/dialogs/event-page.c:2783
+#: ../calendar/gui/dialogs/event-page.c:822
+#: ../calendar/gui/dialogs/event-page.c:2780
 msgid "This event has alarms"
 msgstr "é??å??äº?ä»¶å?·æ??é¬§é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:892
+#: ../calendar/gui/dialogs/event-page.c:889
 #: ../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:939
+#: ../calendar/gui/dialogs/event-page.c:936
 msgid "_Delegatees"
 msgstr "ä»£ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:941
+#: ../calendar/gui/dialogs/event-page.c:938
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1158
+#: ../calendar/gui/dialogs/event-page.c:1155
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1161
+#: ../calendar/gui/dialogs/event-page.c:1158
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?ä»¶"
 
-#: ../calendar/gui/dialogs/event-page.c:1332
-#: ../calendar/gui/dialogs/memo-page.c:674
-#: ../calendar/gui/dialogs/task-page.c:908
+#: ../calendar/gui/dialogs/event-page.c:1329
+#: ../calendar/gui/dialogs/memo-page.c:671
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1342
+#: ../calendar/gui/dialogs/event-page.c:1339
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1365
+#: ../calendar/gui/dialogs/event-page.c:1362
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1372
+#: ../calendar/gui/dialogs/event-page.c:1369
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:715
-#: ../calendar/gui/dialogs/task-page.c:970
+#: ../calendar/gui/dialogs/event-page.c:1533
+#: ../calendar/gui/dialogs/memo-page.c:712
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??äººå·²ç¶?æ²?æ??å¸³è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1542
-#: ../calendar/gui/dialogs/memo-page.c:721
-#: ../calendar/gui/dialogs/task-page.c:976
+#: ../calendar/gui/dialogs/event-page.c:1539
+#: ../calendar/gui/dialogs/memo-page.c:718
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??äººã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1567
-#: ../calendar/gui/dialogs/task-page.c:1000
+#: ../calendar/gui/dialogs/event-page.c:1564
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2657
+#: ../calendar/gui/dialogs/event-page.c:2654
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -2919,47 +2892,47 @@ 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:2701
-#: ../calendar/gui/dialogs/memo-page.c:934
-#: ../calendar/gui/dialogs/task-page.c:1790
+#: ../calendar/gui/dialogs/event-page.c:2698
+#: ../calendar/gui/dialogs/memo-page.c:931
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ£æ??ä»» %s ç??ä»£ç??äºº"
 
-#: ../calendar/gui/dialogs/event-page.c:3012
+#: ../calendar/gui/dialogs/event-page.c:3009
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 msgstr[1] "å?¨æ¯?å??ç´?æ??å?? %d å¤©"
 
-#: ../calendar/gui/dialogs/event-page.c:3018
+#: ../calendar/gui/dialogs/event-page.c:3015
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ç´?æ??å?? %d å°?æ??"
 msgstr[1] "ç´?æ??å?? %d å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:3024
+#: ../calendar/gui/dialogs/event-page.c:3021
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ç´?æ??å?? %d å??é??"
 msgstr[1] "ç´?æ??å?? %d å??é??"
 
-#: ../calendar/gui/dialogs/event-page.c:3043
+#: ../calendar/gui/dialogs/event-page.c:3040
 msgid "Customize"
 msgstr "è?ªè¨?"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3049
+#: ../calendar/gui/dialogs/event-page.c:3046
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "å?°æ??è??(_N)â?¦"
 
@@ -2983,7 +2956,7 @@ msgstr "é¬§é?´(_A)"
 #: ../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:346
+#: ../widgets/misc/e-attachment-dialog.c:343
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
@@ -3030,35 +3003,40 @@ msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3176
+#: ../calendar/gui/dialogs/memo-editor.c:105
+#: ../calendar/gui/print.c:3176
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "å??å?°é??å??å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:340
+#: ../calendar/gui/dialogs/memo-page.c:337
 msgid "Memo's start date is in the past"
 msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/memo-page.c:378
+#: ../calendar/gui/dialogs/memo-page.c:375
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:382
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/memo-page.c:895
+#: ../calendar/gui/dialogs/memo-page.c:892
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1066 ../em-format/em-format-quote.c:283
-#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2399
-#: ../mail/em-format-html.c:2464 ../mail/em-format-html.c:2488
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1063
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1052
+#: ../mail/em-format-html.c:2396
+#: ../mail/em-format-html.c:2461
+#: ../mail/em-format-html.c:2485
+#: ../mail/message-list.etspec.h:20
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -3077,7 +3055,7 @@ msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:425
+#: ../calendar/gui/dialogs/task-page.c:422
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "ç¾¤çµ?(_G):"
@@ -3118,21 +3096,21 @@ msgstr "æ¤ä¾?é ?å??ä»¥å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:566
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?ç·¨è¼¯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:898
+#: ../calendar/gui/dialogs/recurrence-page.c:895
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:938
+#: ../calendar/gui/dialogs/recurrence-page.c:935
 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:968
+#: ../calendar/gui/dialogs/recurrence-page.c:965
 msgid "on"
 msgstr "ç??"
 
@@ -3140,7 +3118,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1023
 msgid "first"
 msgstr "ä¸?"
 
@@ -3149,7 +3127,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:1032
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "second"
 msgstr "äº?"
 
@@ -3157,7 +3135,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:1037
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "third"
 msgstr "ä¸?"
 
@@ -3165,7 +3143,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:1042
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fourth"
 msgstr "å??"
 
@@ -3173,7 +3151,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:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "fifth"
 msgstr "ç¬¬äº?"
 
@@ -3181,13 +3159,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:1052
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 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:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1073
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -3195,7 +3173,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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "1st to 10th"
 msgstr "1æ?¥è?³10æ?¥"
 
@@ -3203,7 +3181,7 @@ msgstr "1æ?¥è?³10æ?¥"
 #. * 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:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "11th to 20th"
 msgstr "11æ?¥è?³20æ?¥"
 
@@ -3211,48 +3189,48 @@ msgstr "11æ?¥è?³20æ?¥"
 #. * 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:1094
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "21st to 31st"
 msgstr "21æ?¥è?³31æ?¥"
 
 #. 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
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "day"
 msgstr "å¤©"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1119
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "æ??æ??å?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
@@ -3260,31 +3238,31 @@ 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:1248
+#: ../calendar/gui/dialogs/recurrence-page.c:1245
 msgid "on the"
 msgstr "å?¨ç¬¬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1422
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "æ¬¡"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2126
+#: ../calendar/gui/dialogs/recurrence-page.c:2123
 msgid "Add exception"
 msgstr "å? å?¥ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?ç·¨è¼¯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2173
+#: ../calendar/gui/dialogs/recurrence-page.c:2170
 msgid "Modify exception"
 msgstr "ç·¨è¼¯ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2217
+#: ../calendar/gui/dialogs/recurrence-page.c:2214
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2348
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -3296,7 +3274,8 @@ msgstr "æ¯?"
 msgid "Exceptions"
 msgstr "ä¾?å¤?"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
+#: ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "é ?è¦½"
 
@@ -3354,82 +3333,101 @@ msgstr "å°?æ??ç??é¬§é?´è??é??å??äº?ä»¶ä¸?èµ·é??å?º"
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:356
-#: ../calendar/gui/dialogs/task-details-page.c:378
+#: ../calendar/gui/dialogs/task-details-page.c:352
+#: ../calendar/gui/dialogs/task-details-page.c:374
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:486
 msgid "Web Page"
 msgstr "ç¶²é ?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
-#: ../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:600
-#: ../calendar/gui/print.c:3262 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#: ../calendar/gui/e-cal-component-preview.c:294
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225
+#: ../calendar/gui/e-task-table.c:596
+#: ../calendar/gui/print.c:3262
+#: ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180
+#: ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:714
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:599 ../calendar/gui/print.c:3259
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:291
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223
+#: ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3259
+#: ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1232 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:313
+#: ../calendar/gui/e-task-table.c:516
+#: ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1228
+#: ../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:292
-#: ../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:598
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-model-tasks.c:435
+#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:786
+#: ../calendar/gui/e-task-table.c:206
+#: ../calendar/gui/e-task-table.c:221
+#: ../calendar/gui/e-task-table.c:594
 #: ../calendar/gui/print.c:3256
 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:321
-#: ../calendar/gui/e-task-table.c:522 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1230 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1226
+#: ../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:319
-#: ../calendar/gui/e-cal-model.c:1525 ../calendar/gui/e-task-table.c:521
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1231
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model.c:1521
+#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17
+#: ../mail/message-list.c:1227
 #: ../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:302
-#: ../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:597
-#: ../calendar/gui/print.c:3253 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:433
+#: ../calendar/gui/e-cal-model-tasks.c:707
+#: ../calendar/gui/e-task-table.c:204
+#: ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3253
+#: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -3445,17 +3443,19 @@ 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:1833
+#: ../calendar/gui/e-calendar-view.c:1831
 #: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:523 ../calendar/gui/tasktypes.xml.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 "æ?ªæ??å®?"
@@ -3473,58 +3473,59 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "ç¶²é ?(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "ç??æ??è©³ç´°è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£¡æ?¹è®?/æª¢è¦?è©²å·¥ä½?ç??ç??æ??è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:122
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3174
+#: ../calendar/gui/dialogs/task-editor.c:328
+#: ../calendar/gui/print.c:3174
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "å·¥ä½?è©³ç´°è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:376
+#: ../calendar/gui/dialogs/task-editor.c:373
 msgid "Print this task"
 msgstr "å??å?°é??é ?å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.c:339
 msgid "Task's start date is in the past"
 msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:340
 msgid "Task's due date is in the past"
 msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:378
+#: ../calendar/gui/dialogs/task-page.c:375
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:382
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??äºº"
 
-#: ../calendar/gui/dialogs/task-page.c:433
+#: ../calendar/gui/dialogs/task-page.c:430
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è°å?¬é??äºº(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:881
+#: ../calendar/gui/dialogs/task-page.c:878
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1747
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
@@ -3617,42 +3618,44 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??è§¸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../filter/e-filter-rule.c:667
 msgid "Untitled"
 msgstr "ç?¡æ¨?é¡?"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:194
 msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:233
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-component-preview.c:257
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Due Date:"
 msgstr "æ?ªæ¢æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:284
 #: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:311
 msgid "Priority:"
 msgstr "å?ªå??ç?ç´?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:367
 msgid "Web Page:"
 msgstr "ç¶²é ?ï¼?"
 
@@ -3679,16 +3682,17 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-task-table.c:570
 msgid "Free"
 msgstr "ç©ºé??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:548 ../calendar/gui/e-task-table.c:575
+#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/e-task-table.c:571
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:655
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3699,44 +3703,51 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:708
+#: ../calendar/gui/e-cal-model-tasks.c:705
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
+#: ../calendar/gui/e-cal-model-tasks.c:1061
+#: ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1030
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1027
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1531
+#: ../calendar/gui/e-cal-model-tasks.c:1061
+#: ../calendar/gui/e-cal-model.c:1527
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:774
+#: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:1109 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:1109
+#: ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
 #: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1527
+#: ../calendar/gui/e-cal-model.c:1523
 msgid "Recurring"
 msgstr "é?±æ??æ?§æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1529
+#: ../calendar/gui/e-cal-model.c:1525
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2647
+#: ../calendar/gui/e-cal-model.c:2643
 #, c-format
 msgid "Opening %s"
 msgstr "æ£å?¨é??å?? %s"
@@ -3776,107 +3787,116 @@ msgstr "é??å§?æ?¥æ??"
 #: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:582
+#: ../widgets/misc/e-attachment-tree-view.c:580
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:422
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:428
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??äº?ä»¶è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Paste events from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:444
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:463 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:261
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:657 ../calendar/gui/e-memo-table.c:859
-#: ../calendar/gui/e-task-table.c:1088
+#: ../calendar/gui/e-calendar-view.c:653
+#: ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1084
 msgid "Updating objects"
 msgstr "æ?´æ?°ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:1780
+#: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220
 #: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1781
+#: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/e-meeting-store.c:222
 #: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1782
+#: ../calendar/gui/e-calendar-view.c:1780
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "Tentative"
 msgstr "æ?«è¨?"
 
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:226
 #: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "å·²å§?æ´¾"
 
-#: ../calendar/gui/e-calendar-view.c:1784
+#: ../calendar/gui/e-calendar-view.c:1782
 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:1928 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:763
+#: ../calendar/gui/e-calendar-view.c:1926
+#: ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:759
 #, 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:1932 ../calendar/gui/e-memo-table.c:547
-#: ../calendar/gui/e-task-table.c:766
+#: ../calendar/gui/e-calendar-view.c:1930
+#: ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:762
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è°å?¬é??äºº: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1948 ../calendar/gui/print.c:3208
+#: ../calendar/gui/e-calendar-view.c:1946
+#: ../calendar/gui/print.c:3208
 #, c-format
 msgid "Location: %s"
 msgstr "ä½?ç½®ï¼?%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1979
+#: ../calendar/gui/e-calendar-view.c:1977
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:156
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:167
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3889,17 +3909,17 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:748
+#: ../calendar/gui/e-day-view-time-item.c:745
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:769
+#: ../calendar/gui/e-day-view-time-item.c:766
 msgid "Show the second time zone"
 msgstr "é¡¯ç¤ºç¬¬äº?æ??å??"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:786
+#: ../calendar/gui/e-day-view-time-item.c:783
 #: ../modules/calendar/e-calendar-preferences.ui.h:76
 #: ../modules/calendar/e-calendar-preferences.c:175
 #: ../modules/calendar/e-calendar-preferences.c:224
@@ -3907,8 +3927,8 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-day-view-time-item.c:813
-#: ../calendar/gui/e-timezone-entry.c:319
+#: ../calendar/gui/e-day-view-time-item.c:810
+#: ../calendar/gui/e-timezone-entry.c:316
 #: ../modules/calendar/e-calendar-preferences.c:251
 msgid "Select..."
 msgstr "é?¸æ??â?¦"
@@ -3919,10 +3939,12 @@ 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:844 ../calendar/gui/e-day-view.c:1793
-#: ../calendar/gui/e-week-view-main-item.c:212 ../calendar/gui/print.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-week-view-main-item.c:208
+#: ../calendar/gui/print.c:1866
 msgid "%A %d %B"
-msgstr "%B %d %A"
+msgstr "%B%dæ?¥%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -3930,41 +3952,49 @@ 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:848 ../calendar/gui/e-day-view.c:1810
-#: ../calendar/gui/e-week-view-main-item.c:221
+#: ../calendar/gui/e-day-view-top-item.c:845
+#: ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-week-view-main-item.c:217
 #: ../calendar/gui/ea-gnome-calendar.c:200
 #: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
-msgstr "%b %d (%a)"
+msgstr "%b%dæ?¥ (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. 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:852 ../calendar/gui/e-day-view.c:1826
-#: ../calendar/gui/e-week-view-main-item.c:235
+#: ../calendar/gui/e-day-view-top-item.c:849
+#: ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-week-view-main-item.c:231
 #: ../calendar/gui/ea-gnome-calendar.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%d %b"
-msgstr "%b %d"
+msgstr "%b%dæ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:920 ../calendar/gui/print.c:939
-#: ../calendar/gui/print.c:2363 ../calendar/gui/print.c:2383
+#: ../calendar/gui/e-day-view.c:1002
+#: ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:939
+#: ../calendar/gui/print.c:2363
+#: ../calendar/gui/print.c:2383
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:925 ../calendar/gui/print.c:941
-#: ../calendar/gui/print.c:2368 ../calendar/gui/print.c:2385
+#: ../calendar/gui/e-day-view.c:1005
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:925
+#: ../calendar/gui/print.c:941
+#: ../calendar/gui/print.c:2368
+#: ../calendar/gui/print.c:2385
 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:2600
+#: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
 msgstr "ç¬¬ %d é?±"
@@ -3986,56 +4016,68 @@ msgid "Resources"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1024 ../calendar/gui/print.c:1088
+#: ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1021
+#: ../calendar/gui/print.c:1088
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1089 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1089
+#: ../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:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:131
 #: ../calendar/gui/print.c:1090
 msgid "Resource"
 msgstr "è³?æº?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:133
 #: ../calendar/gui/print.c:1091
 msgid "Room"
 msgstr "æ??è°å®¤"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/e-meeting-store.c:162
 #: ../calendar/gui/print.c:1105
 msgid "Chair"
 msgstr "ä¸»å¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1027 ../calendar/gui/print.c:1106
+#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/print.c:1106
 msgid "Required Participant"
 msgstr "å?ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:166
 #: ../calendar/gui/print.c:1107
 msgid "Optional Participant"
 msgstr "å??å¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../calendar/gui/print.c:1108
 msgid "Non-Participant"
 msgstr "ç¼ºå¸è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1037
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1034
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
@@ -4050,16 +4092,17 @@ msgstr "å?°æ??è??"
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "é?²è¡?ä¸"
 
-#: ../calendar/gui/e-meeting-store.c:1766
+#: ../calendar/gui/e-meeting-store.c:1763
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "è¼¸å?¥ä½¿ç?¨è?? %2$s å?¨ä¼ºæ??å?¨ %1$s ä¸?å?å??ç©ºé??/å¿?ç¢?è³?è¨?ç??å¯?ç¢¼ "
 
-#: ../calendar/gui/e-meeting-store.c:1775
+#: ../calendar/gui/e-meeting-store.c:1772
 #, c-format
 msgid "Failure reason: %s"
 msgstr "å¤±æ??å??å? ï¼?%s"
@@ -4067,16 +4110,16 @@ msgstr "å¤±æ??å??å? ï¼?%s"
 #. 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:431
-#: ../calendar/gui/e-meeting-time-sel.c:2382
+#: ../calendar/gui/e-meeting-time-sel.c:2380
 msgid "%A, %B %d, %Y"
-msgstr "%Y, %B %d (%A)"
+msgstr "%Y, %B%dæ?¥ (%A)"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:435
-#: ../calendar/gui/e-meeting-time-sel.c:2413
+#: ../calendar/gui/e-meeting-time-sel.c:2411
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -4086,63 +4129,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Out of Office"
 msgstr "ä¸?å?¨è¾¦å?¬å®¤"
 
-#: ../calendar/gui/e-meeting-time-sel.c:550
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:584
 msgid "O_ptions"
 msgstr "é?¸é ?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:604
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:613
 msgid "Show _zoomed out"
 msgstr "é¡¯ç¤ºç¸®å°?(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:629
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:664
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:695
 msgid "_All people and resources"
 msgstr "æ??æ??äººå?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "æ??æ??äººå?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:717
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "_Required people"
 msgstr "å¿?è¦?ç??äººå?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:726
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?äººå?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:775
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:815
+#: ../calendar/gui/e-meeting-time-sel.c:813
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -4170,8 +4213,8 @@ msgstr "èª?è¨?"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:423
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../calendar/gui/e-memo-table.c:419
+#: ../modules/calendar/e-cal-shell-content.c:469
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
@@ -4179,38 +4222,41 @@ msgstr "æ??å?¡"
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:504 ../calendar/gui/e-task-table.c:727
+#: ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:723
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:807
+#: ../calendar/gui/e-memo-table.c:585
+#: ../calendar/gui/e-task-table.c:803
 msgid "Start: "
 msgstr "é??å§?:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:825
+#: ../calendar/gui/e-memo-table.c:604
+#: ../calendar/gui/e-task-table.c:821
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:724
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:730
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:736
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:738
 #: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -4222,56 +4268,58 @@ 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:549
+#: ../calendar/gui/e-task-table.c:545
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:646 ../calendar/gui/print.c:2159
+#: ../calendar/gui/e-task-table.c:642
+#: ../calendar/gui/print.c:2159
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../modules/calendar/e-cal-shell-content.c:430
 #: ../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:444
 #: ../plugins/caldav/caldav-browse-server.c:436
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
+#: ../plugins/groupwise-features/camel-gw-listener.c:428
+#: ../plugins/groupwise-features/camel-gw-listener.c:569
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:949
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:955
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:965
+#: ../calendar/gui/e-task-table.c:961
 msgid "Paste tasks from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:967
 #: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:977
+#: ../calendar/gui/e-task-table.c:973
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:327
 msgid "Select Timezone"
 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:229 ../calendar/gui/print.c:1847
+#: ../calendar/gui/e-week-view-main-item.c:225
+#: ../calendar/gui/print.c:1847
 msgid "%d %B"
-msgstr "%d %B"
+msgstr "%B%dæ?¥"
 
 #: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
@@ -4327,7 +4375,8 @@ msgstr "ç§»è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?æª¢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??è¡¨æ ¼"
 
-#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:147
+#: ../calendar/gui/ea-day-view.c:148
+#: ../calendar/gui/ea-week-view.c:147
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -4336,7 +4385,8 @@ msgstr[1] "å®?æ?? %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:153 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:153
+#: ../calendar/gui/ea-week-view.c:150
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?ä»¶ã??"
 
@@ -4373,7 +4423,7 @@ msgstr "Gnome è¡?äº?æ??"
 #: ../calendar/gui/ea-gnome-calendar.c:197
 #: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
-msgstr "%Y, %b %d (%A)"
+msgstr "%Yå¹´%b%dæ?¥ (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:202
 #: ../calendar/gui/ea-gnome-calendar.c:207
@@ -4382,7 +4432,7 @@ msgstr "%Y, %b %d (%A)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../modules/calendar/e-cal-shell-view-private.c:1017
 msgid "%a %d %b %Y"
-msgstr "%Y, %b %d (%a)"
+msgstr "%Yå¹´%b%dæ?¥ (%a)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:226
 #: ../calendar/gui/ea-gnome-calendar.c:232
@@ -4393,7 +4443,7 @@ msgstr "%Y, %b %d (%a)"
 #: ../modules/calendar/e-cal-shell-view-private.c:1052
 #: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
-msgstr "%Y, %b %d"
+msgstr "%Yå¹´%b%dæ?¥"
 
 #: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
@@ -4482,7 +4532,8 @@ msgstr "é?¸æ??ä»?å¤©(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:422 ../calendar/gui/itip-utils.c:477
+#: ../calendar/gui/itip-utils.c:422
+#: ../calendar/gui/itip-utils.c:477
 #: ../calendar/gui/itip-utils.c:573
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
@@ -4491,19 +4542,23 @@ msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??äººã??"
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:657 ../calendar/gui/itip-utils.c:811
+#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:811
 msgid "Event information"
 msgstr "äº?ä»¶è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:660 ../calendar/gui/itip-utils.c:814
+#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:814
 msgid "Task information"
 msgstr "å·¥ä½?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:663 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:663
+#: ../calendar/gui/itip-utils.c:817
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:666 ../calendar/gui/itip-utils.c:835
+#: ../calendar/gui/itip-utils.c:666
+#: ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "ç©ºé??/å¿?ç¢?è³?è¨?"
 
@@ -4536,7 +4591,8 @@ msgstr "æ?«æ??æ?¥å??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720 ../calendar/gui/itip-utils.c:768
+#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:768
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -4822,11 +4878,13 @@ msgstr "% å·²å®?æ??"
 msgid "In progress"
 msgstr "æ£å?¨é?²è¡?"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28
+#: ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "å¤§æ?¼"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29
+#: ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "å°?æ?¼"
 
@@ -6572,7 +6630,7 @@ msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:292
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
@@ -6588,7 +6646,8 @@ msgstr "æ?°å¯«æ?°é?µä»¶(_M)"
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:308 ../shell/e-shell-window-actions.c:1489
+#: ../composer/e-composer-actions.c:308
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Configure Evolution"
 msgstr "è¨å®? Evolution"
 
@@ -6624,7 +6683,8 @@ msgstr "å?²å?ç?ºè??ç¨¿(_D)"
 msgid "Save as draft"
 msgstr "å?²å?ç?ºè??ç¨¿"
 
-#: ../composer/e-composer-actions.c:367 ../composer/e-composer-private.c:347
+#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-private.c:347
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
@@ -6716,58 +6776,55 @@ msgstr "å??æ??å??è¦?æ¬?ä½?ç??é¡¯ç¤ºç??æ??"
 msgid "Save Draft"
 msgstr "å?²å?è??ç¨¿"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:36
 msgid "Enter the recipients of the message"
 msgstr "è¼¸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "è¼¸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../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:41
+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:1006
+#: ../composer/e-composer-header-table.c:1004
 msgid "Fr_om:"
 msgstr "å¯?ä»¶è??(_O):"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1013
 msgid "_Reply-To:"
 msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:1019
+#: ../composer/e-composer-header-table.c:1017
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:1024
+#: ../composer/e-composer-header-table.c:1022
 msgid "_Cc:"
 msgstr "å?¯æ?¬(_C):"
 
-#: ../composer/e-composer-header-table.c:1029
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Bcc:"
 msgstr "å¯?ä»¶å?¯æ?¬(_B):"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1032
 msgid "_Post To:"
 msgstr "å¼µè²¼å?°(_P):"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1036
 msgid "S_ubject:"
 msgstr "ä¸»æ?¨(_U):"
 
-#: ../composer/e-composer-header-table.c:1047
+#: ../composer/e-composer-header-table.c:1045
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "æ??é??è£¡æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:127
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£¡ï¼?é?¸å??è¦?å¼µè²¼ç??è³?æ??å¤¾"
 
@@ -6793,33 +6850,29 @@ msgstr "å?²å?è??ç¨¿"
 
 #: ../composer/e-msg-composer.c:784
 #, c-format
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?ç°½ç½²é??å?ºç??é?µä»¶ï¼?æ¤å¸³è??æ²?æ??è¨å®?ç°½ç« æ??è?"
 
 #: ../composer/e-msg-composer.c:793
 #, c-format
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
+msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??è¨å®?å? å¯?æ??è?(æ¤å¸³è??)"
 
-#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2058
+#: ../composer/e-msg-composer.c:1675
+#: ../composer/e-msg-composer.c:2058
 msgid "Compose Message"
 msgstr "ç·¨è¼¯é?µä»¶"
 
-#: ../composer/e-msg-composer.c:4134
+#: ../composer/e-msg-composer.c:4116
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4839
+#: ../composer/e-msg-composer.c:4821
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
+msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
 msgstr "é??è£¡æ??ä¸?äº?é??ä»¶è¦?ä¸?è¼?ã??å?³é??æ¤é?µä»¶å°?ç?¡æ³?ä¸?ä½µå¯?å?ºæ?¥ä¸?ä¾?ç??é??ä»¶"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -6839,9 +6892,7 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "å?¨å¯?ä¿¡æ??ç?¼ç??é?¯èª¤ã??æ?¨è¦?å¦?ä½?ç¹¼çº?ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr "ç¢ºå®?è¦?æ?¾æ£?æ£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -6853,22 +6904,12 @@ msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid ""
-"Because you are working offline, the message will be 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 å·¥å?·å??ç??å?³é??/æ?¥æ?¶æ??é??ä¾?å¯?å?ºé?µä»¶ã??"
+msgid "Because you are working offline, the message will be 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 ""
-"é?¤é??æ?¨é?¸æ??å?²å?é?µä»¶è?³ã??è??ç¨¿ã??è³?æ??å¤¾ï¼?å?¦å??é??é??æ¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å?è??"
-"ç¨¿å?¯ä»¥è®?æ?¨ä»¥å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
+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:11
 msgid "Could not create message."
@@ -6899,11 +6940,8 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å?è?³è?ªå??å?²å?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
 #: ../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 æ??å¤?çµ?æ??ã??å¾©å??é?µä»¶å?¯ä»¥è®?æ?¨å¾?å??ä¾?ä¸æ?·ç??å?°æ?¹ç¹¼çº?ã??"
+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:19
 msgid "Saving message to Outbox."
@@ -6913,14 +6951,13 @@ 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 ../mail/mail.error.xml.h:117
+#: ../composer/mail-composer.error.xml.h:21
+#: ../mail/mail.error.xml.h:117
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??"
 
 #: ../composer/mail-composer.error.xml.h:22
-msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
+msgid "The reported error was &quot;{0}&quot;. The message has most likely not been saved."
 msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å¾?å?¯è?½æ²?æ??å?²å?ã??"
 
 #: ../composer/mail-composer.error.xml.h:23
@@ -7059,48 +7096,32 @@ msgid "Sending"
 msgstr "å?³é??ä¸"
 
 #: ../capplet/settings/mail-account-view.c:590
-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. "
-"If we can't do it automatically you'll need your server details as well."
-msgstr ""
-"è¦?ä½¿ç?¨é??å??é?»å?é?µä»¶ç¨?å¼?æ?¨é??è¦?å??è¨å®?ä¸?å??å¸³è??ã??è«?å?¨ä¸?é?¢æ??ä¾?æ?¨ç??é?»å?é?µä»¶ä½?å??å??å¯?"
-"ç¢¼ï¼?æ??å??æ??å??è©¦ä¸¦æ?¾å?ºæ??æ??ç??è¨å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ¥é©?ï¼?æ?¨å°±é??è¦?ä½¿ç?¨"
-"è?ªå·±å¸³è??ç??ä¼ºæ??å?¨è©³ç´°è³?æ??ã??"
+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. If we can't do it automatically you'll need your server details as well."
+msgstr "è¦?ä½¿ç?¨é??å??é?»å?é?µä»¶ç¨?å¼?æ?¨é??è¦?å??è¨å®?ä¸?å??å¸³è??ã??è«?å?¨ä¸?é?¢æ??ä¾?æ?¨ç??é?»å?é?µä»¶ä½?å??å??å¯?ç¢¼ï¼?æ??å??æ??å??è©¦ä¸¦æ?¾å?ºæ??æ??ç??è¨å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ¥é©?ï¼?æ?¨å°±é??è¦?ä½¿ç?¨è?ªå·±å¸³è??ç??ä¼ºæ??å?¨è©³ç´°è³?æ??ã??"
 
 #: ../capplet/settings/mail-account-view.c:592
-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 "
-"entered but you may need to change them."
-msgstr ""
-"æ?±æ?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºæ?¨ç??é?µä»¶è¨å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??ä»¥æ?¨å??å??è¼¸å?¥ç??"
-"è©³ç´°è³?æ??è©¦è??é??å§?ï¼?ä½?æ?¯æ?¨ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
+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 entered but you may need to change them."
+msgstr "æ?±æ?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºæ?¨ç??é?µä»¶è¨å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??ä»¥æ?¨å??å??è¼¸å?¥ç??è©³ç´°è³?æ??è©¦è??é??å§?ï¼?ä½?æ?¯æ?¨ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
 
 #: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?è¨å®?é??å??å¸³è??ç??é?¸é ?ã??"
 
 #: ../capplet/settings/mail-account-view.c:596
-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."
-msgstr ""
-"ç?¾å?¨æ??å??é??è¦?æ?¨ç??è¨å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?è©¦è??ç??æ¸¬é?¨å??è¨å®?ï¼?ä½?æ?¯æ?¨æ??è©²æª¢æ?¥"
-"å®?å??ä»¥é?²è¡?ç¢ºèª?ã??"
+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."
+msgstr "ç?¾å?¨æ??å??é??è¦?æ?¨ç??è¨å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?è©¦è??ç??æ¸¬é?¨å??è¨å®?ï¼?ä½?æ?¯æ?¨æ??è©²æª¢æ?¥å®?å??ä»¥é?²è¡?ç¢ºèª?ã??"
 
 #: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "æ?¨å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?è¨è¨å®?å?¼ã??"
 
 #: ../capplet/settings/mail-account-view.c:598
-msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
+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:613
-#: ../mail/em-account-editor.c:2093 ../mail/em-account-editor.c:2214
+#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2212
 msgid "Identity"
 msgstr "èº«å??"
 
@@ -7152,7 +7173,7 @@ msgid "Back - Receiving options"
 msgstr "ä¸?ä¸?æ¥ - æ?¥æ?¶é?¸é ?"
 
 #: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3045
+#: ../mail/em-account-editor.c:3043
 msgid "Defaults"
 msgstr "é ?è¨å?¼"
 
@@ -7193,13 +7214,8 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
 
 #: ../capplet/settings/mail-account-view.c:784
-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 "
-"correct."
-msgstr ""
-"Yahoo è¡?äº?æ??æ??å?½å??ç?º å??å?_å§?æ°?ã??æ??å??å·²å??è©¦çµ?æ??é??å??è¡?äº?æ??ç??å??ç¨±ã??å? æ¤è«?ç¢ºèª?"
-"å®?ï¼?å¦?æ??æ??é?¯èª¤è«?é??æ?°è¼¸å?¥è¡?äº?æ??ç??å??ç¨±ã??"
+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 correct."
+msgstr "Yahoo è¡?äº?æ??æ??å?½å??ç?º å??å?_å§?æ°?ã??æ??å??å·²å??è©¦çµ?æ??é??å??è¡?äº?æ??ç??å??ç¨±ã??å? æ¤è«?ç¢ºèª?å®?ï¼?å¦?æ??æ??é?¯èª¤è«?é??æ?°è¼¸å?¥è¡?äº?æ??ç??å??ç¨±ã??"
 
 #: ../capplet/settings/mail-account-view.c:793
 msgid "Yahoo account settings:"
@@ -7227,19 +7243,24 @@ msgid "Evolution account assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:353 ../mail/e-mail-migrate.c:680
-#: ../mail/e-mail-store.c:228 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:218
-#: ../mail/message-list.c:1725
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:353
+#: ../mail/e-mail-migrate.c:680
+#: ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:146
+#: ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:163
+#: ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1721
+#: ../modules/addressbook/e-book-shell-backend.c:92
 #: ../modules/addressbook/e-book-shell-migrate.c:135
-#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-backend.c:103
 #: ../modules/calendar/e-cal-shell-migrate.c:150
-#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:106
-#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-backend.c:92
 #: ../modules/calendar/e-task-shell-migrate.c:117
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
@@ -7269,7 +7290,8 @@ msgstr "è¡?äº?æ??äº?ä»¶é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution é¬§é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:955
+#: ../data/evolution.desktop.in.in.h:1
+#: ../mail/e-mail-browser.c:952
 #: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
@@ -7279,7 +7301,8 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3
+#: ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupware å¥?è£?è»?é«?"
 
@@ -7296,36 +7319,36 @@ msgid "Email Settings"
 msgstr "é?»å?é?µä»¶è¨å®?å?¼"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:223
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ï¼?å·²å??æ¶?ï¼?"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ï¼?å·²å®?æ??ï¼? "
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (æ£å?¨ç?å¾?)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
+#: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (æ£å?¨å??æ¶?)"
 
-#: ../e-util/e-activity.c:239
+#: ../e-util/e-activity.c:235
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:244
+#: ../e-util/e-activity.c:240
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
@@ -7387,12 +7410,16 @@ msgid "Western European, New"
 msgstr "è¿?ä»£è¥¿æ?èª?ç³»"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:85
+#: ../e-util/e-charset.c:87
+#: ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "æ£é«?"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:91
+#: ../e-util/e-charset.c:93
+#: ../e-util/e-charset.c:95
 #: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "ç°¡é«?"
@@ -7416,7 +7443,8 @@ msgid "Today"
 msgstr "ä»?å¤©"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:207 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:207
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??å¤©"
 
@@ -7424,22 +7452,80 @@ msgstr "æ??å¤©"
 msgid "Yesterday"
 msgstr "æ?¨å¤©"
 
-#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
-#. ngettext is used to be able to define different translations for different days of week, where
-#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
-#: ../e-util/e-datetime-format.c:215
-#, c-format
-msgid "Next %a"
-msgid_plural "Next %a"
-msgstr[0] "ä¸?%a"
-msgstr[1] "ä¸?%a"
-
-#: ../e-util/e-datetime-format.c:292 ../e-util/e-datetime-format.c:302
-#: ../e-util/e-datetime-format.c:311
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:217
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Mon"
+msgstr "ä¸?é?±ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:223
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Tue"
+msgstr "ä¸?é?±äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:229
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Wed"
+msgstr "ä¸?é?±ä¸?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:235
+#| msgid "Next _Thread"
+msgctxt "DateFmt"
+msgid "Next Thu"
+msgstr "ä¸?é?±å??"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:241
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Fri"
+msgstr "ä¸?é?±äº?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:247
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sat"
+msgstr "ä¸?é?±å?"
+
+#. Translators: This is used for abbreviated days in the future.
+#. You can use strftime modifiers here too, like "Next %a", to avoid
+#. repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:253
+#| msgid "Next %a"
+#| msgid_plural "Next %a"
+msgctxt "DateFmt"
+msgid "Next Sun"
+msgstr "ä¸?é?±æ?¥"
+
+#: ../e-util/e-datetime-format.c:335
+#: ../e-util/e-datetime-format.c:345
+#: ../e-util/e-datetime-format.c:354
 msgid "Use locale default"
 msgstr "ä½¿ç?¨å?°å??è¨å®?é ?è¨å?¼"
 
-#: ../e-util/e-datetime-format.c:508
+#: ../e-util/e-datetime-format.c:551
 msgid "Format:"
 msgstr "æ ¼å¼?ï¼?"
 
@@ -7460,7 +7546,8 @@ msgstr "æ£å?¨å¯«å?¥ã??%sã??"
 msgid "Writing \"%s\" to %s"
 msgstr "æ£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../e-util/e-plugin-util.c:426
+#: ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:378
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
@@ -7475,8 +7562,7 @@ msgid "The printing system reported the following details about the error:"
 msgstr "å??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ¤é?¯èª¤ç??è©³ç´°è³?è¨?ï¼?"
 
 #: ../e-util/e-print.c:170
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "å??å?°ç³»çµ±æ²?æ??å??å ±ä»»ä½?é??æ?¼æ¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
 #: ../e-util/e-signature.c:707
@@ -7503,7 +7589,8 @@ msgstr "è¦?è¦?å¯«å®??"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:157
+#: ../e-util/e-system.error.xml.h:6
+#: ../mail/mail.error.xml.h:157
 msgid "_Overwrite"
 msgstr "è¦?å¯«(_O)"
 
@@ -7524,58 +7611,77 @@ msgstr "GConf é?¯èª¤ï¼?%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?ç«¯æ©?ä¸é¡¯ç¤ºã??"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1050
-#: ../mail/e-mail-tag-editor.c:328 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format-quote.c:283
+#: ../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:70
 msgid "From"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1051
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1051
 #: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1053
-#: ../mail/em-format-html.c:2400 ../mail/em-format-html.c:2468
-#: ../mail/em-format-html.c:2491 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2397
+#: ../mail/em-format-html.c:2465
+#: ../mail/em-format-html.c:2488
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:283 ../em-format/em-format.c:1054
-#: ../mail/em-format-html.c:2401 ../mail/em-format-html.c:2472
-#: ../mail/em-format-html.c:2494 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:283
+#: ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2398
+#: ../mail/em-format-html.c:2469
+#: ../mail/em-format-html.c:2491
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "å¯?ä»¶å?¯æ?¬"
 
-#: ../em-format/em-format-quote.c:427 ../em-format/em-format.c:1055
-#: ../mail/e-mail-tag-editor.c:333 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/em-format-quote.c:427
+#: ../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:75
 #: ../plugins/groupwise-features/notification.ui.h:2
-#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "ä¸»æ?¨"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:438 ../mail/em-format-html.c:2588
+#: ../em-format/em-format-quote.c:438
+#: ../mail/em-format-html.c:2585
 #: ../modules/mail/em-mailer-prefs.c:1119
 msgid "Mailer"
 msgstr "å¯?ä»¶è??"
 
-#: ../em-format/em-format-quote.c:519 ../mail/em-composer-utils.c:1159
+#: ../em-format/em-format-quote.c:519
+#: ../mail/em-composer-utils.c:1179
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
+#: ../em-format/em-format.c:1056
+#: ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:76
+#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1057
+#: ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾¤çµ?"
 
-#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1058
+#: ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "é?¢è²?"
@@ -7585,165 +7691,172 @@ msgstr "é?¢è²?"
 msgid "%s attachment"
 msgstr "%s é??ä»¶"
 
-#: ../em-format/em-format.c:1559
+#: ../em-format/em-format.c:1566
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1741 ../em-format/em-format.c:1935
+#: ../em-format/em-format.c:1748
+#: ../em-format/em-format.c:1942
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?è§£æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1751
+#: ../em-format/em-format.c:1758
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1771
+#: ../em-format/em-format.c:1778
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1772
+#: ../em-format/em-format.c:1779
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1960
+#: ../em-format/em-format.c:1967
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1973 ../em-format/em-format.c:2145
+#: ../em-format/em-format.c:1980
+#: ../em-format/em-format.c:2159
 msgid "Error verifying signature"
 msgstr "æª¢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1974 ../em-format/em-format.c:2132
+#: ../em-format/em-format.c:1981
 #: ../em-format/em-format.c:2146
+#: ../em-format/em-format.c:2160
 msgid "Unknown error verifying signature"
 msgstr "æª¢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2237
+#: ../em-format/em-format.c:2251
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?è§£æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2243 ../mail/em-folder-tree.c:660
-#: ../mail/mail-ops.c:624 ../plugins/caldav/caldav-browse-server.c:210
-#: ../plugins/caldav/caldav-browse-server.c:1407 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2257
+#: ../mail/em-folder-tree.c:656
+#: ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:210
+#: ../plugins/caldav/caldav-browse-server.c:1407
+#: ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "1 ç§?å¾?"
 msgstr[1] "%d ç§?å¾?"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "1 å??é??å¾?"
 msgstr[1] "%d å??é??å¾?"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "1 å°?æ??å¾?"
 msgstr[1] "%d å°?æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "1 å¤©å¾?"
 msgstr[1] "%d å¤©å¾?"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "1 é?±å¾?"
 msgstr[1] "%d é?±å¾?"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "1 å??æ??å¾?"
 msgstr[1] "%d å??æ??å¾?"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "1 å¹´å¾?"
 msgstr[1] "%d å¹´å¾?"
 
-#: ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£¡é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
-#: ../filter/e-filter-datespec.c:158
+#: ../filter/e-filter-datespec.c:132
+#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:154
 msgid "now"
 msgstr "ç?¾å?¨"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:143
+#: ../filter/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
-msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
+msgstr "%Y-%b-%d"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:282
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -7751,70 +7864,73 @@ msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:666
+#: ../filter/e-filter-rule.c:662
 msgid "R_ule name:"
 msgstr "è¦?å??å??ç¨±(_U):"
 
-#: ../filter/e-filter-rule.c:696
+#: ../filter/e-filter-rule.c:692
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?ä»¶ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:717
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:718
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?ä»¶ç¬¦å??"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:721
 msgid "_Find items:"
 msgstr "å°?æ?¾é ?ç?®(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:750
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:751
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:752
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:753
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:754
 msgid "No reply or parent"
 msgstr "æ²?æ??å??å¾©æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:757
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:786
+#: ../filter/e-filter-rule.c:782
 msgid "A_dd Condition"
 msgstr "å? å?¥æ¢?ä»¶(_D)"
 
-#: ../filter/e-filter-rule.c:1133 ../filter/filter.ui.h:2
+#: ../filter/e-filter-rule.c:1130
+#: ../filter/filter.ui.h:2
 #: ../mail/em-utils.c:316
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1133 ../mail/em-utils.c:317
+#: ../filter/e-filter-rule.c:1130
+#: ../mail/em-utils.c:317
 msgid "Outgoing"
 msgstr "å¤?å¯?"
 
-#: ../filter/e-rule-editor.c:267
+#: ../filter/e-rule-editor.c:263
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/e-rule-editor.c:353
+#: ../filter/e-rule-editor.c:349
 msgid "Edit Rule"
 msgstr "ç·¨è¼¯è¦?å??"
 
@@ -7838,7 +7954,8 @@ msgstr "ç¼ºå°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "ç¼ºå°?æª?æ¡?å??ç¨±ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
+#: ../filter/filter.error.xml.h:6
+#: ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "ç¼ºå°?å??ç¨±ã??"
 
@@ -7894,7 +8011,8 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??æ¿¾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
+#: ../filter/filter.ui.h:11
+#: ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "é??æ¿¾å?¨è¦?å??(_F)"
 
@@ -7931,48 +8049,52 @@ msgstr "æ?¨æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1053 ../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
+#: ../mail/e-mail-attachment-bar.c:86
+#: ../mail/e-mail-attachment-bar.c:91
+#: ../mail/em-format-html-display.c:1122
+#: ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:124
+#: ../widgets/misc/e-attachment-paned.c:129
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??ä»¶"
 msgstr[1] "é??ä»¶"
 
-#: ../mail/e-mail-attachment-bar.c:606
-#: ../widgets/misc/e-attachment-paned.c:621
+#: ../mail/e-mail-attachment-bar.c:604
+#: ../widgets/misc/e-attachment-paned.c:619
 msgid "Icon View"
 msgstr "å??ç¤ºæª¢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:606
+#: ../widgets/misc/e-attachment-paned.c:621
 msgid "List View"
 msgstr "æ¸?å?®æª¢è¦?"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:1405
+#: ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1405
 #: ../shell/e-shell-window-actions.c:1412
 #: ../shell/e-shell-window-actions.c:1419
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:282
 msgid "(No Subject)"
 msgstr "(æ²?æ??ä¸»æ?¨)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:62
 msgid "_Add to Address Book..."
 msgstr "å? å?¥å?°é??è¨?é??(_A)â?¦"
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:69
 msgid "_To This Address"
 msgstr "å?°é??å??ä½?å??(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:76
 msgid "_From This Address"
 msgstr "å¾?é??å??ä½?å??(_F)"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:85
 msgid "Create Search _Folder"
 msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
 
@@ -7981,44 +8103,44 @@ msgstr "å»ºç«?æ??å°?è³?æ??å¤¾(_F)"
 msgid "Saving message to folder '%s'"
 msgstr "å?²å?é?µä»¶å?°è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-label-dialog.c:222
+#: ../mail/e-mail-label-dialog.c:219
 msgid "_Label name:"
 msgstr "æ¨?ç±¤å??ç¨±(_L):"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:37
 msgid "I_mportant"
 msgstr "é??è¦?(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:38
 msgid "_Work"
 msgstr "å·¥ä½?(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:39
 msgid "_Personal"
 msgstr "å??äºº(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:40
 msgid "_To Do"
 msgstr "å¾?è¾¦äº?é ?(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:41
 msgid "_Later"
 msgstr "ç¨?å¾?(_L)"
 
-#: ../mail/e-mail-label-manager.c:165
+#: ../mail/e-mail-label-manager.c:161
 #: ../modules/mail/e-mail-shell-view-actions.c:627
 msgid "Add Label"
 msgstr "å? å?¥æ¨?ç±¤"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:212
 msgid "Edit Label"
 msgstr "ç·¨è¼¯æ¨?ç±¤"
 
-#: ../mail/e-mail-label-manager.c:349
+#: ../mail/e-mail-label-manager.c:346
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -8026,11 +8148,11 @@ msgstr ""
 "æ³¨æ??ï¼?å?¨æ¨?ç±¤å??ç¨±ä¸ç??åº?ç·?æ?¯ç?¨ä¾?\n"
 "æ¨?è¨?é?¸å?®ä¸ç??æ?·å¾?é?µã??"
 
-#: ../mail/e-mail-label-tree-view.c:86
+#: ../mail/e-mail-label-tree-view.c:84
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/e-mail-label-tree-view.c:96
+#: ../mail/e-mail-label-tree-view.c:94
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 #: ../plugins/caldav/caldav-browse-server.c:1296
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
@@ -8039,29 +8161,35 @@ msgstr "é¡?è?²"
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
-#: ../mail/em-folder-tree-model.c:741 ../mail/em-folder-tree.c:3144
+#: ../mail/e-mail-local.c:35
+#: ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:738
+#: ../mail/em-folder-tree.c:3138
 #: ../modules/mail/e-mail-shell-view-private.c:1118
 #: ../modules/mail/e-mail-shell-view-private.c:1129
 msgid "Inbox"
 msgstr "æ?¶ä»¶å?£"
 
-#: ../mail/e-mail-local.c:36 ../mail/em-folder-tree-model.c:733
+#: ../mail/e-mail-local.c:36
+#: ../mail/em-folder-tree-model.c:730
 #: ../modules/mail/e-mail-shell-view-private.c:1116
 msgid "Drafts"
 msgstr "è??ç¨¿"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:745
+#: ../mail/e-mail-local.c:37
+#: ../mail/em-folder-tree-model.c:742
 #: ../modules/mail/e-mail-shell-view-private.c:1120
 msgid "Outbox"
 msgstr "å¯?ä»¶å?£"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:747
+#: ../mail/e-mail-local.c:38
+#: ../mail/em-folder-tree-model.c:744
 #: ../modules/mail/e-mail-shell-view-private.c:1122
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:736
+#: ../mail/e-mail-local.c:39
+#: ../mail/em-folder-tree-model.c:733
 #: ../modules/mail/e-mail-shell-view-private.c:1124
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:581
@@ -8087,8 +8215,7 @@ msgstr "æ£å?¨è½?ç§»è³?æ??å¤¾"
 
 #: ../mail/e-mail-migrate.c:661
 msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -8101,7 +8228,7 @@ msgstr ""
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ç?¡æ³?å?¨ã??%sã??å»ºç«?æ?¬å?°é?µä»¶è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:566
+#: ../mail/e-mail-notebook-view.c:562
 msgid "Please select a folder"
 msgstr "è«?é?¸æ??è³?æ??å¤¾"
 
@@ -8113,11 +8240,13 @@ msgstr "è«?é?¸æ??è³?æ??å¤¾"
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:306
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?è£½è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:306 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:306
+#: ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "è¤?è£½(_O)"
 
@@ -8125,34 +8254,33 @@ msgstr "è¤?è£½(_O)"
 #. %d with count of duplicate messages.
 #: ../mail/e-mail-reader.c:523
 #, c-format
-msgid ""
-"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
-"them?"
+msgid "Folder '%s' contains %d duplicate message. Are you sure you want to delete it?"
+msgid_plural "Folder '%s' contains %d duplicate messages. Are you sure you want to delete them?"
 msgstr[0] "è³?æ??å¤¾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??æ?¨ç¢ºå®?è¦?å?ªé?¤å®?ï¼?"
 msgstr[1] "è³?æ??å¤¾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??æ?¨ç¢ºå®?è¦?å?ªé?¤å®?å??ï¼?"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:986
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ç§»è?³è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:986 ../mail/em-folder-utils.c:421
+#: ../mail/e-mail-reader.c:986
+#: ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:1265 ../mail/e-mail-reader.c:1421
-#: ../mail/e-mail-reader.c:1463
+#: ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1423
+#: ../mail/e-mail-reader.c:1467
 msgid "_Do not ask me again."
 msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1472
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
 
-#: ../mail/e-mail-reader.c:1575
+#: ../mail/e-mail-reader.c:1581
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "å?²å?é?µä»¶"
@@ -8164,7 +8292,7 @@ msgstr[1] "å?²å?é?µä»¶"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:1596
+#: ../mail/e-mail-reader.c:1602
 #: ../plugins/groupwise-features/notification.ui.h:1
 #: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
@@ -8172,660 +8300,672 @@ msgid_plural "Messages"
 msgstr[0] "é?µä»¶"
 msgstr[1] "é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:1876
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?ä»¶è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1878
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?ä»¶è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1883
 msgid "Check for _Junk"
 msgstr "æª¢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1885
 msgid "Filter the selected messages for junk status"
 msgstr "ç¯©é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:1890
 msgid "_Copy to Folder..."
 msgstr "è¤?è£½è?³è³?æ??å¤¾(_C)â?¦"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1892
 msgid "Copy selected messages to another folder"
 msgstr "è¤?è£½å·²é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1897
 msgid "_Delete Message"
 msgstr "å?ªé?¤é?µä»¶(_D)"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1899
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:1904
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??æ¿¾å?¨(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??æ¿¾å?¨(_R)â?¦"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:1918
 msgid "Filter on Se_nder..."
 msgstr "å¯?ä»¶è??é??æ¿¾å?¨(_N)â?¦"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1920
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:1925
 msgid "Filter on _Subject..."
 msgstr "ä¸»æ?¨é??æ¿¾å?¨(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1927
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?é??æ¿¾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:1932
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??æ¿¾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1934
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??æ¿¾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:1939
 msgid "_Find in Message..."
 msgstr "å?¨é?µä»¶å?§å°?æ?¾(_F)â?¦"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1941
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?é¡¯ç¤ºç??é?µä»¶æ?¬æ??ä¸ç??æ??å?"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:1946
 msgid "_Clear Flag"
 msgstr "æ¸?é?¤æ¨?å¹?(_C)"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1948
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "ç§»é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:1953
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1955
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?è¨ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1954
+#: ../mail/e-mail-reader.c:1960
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1962
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1967
 msgid "_Attached"
 msgstr "é??ä»¶(_A)"
 
-#: ../mail/e-mail-reader.c:1963 ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??ä»¶å½¢å¼?è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Attached"
 msgstr "ä»¥é??ä»¶è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1981
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1977 ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??ä¸"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Inline"
 msgstr "ä»¥è¡?å?§è½?å¯?(_I)"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1995
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1991 ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2004
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:2002
 msgid "Forward As _Quoted"
 msgstr "ä»¥å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2009
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2011
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2016
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2023
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2030
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?ç¤ºæ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2037
 msgid "_Read"
 msgstr "å·²é?±è®?(_R)"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2044
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2046
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2051
 msgid "_Unread"
 msgstr "æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2053
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?ç¤ºæ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2058
 msgid "_Edit as New Message..."
 msgstr "ç·¨è¼¯ç?ºæ?°é?µä»¶(_E)â?¦"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2065
 msgid "Compose _New Message"
 msgstr "æ?°å¯«æ?°é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2067
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?ä»¥ä¾¿æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2072
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2074
 msgid "Open the selected messages in a new window"
 msgstr "ä½¿ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2079
 msgid "_Move to Folder..."
 msgstr "ç§»è?³è³?æ??å¤¾(_M)â?¦"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2081
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2086
 msgid "_Switch to Folder"
 msgstr "å??æ??è?³è³?æ??å¤¾(_S)"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the parent folder"
 msgstr "é¡¯ç¤ºä¸?å±¤è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2093
 msgid "Switch to _next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2095
 msgid "Switch to the next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2100
 msgid "Switch to _previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2102
 msgid "Switch to the previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2107
 msgid "Cl_ose current tab"
 msgstr "é??é??ç?®å??ç??å??é ?(_O)"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2109
 msgid "Close current tab"
 msgstr "é??é??ç?®å??ç??å??é ?"
 
-#: ../mail/e-mail-reader.c:2108
+#: ../mail/e-mail-reader.c:2114
 msgid "_Next Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the next message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2115
+#: ../mail/e-mail-reader.c:2121
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the next important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2128
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2130
 msgid "Display the next thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2135
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2137
 msgid "Display the next unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2142
 msgid "_Previous Message"
 msgstr "ä¸?ä¸?å°?é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2144
 msgid "Display the previous message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2149
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2151
 msgid "Display the previous important message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2150
+#: ../mail/e-mail-reader.c:2156
 msgid "Previous T_hread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_H)"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2158
 msgid "Display the previous thread"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2157
+#: ../mail/e-mail-reader.c:2163
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2165
 msgid "Display the previous unread message"
 msgstr "é¡¯ç¤ºä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2172
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2179
 msgid "Preview the message to be printed"
 msgstr "é ?è¦½é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2184
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2186
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2191
 msgid "Remo_ve Attachments"
 msgstr "ç§»é?¤é??ä»¶(_V)"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2193
 msgid "Remove attachments"
 msgstr "ç§»é?¤é??ä»¶"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2198
 msgid "Remove Du_plicate Messages"
 msgstr "ç§»é?¤é??è¤?ç??é?µä»¶(_P)"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2200
 msgid "Checks selected messages for duplicates"
 msgstr "æª¢æ?¥é?¸å??ç??é?µä»¶æ?¯å?¦æ??é??è¤?"
 
-#: ../mail/e-mail-reader.c:2199 ../mail/mail.error.xml.h:102
+#: ../mail/e-mail-reader.c:2205
+#: ../mail/mail.error.xml.h:102
 #: ../modules/calendar/e-cal-shell-view-actions.c:1465
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../modules/mail/e-mail-attachment-handler.c:179
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??äºº(_A)"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2207
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:2206 ../mail/mail.error.xml.h:103
+#: ../mail/e-mail-reader.c:2212
+#: ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2214
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:2213
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2219
+#: ../modules/mail/e-mail-attachment-handler.c:186
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?ä»¶è??(_R)"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2221
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?ä»¶è??"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2226
 msgid "_Save as mbox..."
 msgstr "å?²å?æ?? mbox(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2228
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2233
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??å¤¾(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2235
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2240
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??å¤¾(_T)â?¦"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2242
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2247
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?ä»¶è??æ??å°?è³?æ??å¤¾(_D)â?¦"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2249
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?ä»¶è??å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2254
 msgid "Search Folder from S_ubject..."
 msgstr "ä¸»æ?¨æ??å°?è³?æ??å¤¾(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2256
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??ä¸»æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??å¤¾"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2261
 msgid "_Message Source"
 msgstr "é?µä»¶ä¾?æº?(_M)"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2263
 msgid "Show the raw email source of the message"
 msgstr "é¡¯ç¤ºé?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2275
 msgid "_Undelete Message"
 msgstr "å¾©å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2277
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2282
 msgid "_Normal Size"
 msgstr "æ£å¸¸å¤§å°?(_N)"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2284
 msgid "Reset the text to its original size"
 msgstr "é??è¨æ??å?ç?ºå??å§?å¤§å°?"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2289
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2291
 msgid "Increase the text size"
 msgstr "å°?æ??å?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2296
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2298
 msgid "Decrease the text size"
 msgstr "å°?æ??å?ç¸®å°?"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2305
 msgid "Create R_ule"
 msgstr "å»ºç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2312
 msgid "Ch_aracter Encoding"
 msgstr "å?å??ç·¨ç¢¼(_A)"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2319
 msgid "F_orward As"
 msgstr "è½?å¯?ç?º(_O)"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2326
 msgid "_Group Reply"
 msgstr "ç¾¤çµ?å??è¦?(_G)"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2333
 msgid "_Go To"
 msgstr "ç§»è?³(_G)"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2340
 msgid "Mar_k As"
 msgstr "æ¨?ç¤ºæ??(_K)"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2347
 msgid "_Message"
 msgstr "é?µä»¶(_M)"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2354
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2379
 msgid "Mark for Follo_w Up..."
 msgstr "æ¨?ç¤ºç?ºè·?é?¨(_W)â?¦"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2387
 msgid "Mark as _Important"
 msgstr "æ¨?ç¤ºæ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2391
 msgid "Mark as _Junk"
 msgstr "æ¨?ç¤ºæ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:2389
+#: ../mail/e-mail-reader.c:2395
 msgid "Mark as _Not Junk"
 msgstr "æ¨?ç¤ºæ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:2393
+#: ../mail/e-mail-reader.c:2399
 msgid "Mar_k as Read"
 msgstr "æ¨?ç¤ºæ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2403
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?ç¤ºæ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2401
+#: ../mail/e-mail-reader.c:2407
 msgid "Mark as _Unread"
 msgstr "æ¨?ç¤ºæ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2451
 msgid "_Caret Mode"
 msgstr "æ¼?å?æ¨¡å¼?(_C)"
 
-#: ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2453
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??ä¸é¡¯ç¤ºé??ç??æ¸¸æ¨?"
 
-#: ../mail/e-mail-reader.c:2453
+#: ../mail/e-mail-reader.c:2459
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é (_H)"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2461
 msgid "Show messages with all email headers"
 msgstr "é¡¯ç¤ºé?µä»¶å??è©³ç´°æª?é "
 
-#: ../mail/e-mail-reader.c:2693
+#: ../mail/e-mail-reader.c:2699
 msgid "Unable to retrieve message"
 msgstr "ç?¡æ³?æ?¥æ?¶é?µä»¶"
 
-#: ../mail/e-mail-reader.c:2755 ../mail/mail-ops.c:2068
+#: ../mail/e-mail-reader.c:2761
+#: ../mail/mail-ops.c:2068
 #, 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:3373 ../mail/mail-config.ui.h:31
+#: ../mail/e-mail-reader.c:3379
+#: ../mail/mail-config.ui.h:31
 #: ../plugins/google-account-setup/google-source.c:304
 #: ../plugins/google-account-setup/google-source.c:538
 #: ../plugins/google-account-setup/google-source.c:674
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../widgets/misc/e-account-tree-view.c:249
 msgid "Default"
 msgstr "é ?è¨å?¼"
 
-#: ../mail/e-mail-reader.c:3544
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3550
+#: ../modules/mail/e-mail-attachment-handler.c:172
 msgid "_Forward"
 msgstr "è½?å¯?(_F)"
 
-#: ../mail/e-mail-reader.c:3545
+#: ../mail/e-mail-reader.c:3551
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?çµ¦æ??äºº"
 
-#: ../mail/e-mail-reader.c:3564
+#: ../mail/e-mail-reader.c:3570
 msgid "Group Reply"
 msgstr "ç¾¤çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3565
+#: ../mail/e-mail-reader.c:3571
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?çµ¦é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3610 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3616
+#: ../mail/em-filter-i18n.h:14
 #: ../plugins/groupwise-features/share-folder.c:746
 msgid "Delete"
 msgstr "å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:3643
+#: ../mail/e-mail-reader.c:3649
 #: ../modules/calendar/e-cal-shell-view-actions.c:1311
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3647
+#: ../mail/e-mail-reader.c:3653
 #: ../modules/calendar/e-cal-shell-view-actions.c:1304
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3657 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3663
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:4292
+#: ../mail/e-mail-reader.c:4298
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-session.c:647
+#: ../mail/e-mail-session.c:643
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/e-mail-session.c:649
+#: ../mail/e-mail-session.c:645
 msgid "Enter Passphrase"
 msgstr "è¼¸å?¥å¯?èª?"
 
-#: ../mail/e-mail-session.c:652
+#: ../mail/e-mail-session.c:648
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?è¼¸å?¥ %s æ??é??ç??å¯?ç¢¼"
 
-#: ../mail/e-mail-session.c:654
+#: ../mail/e-mail-session.c:650
 msgid "Enter Password"
 msgstr "è¼¸å?¥å¯?ç¢¼"
 
-#: ../mail/e-mail-session.c:705
+#: ../mail/e-mail-session.c:703
 #, c-format
 msgid "User canceled operation."
 msgstr "ä½¿ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/e-mail-session.c:875
+#: ../mail/e-mail-session.c:873
 #, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
+msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:884
+#: ../mail/e-mail-session.c:882
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??å¸³è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/e-mail-session.c:1287 ../mail/mail-ops.c:1220
+#: ../mail/e-mail-session.c:1286
+#: ../mail/mail-ops.c:1220
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??å¤¾ã??%sã??"
 
-#: ../mail/e-mail-session.c:1303
+#: ../mail/e-mail-session.c:1302
 #, c-format
 msgid "Invalid folder: %s"
 msgstr "ç?¡æ??ç??è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:490 ../mail/mail-ops.c:605
+#: ../mail/e-mail-session-utils.c:490
+#: ../mail/mail-ops.c:605
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??æ¿¾å?¨ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:514 ../mail/e-mail-session-utils.c:548
-#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#: ../mail/e-mail-session-utils.c:514
+#: ../mail/e-mail-session-utils.c:548
+#: ../mail/mail-ops.c:622
+#: ../mail/mail-ops.c:653
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -8834,12 +8974,14 @@ msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
 "æ?¹é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??è³?æ??å¤¾ã??"
 
-#: ../mail/e-mail-session-utils.c:568 ../mail/mail-ops.c:673
+#: ../mail/e-mail-session-utils.c:568
+#: ../mail/mail-ops.c:673
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?ä»¶å?£ã??è³?æ??å¤¾ï¼?%s"
 
-#: ../mail/e-mail-session-utils.c:779 ../mail/mail-ops.c:774
+#: ../mail/e-mail-session-utils.c:779
+#: ../mail/mail-ops.c:774
 #: ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æ£å?¨å?³é??é?µä»¶"
@@ -8859,13 +9001,14 @@ msgstr "ä¸æ?·è??ã??%sã??ç??é?£ç·?"
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/e-mail-tag-editor.c:294
+#: ../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:567 ../mail/mail-config.ui.h:69
+#: ../mail/em-account-editor.c:564
+#: ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -8873,7 +9016,8 @@ 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:571 ../mail/mail-config.ui.h:126
+#: ../mail/em-account-editor.c:568
+#: ../mail/mail-config.ui.h:126
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS å? å¯?"
@@ -8881,40 +9025,43 @@ 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:575 ../mail/mail-config.ui.h:91
+#: ../mail/em-account-editor.c:572
+#: ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL å? å¯?"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:838 ../widgets/misc/e-signature-combo-box.c:79
+#: ../mail/em-account-editor.c:835
+#: ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:919
+#: ../mail/em-account-editor.c:916
 msgid "Never"
 msgstr "æ°¸ä¸?"
 
-#: ../mail/em-account-editor.c:920
+#: ../mail/em-account-editor.c:917
 msgid "Always"
 msgstr "æ°¸é? "
 
-#: ../mail/em-account-editor.c:921
+#: ../mail/em-account-editor.c:918
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1703 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1701
+#: ../widgets/misc/e-account-tree-view.c:127
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2090
+#: ../mail/em-account-editor.c:2088
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2091
+#: ../mail/em-account-editor.c:2089
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8924,40 +9071,34 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2094
-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 "
-"information in email you send."
-msgstr ""
-"è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
-"ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
+#: ../mail/em-account-editor.c:2092
+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 information in email you send."
+msgstr "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??ç¨±å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?ºç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2096 ../mail/em-account-editor.c:2259
+#: ../mail/em-account-editor.c:2094
+#: ../mail/em-account-editor.c:2257
 msgid "Receiving Email"
 msgstr "æ?¥æ?¶é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2095
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨å®?ä¸?å??å¸³è??ç??è¨å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2099 ../mail/em-account-editor.c:2759
+#: ../mail/em-account-editor.c:2097
+#: ../mail/em-account-editor.c:2757
 msgid "Sending Email"
 msgstr "å?³é??é?»å?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2100
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?"
-"æ??å??ã??"
+#: ../mail/em-account-editor.c:2098
+msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgstr "è«?è¼¸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??ç¶²è·¯æ??å??ä¾?æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2102 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2100
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "å¸³è??è³?è¨?"
 
-#: ../mail/em-account-editor.c:2103
+#: ../mail/em-account-editor.c:2101
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8965,11 +9106,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??ç©ºé??è¼¸å?¥æ??è¿°é??å??å¸³è??ç??å??ç¨±ã??\n"
 "é??å??å??ç¨±å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2105
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2106
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8983,72 +9124,71 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å?è¨å®?ã??"
 
-#: ../mail/em-account-editor.c:2573
+#: ../mail/em-account-editor.c:2571
 msgid "Check for _new messages every"
 msgstr "è?ªå??æª¢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2581
+#: ../mail/em-account-editor.c:2579
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2864
+#: ../mail/em-account-editor.c:2862
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??å¸³è??ç??è³?æ??å¤¾ã??"
 
-#: ../mail/em-account-editor.c:3174 ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:3172
+#: ../mail/mail-config.ui.h:98
 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:3220 ../mail/em-account-editor.c:3288
+#: ../mail/em-account-editor.c:3218
+#: ../mail/em-account-editor.c:3286
 msgid "Receiving Options"
 msgstr "æ?¥æ?¶é?¸é ?"
 
-#: ../mail/em-account-editor.c:3221 ../mail/em-account-editor.c:3289
+#: ../mail/em-account-editor.c:3219
+#: ../mail/em-account-editor.c:3287
 msgid "Checking for New Messages"
 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 mail/em-composer-utils.c:attribvars array
-#: ../mail/em-composer-utils.c:1154
-msgid ""
-"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
-"${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} "
-"${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
+#: ../mail/em-composer-utils.c:1173
+msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgstr "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} ${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:1164
+#: ../mail/em-composer-utils.c:1184
 msgid "-----Original Message-----"
 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:1821
+#. 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:1851
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "æ?¨å¯?çµ¦ %s ä¸»æ?¨ã??%sã?? (%s) ç??é?µä»¶å·²è¢«é?±è®?ã??"
 
-#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1871
+#: ../mail/em-composer-utils.c:1905
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2291
+#: ../mail/em-composer-utils.c:2356
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?ä»¶è??"
 
-#: ../mail/em-composer-utils.c:2715
+#: ../mail/em-composer-utils.c:2787
 msgid "Posting destination"
 msgstr "å¼µè²¼ç??ç?®ç??ç«¯"
 
-#: ../mail/em-composer-utils.c:2716
+#: ../mail/em-composer-utils.c:2788
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??å¤¾ä¾?å¼µè²¼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:341
+#: ../mail/em-filter-folder-element.c:339
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
@@ -9165,7 +9305,8 @@ msgstr "æ?ªè¨å®?"
 msgid "is set"
 msgstr "è¨å®?"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
+#: ../mail/em-filter-i18n.h:41
+#: ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -9214,11 +9355,13 @@ msgid "Play Sound"
 msgstr "æ?æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54
+#: ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "å·²è®?"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55
+#: ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "æ?¶ä»¶è??"
 
@@ -9246,11 +9389,13 @@ msgstr "å?³å??å°?æ?¼"
 msgid "Run Program"
 msgstr "å?·è¡?ç¨?å¼?"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62
+#: ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "å??æ?¸"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "å¯?ä»¶è??"
 
@@ -9332,7 +9477,7 @@ msgstr "é??å?¶ç?¨é??"
 msgid "Folder Properties"
 msgstr "è³?æ??å¤¾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:81
+#: ../mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£¡é?¸æ??è³?æ??å¤¾>"
 
@@ -9345,62 +9490,72 @@ msgid "Folder _name:"
 msgstr "è³?æ??å¤¾å??ç¨±(_N):"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1164 ../mail/mail-vfolder.c:1239
+#: ../mail/em-folder-tree-model.c:147
+#: ../mail/em-folder-tree-model.c:150
+#: ../mail/em-folder-tree-model.c:156
+#: ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:165
+#: ../mail/em-folder-tree-model.c:167
+#: ../mail/mail-vfolder.c:1164
+#: ../mail/mail-vfolder.c:1239
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??å¤¾"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:172
+#: ../mail/em-folder-tree-model.c:174
 msgid "UNMATCHED"
 msgstr "ä¸?ç¬¦å??"
 
-#: ../mail/em-folder-tree-model.c:811 ../mail/em-folder-tree-model.c:1088
+#: ../mail/em-folder-tree-model.c:808
+#: ../mail/em-folder-tree-model.c:1085
 msgid "Loading..."
 msgstr "è¼?å?¥ä¸â?¦"
 
-#: ../mail/em-folder-tree.c:201
+#: ../mail/em-folder-tree.c:197
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??å¤¾"
 
-#: ../mail/em-folder-tree.c:629
+#: ../mail/em-folder-tree.c:625
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??å¤¾å??ç¨±ä¸?è?½å??å?«æ??ç·?ã??"
 
-#: ../mail/em-folder-tree.c:1248
+#: ../mail/em-folder-tree.c:1245
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1484
+#: ../mail/em-folder-tree.c:1482
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??å¤¾æ¨¹"
 
-#: ../mail/em-folder-tree.c:1940 ../mail/em-folder-utils.c:90
+#: ../mail/em-folder-tree.c:1938
+#: ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ£å?¨ç§»å??è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1944 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1942
+#: ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ£å?¨è¤?è£½è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1953 ../mail/message-list.c:2247
+#: ../mail/em-folder-tree.c:1951
+#: ../mail/message-list.c:2243
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ£å?¨å°?é?µä»¶ç§»è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1957 ../mail/message-list.c:2249
+#: ../mail/em-folder-tree.c:1955
+#: ../mail/message-list.c:2245
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ£å?¨è¤?è£½é?µä»¶è?³è³?æ??å¤¾ %s"
 
-#: ../mail/em-folder-tree.c:1976
+#: ../mail/em-folder-tree.c:1974
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?å±¤ç??å?²å?å??"
@@ -9429,140 +9584,123 @@ msgstr "å»ºç«?è³?æ??å¤¾"
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?å»ºç«?è³?æ??å¤¾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html-display.c:84
+#: ../mail/em-format-html.c:1601
 msgid "Unsigned"
 msgstr "æ?ªç°½å??"
 
-#: ../mail/em-format-html-display.c:88
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: ../mail/em-format-html-display.c:84
+msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "æ¤é?µä»¶æ?ªç°½å??ã??ä¸?ä¿?è?æ¤é?µä»¶å·²é©?è?ã??"
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
+#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1602
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:89
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: ../mail/em-format-html-display.c:85
+msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "æ¤é?µä»¶å·²ç°½å??è??ä¸?æ??æ??ï¼?è¡¨ç¤ºå®?é??å¸¸æ??å?¯è?½æ?¯é©?è?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
+#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1603
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:90
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: ../mail/em-format-html-display.c:86
+msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "é?µä»¶ç??ç°½å??ç?¡æ³?æª¢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??è¢«æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
+#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1604
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?æª¢é©?å¯?ä»¶è??"
 
-#: ../mail/em-format-html-display.c:91
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: ../mail/em-format-html-display.c:87
+msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯é?µä»¶ç??å¯?ä»¶è??ç?¡æ³?æª¢é©?ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1605
 msgid "Signature exists, but need public key"
 msgstr "ç°½ç« å?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
-#: ../mail/em-format-html-display.c:92
-msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+#: ../mail/em-format-html-display.c:88
+msgid "This message is signed with a signature, but there is no corresponding public key."
 msgstr "æ¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??é??é?°ã??"
 
-#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
+#: ../mail/em-format-html-display.c:95
+#: ../mail/em-format-html.c:1611
 msgid "Unencrypted"
 msgstr "æ?ªå? å¯?"
 
-#: ../mail/em-format-html-display.c:99
-msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
-"the Internet."
+#: ../mail/em-format-html-display.c:95
+msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "æ¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??ç¶²é??ç¶²è·¯å?³é??å?¯è?½æ??è¢«æª¢é?±ã??"
 
-#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
+#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1612
 msgid "Encrypted, weak"
 msgstr "å·²å? å¯?ï¼?ä¸?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:100
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would be "
-"difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-"æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??"
-"æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
+#: ../mail/em-format-html-display.c:96
+msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??äººå¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?ä¸¦ä¸?æ?¯ç?¡æ³?æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1613
 msgid "Encrypted"
 msgstr "å·²å? å¯?"
 
-#: ../mail/em-format-html-display.c:101
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: ../mail/em-format-html-display.c:97
+msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "æ¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??äººé?£ä»¥æª¢è¦?æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
+#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1614
 msgid "Encrypted, strong"
 msgstr "å·²å? å¯?ï¼?å?´å¯?"
 
-#: ../mail/em-format-html-display.c:102
-msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
-msgstr ""
-"æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶"
-"ç??å?§å®¹ã??"
+#: ../mail/em-format-html-display.c:98
+msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgstr "æ¤é?µä»¶å·²å? å¯?ï¼?ä½¿ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??ç¸±ä½¿ç¶?é??ä¸?æ®µæ??é??ï¼?å¤?é?¢ç??äººå¾?é?£æª¢é?±æ¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:236
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æª¢è¦?æ??è?(_V)"
 
-#: ../mail/em-format-html-display.c:251
+#: ../mail/em-format-html-display.c:249
 msgid "This certificate is not viewable"
 msgstr "æ¤æ??è?ç?¡æ³?æª¢è¦?"
 
-#: ../mail/em-format-html-display.c:506
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹"
-"å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
+#: ../mail/em-format-html-display.c:538
+msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
+msgstr "Evolution ç?¡æ³?é¡¯ç¤ºæ¤å°?é?»å?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??å¤§å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??ä½¿ç?¨å¤?é?¨æ??å?ç·¨è¼¯å?¨ä¾?é?±è®?å®?ã??"
 
-#: ../mail/em-format-html-display.c:749
+#: ../mail/em-format-html-display.c:804
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html-display.c:812
 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:761
+#: ../mail/em-format-html-display.c:816
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
+#: ../mail/em-format-html-display.c:1047
+#: ../mail/em-format-html-display.c:1094
 msgid "View _Unformatted"
 msgstr "æª¢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:980
+#: ../mail/em-format-html-display.c:1049
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1045
+#: ../mail/em-format-html-display.c:1114
 msgid "O_pen With"
 msgstr "ä»¥â?¦é??å??(_O)"
 
@@ -9571,120 +9709,122 @@ msgstr "ä»¥â?¦é??å??(_O)"
 msgid "Page %d of %d"
 msgstr "ç¬¬ %d / %d é ?"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:161
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:364
+#: ../mail/em-format-html.c:360
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶â?¦"
 
-#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
+#: ../mail/em-format-html.c:1445
+#: ../mail/em-format-html.c:1455
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1979
+#: ../mail/em-format-html.c:1976
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1987
+#: ../mail/em-format-html.c:1984
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:2017
+#: ../mail/em-format-html.c:2014
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2028
+#: ../mail/em-format-html.c:2025
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??ç¤º"
 
-#: ../mail/em-format-html.c:2030
+#: ../mail/em-format-html.c:2027
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2051
+#: ../mail/em-format-html.c:2048
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??ç¤º (%s)"
 
-#: ../mail/em-format-html.c:2062
+#: ../mail/em-format-html.c:2059
 #, 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:2766
+#: ../mail/em-format-html.c:2763
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s ä»£è¡¨ %s å¯?å?º"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:82
+#: ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
 msgstr "æ²?æ?? HTML ä¸²æµ?å?¯ç?¨"
 
-#: ../mail/em-subscription-editor.c:1107
+#: ../mail/em-subscription-editor.c:1105
 msgid "Folder Subscriptions"
 msgstr "è³?æ??å¤¾è¨?é?±"
 
-#: ../mail/em-subscription-editor.c:1146
+#: ../mail/em-subscription-editor.c:1144
 msgid "_Account:"
 msgstr "å¸³è??(_A):"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1159
 msgid "Clear Search"
 msgstr "æ¸?é?¤æ??å°?"
 
-#: ../mail/em-subscription-editor.c:1179
+#: ../mail/em-subscription-editor.c:1177
 msgid "Sho_w items that contain:"
 msgstr "é¡¯ç¤ºé ?ç?®å??å?«(_W):"
 
-#: ../mail/em-subscription-editor.c:1218
+#: ../mail/em-subscription-editor.c:1216
 msgid "Subscribe to the selected folder"
 msgstr "è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1219
+#: ../mail/em-subscription-editor.c:1217
 msgid "Su_bscribe"
 msgstr "è¨?é?±(_B)"
 
-#: ../mail/em-subscription-editor.c:1230
+#: ../mail/em-subscription-editor.c:1228
 #: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1231
+#: ../mail/em-subscription-editor.c:1229
 #: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../mail/em-subscription-editor.c:1242
+#: ../mail/em-subscription-editor.c:1240
 msgid "Collapse all folders"
 msgstr "æ?¶æ?ºæ??æ??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1243
+#: ../mail/em-subscription-editor.c:1241
 msgid "C_ollapse All"
 msgstr "å?¨é?¨æ?¶æ?º(_O)"
 
-#: ../mail/em-subscription-editor.c:1253
+#: ../mail/em-subscription-editor.c:1251
 msgid "Expand all folders"
 msgstr "å±?é??æ??æ??ç??è³?æ??å¤¾"
 
-#: ../mail/em-subscription-editor.c:1254
+#: ../mail/em-subscription-editor.c:1252
 msgid "E_xpand All"
 msgstr "å?¨é?¨å±?é??(_X)"
 
-#: ../mail/em-subscription-editor.c:1264
+#: ../mail/em-subscription-editor.c:1262
 msgid "Refresh the folder list"
 msgstr "é??æ?°æ?´ç??è³?æ??å¤¾æ¸?å?®"
 
-#: ../mail/em-subscription-editor.c:1276
+#: ../mail/em-subscription-editor.c:1274
 msgid "Stop the current operation"
 msgstr "å??æ¢ç?®å??ç??æ??ä½?"
 
@@ -9704,11 +9844,11 @@ msgstr[1] "æ?¨ç¢ºå®?è¦?ä¸?æ¬¡é??å?? %d å°?é?µä»¶ï¼?"
 msgid "_Do not show this message again"
 msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:326
+#: ../mail/em-utils.c:328
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:882
+#: ../mail/em-utils.c:904
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
@@ -9717,7 +9857,7 @@ msgstr "ä¾?è?ª %s ç??é?µä»¶"
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??å¤¾(_F)"
 
-#: ../mail/em-vfolder-rule.c:613
+#: ../mail/em-vfolder-rule.c:610
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??å¤¾"
 
@@ -9779,9 +9919,7 @@ msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??ä¸é¡¯ç¤ºç??æ??é??(ç§?)ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+msgid "Asks whether to close the message window when the user forwards or replies to the message shown in the window"
 msgstr "ç?¶ä½¿ç?¨è??è½?å¯?æ??å??è¦?è¦?çª?ä¸é¡¯ç¤ºç??é?µä»¶æ??è©¢å??æ?¯å?¦è¦?é??é??é?µä»¶è¦?çª?"
 
 #: ../mail/evolution-mail.schemas.in.h:16
@@ -9833,15 +9971,11 @@ msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?ç¸®å?¨ TO/CC/BCC ä¸ä½?å??ç??é¡¯ç¤ºæ?¹å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
+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:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
+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:30
@@ -9849,11 +9983,8 @@ msgid "Custom headers to use while checking for junk."
 msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:31
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr ""
-"æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
+msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
+msgstr "æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ã??æ¤æ¸?å?®ä¸ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å?ä¸²ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
@@ -9904,9 +10035,7 @@ msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??è¦½å?¨è¦?çª?ç??é ?è¨å¯¬åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
+msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å?é?µä»¶ä½?å??"
 
 #: ../mail/evolution-mail.schemas.in.h:45
@@ -9914,33 +10043,19 @@ msgid "Determines whether to lookup in address book for sender email"
 msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??"
 
 #: ../mail/evolution-mail.schemas.in.h:46
-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 "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?"
-"æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??"
-"é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
+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 can be slow, if remote address books (like LDAP) are marked for autocompletion."
+msgstr "æ±ºå®?æ?¯å?¦å?¨é??è¨?é??ä¸å°?æ?¾å¯?ä»¶è??é?»å?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??åº¦å?¯è?½æ??å¾?æ?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶"
 
 #: ../mail/evolution-mail.schemas.in.h:48
-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 "
-"checking speed."
-msgstr ""
-"æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??"
-"å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
+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 checking speed."
+msgstr "æ±ºå®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ä¾?æª¢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?ä¸¦ä¸?æ??ä¾?æ¨?é ï¼?å°?æ??æ??å??å??å?¾é?µä»¶æª¢æ?¥ç??é??åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
+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:50
@@ -9984,12 +10099,8 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?ç©ºæ??æ??å??å?¾è³?æ??å¤¾"
 
 #: ../mail/evolution-mail.schemas.in.h:60
-msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
-msgstr ""
-"å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??"
-"ä»£æ?¿ã??"
+msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
+msgstr "å??ç?¨ HTML é?µä»¶ä¸ç??å??ç?«å??ç??ã??è¨±å¤?ä½¿ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??å¥½ä»¥é??æ??å??ç??ä»£æ?¿ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -10016,24 +10127,16 @@ msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??å¤¾ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
+msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??è¨±äº?å??å¼?æ??å°?è³?æ??å¤¾å??ç¨±ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
+msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr "å??ç?¨æ¤é?¸é ?å?¯å?¨é?µä»¶é ?è¦½ã??é?µä»¶æ¸?å?®å??è³?æ??å¤¾ä¸ä½¿ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"å??ç?¨å??å?ªæ??é¡¯ç¤ºä¸?è¶?é??ã??message_text_part_limitã??è¨å®?é?µä¸æ??å®?ç¾©ç??å¤§å°?ç??é?µä»¶æ??"
-"å?ã??"
+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:70
 msgid "Enable to use a similar message list view settings for all folders"
@@ -10047,20 +10150,14 @@ msgstr "å??ç?¨æ¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??å¤¾ä½¿ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??æ¨¡å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
+#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook/GMail å½¢å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:74
-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, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
-msgstr ""
-"å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± "
-"Evolution å¯?å?ºç?? UTF-8 å?å??æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?"
-"æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
+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, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
+msgstr "å°?é?µä»¶æ¨?é ä¸ç??æª?æ¡?å??ç¨±ç·¨ç¢¼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?å¥½è®?å®?å??è?½æ£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å?å??æª?æ¡?å??ç¨±ï¼?å? ç?ºå®?å??ä¸¦æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?æ£ç¢ºç?? RFC 2047 æ¨?æº?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
@@ -10087,164 +10184,87 @@ msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??å¤¾é ?è¦½ä¸¦ç§»é?¤é?¸å??å??"
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+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 "å¦?æ??ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??ä½¿ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??éº¼å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:82
-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 "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"å¦?æ??æ²?æ??å?§å»ºæª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£¡é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  "
-"MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§"
-"å®¹ã??"
+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 in GNOME's MIME type database may be used for displaying content."
+msgstr "å¦?æ??æ²?æ??å?§å»ºæª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£¡é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?é¡¯ç¤ºå?¨æ¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??åº«ä¹? Bonobo å??ä»¶æª¢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "å¿½ç?¥é??ä¿¡è«?å£? Reply-To:"
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+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:85
-msgid ""
-"Initial height of the \"Folder Subscriptions\" 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:86
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr ""
-"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?é«?åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+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:87
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
+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:88
-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."
-msgstr ""
-"ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??"
-"è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯"
-"å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+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."
+msgstr "ã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??é??æ¿¾æ¢?ä»¶ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:89
-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 ä¸ä½¿ç?¨ï¼?å? ç?ºã??è³?æ??å¤¾è¨?é?±ã??è¦?çª?ä¸?"
-"è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+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:90
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§"
-"å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??å¤¾ç·¨"
-"è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr "ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??"
-"è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µ"
-"ä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
+msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
+msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??å¤§å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??å¤§å??æ??å??æ¶?æ??å¤§å??è¦?çª?æ??æ?´æ?°ã??æ³¨æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution ä¸ä½¿ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??å¤§å??ã??é??å??é?µå?¼å?ªç?ºäº?å¯¦ä½?é??è¦?è??å?å?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
+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:93
-msgid ""
-"Initial width of the \"Folder Subscriptions\" 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:94
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr ""
-"ã??æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ã??è¦?çª?ç??å??å§?å¯¬åº¦ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?å¤§å°?æ??æ?´æ?°ã??"
+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:95
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+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:96
-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 "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-"æ??å?¥æ?¼ä¸?è?¬ç??ã??å??è¦?å?¨é?¨ã??è¡?ç?ºï¼?é??å??é?¸é ?æ??è®?ã??ç¾¤çµ?å??è¦?ã??å·¥å?·å??æ??é??å??è©¦å?ªå??ä¿¡å?°"
-"é??ä¿¡è«?å£?ï¼?ä¹?å°±æ?¯æ?¨æ?¶å?°è¦?å??è¦?ç??é??å°?ä¿¡ç??ä¾?æº?ã??"
+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 which you happened to receive the copy of the message to which you're replying."
+msgstr "æ??å?¥æ?¼ä¸?è?¬ç??ã??å??è¦?å?¨é?¨ã??è¡?ç?ºï¼?é??å??é?¸é ?æ??è®?ã??ç¾¤çµ?å??è¦?ã??å·¥å?·å??æ??é??å??è©¦å?ªå??ä¿¡å?°é??ä¿¡è«?å£?ï¼?ä¹?å°±æ?¯æ?¨æ?¶å?°è¦?å??è¦?ç??é??å°?ä¿¡ç??ä¾?æº?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??"
-"é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
+msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
+msgstr "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??ç¤ºä»¥è¦å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??ä¸ç§»é?¤ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:98
-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."
+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 "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??ç¤ºè¦å??æ?¨æ£è©¦è??å??è¦?ç§?äººä¿¡ä»¶çµ¦é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+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:100
-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: æ¨?é æ??å°?æ?¨ç??å??ä¿¡é??æ?°å°?å??è?³é??ä¿¡è«?å£?ä¸?ç??æ??æ??æ??å?¡"
+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: æ¨?é æ??å°?æ?¨ç??å??ä¿¡é??æ?°å°?å??è?³é??ä¿¡è«?å£?ä¸?ç??æ??æ??æ??å?¡"
 
 #: ../mail/evolution-mail.schemas.in.h:101
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
+msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
 msgstr "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??ç¤ºè¦å??æ?¨æ£è©¦è??å?³é??é?µä»¶çµ¦æ²?æ??è¼¸å?¥é?µä»¶ä½?å??ç??æ?¶ä»¶è??"
 
 #: ../mail/evolution-mail.schemas.in.h:102
@@ -10281,12 +10301,8 @@ msgid "List of accounts"
 msgstr "å¸³è??æ¸?å?®"
 
 #: ../mail/evolution-mail.schemas.in.h:110
-msgid ""
-"List of accounts known to the mail component of Evolution. The list contains "
-"strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr ""
-"Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts "
-"ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
+msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??å¸³è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts ç?¸é??ç??å?ä¸²å?½å??å?ç?®é??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
@@ -10297,12 +10313,8 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å?æª¢æ?¥ç??å?å?¸èª?è¨?ç¢¼æ¸?å?®ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:113
-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."
-msgstr ""
-"Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color "
-"ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
+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."
+msgstr "Evolution ç??é?µä»¶å??ä»¶å·²ç?¥ç??æ¨?ç±¤æ¸?å?®ã??æ¸?å?®å??å?«å?ä¸²ï¼?å?¶ä¸å??å?« name:colorï¼?color ä½¿ç?¨ HTML å??å?é?²ä½?ç·¨ç¢¼ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
@@ -10313,13 +10325,8 @@ msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
 #: ../mail/evolution-mail.schemas.in.h:116
-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 "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
-"ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
+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 contacts. \"2\" - Always load images off the net."
+msgstr "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?ä»¶è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?ç¶²è·¯è¼?å?¥å??ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
@@ -10372,8 +10379,7 @@ msgstr "é¡¯ç¤ºé?µä»¶æ??å?é??å?¶"
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
 #: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ]ã??ã??sourceã??[ä¾?æº?])"
+msgstr "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ]ã??ã??sourceã??[ä¾?æº?])"
 
 #: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
@@ -10404,12 +10410,8 @@ msgid "Path where picture gallery should search for its content"
 msgstr "å??ç??é??ç?¨ä¾?æ??å°?å?§å®¹ç??è·¯å¾?"
 
 #: ../mail/evolution-mail.schemas.in.h:137
-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 - "
-"(æ??ä»»ä½?å?¶ä»?æ?¸å?¼) æ??è©¢å??ä½¿ç?¨è??"
+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:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
@@ -10424,8 +10426,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦æ¸?ç©ºè³?æ??å¤¾æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:141
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??ä¸»æ?¨ç??é?µä»¶æ??ï¼?æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:142
@@ -10457,9 +10458,7 @@ msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??è©¦ä¸?æ¬¡é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??ç¤ºä½¿ç?¨è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:149
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
+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:150
@@ -10519,9 +10518,7 @@ msgid "Server synchronization interval"
 msgstr "ä¼ºæ??å?¨å??æ¥é??é??"
 
 #: ../mail/evolution-mail.schemas.in.h:164
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
+msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
 msgstr "è¨ç?º TRUE è¡¨ç¤ºå?¨æ?¨æ?°å¯«é?µä»¶æ??ä¸?æ?³å?¨ç°½å??æª?å??å? å?¥ç°½å??æª?å??é??ç¬¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:165
@@ -10581,72 +10578,40 @@ msgid "Show photo of the sender"
 msgstr "é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??"
 
 #: ../mail/evolution-mail.schemas.in.h:179
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
+msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å¯?ä»¶å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
+msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:181
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å¯?ä»¶è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
-msgstr ""
-"å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
+msgstr "å¼µè²¼å?°æ?°è??ç¾¤çµ?æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:183
-msgid ""
-"Show the \"Reply To\" field when sending a mail message. This is controlled "
-"from the View menu when a mail account is chosen."
+msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??é¡¯ç¤ºã??å??è¦?ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:184
-msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??ä¸ä»¥å??é?¢ç??æ¬?ä½?é¡¯ç¤ºå¯?ä»¶è??ç??é?»å?é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:185
-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 "
-"format and local time zone."
-msgstr ""
-"é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æª?é ï¼?è?¥æ??å??ä¸?å??æ??æ??ä½¿ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??å¥½ç??"
-"æ ¼å¼?å??æ?¬å?°æ??å??é¡¯ç¤ºã??æ?¥æ??ã??æª?é ã??"
+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 format and local time zone."
+msgstr "é¡¯ç¤ºå??å§?ç??ã??æ?¥æ??ã??æª?é ï¼?è?¥æ??å??ä¸?å??æ??æ??ä½¿ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??å¥½ç??æ ¼å¼?å??æ?¬å?°æ??å??é¡¯ç¤ºã??æ?¥æ??ã??æª?é ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?æ ¼ä¸é¡¯ç¤ºå¯?ä»¶è??ç??ç?¸ç??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:187
-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. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
-msgstr ""
-"æ??äº?é??ä¿¡è«?å£?æ??è¨å®? Reply-To: æ¨?é ä¾?èª¤å°?ä½¿ç?¨è??å?³é??å??è¦?ç??ä¿¡ä»¶å?°è«?å£?ä¸?ï¼?å?³ä½¿ä½¿ç?¨"
-"è??å·²è¦?æ±? Evolution é?²è¡?ç§?äººå??è¦?ä¹?ä¸?æ¨£ã??å°?é??å??é?¸é ?è¨ç?º TRUE æ??å??è©¦å¿½ç?¥ Reply-"
-"To: æ¨?é ï¼?å? æ¤ Evolution å°±è?½ä¾?æ?¨æ??è¦?æ±?ç??è¡?å??ã??å¦?æ??æ?¨ä½¿ç?¨ç§?äººå??è¦?å??ä½?ï¼?å®?å°±æ??"
-"é?²è¡?å??ä¿¡çµ¦å??äººç??å??ä½?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨ã??å??è¦?å?°è«?å£?ã??å??ä½?ï¼?å®?ä¹?æ??ç?§å??ã??å®?ç??é??ä½?æ?¹"
-"å¼?æ?¯æ¯?å°? Reply-To: æ¨?é å?? List-Post: æ¨?é ï¼?å¦?æ??æ??ç??è©±ã??"
+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. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one."
+msgstr "æ??äº?é??ä¿¡è«?å£?æ??è¨å®? Reply-To: æ¨?é ä¾?èª¤å°?ä½¿ç?¨è??å?³é??å??è¦?ç??ä¿¡ä»¶å?°è«?å£?ä¸?ï¼?å?³ä½¿ä½¿ç?¨è??å·²è¦?æ±? Evolution é?²è¡?ç§?äººå??è¦?ä¹?ä¸?æ¨£ã??å°?é??å??é?¸é ?è¨ç?º TRUE æ??å??è©¦å¿½ç?¥ Reply-To: æ¨?é ï¼?å? æ¤ Evolution å°±è?½ä¾?æ?¨æ??è¦?æ±?ç??è¡?å??ã??å¦?æ??æ?¨ä½¿ç?¨ç§?äººå??è¦?å??ä½?ï¼?å®?å°±æ??é?²è¡?å??ä¿¡çµ¦å??äººç??å??ä½?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨ã??å??è¦?å?°è«?å£?ã??å??ä½?ï¼?å®?ä¹?æ??ç?§å??ã??å®?ç??é??ä½?æ?¹å¼?æ?¯æ¯?å°? Reply-To: æ¨?é å?? List-Post: æ¨?é ï¼?å¦?æ??æ??ç??è©±ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid "Spell check inline"
@@ -10669,45 +10634,31 @@ msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?è¨å¤?æ??ç¨?å¼?"
 
 #: ../mail/evolution-mail.schemas.in.h:193
-msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?ç©ºå??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:194
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?æ¬¡å?·è¡?æ¸?å?®å??æ?¶ç?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:195
-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 "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
-msgstr ""
-"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?µä»¶æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶"
-"æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
+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 message list. \"1\" (Vertical View) places the preview pane next to the message list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?µä»¶æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:196
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?ç«¯æ©?å?å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:197
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
+msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
 msgstr "å?¨è½?å¯?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?èªªæ??æ?¥ä¸?ä¾?æ?¯è½?å¯?ç??é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:198
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
+msgid "The text that is inserted when replying to a message (top posting), saying that the original message follows."
 msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?ç½®é ?å¼µè²¼ï¼?ï¼?èªªæ??æ?¥ä¸?ä¾?æ?¯å??å§?é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+msgid "The text that is inserted when replying to a message, attributing the message to the original author."
 msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å?ï¼?èªªæ??é?µä»¶ç??å??ä½?è??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:200
@@ -10715,89 +10666,48 @@ msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??å¯¬åº¦å?å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:201
-msgid ""
-"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
-"\"2\" for debug messages."
+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:202
-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 "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"é??è£¡æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯é¡¯ç¤ºç??æ??å¤§å®¹é??ï¼?ä»¥ KB ç?ºå?®ä½?æ??å®?ã??é ?è¨å?¼"
-"ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??è¨å®?é?µæ??æ??æ??ã??"
+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 is used only when 'force_message_limit' key is activated."
+msgstr "é??è£¡æ±ºå®?äº?é?µä»¶å?§æ??å?¨ Evolution ä¸å?¯é¡¯ç¤ºç??æ??å¤§å®¹é??ï¼?ä»¥ KB ç?ºå?®ä½?æ??å®?ã??é ?è¨å?¼ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??è¨å®?é?µæ??æ??æ??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:203
-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 "
-"to the other available plugins."
-msgstr ""
-"é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£¡å??å?ºç??é ?"
-"è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
+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 to the other available plugins."
+msgstr "é??æ?¯é ?è¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??è£¡å??å?ºç??é ?è¨å¤?æ??ç¨?å¼?ï¼?ä¸¦ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:204
-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."
-msgstr ""
-"é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??"
-"é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
+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."
+msgstr "é??å??é?µå?¼å?ªè?½è®?å??ä¸?æ¬¡ï¼?ä¸¦æ??å?¨è®?å??å¾?è¨ç?ºã??falseã??ã??é??æ¨£æ??å??æ¶?å?¨æ¸?å?®ä¸å°?è©²é?µä»¶ç??é?¸å??ä¸¦ç§»é?¤å°?è©²è³?æ??å¤¾ç??é ?è¦½ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:205
-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;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"æ¤é??é?°æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?"
-"æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
+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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgstr "æ¤é??é?°æ??è©²å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ï¼?ä»¥å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é æ??é¡¯ç¤ºå?¨é?µä»¶æª¢è¦?ï¼?å??è¨å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:206
-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 "
-"mail sent by known contacts from junk filtering."
-msgstr ""
-"é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥"
-"è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
+#: ../mail/evolution-mail.schemas.in.h:206
+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 mail sent by known contacts from junk filtering."
+msgstr "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?æ±ºå®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??ä¸æ?¥è©¢é?»å?é?µä»¶ä½?å??ä»¥ç?¨æ?¼å??å?¾é?µä»¶é??æ¿¾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:207
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??åº¦ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:208
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
+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:209
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Requires a restart to apply."
 msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?è¨ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??é??è¦?é??æ?°å??å??æ??è?½å¥?ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:210
-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 "
-"restart."
-msgstr ""
-"é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??"
-"Evolution å°?é??è¦?é??æ?°å??å??ã??"
+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 restart."
+msgstr "é??å??è¨å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:211
-msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"é??å??æ?¸å?¼å?¯ä»¥æ?¯ç©ºå?ä¸²ï¼?ä»£è¡¨è¦?ä½¿ç?¨ç³»çµ±å??ç??è³?æ??å¤¾ï¼?é??å¸¸è¨å®?å?¨ ~/Picturesã??é??å??è³?"
-"æ??å¤¾ä¹?æ??å?¨è·¯å¾?æ??å??ä¸?å?å?¨ç??è³?æ??å¤¾æ??ä½¿ç?¨ã??"
+msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder."
+msgstr "é??å??æ?¸å?¼å?¯ä»¥æ?¯ç©ºå?ä¸²ï¼?ä»£è¡¨è¦?ä½¿ç?¨ç³»çµ±å??ç??è³?æ??å¤¾ï¼?é??å¸¸è¨å®?å?¨ ~/Picturesã??é??å??è³?æ??å¤¾ä¹?æ??å?¨è·¯å¾?æ??å??ä¸?å?å?¨ç??è³?æ??å¤¾æ??ä½¿ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:212
 msgid "Thread the message-list based on Subject"
@@ -10844,21 +10754,12 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:223
-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 ""
-"ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??æ¸¸æ¨?å??å?¨ä½?è??ã??é??æ??æ±ºå®?æ¸¸æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?é?¨ã??"
+msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
+msgstr "ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??æ¸¸æ¨?å??å?¨ä½?è??ã??é??æ??æ±ºå®?æ¸¸æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:224
-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 ""
-"ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??æ±ºå®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?"
-"é?¨ã??"
+msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
+msgstr "ä½¿ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??æ±ºå®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?ç«¯æ??åº?é?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:225
 msgid "Variable width font"
@@ -10869,18 +10770,11 @@ msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?è¨å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
 #: ../mail/evolution-mail.schemas.in.h:227
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
-msgstr ""
-"ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ??æ??ä½¿ç?¨ä¸å¸³è??ç??æ?°é?µä»¶è??ä¸?ç®¡ã??æª¢æ?¥æ?°é?µä»¶æ?¼æ¯? X å??"
-"é??ã??é?¸é ?ã??é??å??é?¸é ?å?ªè?½å??ã??send_recv_on_startã??é?¸é ?ä¸?èµ·ä½¿ç?¨ã??"
+msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
+msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ??æ??ä½¿ç?¨ä¸å¸³è??ç??æ?°é?µä»¶è??ä¸?ç®¡ã??æª¢æ?¥æ?°é?µä»¶æ?¼æ¯? X å??é??ã??é?¸é ?ã??é??å??é?¸é ?å?ªè?½å??ã??send_recv_on_startã??é?¸é ?ä¸?èµ·ä½¿ç?¨ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:228
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
+msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
 msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ?°é?µä»¶ã??é??ä¹?å??å?«å¯?å?ºå¯?ä»¶å?£ä¸ç??é?µä»¶ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:229
@@ -10888,24 +10782,16 @@ msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??å¤¾å??ç¨±ç??ç?¥ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:230
-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 æª?é æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾¤çµ?ã??"
+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:231
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä¾?é?µä»¶ç¾¤çµ?ä¸æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
 #: ../mail/evolution-mail.schemas.in.h:232
-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 "
-"one minute after the last action invocation."
-msgstr ""
-"æ?¯å?¦å?¨é??æ¿¾å®?å¾?æ¸?ç©ºå¯?ä»¶å?£ã??å¯?ä»¶å?£ç??æ¸?ç©ºå?ªç?¨å?¨ç?¶ä½¿ç?¨äº?ä»»ä½?ã??è½?å¯?è?³ã??é??æ¿¾å?¨å??"
-"ä½?ï¼?ä¸¦ä¸?å?¨é??å??å??ä½?å¾?å¤§ç´?ä¸?å??é??é??å§?é?²è¡?ã??"
+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 one minute after the last action invocation."
+msgstr "æ?¯å?¦å?¨é??æ¿¾å®?å¾?æ¸?ç©ºå¯?ä»¶å?£ã??å¯?ä»¶å?£ç??æ¸?ç©ºå?ªç?¨å?¨ç?¶ä½¿ç?¨äº?ä»»ä½?ã??è½?å¯?è?³ã??é??æ¿¾å?¨å??ä½?ï¼?ä¸¦ä¸?å?¨é??å??å??ä½?å¾?å¤§ç´?ä¸?å??é??é??å§?é?²è¡?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
@@ -10919,7 +10805,8 @@ msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??å¯¬åº¦ã??"
 msgid "Importing Elm data"
 msgstr "è¼¸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../mail/importers/elm-importer.c:339
+#: ../mail/importers/pine-importer.c:415
 #: ../modules/mail/e-mail-shell-view.c:1044
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 #: ../widgets/misc/e-send-options.c:511
@@ -10935,19 +10822,19 @@ msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
 #: ../mail/importers/evolution-mbox-importer.c:127
-#: ../plugins/dbx-import/dbx-importer.c:227
+#: ../plugins/dbx-import/dbx-importer.c:242
 msgid "_Destination folder:"
 msgstr "ç?®ç??ç«¯è³?æ??å¤¾(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:133
-#: ../plugins/dbx-import/dbx-importer.c:237
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??å¤¾"
 
 #: ../mail/importers/evolution-mbox-importer.c:134
-#: ../plugins/dbx-import/dbx-importer.c:238
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:318
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??å¤¾ä¾?è¼¸å?¥"
 
@@ -10976,9 +10863,9 @@ msgstr "æ£å?¨å?¯å?¥ä¿¡ç®±"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:574
-#: ../plugins/pst-import/pst-importer.c:482
-#: ../plugins/pst-import/pst-importer.c:591
+#: ../plugins/dbx-import/dbx-importer.c:593
+#: ../plugins/pst-import/pst-importer.c:480
+#: ../plugins/pst-import/pst-importer.c:589
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ£å?¨å?¯å?¥ã??%sã??"
@@ -11010,7 +10897,8 @@ msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:238 ../mail/mail-autofilter.c:280
+#: ../mail/mail-autofilter.c:238
+#: ../mail/mail-autofilter.c:280
 #, c-format
 msgid "Mail from %s"
 msgstr "é?µä»¶ä¾?è?ª %s "
@@ -11264,7 +11152,8 @@ msgstr "è¡?å?§"
 msgid "Inline (Outlook style)"
 msgstr "è¡?å?§ï¼?Outlook é¢¨æ ¼ï¼?"
 
-#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61
+#: ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "æ¨?ç±¤"
 
@@ -11496,9 +11385,7 @@ msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
 #: ../mail/mail-config.ui.h:128
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "é??è£¡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
 #: ../mail/mail-config.ui.h:129
@@ -11512,12 +11399,8 @@ msgstr ""
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
 #: ../mail/mail-config.ui.h:132
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr ""
-"è¦?é?¿å??é?»å?é?µä»¶å?ºç?¾æ??å¤?æ??ä»¤äººé?£å ªç??æ??æ³?ï¼?å?¨é?²è¡?ä¸?å??å·²æ ¸å??å??ä½?æ??è©¢å??ä½¿ç?¨è??ä»¥å??"
-"å¾?ç¢ºèª?ï¼?"
+msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
+msgstr "è¦?é?¿å??é?»å?é?µä»¶å?ºç?¾æ??å¤?æ??ä»¤äººé?£å ªç??æ??æ³?ï¼?å?¨é?²è¡?ä¸?å??å·²æ ¸å??å??ä½?æ??è©¢å??ä½¿ç?¨è??ä»¥å??å¾?ç¢ºèª?ï¼?"
 
 #: ../mail/mail-config.ui.h:133
 msgid ""
@@ -11619,7 +11502,8 @@ msgstr "å?½ä»¤ç¨¿(_S):"
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP ä»£ç??ä¼ºæ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:160 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:160
+#: ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S):"
@@ -11649,11 +11533,13 @@ msgstr "ä½¿ç?¨ç³»çµ±é ?è¨å?¼(_U)"
 msgid "_Use the same fonts as other applications"
 msgstr "ä½¿ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å?å??(_U)"
 
-#: ../mail/mail-config.ui.h:168 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:168
+#: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:169 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:169
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
@@ -11761,7 +11647,7 @@ msgstr "æ¨?å¹?(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:793
+#: ../mail/mail-folder-cache.c:789
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -11784,11 +11670,13 @@ msgstr "æ£å?¨å?³é??é?µä»¶ %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??ç¬¬ %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:787
+#: ../mail/mail-ops.c:833
+#: ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:789
+#: ../mail/mail-ops.c:835
+#: ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
@@ -11903,27 +11791,28 @@ msgstr "æ£å?¨ç§»é?¤é??ä»¶"
 msgid "File \"%s\" has been removed."
 msgstr "æª?æ¡?ã??%sã??å·²ç¶?è¢«ç§»é?¤ã??"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "æ£å?¨å??æ¶?â?¦"
 
-#: ../mail/mail-send-recv.c:435
+#: ../mail/mail-send-recv.c:436
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:451
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:568
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
 msgstr "æ?´æ?°ä¸â?¦"
 
-#: ../mail/mail-send-recv.c:568 ../mail/mail-send-recv.c:652
+#: ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:653
 msgid "Waiting..."
 msgstr "æ£å?¨ç?å¾?â?¦"
 
-#: ../mail/mail-send-recv.c:902
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "æª¢æ?¥æ?°é?µä»¶"
@@ -11970,8 +11859,7 @@ msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??å¤¾"
 #: ../mail/mail-vfolder.c:718
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -12017,29 +11905,22 @@ msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{1}ã??ç??è³?æ??å¤¾å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "ä½?æ?¼ã??{1}ã??ç??é??ç©ºç?½è³?æ??å¤¾å·²ç¶?å?å?¨ã??\n"
 "\n"
 "æ?¨å?¯ä»¥é?¸æ??å¿½ç?¥æ¤è³?æ??å¤¾ã??è¦?å¯«æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
+msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?çµ¦ {0}ï¼?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
+msgid "A signature already exists with the name \"{0}\". Please specify a different name."
 msgstr "å·²ç¶?æ??å??ç¨±ç?ºã??{0}ã??ç??ç°½å??æª?å?å?¨ã??è«?ä½¿ç?¨ä¸?å??ç??å??ç¨±ã??"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??ç¾©ç??ä¸»æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??é?µä»¶å??ä»?éº¼äº?æ??é??ã??"
 
 #: ../mail/mail.error.xml.h:12
@@ -12051,20 +11932,15 @@ msgid "Are you sure you want to delete this account?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ï¼?"
 
 #: ../mail/mail.error.xml.h:14
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "ç¢ºå®?è¦?å?ªé?¤é??å??å¸³è??ä»¥å??å®?æ??æ??ç??ä»£ç??ä¼ºæ??å?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:15
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
 msgstr "è¦?æ°¸ä¹?ç§»é?¤æ??æ??è³?æ??å¤¾ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:16
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
+msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
 msgstr "ç¢ºå®?è¦?æ°¸ä¹?ç§»é?¤è³?æ??å¤¾ã??{0}ã??ä¸æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
 #: ../mail/mail.error.xml.h:17
@@ -12140,12 +12016,8 @@ msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
 #: ../mail/mail.error.xml.h:35
-msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
-msgstr ""
-"ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨æ?¨å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?"
-"ä½¿ç?¨å®?ã??"
+msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
+msgstr "ä¸?è?½è®?å??æ??æ¬?æ¢?æ¬¾æª?æ¡?ã??{0}ã??ï¼?æ??è©²æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨æ?¨å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?ä½¿ç?¨å®?ã??"
 
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
@@ -12173,11 +12045,8 @@ msgstr "ä¸?è?½è¨å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
 # (Abel) é?µç?¤ç??é?µæ??å¥½ä¸?è¯äº?
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½æ??äº? Caps Lockã??"
+msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
+msgstr "è«?æª¢æ?¥å¯?ç¢¼æ?¼å?æ?¯å?¦æ£ç¢ºã??è«?æ³¨æ??ï¼?å¾?å¤?å¯?ç¢¼å??å??å¤§å°?å¯«ï¼?æ?¨å?¯è?½æ??äº? Caps Lockã??"
 
 #: ../mail/mail.error.xml.h:43
 msgid "Close message window."
@@ -12204,9 +12073,7 @@ msgid "Do _Not Synchronize"
 msgstr "ä¸?è¦?å??æ¥(_N)"
 
 #: ../mail/mail.error.xml.h:50
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
+msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?ä½¿ç?¨ç??è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:51
@@ -12238,19 +12105,13 @@ msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
 #: ../mail/mail.error.xml.h:60
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local mail must be migrated to the new format before Evolution can proceed. Do you want to migrate now?\n"
 "\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
+"An mbox account will be created to preserve the old mbox folders. You can delete the account after ensuring the data is safely migrated. Please make sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"é ?è¨ç??æ?¬å?°ç«¯å?²å?å??å·²ç¶?å¾? mbox æ?¹è®?ç?º Maildir æ ¼å¼?ã??å?¨ Evolution ç¹¼çº?å??æ?¨ç??æ?¬"
-"å?°ç«¯é?µä»¶å¿?é ?è½?æ??ç?ºæ?°ç??æ ¼å¼?ã??æ?¨ç?¾å?¨æ?¯å?¦è¦?è½?æ??ï¼?\n"
+"é ?è¨ç??æ?¬å?°ç«¯å?²å?å??å·²ç¶?å¾? mbox æ?¹è®?ç?º Maildir æ ¼å¼?ã??å?¨ Evolution ç¹¼çº?å??æ?¨ç??æ?¬å?°ç«¯é?µä»¶å¿?é ?è½?æ??ç?ºæ?°ç??æ ¼å¼?ã??æ?¨ç?¾å?¨æ?¯å?¦è¦?è½?æ??ï¼?\n"
 "\n"
-"ç¨?å¼?æ??å»ºç«?ä¸?å?? mbox å¸³è??ä¾?ä¿?ç??è??ç?? mbox è³?æ??å¤¾ã??æ?¨å?¯ä»¥å?¨ç¢ºèª?è³?æ??é?½å®?å?¨è½?æ??å¾?"
-"å??å°?å®?å?ªé?¤ã??å¦?æ??æ?¨é?¸æ??è½?æ??ï¼?è«?ç¢ºå®?æ??è¶³å¤ ç??ç©ºé??ã??"
+"ç¨?å¼?æ??å»ºç«?ä¸?å?? mbox å¸³è??ä¾?ä¿?ç??è??ç?? mbox è³?æ??å¤¾ã??æ?¨å?¯ä»¥å?¨ç¢ºèª?è³?æ??é?½å®?å?¨è½?æ??å¾?å??å°?å®?å?ªé?¤ã??å¦?æ??æ?¨é?¸æ??è½?æ??ï¼?è«?ç¢ºå®?æ??è¶³å¤ ç??ç©ºé??ã??"
 
 #: ../mail/mail.error.xml.h:63
 msgid "Evolution's local mail format has changed."
@@ -12278,14 +12139,11 @@ msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:70
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
+msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹å??å?è³?æ??å¤¾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:71
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
+msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨é?¸æ??å?ªé?¤è³?æ??å¤¾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?å¤±ã??"
 
 #: ../mail/mail.error.xml.h:72
@@ -12305,9 +12163,7 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?å¸³è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "å¦?æ??æ?¨é?¸æ??çµ?æ??ï¼?å??æ¬¡å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:77
@@ -12327,15 +12183,8 @@ msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??æ¿¾å?¨è?ªå??æ?´æ?°ã??"
 
 #: ../mail/mail.error.xml.h:81
-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 "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥"
-"äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
-"è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
+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 your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgstr "å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ¤æª?é ï¼?æ??æ°¸é? å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
 #: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
@@ -12366,17 +12215,12 @@ msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??ä½¿ç?¨å?¶ä»?å¸³è??å?³é??ã??"
 
 #: ../mail/mail.error.xml.h:90
-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."
-msgstr ""
-"è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??"
-"ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
+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."
+msgstr "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?è¼¸å?¥ä¸?å??æ??æ??ç??é?»å?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?è¼¸å?¥æ?¹å¡?æ??é??ç??ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å?é?µä»¶å?°å??ã??"
 
 #: ../mail/mail.error.xml.h:91
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
+"Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
 msgstr ""
 "è«?ç¢ºå®?ä»¥ä¸?æ?¶ä»¶è??å¸?æ??ä¸¦ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å?é?µä»¶ï¼?\n"
@@ -12439,27 +12283,18 @@ msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ¥è³?æ??å¤¾ä»¥ä¾?é?¢ç·?ä½¿ç?¨ï¼?"
 
 #: ../mail/mail.error.xml.h:109
-msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr ""
-"Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ª"
-"é?¤ã??"
+msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
+msgstr "Evolution é??è¦?ç³»çµ±è³?æ??å¤¾æ??è?½æ£å¸¸ä½?æ¥ï¼?è??ä¸?è©²è³?æ??å¤¾ä¸?å?¯ä»¥é??æ?°å?½å??ã??ç§»å??æ??å?ªé?¤ã??"
 
 #: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"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 in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"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 in your message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "å?³é??ç??é?£çµ¡äººæ¸?å?®æ?¯è¨å®?æ??é?±è??æ¸?å?®æ?¶ä»¶è??ã??\n"
 "\n"
-"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?"
-"æ¤æª?é ï¼?æ??å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ?¨æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
-"è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
+"å¾?å¤?é?»å?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é è?³å?ªæ??å¯?ä»¶å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?æ¤æª?é ï¼?æ??å??ç¤ºé?µä»¶ä¸æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ¤æ??æ³?ï¼?æ?¨æ??è©²è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
 #: ../mail/mail.error.xml.h:113
 msgid ""
@@ -12490,20 +12325,15 @@ msgstr ""
 "é??è¦?æ??ï¼?è«?ç§»è?³æ??å°?è³?æ??å¤¾ç·¨è¼¯å?¨ï¼?ä»¥æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
 #: ../mail/mail.error.xml.h:121
-msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "å? ç?ºæ?¨æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??å¸³è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶ã??"
 
 #: ../mail/mail.error.xml.h:122
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºæ?¨æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??ä»¥ç?¡æ³?å?³é??æ¤é?µä»¶"
 
 #: ../mail/mail.error.xml.h:123
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "æ¤ä¼ºæ??å?¨ä¸?æ?¯æ?´æ¤é©?è?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è?ã??"
 
 #: ../mail/mail.error.xml.h:124
@@ -12511,9 +12341,7 @@ msgid "This signature has been changed, but has not been saved."
 msgstr "æ¤ç°½ç« å·²ç¶?è®?æ?´ï¼?ä½?å°?æ?ªå?²å?ã??"
 
 #: ../mail/mail.error.xml.h:125
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "é??æ??å°?æ¨?ç¤ºé?¸å®?ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
 #: ../mail/mail.error.xml.h:126
@@ -12525,9 +12353,7 @@ msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise ä¼ºæ??å?¨ã??"
 
 #: ../mail/mail.error.xml.h:128
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "ç?¡æ³?é??å??æ¤å¸³è??ç??è??ç¨¿è³?æ??å¤¾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??ç¨¿è³?æ??å¤¾ä»£æ?¿ï¼?"
 
 #: ../mail/mail.error.xml.h:129
@@ -12544,8 +12370,7 @@ msgstr "ä½¿ç?¨é ?è¨ç??è??ç¨¿è³?æ??å¤¾ï¼?"
 
 #: ../mail/mail.error.xml.h:132
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual "
-"message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
 "è¦å??ï¼?å¾?æ??å°?è³?æ??å¤¾ä¸å?ªé?¤é?µä»¶å°?æ??è?ªæ?¨ç??æ?¬å?°æ??é? ç«¯è³?æ??å¤¾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
@@ -12556,27 +12381,15 @@ msgid "Would you like to close the message window?"
 msgstr "æ?¨æ?³è¦?é??é??é?µä»¶è¦?çª?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:135
-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 "
-"you sure you want to proceed?"
-msgstr ""
-"æ?¨æ£ä»¥ç§?äººå??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯é??å??é??ä¿¡è«?å£?å??è©¦å°?æ?¨ç??å??ä¿¡å°?å??è«?å£?ã??æ?¨"
-"ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
+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 you sure you want to proceed?"
+msgstr "æ?¨æ£ä»¥ç§?äººå??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯é??å??é??ä¿¡è«?å£?å??è©¦å°?æ?¨ç??å??ä¿¡å°?å??è«?å£?ã??æ?¨ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:136
-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 "
-"proceed?"
-msgstr ""
-"æ?¨æ£å?¨å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯æ?¨ä»¥ç§?äººå??è¦?æ?¹å¼?å¯?çµ¦å??å¯?ä»¶è??ï¼?è??é??å¯?å??é??ä¿¡"
-"è«?å£?ã??æ?¨ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
+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 proceed?"
+msgstr "æ?¨æ£å?¨å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯æ?¨ä»¥ç§?äººå??è¦?æ?¹å¼?å¯?çµ¦å??å¯?ä»¶è??ï¼?è??é??å¯?å??é??ä¿¡è«?å£?ã??æ?¨ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
 
 #: ../mail/mail.error.xml.h:137
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+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:138
@@ -12606,8 +12419,7 @@ msgstr "æ?¨å¿?é ?æ??å®?ä¸?å??è³?æ??å¤¾ã??"
 #: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
 msgstr ""
 "æ?¨å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??å¤¾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??å¤¾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??å¤¾ã??æ??æ??é? ç«¯è³?æ??å¤¾æ??äº?è??ç??é?¸ã??"
@@ -12671,93 +12483,94 @@ msgstr "å??æ¥å??(_S)"
 msgid "_Yes"
 msgstr "æ?¯(_Y)"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1215
 msgid "Unseen"
 msgstr "æ?ªé?±è®?"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1216
 msgid "Seen"
 msgstr "å·²é?±è®?"
 
-#: ../mail/message-list.c:1221
+#: ../mail/message-list.c:1217
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1218
 msgid "Forwarded"
 msgstr "è½?å¯?"
 
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1219
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1220
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1228
+#: ../mail/message-list.c:1224
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1229
+#: ../mail/message-list.c:1225
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1233
+#: ../mail/message-list.c:1229
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1234
+#: ../mail/message-list.c:1230
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1853 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1849
+#: ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1856
+#: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "ä»?å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:1865
 msgid "Yesterday %l:%M %p"
 msgstr "æ?¨å¤© %p %l:%M"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:1877
 msgid "%a %l:%M %p"
 msgstr "%a %p %l:%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1885
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %p %l:%M"
+msgstr "%b%dæ?¥ %p %l:%M"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:1887
 msgid "%b %d %Y"
-msgstr "%Y %b %d"
+msgstr "%Y %b%dæ?¥"
 
-#: ../mail/message-list.c:2675
+#: ../mail/message-list.c:2672
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
-#: ../mail/message-list.c:2833 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2830
+#: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "é?µä»¶"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4501 ../mail/message-list.c:4925
+#: ../mail/message-list.c:4506
+#: ../mail/message-list.c:4930
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4740
-msgid ""
-"No message satisfies your search criteria. Either clear search with Search-"
-">Clear menu item or change it."
-msgstr ""
-"æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
+#: ../mail/message-list.c:4745
+msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
+msgstr "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4742
+#: ../mail/message-list.c:4747
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??å¤¾ä¸æ²?æ??é?µä»¶ã??"
 
@@ -12786,7 +12599,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:570
+#: ../widgets/misc/e-attachment-tree-view.c:568
 msgid "Size"
 msgstr "å¤§å°?"
 
@@ -12824,29 +12637,16 @@ msgid "Subject or Addresses contains"
 msgstr "ä¸»æ?¨æ??é?»å?é?µä»¶ä½?å??å??å?«"
 
 #: ../modules/addressbook/addressbook-config.c:205
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
-"æ?´ SSL)ã??"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ SSL)ã??"
 
 #: ../modules/addressbook/addressbook-config.c:207
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯"
-"æ?´ TLS)ã??"
+msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP ä¼ºæ??å?¨ (å¦?æ??æ?¨ç?? LDAP ä¼ºæ??å?¨æ?¯æ?´ TLS)ã??"
 
 #: ../modules/addressbook/addressbook-config.c:209
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?æ?¨ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºæ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??"
-"å®?å?¨æ??æ¼?æ´?ã?? "
+msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
+msgstr "é?¸å??æ¤é?¸é ?è¡¨ç¤ºï¼?æ?¨ç??ä¼ºæ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??è¡¨ç¤ºæ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
 #: ../modules/addressbook/addressbook-config.c:608
 msgid "U_se in Birthday & Anniversaries calendar"
@@ -12857,32 +12657,16 @@ msgid "Copy _book content locally for offline operation"
 msgstr "è¤?è£½é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?æ¥(_B)"
 
 #: ../modules/addressbook/addressbook-config.c:751
-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 "
-"port you should specify."
-msgstr ""
-"é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?"
-"æ´½è©¢æ?¨ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£æ?¨æ??è©²æ??å®?ç??å? ã??"
+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 port you should specify."
+msgstr "é??æ?¯ LDAP ä¼ºæ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??è©¦é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?æ´½è©¢æ?¨ç??ç³»çµ±ç®¡ç??å?¡ï¼?ç?è§£æ?¨æ??è©²æ??å®?ç??å? ã??"
 
 #: ../modules/addressbook/addressbook-config.c:825
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?æ?¨ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿"
-"å??å?å??æ?¨ç?? LDAP ä¼ºæ??å?¨ã??"
+msgid "This is the method Evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your LDAP server."
+msgstr "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è?æ?¨ç??æ?¹æ³?ã??æ³¨æ??è¦?è¨å®?æ¤é ?è?³ã??é?»å?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿å??å?å??æ?¨ç?? LDAP ä¼ºæ??å?¨ã??"
 
 #: ../modules/addressbook/addressbook-config.c:900
-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 "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??ã??subã??(å?é ?)ç??æ??å°?ç¯?å??æ??å??"
-"æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
+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 your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgstr "æ??å°?ç¯?å??æ??å®?ç¾©æ?¨æ?³å¾?ç¶²è·¯ç?®é??æ¨¹å¾?ä¸?å»¶ä¼¸æ??å°?ç??æ·±åº¦ã??ã??subã??(å?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??å±¤ç´?ã??"
 
 #: ../modules/addressbook/addressbook-config.c:1016
 msgid "Server Information"
@@ -12955,25 +12739,15 @@ msgid "Show preview pane"
 msgstr "é¡¯ç¤ºé ?è¦½çª?æ ¼"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid ""
-"The UID of the selected (or \"primary\") address book in the sidebar of the "
-"\"Contacts\" view."
+msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view."
 msgstr "ã??é?£çµ¡äººã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?£çµ¡äººæ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£"
-"çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£çµ¡äººæ¸?å?®æ??é??ã??"
+msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨é?£çµ¡äººæ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨é?£çµ¡äººæ¸?å?®æ??é??ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
+msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr "å?¨ Evolution å??è©¦è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?è¼¸å?¥ç??å?å??æ?¸ç?®ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
@@ -12985,9 +12759,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "ä¸?æ¬¡ç?¨æ?¼é?¸å??å??ç¨±å°?è©±ç??ç??è³?æ??å¤¾ URI"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
+msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
 msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸è?ªå??è£?é½?ç??é?£çµ¡äººå§?å??è??é?»å?é?µä»¶ä½?å??ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
@@ -13009,50 +12781,50 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??é?£çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:94
 #: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP ä¼ºæ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:280
+#: ../modules/addressbook/e-book-shell-backend.c:276
 msgctxt "New"
 msgid "_Contact"
 msgstr "é?£çµ¡äºº(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-backend.c:278
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-backend.c:283
 msgctxt "New"
 msgid "Contact _List"
 msgstr "é?£çµ¡äººæ¸?å?®(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:289
+#: ../modules/addressbook/e-book-shell-backend.c:285
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "å»ºç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:297
+#: ../modules/addressbook/e-book-shell-backend.c:293
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-backend.c:295
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "å»ºç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:316
+#: ../modules/addressbook/e-book-shell-backend.c:312
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:105
 #: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:325
+#: ../modules/addressbook/e-book-shell-backend.c:322
 msgid "Certificates"
 msgstr "æ??è?"
 
@@ -13261,7 +13033,7 @@ msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 #: ../modules/calendar/e-memo-shell-view-actions.c:767
 #: ../modules/calendar/e-task-shell-view-actions.c:966
 #: ../modules/mail/e-mail-shell-view-actions.c:1501
-#: ../shell/e-shell-content.c:637
+#: ../shell/e-shell-content.c:634
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
@@ -13365,12 +13137,8 @@ msgid "Search _filter:"
 msgstr "æ??å°?é??æ¿¾å?¨(_F):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯"
-"ã??personã??ç?©ä»¶é¡?å??ã??"
+msgid "Search filter is the type of object to be searched for. If this is not modified, the default search will be performed on the type \"person\"."
+msgstr "æ??å°?é??æ¿¾å?¨æ?¯å?¨é?²è¡?æ??å°?æ??ä½¿ç?¨ç??ç?©ä»¶é¡?å??ã??å¦?æ??æ¤é ?æ²?æ??è¢«ä¿®æ?¹ï¼?é ?è¨ç??æ??å°?ç?®æ¨?æ?¯ã??personã??ç?©ä»¶é¡?å??ã??"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:18
@@ -13531,7 +13299,7 @@ msgid "Template:"
 msgstr "æ¨£æ?¿:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
-#: ../widgets/misc/e-dateedit.c:595
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æ??é??"
 
@@ -13661,8 +13429,7 @@ msgid "Calendars to run alarms for"
 msgstr "å?·è¡?é¬§é?´ç??è¡?äº?æ??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??ä¸ç?¨ä¾?ç¹ªè£½ Marcus Bains ç·?ç??è?²å½©(ç??ç©ºè¡¨ç¤ºä½¿ç?¨é ?è¨å?¼)ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
@@ -13766,9 +13533,7 @@ msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸è¦?è¨?ä½?ç??æ??è¿?ä½¿ç?¨æ??å??æ?¸ç?®ç??æ??å¤§å?¼ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
@@ -13820,18 +13585,12 @@ msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
-msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr ""
-"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
+msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the memo preview pane when oriented vertically."
@@ -13846,24 +13605,16 @@ msgid "Position of the task preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?è¦½çª?æ ¼ç??ä½?ç½®ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
+msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?è¦½è¡?äº?æ??ä¹?é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr ""
-"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??æª¢è¦?ä¸ç??è¦?çª?è??æ?¥æ??å°?è¦½è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr ""
-"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
+msgid "Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??æª¢è¦?ä¸æ??ï¼?å?¨æ?¥æ??å°?è¦½è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary calendar"
@@ -13946,11 +13697,8 @@ msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?è¦½é¡¯ç¤ºé?±æ?¸"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
-msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr ""
-"å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
+msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
+msgstr "å¦?æ??è¨å®?å??æ??å?¨æ?¥æª¢è¦?ä¸é¡¯ç¤ºç¬¬äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??è¨å®?é?µç??ç?¨æ³?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
 msgid "Task layout style"
@@ -13969,66 +13717,40 @@ msgid "Tasks due today color"
 msgstr "ä»?å¤©å?°æ??å·¥ä½?ç??è?²å½©"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
+msgid "The UID of the selected (or \"primary\") calendar in the sidebar of the \"Calendar\" view."
 msgstr "ã??è¡?äº?æ??ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
-"The UID of the selected (or \"primary\") memo list in the sidebar of the "
-"\"Memos\" view."
+msgid "The UID of the selected (or \"primary\") memo list in the sidebar of the \"Memos\" view."
 msgstr "ã??å??å¿?é??ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
-msgid ""
-"The UID of the selected (or \"primary\") task list in the sidebar of the "
-"\"Tasks\" view."
+msgid "The UID of the selected (or \"primary\") task list in the sidebar of the \"Tasks\" view."
 msgstr "ã??å·¥ä½?ã??æª¢è¦?å?´é??æ¬?ä¸å·²é?¸å??ï¼?æ??ã??ä¸»è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??"
-"ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
+msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
+msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??ç¶²å??ç¯?æ?¬ï¼?%u è¦?ä»¥é?»å?é?µä»¶ä½?å??ç??ä½¿ç?¨è??å??ç¨±é?¨å??ä¾?å??ä»£ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??ç¨±ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? "
-"\"America/New York\"ã??"
+msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "ç?¨æ?¼è¡?äº?æ??ä¸æ?¥æ??è??æ??å?»ç??é ?è¨æ??å??ï¼?æ?ªç¿»è¯ç?? Olsen æ??å??è³?æ??åº«ä½?ç½®å°±å?? \"America/New York\"ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å??å¿?é??æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??"
-"å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
+msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å??å¿?é??æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å·¥ä½?æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?"
-"æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
+msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr "é??ç½®æ?¹å¼?æ±ºå®?äº?å?¨å·¥ä½?æ¸?å?®ä¸é ?è¦½çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?è¦½çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??ç¬¬äº?æ??å??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
+msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
 msgstr "é??è£¡å?¯ä½¿ç?¨ä¸?ç¨®æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
@@ -14049,12 +13771,8 @@ msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr ""
-"ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥æ??é??ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??"
-"(æ?¥)ã??"
+msgid "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥æ??é??ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
@@ -14063,10 +13781,8 @@ msgstr "é ?è¨æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??da
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "æ±ºå®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
 msgid "Use system timezone"
@@ -14101,9 +13817,7 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?ç¢ºèª?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
+msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
 msgstr "æ?¯å?¦å£?ç¸®æ??æª¢è¦?ä¸ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸ç??é?±å?è??é?±æ?¥ç½®æ?¼ä¸?å??ç©ºä½?ä¸ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
@@ -14111,8 +13825,7 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??æª¢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??ä¸ç¹ªå?º Marcus Bains ç·?ï¼?ä»£è¡¨ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
@@ -14148,8 +13861,7 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?ä»¶/å·¥ä½?/æ??è°ç·¨è¼¯å?¨ä¸é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
@@ -14184,104 +13896,104 @@ msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:271
+#: ../modules/calendar/e-cal-attachment-handler.c:267
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "å?¯å?¥(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:352
+#: ../modules/calendar/e-cal-attachment-handler.c:348
 msgid "Select a Calendar"
 msgstr "é?¸æ??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:379
+#: ../modules/calendar/e-cal-attachment-handler.c:375
 msgid "Select a Task List"
 msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:389
+#: ../modules/calendar/e-cal-attachment-handler.c:385
 msgid "I_mport to Calendar"
 msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:396
+#: ../modules/calendar/e-cal-attachment-handler.c:392
 msgid "I_mport to Tasks"
 msgstr "å?¯å?¥è?³å·¥ä½?(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:107
 #: ../modules/calendar/e-cal-shell-migrate.c:194
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:149
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:94
 #: ../modules/calendar/e-task-shell-migrate.c:160
 msgid "On The Web"
 msgstr "å?¨ç¶²ç«?ä¸?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:109
 #: ../plugins/calendar-weather/calendar-weather.c:121
 msgid "Weather"
 msgstr "å¤©æ°£"
 
-#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-backend.c:196
 #: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?å¿µæ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
+#: ../modules/calendar/e-cal-shell-backend.c:421
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-backend.c:423
 #: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Create a new appointment"
 msgstr "å»ºç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:428
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:434
+#: ../modules/calendar/e-cal-shell-backend.c:430
 msgid "Create a new all-day appointment"
 msgstr "å»ºç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:435
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:437
 msgid "Create a new meeting request"
 msgstr "å»ºç«?æ?°æ??è°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
+#: ../modules/calendar/e-cal-shell-backend.c:445
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-backend.c:447
 #: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Create a new calendar"
 msgstr "å»ºç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../modules/calendar/e-cal-shell-backend.c:750
 #: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:225
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "æ£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:640
+#: ../modules/calendar/e-cal-shell-sidebar.c:636
 msgid "_New Calendar..."
 msgstr "æ?°å¢?è¡?äº?æ??(_N)â?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:657
+#: ../modules/calendar/e-cal-shell-sidebar.c:653
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1000
+#: ../modules/calendar/e-cal-shell-sidebar.c:998
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14293,12 +14005,8 @@ msgid "Print"
 msgstr "å??å?°"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??æ?¨ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
+msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgstr "æ¤ä½?æ¥æ??æ°¸ä¹?æ?§å?ªé?¤æ¯?é?¸å??æ??é??é??è??ç??æ??æ??äº?ä»¶ã??å¦?æ??æ?¨ç¹¼çº?ï¼?å°?ç?¡æ³?å¾©å??é??äº?äº?ä»¶ã??"
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -14580,7 +14288,7 @@ msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-backend.c:283
 #: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "å»ºç«?æ?°ç??å??å¿?é??"
@@ -14646,7 +14354,7 @@ msgid "New _Task"
 msgstr "æ?°å¢?å·¥ä½?(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-backend.c:282
 #: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å·¥ä½?"
@@ -14684,40 +14392,40 @@ msgstr "æ??å?»å??æ?¥æ??(_M):"
 msgid "_Date only:"
 msgstr "å?ªæ??æ?¥æ??(_D):"
 
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:281
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:288
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:290
 msgid "Create a new shared memo"
 msgstr "å»ºç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-backend.c:300
 #: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "å»ºç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:220
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "æ£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:582
+#: ../modules/calendar/e-memo-shell-sidebar.c:578
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:887
+#: ../modules/calendar/e-memo-shell-sidebar.c:885
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14811,40 +14519,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:280
 msgctxt "New"
 msgid "_Task"
 msgstr "å·¥ä½?(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:287
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:289
 msgid "Create a new assigned task"
 msgstr "å»ºç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "å·¥ä½?æ¸?å?®(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-backend.c:299
 #: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "å»ºç«?æ?°å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:220
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "æ£å?¨è¼?å?¥å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:582
+#: ../modules/calendar/e-task-shell-sidebar.c:578
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:887
+#: ../modules/calendar/e-task-shell-sidebar.c:885
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -14856,13 +14564,11 @@ msgstr "å??å?°å·¥ä½?"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??æ?¨è¦?ç¹¼çº?ï¼?æ?¨å°?ä¸?è?½å¾©å??é??äº?å·¥"
-"ä½?ã??\n"
+"é??å??å??ä½?æ??æ°¸ä¹?å?°æ¸?é?¤æ??æ??æ¨?ç¤ºç?ºå·²å®?æ??ç??å·¥ä½?ã??å¦?æ??æ?¨è¦?ç¹¼çº?ï¼?æ?¨å°?ä¸?è?½å¾©å??é??äº?å·¥ä½?ã??\n"
 "\n"
 "ç¢ºå®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
@@ -14980,49 +14686,49 @@ msgid "Delete Task"
 msgstr "å?ªé?¤å·¥ä½?"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:380
+#: ../modules/mail/e-mail-attachment-handler.c:382
 #, c-format
 msgid "%d attached messages"
 msgstr "%d å??é??å? ç??é?µä»¶"
 
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
+#: ../modules/mail/e-mail-junk-hook.c:90
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:187
+#: ../modules/mail/e-mail-shell-backend.c:183
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "é?µä»¶è¨?æ?¯(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:189
+#: ../modules/mail/e-mail-shell-backend.c:185
 msgid "Compose a new mail message"
 msgstr "ç·¨è¼¯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:193
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??å¤¾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:195
 msgid "Create a new mail folder"
 msgstr "å»ºç«?æ?°é?µä»¶è³?æ??å¤¾"
 
-#: ../modules/mail/e-mail-shell-backend.c:498
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:506
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??å¥½è¨å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:514
+#: ../modules/mail/e-mail-shell-backend.c:510
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å¥½è¨å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:522
+#: ../modules/mail/e-mail-shell-backend.c:518
 msgid "Network Preferences"
 msgstr "ç¶²è·¯å??å¥½è¨å®?"
 
@@ -15178,7 +14884,7 @@ msgid "Send queued items in all accounts"
 msgstr "å?³é??å?¨æ??æ??å¸³è??å?§å¾?é??ç??é ?ç?®"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1262
-#: ../widgets/misc/e-activity-proxy.c:314
+#: ../widgets/misc/e-activity-proxy.c:306
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -15395,18 +15101,18 @@ msgstr "å¸³è??æ??å°?"
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??ä¼ºæ??å?¨(_L)"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:215
 msgid "Evolution Account Assistant"
 msgstr "Evolution å¸³è??å?©ç??"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:264
 msgid "Account Editor"
 msgstr "å¸³è??ç·¨è¼¯å?¨"
 
 #: ../modules/mail/em-composer-prefs.c:502
 #: ../modules/plugin-manager/evolution-plugin-manager.c:356
 #: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:220
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
@@ -15451,16 +15157,17 @@ msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:693
+#: ../modules/mail/em-mailer-prefs.c:766
 #, 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:701 ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:701
+#: ../modules/mail/em-mailer-prefs.c:775
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?ä½¿ç?¨ã??è«?æª¢æ?¥æ?¯å?¦æ??å®?è£?è©²å¥?ä»¶ã??"
 
 #: ../modules/mail/em-mailer-prefs.c:739
@@ -15481,8 +15188,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "æª¢æ?¥ Evolution æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?æ¬¡å??å?? Evolution æ??ï¼?æª¢æ?¥å®?æ?¯å?¦ç?ºé ?è¨ç??é?µä»¶ç¨?å¼?ã??"
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:143
@@ -15504,9 +15210,7 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
+msgid "Evolution will return to online mode once a network connection is established."
 msgstr "ä¸?æ?¦ç¶²è·¯é?£ç·?å»ºç«?ï¼?Evolution å°±æ??å??å?°ç·?ä¸?æ¨¡å¼?ã??"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:67
@@ -15555,12 +15259,12 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??æ¸¬è©¦å¤?æ??ç¨?å¼?ã??"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:277
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../widgets/misc/e-import-assistant.c:392
 msgid "Please select the information that you would like to import:"
 msgstr "è«?é?¸æ??æ?¨æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:309
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../widgets/misc/e-import-assistant.c:548
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
@@ -15588,13 +15292,11 @@ msgstr "æ¡è¿?ä½¿ç?¨"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:498
 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"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"æ¡è¿?ä½¿ç?¨ Evolutionã??ä»¥ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³æ?¨ç??é?»å?é?µä»¶å¸³è??ï¼?ä»¥å??å¾?å?¶ä»?"
-"æ??ç?¨ç¨?å¼?è¼¸å?¥æª?æ¡?ã??\n"
+"æ¡è¿?ä½¿ç?¨ Evolutionã??ä»¥ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³æ?¨ç??é?»å?é?µä»¶å¸³è??ï¼?ä»¥å??å¾?å?¶ä»?æ??ç?¨ç¨?å¼?è¼¸å?¥æª?æ¡?ã??\n"
 "\n"
 "è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ¥ã??æ??é??ç¹¼çº?ã?? "
 
@@ -15607,9 +15309,7 @@ msgid "Local Address Books"
 msgstr "æ?¬å?°ç«¯é??è¨?é??"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+msgid "List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "è®?é??ä»¶æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå?æ¸?å?®"
 
 #. Check buttons
@@ -15623,9 +15323,7 @@ msgid "Keywords"
 msgstr "é??é?µå?"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid ""
-"Evolution has found some keywords that suggest that this message should "
-"contain an attachment, but cannot find one."
+msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
 msgstr "Evolution å·²æ?¾å?°æ??äº?ä»£è¡¨è©²é?µä»¶æ??å?«æ??é??ä»¶ç??é??é?µå?ï¼?å?»æ?¾ä¸?å?°é??å??é??ä»¶ã??"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
@@ -15673,13 +15371,8 @@ msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
 #: ../plugins/backup-restore/backup-restore.c:323
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"æ?¨å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£"
-"çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
+msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
+msgstr "æ?¨å?¯ä»¥å¾?å??ä»½ä¸é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??äººè¨å®?ã??é?µä»¶é??æ¿¾å?¨ç?ã??"
 
 #: ../plugins/backup-restore/backup-restore.c:330
 msgid "_Restore Evolution from the backup file"
@@ -15828,8 +15521,7 @@ 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 back up file?"
+msgid "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
@@ -15857,25 +15549,15 @@ msgid "The selected folder is not writable."
 msgstr "é?¸å??ç??è³?æ??å¤¾ç?¡æ³?å¯«å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
-msgid ""
-"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ã??è«?ç¢ºå®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?"
-"ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??"
+msgid "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 back "
-"up."
-msgstr ""
-"è¦?é??å??æ?¨ç??è³?æ??å??è¨å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?ç¢ºå®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?"
-"ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤æ?¨ç?®å?? Evolution æ??æ??ç??è³?æ??å??è¨å®?å?¼ï¼?ä¸¦å¾?æ?¨"
-"ç??å??ä»½é??å??å®?å??ã??"
+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 back up."
+msgstr "è¦?é??å??æ?¨ç??è³?æ??å??è¨å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?ç¢ºå®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å?ä»»ä½?å°?æ?ªå?²å?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤æ?¨ç?®å?? Evolution æ??æ??ç??è³?æ??å??è¨å®?å?¼ï¼?ä¸¦å¾?æ?¨ç??å??ä»½é??å??å®?å??ã??"
 
-#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:685
+#: ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??é?£çµ¡äºº"
@@ -15915,14 +15597,11 @@ msgstr "BBDB"
 msgid ""
 "Takes the gruntwork out of managing your address book.\n"
 "\n"
-"Automatically fills your address book with names and email addresses as you "
-"reply to messages.  Also fills in IM contact information from your buddy "
-"lists."
+"Automatically fills your address book with names and email addresses as you reply to messages.  Also fills in IM contact information from your buddy lists."
 msgstr ""
 "ä¸?ç?¨å??å¤§è²»å?¨ç« ç®¡ç??æ?¨ç??é??è¨?é??äº?ã??\n"
 "\n"
-"å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM "
-"é?£çµ¡äººè³?è¨?ã??"
+"å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??ä¸å¡«å?¥å§?å??è??é?»å?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸å¡«å?¥ IM é?£çµ¡äººè³?è¨?ã??"
 
 #: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
@@ -15959,9 +15638,7 @@ msgid "Convert mail messages to Unicode"
 msgstr "å°?é?µä»¶è½?æ??ç?º Unicode"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
+msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
 msgstr "å°?é?µä»¶æ??å?è½?æ??ç?º Unicode UTF-8 ä»¥çµ±ä¸?ä¾?è?ªä¸?å??å?é??ç?? spam/ham ç?¹å¾µã??"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
@@ -16252,7 +15929,7 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?é¡¯ç¤ºé?£çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "é?£çµ¡äººç??å?°å??"
 
-#: ../plugins/dbx-import/dbx-importer.c:258
+#: ../plugins/dbx-import/dbx-importer.c:273
 msgid "Importing Outlook Express data"
 msgstr "æ£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
@@ -16301,13 +15978,8 @@ msgid "List of Custom Headers"
 msgstr "è?ªè¨?æ¨?é ç??æ¸?å?®"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"é??å??é?µå?¼æ??å®?ç??æ?¯æ?¨å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªè¨?æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?"
-"ç?ºï¼?è?ªè¨?æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
+msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
+msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯æ?¨å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªè¨?æ¨?é æ¸?å?®ã??æ??å®?æ¨?é è??æ¨?é æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªè¨?æ¨?é å??ç¨±å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??ä»¥ã??;ã??é??é??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
 msgctxt "email-custom-header-Security"
@@ -16435,9 +16107,7 @@ msgid "Editor not launchable"
 msgstr "ç·¨è¼¯å?¨ç?¡æ³?å??å??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
-msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+msgid "Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr "Evoluton ç?¡æ³?å»ºç«?ç?¨ä¾?å?²å?æ?¨é?µä»¶ç??æ?«å?æª?æ¡?ã??è«?ç¨?å¾?å??è©¦ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
@@ -16445,29 +16115,20 @@ msgid "External editor still running"
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
-msgid ""
-"The external editor is still running. The mail composer window cannot be "
-"closed as long as the editor is active."
+msgid "The external editor is still running. The mail composer window cannot be closed as long as the editor is active."
 msgstr "å¤?é?¨ç·¨è¼¯å?¨ä»?å?¨å?·è¡?ä¸ã??å?ªè¦?è©²ç·¨è¼¯å?¨ä»?å?¨ä½¿ç?¨ï¼?é?µä»¶ç·¨è¼¯å?¨è¦?çª?å°±ä¸?è?½é??é??ã??"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr ""
-"ä¸?è?½å??å??å?¨æ?¨å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?è©¦è??è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
+msgid "The external editor set in your plugin preferences cannot be launched. Try setting a different editor."
+msgstr "ä¸?è?½å??å??å?¨æ?¨å¤?æ??ç¨?å¼?å??å¥½è¨å®?ä¸è¨å®?ç??å¤?é?¨ç·¨è¼¯å?¨ã??è«?è©¦è??è¨å®?ä¸?å??ç??ç·¨è¼¯å?¨ã??"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "é ?è¨æ??å?¥å¤§é ç?§"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"æ?¯å?¦é ?è¨å?¨å¤?å¯?é?µä»¶ä¸æ??å?¥å¤§é ç?§ã??å?¨æ ¸å??é??å??é?¸é ?ä¹?å??å¿?é ?å??è¨å®?å¥½ç?¸ç??ï¼?å?¦å??ä¸?æ??"
-"æ??ä»»ä½?æ??æ??ã??"
+msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
+msgstr "æ?¯å?¦é ?è¨å?¨å¤?å¯?é?µä»¶ä¸æ??å?¥å¤§é ç?§ã??å?¨æ ¸å??é??å??é?¸é ?ä¹?å??å¿?é ?å??è¨å®?å¥½ç?¸ç??ï¼?å?¦å??ä¸?æ??æ??ä»»ä½?æ??æ??ã??"
 
 #: ../plugins/face/face.c:286
 msgid "Select a Face Picture"
@@ -16537,8 +16198,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:955
+#: ../plugins/mail-to-task/mail-to-task.c:737
+#: ../plugins/mail-to-task/mail-to-task.c:956
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
@@ -16558,17 +16219,17 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:453
 msgid "Checklist"
 msgstr "æª¢æ?¥æ¸?å?®"
 
 #. Translators: First %s is the server name, second %s is user name
-#: ../plugins/groupwise-features/camel-gw-listener.c:507
+#: ../plugins/groupwise-features/camel-gw-listener.c:513
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "è¼¸å?¥ %s (ä½¿ç?¨è?? %s) ç??å¯?ç¢¼ "
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:527
+#: ../plugins/groupwise-features/camel-gw-listener.c:533
 msgid "Failed to authenticate.\n"
 msgstr "é©?è?æ??è?å¤±æ??ã??\n"
 
@@ -16682,9 +16343,7 @@ msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
 #: ../plugins/groupwise-features/mail-retract.c:90
-msgid ""
-"Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this?"
+msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?è©²é?µä»¶è?ªæ?¶ä»¶è??ç??ä¿¡ç®±ç§»é?¤ã??æ?¨ç¢ºå®?è¦?é??éº¼å??ï¼?"
 
 #: ../plugins/groupwise-features/mail-retract.c:111
@@ -16735,11 +16394,8 @@ msgid "Invalid user"
 msgstr "ç?¡æ??ç??ä½¿ç?¨è??"
 
 #: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
+msgid "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email address and try again."
+msgstr "ä»¥ &quot;{0}&quot; ç?»å?¥ä»£ç??ä¼ºæ??å?¨å¤±æ??ã??è«?æª¢æ?¥æ?¨ç??é?»å?é?µä»¶ä½?å??ä¸¦å??è©¦ä¸?æ¬¡ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
@@ -16794,11 +16450,8 @@ msgid "This will create a new meeting using the existing meeting details."
 msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
-msgid ""
-"This will create a new meeting with the existing meeting details. The "
-"recurrence rule needs to be re-entered."
-msgstr ""
-"é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
+msgid "This will create a new meeting with the existing meeting details. The recurrence rule needs to be re-entered."
+msgstr "é??æ??ä½¿ç?¨æ?¢å?ç??æ??è°è©³ç´°è³?æ??å»ºç«?æ?°ç??æ??è°ã??å?¶ä¸é?±æ??æ?§è¦?å??ç??é?¨å??é??è¦?é??æ?°è¼¸å?¥ã??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -16879,7 +16532,7 @@ msgid "Proxy"
 msgstr "ä»£ç??ä¼ºæ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:239
 msgid "Account Name"
 msgstr "å¸³è??å??ç¨±"
 
@@ -17018,8 +16671,7 @@ msgstr "å?ºæ?¬è??é??ä¿¡è«?å£?æª?é (é ?è¨å?¼)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
 "æ??ä¾?å?¨ä¸?å??æ¨?æº?æª?é ä»¥å¤?æ?¨æ?³è¦?æ?¥æ?¶ç??é¡?å¤?æª?é ã??\n"
@@ -17193,9 +16845,7 @@ msgstr "é??å¸¶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1704
 #: ../plugins/itip-formatter/itip-formatter.c:1715
-msgid ""
-"The message claims to contain a calendar, but the calendar is not a valid "
-"iCalendar."
+msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "æ¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??ä¸¦é??æ??æ??ç?? iCalendarã??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1755
@@ -17207,20 +16857,15 @@ msgstr "è¡?äº?æ??ä¸ç??é ?ç?®æ?¯ç?¡æ??ç??"
 #: ../plugins/itip-formatter/itip-formatter.c:1756
 #: ../plugins/itip-formatter/itip-formatter.c:1784
 #: ../plugins/itip-formatter/itip-formatter.c:1893
-msgid ""
-"The message does contain a calendar, but the calendar contains no events, "
-"tasks or free/busy information"
-msgstr ""
-"æ¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?è©²å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?ä»¶ã??å·¥ä½?æ??ç©ºé??/å¿?ç¢?è³?è¨?"
+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:1797
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1798
-msgid ""
-"To process all of these items, the file should be saved and the calendar "
-"imported"
+msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??è©²å°?æ¤æª?æ¡?å?²å?å¾?å?¯å?¥å?¶ä¸ç??è¡?äº?æ??"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2460
@@ -17451,9 +17096,7 @@ msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å?ç??æ??è°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"meeting:"
+msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:400
@@ -17538,15 +17181,12 @@ msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid ""
-"%s through %s wishes to receive the latest information for the following "
-"assigned task:"
+msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"%s wishes to receive the latest information for the following assigned task:"
+msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??æ´¾å·¥ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:492
@@ -17753,8 +17393,7 @@ msgid "This meeting has been delegated"
 msgstr "é??å??æ??è°å·²å§?æ´¾"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "é??å??å??è¦?ä¸¦é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?ä»¶äººå? å?¥ç?ºå?°æ??è??ï¼?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -17774,9 +17413,7 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??ç?¢ç?? D-BUS è¨?æ?¯ã??"
 
 #: ../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."
+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:6
@@ -17823,7 +17460,7 @@ msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??ç¤ºä¸?å½?å?ºè¨?æ?¯ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:398
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17840,64 +17477,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../plugins/mail-notification/mail-notification.c:410
 #, 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:415
+#: ../plugins/mail-notification/mail-notification.c:423
 #, c-format
 msgid "Subject: %s"
 msgstr "ä¸»æ?¨ï¼?%s"
 
-#: ../plugins/mail-notification/mail-notification.c:425
+#: ../plugins/mail-notification/mail-notification.c:433
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 msgstr[1] "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? "
 
-#: ../plugins/mail-notification/mail-notification.c:438
 #: ../plugins/mail-notification/mail-notification.c:446
-#: ../plugins/mail-notification/mail-notification.c:449
+#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:457
 msgid "New email"
 msgstr "æ?°é?µä»¶"
 
-#: ../plugins/mail-notification/mail-notification.c:498
+#: ../plugins/mail-notification/mail-notification.c:506
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??ä¸é¡¯ç¤ºå??ç¤º(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:528
+#: ../plugins/mail-notification/mail-notification.c:536
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??ç¤ºä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:715
+#: ../plugins/mail-notification/mail-notification.c:723
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:745
+#: ../plugins/mail-notification/mail-notification.c:753
 msgid "_Beep"
 msgstr "å?¶è?²(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:766
 msgid "Use sound _theme"
 msgstr "ä½¿ç?¨é?³æ??ä¸»é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:777
+#: ../plugins/mail-notification/mail-notification.c:785
 msgid "Play _file:"
 msgstr "æ?æ?¾æª?æ¡?(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:796
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:846
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:855
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -17915,166 +17552,133 @@ 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?"
+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?"
+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 "
-"old memo?"
+msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
 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
-msgid ""
-"Selected calendar contains some events for the given mails already. Would "
-"you like to create new events anyway?"
+#: ../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?"
 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
-msgid ""
-"Selected task list contains some tasks for the given mails already. Would "
-"you like to create new tasks anyway?"
+#: ../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?"
 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
-msgid ""
-"Selected memo list contains some memos for the given mails already. Would "
-"you like to create new memos anyway?"
-msgstr ""
-"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+#: ../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?"
+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
-msgid ""
-"Selected calendar contains an event for the given mail already. Would you "
-"like to create new event anyway?"
-msgid_plural ""
-"Selected calendar contains events for the given mails already. Would you "
-"like to create new events anyway?"
+#: ../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?"
+msgid_plural "Selected calendar contains events for the given mails already. Would you like to create new events anyway?"
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??äº?ä»¶ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?ä»¶ï¼?"
 
 #. 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
-msgid ""
-"Selected task list contains a task for the given mail already. Would you "
-"like to create new task anyway?"
-msgid_plural ""
-"Selected task list contains tasks for the given mails already. Would you "
-"like to create new tasks anyway?"
+#: ../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?"
+msgid_plural "Selected task list contains tasks for the given mails already. Would you like to create new tasks anyway?"
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
 #. 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
-msgid ""
-"Selected memo list contains a memo for the given mail already. Would you "
-"like to create new memo anyway?"
-msgid_plural ""
-"Selected memo list contains memos for the given mails already. Would you "
-"like to create new memos anyway?"
-msgstr[0] ""
-"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
-msgstr[1] ""
-"é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+#: ../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?"
+msgid_plural "Selected memo list contains memos for the given mails already. Would you like to create new memos anyway?"
+msgstr[0] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
+msgstr[1] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../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
-msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+#: ../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
-msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+#: ../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
-msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+#: ../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:955
+#: ../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:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1075
 msgid "Create an _Event"
 msgstr "å»ºç«?äº?ä»¶(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../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:1081
+#: ../plugins/mail-to-task/mail-to-task.c:1082
 msgid "Create a Mem_o"
 msgstr "å»ºç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1083
+#: ../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:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1089
 msgid "Create a _Task"
 msgstr "å»ºç«?å·¥ä½?(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1090
+#: ../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:1098
+#: ../plugins/mail-to-task/mail-to-task.c:1099
 msgid "Create a _Meeting"
 msgstr "å»ºç«?æ??è°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1100
+#: ../plugins/mail-to-task/mail-to-task.c:1101
 msgid "Create a new meeting from the selected message"
 msgstr "ä»¥é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è°"
 
@@ -18148,14 +17752,11 @@ msgstr "ç?¡æ³?ä½¿ç?¨å??ä½?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
+"You should receive an answer from the mailing list shortly after the message has been sent."
 msgstr ""
-"å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??æ?¨å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹"
-"è®?ã??\n"
+"å?³å°?å¯?å?ºä¸?å°?é?»å?é?µä»¶è?³ URL \"{0}\"ã??æ?¨å?¯ä»¥è?ªå??é??å?ºé?µä»¶ï¼?æ??æ?¯å??æ?¥ç??ä¸¦å??äº?æ?¹è®?ã??\n"
 "\n"
 "å?¨é??å°?é?µä»¶é??å?ºå¾?ä¸?ä¹?æ?¨æ??è©²æ??æ?¶å?°ä¾?è?ªé??ä¿¡è«?å£?ç??å??æ??ã??"
 
@@ -18172,12 +17773,8 @@ msgid "Posting not allowed"
 msgstr "ä¸?å??è¨±å¼µè²¼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?é?£çµ¡è«?å£?ç??ç®¡ç??"
-"è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
+msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
+msgstr "å°?æ¤é??ä¿¡è«?å£?ç??å¼µè²¼æ?¯ä¸?è¢«å??è¨±ç??ã??é??å?¯è?½æ?¯ä¸?å??å?¯è®?ç??é??ä¿¡è«?å£?ã??è«?é?£çµ¡è«?å£?ç??ç®¡ç??è??ä»¥å??å¾?é?²ä¸?æ¥è³?è¨?ã??"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18185,8 +17782,7 @@ msgstr "å?³é??é?µä»¶å?°é??ä¿¡è«?å£?ï¼?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18205,9 +17801,7 @@ msgstr ""
 "æª?é ï¼? {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
+msgid "This message does not contain the header information required for this action."
 msgstr "é??å°?é?µä»¶æ²?æ??å??å?«æ¤å??ä½?æ??é??ç??æª?é è³?è¨?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18223,12 +17817,8 @@ msgid "Also mark messages in subfolders?"
 msgstr "æ?¯å?¦ä¹?æ¨?è¨?å?è³?æ??å¤¾ä¸ç??é?µä»¶ï¼?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid ""
-"Do you want to mark messages as read in the current folder only, or in the "
-"current folder as well as all subfolders?"
-msgstr ""
-"æ?¨è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µ"
-"ä»¶ã??"
+msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
+msgstr "æ?¨è¦?å°?ç?®å??ç??è³?æ??å¤¾ä¸ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??å¤¾å??å?¶å?è³?æ??å¤¾ä¸æ??æ??é?µä»¶ã??"
 
 #: ../plugins/mark-all-read/mark-all-read.c:193
 msgid "In Current Folder and _Subfolders"
@@ -18263,39 +17853,35 @@ msgstr "å??å¥½ç´?æ??å?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "ä»¥ç´?æ??å?æ?¹å¼?æª¢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??é¡¯ç¤ºä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:225
+#: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
+#: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å?å??é¡¯ç¤ºå®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:226
-msgid ""
-"Show plain text part, if present, otherwise let Evolution choose the best "
-"part to show."
+#: ../plugins/prefer-plain/prefer-plain.c:242
+msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "å¦?æ??æ??ç´?æ??å?ç??é?¨å??å°±é¡¯ç¤ºå®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?é¡¯ç¤ºã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
+#: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å?é¡¯ç¤º"
 
-#: ../plugins/prefer-plain/prefer-plain.c:227
-msgid ""
-"Always show plain text part and make attachments from other parts, if "
-"requested."
+#: ../plugins/prefer-plain/prefer-plain.c:243
+msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å?ç??é?¨å??ä¸¦å¾?å?¶ä»?ç??é?¨å??è£½ä½?é??ä»¶ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:274
+#: ../plugins/prefer-plain/prefer-plain.c:290
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??é¡¯ç¤ºç?ºé??ä»¶(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:294
+#: ../plugins/prefer-plain/prefer-plain.c:310
 msgid "HTML _Mode"
 msgstr "HT_ML æ¨¡å¼?"
 
@@ -18319,35 +17905,36 @@ msgstr "Outlook PST å?¯å?¥"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??äººè³?æ??å¤¾ (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:311
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "_Mail"
 msgstr "é?µä»¶(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:327
+#: ../plugins/pst-import/pst-importer.c:325
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??å¤¾:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:333
+#: ../plugins/pst-import/pst-importer.c:331
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:340
+#: ../plugins/pst-import/pst-importer.c:338
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:346 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:344
+#: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "å·¥ä½?(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:350
 msgid "_Journal entries"
 msgstr "æ?¥èª?é ?ç?®(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:367
+#: ../plugins/pst-import/pst-importer.c:365
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
@@ -18404,11 +17991,11 @@ msgstr "ç¢ºå®?è¦?ç§»é?¤é??å??ä½?ç½®ï¼?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1055
+#: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
 msgstr "ç?¡æ³?å»ºç«?ç?¼å¸?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1063
+#: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
 msgstr "ç?¼å¸?è¡?äº?æ??è³?è¨?(_P)"
 
@@ -18506,11 +18093,11 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼å¸?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?ç«¯ç¨?å¼?å·²ä¸?å?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:475
+#: ../plugins/publish-calendar/url-editor-dialog.c:484
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:477
+#: ../plugins/publish-calendar/url-editor-dialog.c:486
 msgid "Edit Location"
 msgstr "ç·¨è¼¯ä½?ç½®"
 
@@ -18696,9 +18283,7 @@ msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å?è?³ç£?ç¢?"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
+msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
 msgstr "ä½¿ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå?/æ?¸å?¼çµ?æ¸?å?®ã??"
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -18818,8 +18403,7 @@ msgid "Enable express mode"
 msgstr "å??ç?¨å¿«é??æ¨¡å¼?"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr "ç?¶å?å??ç¶²é??ç¶²è·¯ä¸?ç?? HTTP/ å®?å?¨å¼? HTTP æ??å??ç?¨ä»£ç??ä¼ºæ??å?¨è¨å®?å?¼ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -18847,15 +18431,8 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "å??å??æ??é ?è¨é¡¯ç¤ºç??å??ä»¶ç?¸é?? ID æ??å?¥å??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/"
-"evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? "
-"gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
+msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr "å¦?æ??ç?º trueï¼?å°?ä»£ç??ä¼ºæ??å?¨ç??é?£ç·?å°±é??è¦?é©?è?ã??å?¶ä¸ä½¿ç?¨è??å??ç¨±æ??å¾? GConf ç??ã??apps/evolution/shell/network_config/authentication_userã??é?µå?¼å??å¾?ï¼?è??å¯?ç¢¼æ??å¾? gnome-keyring æ??ã??~/.gnome2_private/Evolutionã??ç??å¯?ç¢¼æª?æ¡?å??å¾?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -18870,9 +18447,7 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser å°?è©±ç??ç??å??å§?è³?æ??å¤¾ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
+msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
 msgstr "é??ä»¶å·¥å?·å??å??ä»¶ç??å??å§?æª¢è¦?ã??ã??0ã??æ?¯å??ç¤ºï¼?ã??1ã??æ?¯æ¸?å?®æª¢è¦?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
@@ -18880,8 +18455,7 @@ msgid "Last upgraded configuration version"
 msgstr "ä¸?æ¬¡å??ç´?ç??çµ?æ??ç??æ?¬"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "è¦?å??æ¥è?³ç£?ç¢?ç??è³?æ??å¤¾ï¼?å?¶è·¯å¾?æ¸?å?® (ä¾?é?¢ç·?ä½¿ç?¨)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -18913,15 +18487,8 @@ msgid "Secure HTTP proxy port"
 msgstr "å®?å?¨å¼? HTTP ä»£ç??ä¼ºæ??å?¨é??è¨?å? "
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid ""
-"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
-"representing \"use system settings\", \"no proxy\", \"use manual proxy "
-"configuration\" and \"use proxy configuration provided in the autoconfig url"
-"\" respectively."
-msgstr ""
-"é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?"
-"å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig "
-"url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
+msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
+msgstr "é?¸æ??ä»£ç??ä¼ºæ??å?¨çµ?æ??æ¨¡å¼?ã??æ?¯æ?´ç??æ?¸å?¼æ?? 0ã?? 1ã?? 2ã?? å?? 3ï¼?å??å?¥ä»£è¡¨ã??ä½¿ç?¨ç³»çµ±è¨å®?å?¼ã??ã??ã??ä¸?ä½¿ç?¨ä»£ç??ä¼ºæ??å?¨ã??ã??ã??ä½¿ç?¨æ??å??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??å??ã??ä½¿ç?¨å?¨ autoconfig url ä¸æ??ä¾?ç??ä»£ç??ä¼ºæ??å?¨çµ?æ??ã??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -18931,7 +18498,8 @@ msgstr "é¡¯ç¤ºå?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "å¿½ç?¥é??ç?¼è¦å??å°?è©±ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
+#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "ä»¥é?¢ç·?æ¨¡å¼?å??å??"
 
@@ -18940,11 +18508,8 @@ msgid "Statusbar is visible"
 msgstr "ç??æ??å??è¨ç?ºé¡¯ç¤º"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr ""
-"Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
+msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "Evolution ç??çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -18967,12 +18532,8 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "å?´é??æ¬?ç??é ?è¨å¯¬åº¦ï¼?ä»¥å??ç´ è¨?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr ""
-"ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?"
-"ã??2.6.0ã??) ã??"
+msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
+msgstr "ä¸?æ¬¡å??ç´?ç?? Evolution çµ?æ??ç??æ?¬ï¼?ä»¥ major/minor/configuration å±¤ç´?è¡¨ç¤º(ä¾?å¦?ã??2.6.0ã??) ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -18987,50 +18548,25 @@ msgid "The machine name to proxy socks through."
 msgstr "socks ä»£ç??ä¼ºæ??å?¨ä¸»æ©?å??ç¨±ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
-msgstr ""
-"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?"
-"å? ã??"
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
+msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/http_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??"
-"è¨?å? ã??"
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
+msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/secure_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?"
-"å? ã??"
+msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
+msgstr "å®?ç¾©æ?¼ã??/apps/evolution/shell/network_config/socks_hostã??ç??ä»£ç??ä¼ºæ??å?¨ä¸»æ©?é??è¨?å? ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "text", "icons", "both", "toolbar", "toolbar"
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??"
-"ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??ä¾? GNOME å·¥å?·å??"
-"è¨å®?å?¼æ±ºå®?ã??"
+msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
+msgstr "è¦?çª?æ??é??ç??é¢¨æ ¼ã??å?¯ä»¥æ?¯ã??textã??(æ??å?)ã??ã??iconsã??(å??ç¤º)ã??ã??bothã??(å?©è??)ã??ã??toolbarã??(å·¥å?·å??)ã??å¦?æ??è¨ç?ºã??toolbarã??(å·¥å?·å??)ï¼?æ??é??ç??é¢¨æ ¼æ??ä¾? GNOME å·¥å?·å??è¨å®?å?¼æ±ºå®?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»"
-"æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?å??å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??"
-"å¸¶æ??å?ç¶²è·¯é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
+msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr "é??å??é?µå?¼å??å?«äº?è¦?ç?´æ?¥é?£ç·?ï¼?ä¸?é??é??ä»£ç??ä¼ºæ??å?¨ï¼?å¦?æ??æ??ä½¿ç?¨ï¼?ç??ä¸»æ©?ã??æ?¸å?¼å?¯ä»¥ç?ºä¸»æ©?å??ç¨±ã??ç¶²å??ï¼?é??é ä½¿ç?¨è?¬ç?¨å?å??å¦? *.foo.comï¼?ã??IP ä½?å??ï¼?IPv4 å?? IPv6 ç??å?¯ï¼?æ??å¸¶æ??å?ç¶²è·¯é?®ç½©ç??ä½?å??ï¼?å??æ?¯ 192.168.0.0/24ï¼?ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -19070,8 +18606,7 @@ msgid "Whether the toolbar should be visible."
 msgstr "æ?¯å?¦å?¯ä»¥ç??å?°å·¥å?·å??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "æ?¯å?¦ç??ç?¥ Evulution é??ç?¼ç??æ?¬ç??è¦å??å°?è©±ç??ã??"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
@@ -19086,11 +18621,12 @@ msgstr "è¦?çª?æ??é??é¢¨æ ¼"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:698 ../shell/e-shell-content.c:699
+#: ../shell/e-shell-content.c:695
+#: ../shell/e-shell-content.c:696
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:741
+#: ../shell/e-shell-content.c:738
 msgid "Save Search"
 msgstr "å?²å?æ??å°?çµ?æ??"
 
@@ -19098,19 +18634,19 @@ 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:938
+#: ../shell/e-shell-searchbar.c:935
 msgid "Sho_w:"
 msgstr "é¡¯ç¤º(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:968
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1031
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
@@ -19126,7 +18662,7 @@ msgstr "iCalendar (.ics)"
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
-#: ../shell/e-shell-view.c:286
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "å?²å?ä½¿ç?¨è??ä»?é?¢ç??æ??"
 
@@ -19415,19 +18951,19 @@ msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:434
+#: ../shell/e-shell-window.c:438
 msgid "New"
 msgstr "æ?°å¢?"
 
-#: ../shell/e-shell.c:261
+#: ../shell/e-shell.c:257
 msgid "Preparing to go offline..."
 msgstr "æº?å??é?²å?¥é?¢ç·?â?¦"
 
-#: ../shell/e-shell.c:314
+#: ../shell/e-shell.c:310
 msgid "Preparing to go online..."
 msgstr "æº?å??é?²å?¥ä¸?ç·?â?¦"
 
-#: ../shell/e-shell.c:376
+#: ../shell/e-shell.c:372
 msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??â?¦"
 
@@ -19482,12 +19018,8 @@ msgstr "ä¸?è¦?å??é¡¯ç¤ºé??å??è¨?æ?¯"
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../shell/main.c:365
-msgid ""
-"Start Evolution showing the specified component. Available options are "
-"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
-msgstr ""
-"å??å?? Evolution æ??ä»¥æ??å®?ç??å??ä»¶é¡¯ç¤ºã??å?¯ç?¨ç??é?¸é ?æ??ã??mailã??ã??ã??calendarã??ã??"
-"ã??contactsã??ã??ã??tasksã??å??ã??memosã??"
+msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr "å??å?? Evolution æ??ä»¥æ??å®?ç??å??ä»¶é¡¯ç¤ºã??å?¯ç?¨ç??é?¸é ?æ??ã??mailã??ã??ã??calendarã??ã??ã??contactsã??ã??ã??tasksã??å??ã??memosã??"
 
 #: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
@@ -19530,7 +19062,8 @@ msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??ç¨±å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?ä¸ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:557 ../shell/main.c:565
+#: ../shell/main.c:557
+#: ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
@@ -19565,20 +19098,12 @@ msgid "Continue Anyway"
 msgstr "å¼·å?¶ç¹¼çº?"
 
 #: ../shell/shell.error.xml.h:4
-msgid ""
-"Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
-msgstr ""
-"Evolution ä¸?å??æ?¯æ?´å¾? {0} ç??ç?´æ?¥å??ç´?ã??ç?¶è??è®?é??ç??æ?¹æ³?æ?¯æ?¨å?¯ä»¥è©¦è??å??å??ç´?å?° "
-"Evolution 2ï¼?æ?¥è??å??å??ç´?å?° Evolution 3ã??"
+msgid "Evolution no longer supports upgrading directly from version {0}. However as a workaround you might try first upgrading to Evolution 2, and then upgrading to Evolution 3."
+msgstr "Evolution ä¸?å??æ?¯æ?´å¾? {0} ç??ç?´æ?¥å??ç´?ã??ç?¶è??è®?é??ç??æ?¹æ³?æ?¯æ?¨å?¯ä»¥è©¦è??å??å??ç´?å?° Evolution 2ï¼?æ?¥è??å??å??ç´?å?° Evolution 3ã??"
 
 #: ../shell/shell.error.xml.h:5
-msgid ""
-"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed."
-msgstr ""
-"é?ºå¿?æ?¨ç??å¯?ç¢¼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?ç¢¼ã??å?¨ä¸?æ¬¡é??è¦?ä½¿ç?¨å¯?ç¢¼æ??å°?æ??æ??ç¤ºæ?¨è¼¸å?¥ã??"
+msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
+msgstr "é?ºå¿?æ?¨ç??å¯?ç¢¼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?ç¢¼ã??å?¨ä¸?æ¬¡é??è¦?ä½¿ç?¨å¯?ç¢¼æ??å°?æ??æ??ç¤ºæ?¨è¼¸å?¥ã??"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Quit Now"
@@ -19596,28 +19121,27 @@ msgstr "é?ºå¿?(_F)"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
 "å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å?¯è?½ç?¡æ³?å?å??é?¨å??è??è³?æ??ã??\n"
 
-#: ../shell/test/e-test-shell-backend.c:60
+#: ../shell/test/e-test-shell-backend.c:56
 msgctxt "New"
 msgid "_Test Item"
 msgstr "æ¸¬è©¦é ?ç?®(_T)"
 
-#: ../shell/test/e-test-shell-backend.c:62
+#: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦é ?ç?®"
 
-#: ../shell/test/e-test-shell-backend.c:70
+#: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
 msgid "Test _Source"
 msgstr "æ¸¬è©¦ä¾?æº?(_S)"
 
-#: ../shell/test/e-test-shell-backend.c:72
+#: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
 msgstr "å»ºç«?æ?°ç??æ¸¬è©¦ä¾?æº?"
 
@@ -19656,31 +19180,31 @@ msgstr "ä¸?è?½å?³é??æ??ä»¶ URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
 
-#: ../smclient/eggsmclient.c:227
+#: ../smclient/eggsmclient.c:224
 msgid "Disable connection to session manager"
 msgstr "å??ç?¨å?°ä½?æ¥é??æ®µç®¡ç??ç¨?å¼?ç??é?£ç·?"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?å??å?«å·²å?²å?çµ?æ??ç??æª?æ¡?"
 
-#: ../smclient/eggsmclient.c:230
+#: ../smclient/eggsmclient.c:227
 msgid "FILE"
 msgstr "æª?æ¡?"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "Specify session management ID"
 msgstr "æ??å®?ä½?æ¥é??æ®µç®¡ç?? ID"
 
-#: ../smclient/eggsmclient.c:233
+#: ../smclient/eggsmclient.c:230
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:251
 msgid "Session management options:"
 msgstr "ä½?æ¥é??æ®µç®¡ç??é?¸é ?ï¼?"
 
-#: ../smclient/eggsmclient.c:255
+#: ../smclient/eggsmclient.c:252
 msgid "Show session management options"
 msgstr "é¡¯ç¤ºä½?æ¥é??æ®µç®¡ç??é?¸é ?"
 
@@ -19696,22 +19220,12 @@ msgstr ""
 "ç·¨è¼¯ä¿¡ä»»è¨å®?å?¼ï¼?"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr ""
-"å? ç?ºæ?¨ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¿¡ä»»æ¤æ??è?ç??æ??æ??"
-"æ?§ã??"
+msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "å? ç?ºæ?¨ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§ã??"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr ""
-"å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??"
-"æ??æ?§ã??"
+msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
+msgstr "å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ¤æ??è?ç??æ??è?å?®ä½?ï¼?æ??ä»¥é?¤é??å?¨æ¤æ??ç¤ºï¼?å?¦å??æ?¨å°?ä¸?ä¿¡ä»»æ¤æ??è?ç??æ??æ??æ?§ã??"
 
 #: ../smime/gui/certificate-manager.c:148
 #: ../smime/gui/certificate-manager.c:460
@@ -19744,7 +19258,8 @@ msgstr "æ??è?å??ç¨±"
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/certificate-manager.c:370
+#: ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
@@ -19828,14 +19343,11 @@ msgid "Backup _All"
 msgstr "å?¨é?¨å??ä»½(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr ""
-"ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?æ?¨æ??è©²å??æª¢æ?¥å®?ç??æ??è?ä»¥å??å®?ç??æ?¿ç?å??ç¨?"
-"åº?ã??"
+msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgstr "ä¿¡ä»»æ¤æ??è?ç®¡ç??ä¸å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??è©±ï¼?æ?¨æ??è©²å??æª¢æ?¥å®?ç??æ??è?ä»¥å??å®?ç??æ?¿ç?å??ç¨?åº?ã??"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
+#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "æ??è?"
 
@@ -19923,11 +19435,13 @@ msgstr "çµ?ç¹?å?®ä½? (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
+#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "SSL ç?¨æ?¶ç«¯æ??è?"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
+#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL ä¼ºæ??å?¨æ??è?"
 
@@ -19960,8 +19474,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "æ?¨å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??æ??è?ï¼?å?¯ä»¥è?å?¥æ?¨ç??èº«å??:"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è?ï¼?å?¯ä»¥è?å?¥é??äº?æ??è?ç®¡ç??ä¸å¿?:"
 
 #: ../smime/gui/smime-ui.ui.h:41
@@ -19985,7 +19498,8 @@ msgstr "ç·¨è¼¯æ??è?ç®¡ç??ä¸å¿? (CA) ä¿¡ä»»åº¦(_E)"
 msgid "Certificate already exists"
 msgstr "æ??è?å·²ç¶?å?å?¨"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228
+#: ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
@@ -20079,11 +19593,13 @@ msgstr "ä¸»æ?¨å?¬é?°æ¼?ç®?æ³?"
 msgid "Subject's Public Key"
 msgstr "ä¸»æ?¨ç??å?¬é?°"
 
-#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:815
+#: ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??å»¶ä¼¸"
 
-#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:836
+#: ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
@@ -20127,7 +19643,8 @@ msgstr "CRL ç°½ç½²è??"
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
@@ -20146,7 +19663,8 @@ msgstr "å»¶ä¼¸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
+#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "æ??è?ç°½ç« æ¼?ç®?æ³?"
 
@@ -20186,7 +19704,8 @@ msgstr "ä¾?å?¬å?¸(_C)"
 msgid "_Address Cards"
 msgstr "å?°å??å?¡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3
+#: ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "æ¸?å?®æª¢è¦?(_L)"
 
@@ -20273,8 +19792,7 @@ msgstr "æ??å??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "ä½¿ç?¨æ»?é¼ å·¦é?µæ??è¿?å?°å??ç??å??å??ï¼?ç?¶å¾?é?¸å??æ??å??ã??\n"
@@ -20300,7 +19818,7 @@ msgstr "å®?ç¾©æª¢è¦?"
 msgid "Define Views for \"%s\""
 msgstr "å®?ç¾©ã??%sã??ç??æª¢è¦?"
 
-#: ../widgets/menus/gal-view-factory-etable.c:113
+#: ../widgets/menus/gal-view-factory-etable.c:109
 msgid "Table"
 msgstr "è¡¨æ ¼"
 
@@ -20332,36 +19850,36 @@ msgstr "æª¢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "æª¢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-account-manager.c:352
+#: ../widgets/misc/e-account-manager.c:349
 msgid "De_fault"
 msgstr "é ?è¨å?¼(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:270
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment-dialog.c:307
+#: ../widgets/misc/e-attachment-dialog.c:304
 msgid "Attachment Properties"
 msgstr "é??ä»¶å?§å®¹"
 
-#: ../widgets/misc/e-attachment-dialog.c:329
+#: ../widgets/misc/e-attachment-dialog.c:326
 msgid "_Filename:"
 msgstr "æª?æ¡?å??ç¨±(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:364
+#: ../widgets/misc/e-attachment-dialog.c:361
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:372
-#: ../widgets/misc/e-attachment-store.c:533
+#: ../widgets/misc/e-attachment-dialog.c:369
+#: ../widgets/misc/e-attachment-store.c:556
 msgid "_Suggest automatic display of attachment"
 msgstr "å»ºè°è?ªå??é¡¯ç¤ºé??ä»¶(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:100
+#: ../widgets/misc/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "ç?¡æ³?è¨ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:152
+#: ../widgets/misc/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "è¨ç?ºè??æ?¯(_B)"
 
@@ -20379,42 +19897,43 @@ msgstr "å?³é??è?³(_S)â?¦"
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??ä»¶å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:545
+#: ../widgets/misc/e-attachment-icon-view.c:158
+#: ../widgets/misc/e-attachment-tree-view.c:543
 msgid "Loading"
 msgstr "è¼?å?¥ä¸"
 
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:557
+#: ../widgets/misc/e-attachment-icon-view.c:170
+#: ../widgets/misc/e-attachment-tree-view.c:555
 msgid "Saving"
 msgstr "å?²å?ä¸"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:93
 msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:637
+#: ../widgets/misc/e-attachment-paned.c:95
+#: ../widgets/misc/e-attachment-paned.c:635
 msgid "Show Attachment _Bar"
 msgstr "é¡¯ç¤ºé??ä»¶å??(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:521
+#: ../widgets/misc/e-attachment-store.c:544
 msgid "Add Attachment"
 msgstr "å? å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment-store.c:524
+#: ../widgets/misc/e-attachment-store.c:547
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:587
+#: ../widgets/misc/e-attachment-store.c:610
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å?é??ä»¶"
 msgstr[1] "å?²å?é??ä»¶"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:616
-#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2351
+#: ../widgets/misc/e-attachment-store.c:639
+#: ../widgets/misc/e-attachment.c:1806
+#: ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20456,48 +19975,50 @@ msgstr "å?¨ %s ä¸é??å??é??å??é??ä»¶"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:1849
+#: ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?ä¸"
 
-#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
+#: ../widgets/misc/e-attachment.c:1857
+#: ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "å?²å?æ??ä½?å·²å?¨é?²è¡?ä¸"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1955
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2234
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??ä»¶"
 
-#: ../widgets/misc/e-attachment.c:2669
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??ä»¶å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2748
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å?é??ä»¶"
@@ -20516,161 +20037,154 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#: ../widgets/misc/e-charset-combo-box.c:92
 msgid "Character Encoding"
 msgstr "å?å??ç·¨ç¢¼"
 
-#: ../widgets/misc/e-charset-combo-box.c:119
+#: ../widgets/misc/e-charset-combo-box.c:115
 msgid "Enter the character set to use"
 msgstr "è¼¸å?¥è¦?ä½¿ç?¨ç??å?å??é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:338
+#: ../widgets/misc/e-charset-combo-box.c:335
 msgid "Other..."
 msgstr "å?¶å®?â?¦"
 
-#: ../widgets/misc/e-dateedit.c:504
+#: ../widgets/misc/e-dateedit.c:501
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:525
+#: ../widgets/misc/e-dateedit.c:522
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?è¼¸å?¥æ?¥æ??ç??æ??å?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:547
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
 msgstr "æ??æ¤æ??é??ä»¥é¡¯ç¤ºè¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:594
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:666
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "ç?¾å?¨(_W)"
 
-#: ../widgets/misc/e-dateedit.c:672
+#: ../widgets/misc/e-dateedit.c:669
 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:677
 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:1689 ../widgets/misc/e-dateedit.c:1921
+#: ../widgets/misc/e-dateedit.c:1686
+#: ../widgets/misc/e-dateedit.c:1918
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1816
+#: ../widgets/misc/e-dateedit.c:1813
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1860
+#: ../widgets/misc/e-dateedit.c:1857
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:249
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
+#: ../widgets/misc/e-import-assistant.c:245
+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:262
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??ç¨±(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:272
 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:286
+#: ../widgets/misc/e-import-assistant.c:461
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:329
+#: ../widgets/misc/e-import-assistant.c:905
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??æ¤è¼¸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:354
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:362
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?è¼¸å?¥è³?æ??å??è¨å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:370
 msgid "Import a _single file"
 msgstr "å?¯å?¥å?®ä¸?æª?æ¡?(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:526
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??"
-"iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??æ?¨æ?³å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
+#: ../widgets/misc/e-import-assistant.c:522
+msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
+msgstr "Evolution å·²ç¶?æª¢æ?¥å¾?ä»¥ä¸?æ??ç?¨ç¨?å¼?è¼¸å?¥ç??è¨å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??è¨å®?å?¼ã??å¦?æ??æ?¨æ?³å??è©¦ä¸?æ¬¡ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:766
+#: ../widgets/misc/e-import-assistant.c:762
 msgid "_Cancel Import"
 msgstr "å??æ¶?å?¯å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:908
+#: ../widgets/misc/e-import-assistant.c:904
 msgid "Preview data to be imported"
 msgstr "é ?è¦½é??è¦?å?¯å?¥ç??è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:914
-#: ../widgets/misc/e-import-assistant.c:927
-#: ../widgets/misc/e-import-assistant.c:1277
-#: ../widgets/misc/e-import-assistant.c:1343
-#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Import Data"
 msgstr "å?¯å?¥è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:922
+#: ../widgets/misc/e-import-assistant.c:918
 msgid "Select what type of file you want to import from the list."
 msgstr "é?¸æ??æ?¨æ?³è¦?å¾?æ¸?å?®ä¸å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:1267
-#: ../widgets/misc/e-import-assistant.c:1301
+#: ../widgets/misc/e-import-assistant.c:1260
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1284
-#: ../widgets/misc/e-import-assistant.c:1331
+#: ../widgets/misc/e-import-assistant.c:1277
+#: ../widgets/misc/e-import-assistant.c:1324
 msgid "Import Location"
 msgstr "è¼¸å?¥ä½?ç½®"
 
-#: ../widgets/misc/e-import-assistant.c:1295
+#: ../widgets/misc/e-import-assistant.c:1288
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
+"With this assistant you will be guided through the process of importing external files into Evolution."
 msgstr ""
 "æ¡è¿?ä½¿ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?æ?¨å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1309
+#: ../widgets/misc/e-import-assistant.c:1302
 msgid "Importer Type"
 msgstr "è¼¸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1317
+#: ../widgets/misc/e-import-assistant.c:1310
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1324
+#: ../widgets/misc/e-import-assistant.c:1317
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1338
+#: ../widgets/misc/e-import-assistant.c:1331
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
@@ -20679,74 +20193,70 @@ msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
 #: ../widgets/misc/e-map.c:869
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹"
-"å¡?ä¾?é?¸æ??æ??å??ã??"
+msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
+msgstr "ç?¨ä¾?é?¸æ??æ??å??ç??æ»?é¼ äº?å??å¼?å?°å??å??ä»¶ã??ä½¿ç?¨é?µç?¤ç??ä½¿ç?¨è??æ??è©²ä½¿ç?¨ä¸?æ?¹ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?ä¾?é?¸æ??æ??å??ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:23
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution ç?®å??ç?ºç·?ä¸?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?é?¢ç·?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:26
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
 # zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?æ¨¡å¼?ã??æ??ä¸?ä¸?æ¤æ??é??ä»¥é?²è¡?ç·?ä¸?å·¥ä½?ã??"
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:29
 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:275
 msgid "Evolution Preferences"
 msgstr "Evolution å??å¥½è¨å®?"
 
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:75
 #, c-format
 msgid "Matches: %d"
 msgstr "ç¬¦å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:560
+#: ../widgets/misc/e-search-bar.c:557
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:568
+#: ../widgets/misc/e-search-bar.c:565
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:601
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:607
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:620
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å?è©?"
 
-#: ../widgets/misc/e-search-bar.c:642
+#: ../widgets/misc/e-search-bar.c:639
 msgid "Mat_ch case"
 msgstr "å??å??å¤§å°?å¯«(_C)"
 
-#: ../widgets/misc/e-search-bar.c:670
+#: ../widgets/misc/e-search-bar.c:667
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?ç«¯ç¹¼çº?"
 
-#: ../widgets/misc/e-search-bar.c:692
+#: ../widgets/misc/e-search-bar.c:689
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?ç«¯ï¼?å¾?åº?é?¨ç¹¼çº?"
 
@@ -20885,38 +20395,38 @@ msgctxt "send-options"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:563
-#: ../widgets/misc/e-signature-manager.c:352
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:134
+#: ../widgets/misc/e-signature-editor.c:560
+#: ../widgets/misc/e-signature-manager.c:348
+#: ../widgets/misc/e-signature-script-dialog.c:215
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "å?²å?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:430
+#: ../widgets/misc/e-signature-editor.c:427
 msgid "Edit Signature"
 msgstr "ç·¨è¼¯ç°½å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:445
+#: ../widgets/misc/e-signature-editor.c:442
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??ç¨±(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:297
+#: ../widgets/misc/e-signature-manager.c:293
 msgid "Add Signature Script"
 msgstr "æ?°å¢?ç°½å??å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:362
+#: ../widgets/misc/e-signature-manager.c:358
 msgid "Edit Signature Script"
 msgstr "ç·¨è¼¯ç°½å??å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:580
+#: ../widgets/misc/e-signature-manager.c:577
 msgid "Add _Script"
 msgstr "æ?°å¢?å?½ä»¤ç¨¿(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:264
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20926,11 +20436,11 @@ msgstr ""
 "ç°½å??æª?ã??æ?¨æ??å®?ç??å??ç¨±å?ªæ??ä½?ç?º\n"
 "é¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:309
 msgid "S_cript:"
 msgstr "å?½ä»¤ç¨¿(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:340
 msgid "Script file must be executable."
 msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 
@@ -20938,41 +20448,43 @@ msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 msgid "Click here to go to URL"
 msgstr "æ??é??è£¡ä»¥ç§»è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:373
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Copy Link Location"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:377
 msgid "Copy the link to the clipboard"
 msgstr "è¤?è£½é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:383
+#: ../widgets/misc/e-web-view.c:385
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??è¦½å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:385
+#: ../widgets/misc/e-web-view.c:387
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??è¦½å?¨ä¸é??å??æ¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:393
+#: ../widgets/misc/e-web-view.c:395
 msgid "_Copy Email Address"
 msgstr "è¤?è£½é?»å?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
+#: ../widgets/misc/e-web-view.c:424
+#: ../widgets/misc/e-web-view.c:1080
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:864
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?è??çµ¦ %s"
 
-#: ../widgets/misc/e-web-view.c:860
+#: ../widgets/misc/e-web-view.c:866
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??è£¡é?±è??/è§£é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:862
+#: ../widgets/misc/e-web-view.c:868
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -21024,11 +20536,13 @@ msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å?"
 msgid "click to add"
 msgstr "è«?æ??é??è£¡å? å?¥"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:385
+#: ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
@@ -21324,16 +20838,19 @@ msgstr "è¼¸å?¥æ³?"
 #~ msgstr "æ?¯ã??(è¤?é??å¾ªç?°)"
 
 #~ msgid "Every day"
+
 #~ msgid_plural "Every %d days"
 #~ msgstr[0] "æ¯?å¤©"
 #~ msgstr[1] "æ¯? %d å¤©"
 
 #~ msgid "Every week"
+
 #~ msgid_plural "Every %d weeks"
 #~ msgstr[0] "æ¯?é?±"
 #~ msgstr[1] "æ¯? %d é?±"
 
 #~ msgid "Every week on "
+
 #~ msgid_plural "Every %d weeks on "
 #~ msgstr[0] "æ¯?é?±æ?¼"
 #~ msgstr[1] "æ¯? %d é?±æ?¼"
@@ -21348,16 +20865,19 @@ msgstr "è¼¸å?¥æ³?"
 #~ msgstr "%s %s æ?¥æ?¼ "
 
 #~ msgid "every month"
+
 #~ msgid_plural "every %d months"
 #~ msgstr[0] "æ¯?æ??"
 #~ msgstr[1] "æ¯? %d æ??"
 
 #~ msgid "Every year"
+
 #~ msgid_plural "Every %d years"
 #~ msgstr[0] "æ¯?å¹´"
 #~ msgstr[1] "æ¯? %d å¹´"
 
 #~ msgid "a total of %d time"
+
 #~ msgid_plural "a total of %d times"
 #~ msgstr[0] "ç¸½å?± %d æ¬¡"
 #~ msgstr[1] "ç¸½å?± %d æ¬¡"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]