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



commit 3e12c61e4cc3bd04b4c1a07358fd72530836e526
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jul 20 14:49:53 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |11011 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po |11044 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 11330 insertions(+), 10725 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index a4f5e65..105b691 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:479
+#: ../shell/main.c:519
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.30.0\n"
+"Project-Id-Version: evolution 2.31.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 19:29+0800\n"
-"PO-Revision-Date: 2010-03-20 19:30+0800\n"
+"POT-Creation-Date: 2010-07-20 14:48+0800\n"
+"PO-Revision-Date: 2010-07-20 14:48+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 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}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ã??è«?å¾?é??è¨?é??檢è¦?ç??å?´é??æ¬?中é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
+msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ï¼?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?è?¯çµ¡äººæª¢è¦?ç??å?´é??æ¬?中é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -76,163 +76,144 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "����(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å°? {0} å?²å­?è?³ {1} ç?¼ç??é?¯èª¤ï¼? {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "ç?¡æ³?é©?è­? LDAP 伺æ??å?¨ã??"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise é??è¨?é??ç??建ç«?"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺æ??å?¨æ?ªå??æ??æ??æ??ç??綱è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??太大ã??ä½ æ?¯å?¦è¦?æ?¹è®?大å°?å¾?æ??å?²å­?å®?ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../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 ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ­¤å??è?½ï¼?æ??å?¯è?½è¨­å®?é?¯èª¤ã??è«?洽詢管ç??å?¡ï¼?ç?­è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "ç?¡æ³?é??å??æ­¤é??è¨?é??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "æ­¤é??è¨?é??伺æ??å?¨æ²?æ??ä»»ä½?建議ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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."
 msgstr "æ­¤é??è¨?é??伺æ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??伺æ??å?¨å??稱å?¯è?½æ?¼é?¯ï¼?æ??ä½ ç??網絡é?£ç·?å·²ç¶?å??æ­¢ã??"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "æ­¤é??è¨?é??å°?被永é? ç§»é?¤ã??"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´ LDAPv3 綱è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "ç?¡æ³?å?·è¡?æ??å°?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "ç?¡æ³?å?²å­? {0}ã??"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../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 "ä½ æ­£å?¨å??試å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?移é?¤ã??ä½ æ?³è¦?å?²å­?ä¸?å??å?¯æ?¬ä¾?代æ?¿å??ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../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 ç??å??é¡?ã??æ??好ç??解決æ?¹æ¡?æ?¯å°?該伺æ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??太"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../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:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ä½ å·²ç¶?ä¿®æ?¹æ­¤è?¯çµ¡äººã??è¦?å?²å­?é??äº?æ?´æ?¹ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ {0} ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "��(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "����(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "調�大�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "����(_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "é ?設ç??å??æ­¥å?°å??:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -243,261 +224,236 @@ msgstr "�年�念�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:118
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "��格�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "å??é¡?(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "è¡?äº?æ??ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "�絡人編輯�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../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:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "���件"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "空é??/å¿?ç¢?ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�家"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "å?³æ??é??è¨?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "工�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "網å??(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "å??註"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "�話"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "è¦?å??è??天ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "網å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "網��"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "網å??"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "工�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "�年�念�(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "��格(_B):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "縣/�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "��(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "å??家/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "歸��(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "空é??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "��(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "主管(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "辦�室(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "�箱(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "�業(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "é??å?¶(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??輸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "é??é ­(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "è¦?å??交è«?(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "網�(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "å??稱"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "�編輯"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -539,7 +495,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -551,45 +507,21 @@ msgstr "ä¿®æ?¹è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 msgid "Error removing contact"
 msgstr "移é?¤è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "ä¾?æº?é??è¨?é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ç?®æ¨?é??è¨?é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "���絡人"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "å?¯å¯«ç??æ¬?ä½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "已��"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2515
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??代表此è?¯çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2913
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -597,56 +529,46 @@ msgstr ""
 "è?¯çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3212
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?è?¯çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "編輯��(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "���件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell ��"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -713,7 +635,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "�絡人��編輯�"
 
@@ -730,7 +652,7 @@ msgid "_List name:"
 msgstr "å??å?ºå??稱(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "é?¸å??(_S)..."
 
@@ -738,39 +660,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "編輯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "移é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "��"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "æ?¯æ?°ç??æ¸?å?®"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "æ?´æ?¹å¾?ç??è?¯çµ¡äºº:"
@@ -807,134 +717,111 @@ msgstr ""
 "æ?¼æ­¤è³?æ??夾ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 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/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "é?»å­?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "å??稱å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "æ²?æ??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??è?¯çµ¡äºº"
 msgstr[1] "%d å??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "�詢"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "æ??å°?被中æ?·"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "模å??"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "編輯å?¡ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?製é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Paste contacts from the clipboard"
 msgstr "��貼簿貼��絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Shell 檢�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "你確å®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete this contact list?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
 msgid "Are you sure you want to delete these contacts?"
 msgstr "你確å®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete this contact?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -943,11 +830,11 @@ msgstr ""
 "é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "確å®?è¦?顯示é??è£?æ??æ??ç??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 msgid "Display _All Contacts"
 msgstr "顯示æ??æ??ç??è?¯çµ¡äºº(_A)"
 
@@ -981,7 +868,7 @@ msgid "Car Phone"
 msgstr "汽��話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1082,7 +969,7 @@ msgid "Radio"
 msgstr "����話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "��"
@@ -1107,7 +994,6 @@ msgid "Telex"
 msgstr "�報"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "é??é ­"
 
@@ -1119,59 +1005,7 @@ msgstr "��"
 msgid "Web Site"
 msgstr "網å??"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "é??度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "�度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "����"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "��"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "æ¬?ä½?å??稱"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "æ??å­?模å??"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "æ??大æ¬?ä½?å??稱é?·åº¦"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "�寬"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1181,7 +1015,7 @@ msgstr ""
 "\n"
 "æ??å°?è?¯çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1195,7 +1029,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?以建ç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1209,7 +1043,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?以建ç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1219,7 +1053,7 @@ msgstr ""
 "\n"
 "å°?æ?¾è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1229,10 +1063,6 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??種檢è¦?æ?¹å¼?顯示ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "���"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "工����件"
@@ -1242,21 +1072,13 @@ msgid "Home Email"
 msgstr "�家���件"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "�����件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "å·²é?¸æ??"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "æ??游æ¨?"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "evolution é??è¨?é??"
 
@@ -1268,7 +1090,7 @@ msgstr "���絡人"
 msgid "New Contact List"
 msgstr "���絡人��"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1296,17 +1118,17 @@ msgid "Copy _Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
@@ -1342,22 +1164,22 @@ msgid "Video Chat"
 msgstr "è¦?å??交è«?"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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:495
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "空é??/å¿?ç¢?"
@@ -1385,21 +1207,19 @@ msgid "Web Log"
 msgstr "網�"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "å??人"
@@ -1414,151 +1234,45 @@ msgstr "��"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
-msgstr "Blog"
+msgstr "��格"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "æ??å??"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "�端��"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "è³?æ??庫é?¢ç·?"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "é??è¨?é??ä¸?å­?å?¨"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "æ²?æ??å®?義è?ªæ??è?¯çµ¡äºº"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "æ¬?é??ä¸?足"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "����絡人"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "�絡人 ID 已���"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "ç?¡æ³?å??æ¶?"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "é©?証失æ??"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "����"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS ��使�"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "��此��"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "�����模��使�"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "���誤"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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 "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??å?¯è?½è¡¨ç¤ºæ­¤é??è¨?é??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??é??è¨?é??以ä¸?è¼?å®?ç??å?§å®¹ã??"
+msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ­¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??ç?®é??æ??å??以ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, 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 æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
+msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 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:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
-msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??表示你輸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
+msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示你輸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
-msgstr "詳細ç??é?¯èª¤è¨?æ?¯:"
+msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1570,7 +1284,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1582,44 +1296,50 @@ msgstr ""
 "æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??伺æ??å?¨å??好設å®?中ç??\n"
 "æ??é??ä¸?é??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1627,54 +1347,61 @@ msgstr "�製�絡人�"
 msgid "Card View"
 msgstr "å?¡ç??檢è¦?模å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "��..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??交æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸��"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ����"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "第 %d �"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1748,21 +1475,21 @@ msgstr "æ?ªè??ç??ç??é?¯èª¤"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以å?¿å??æ?¹å¼?å­?å?? LDAP 伺æ??å?¨"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "é©?è­?è­?æ?¸å¤±æ??ã??\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1784,15 +1511,15 @@ msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr "æ?°å¢?æ??æ??義ç??æ??è¦?å?°ä½ ç??ç´?æ??å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??ç´?æ??å??ä»?麼äº?æ??é??ã??"
+"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 your recipients an idea "
-"of what your task is about."
-msgstr "æ?°å¢?æ??æ??義ç??æ??è¦?å?°ä½ ç??å·¥ä½?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??å·¥ä½?å??ä»?麼äº?æ??é??ã??"
+"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
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1881,38 +1608,34 @@ msgid "Are you sure you want to delete this task?"
 msgstr "確����此工��"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "你確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "你確å®?è¦?å?³é??æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "你確å®?è¦?å?³é??æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "你確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "è¡?äº?æ??è³?æ??庫已é?¢ç·?ã??"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ä¸?è?½å»ºç«?æ?°ç??äº?件"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "�����件"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "å?ªé?¤è¡?äº?æ??ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®ã??{0}ã??ï¼?"
 
@@ -1955,249 +1678,190 @@ msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 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:47
+#: ../calendar/calendar.error.xml.h:45
 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:48
+#: ../calendar/calendar.error.xml.h:46
 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:49
-msgid "No response from the server."
-msgstr "伺æ??å?¨æ²?æ??å??æ??ã??"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??許å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?æ­¤ç´?æ??å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?此工ä½?å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "æ­¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "æ­¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "此工ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å­?å°?æ­¤ç´?æ??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "è¦?å?²å­?å°?æ­¤æ??è­°æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å­?å°?æ­¤å??å¿?é??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å­?å°?此工ä½?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ­¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è­°é??è«?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??此工ä½?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è­°æ?´æ?°è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 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:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤æ??è­°ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å­?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "����(_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "��(_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "����(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "å??å?²å¤?æ?¥äº?件:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "ç?¡æ³?å??å?? Evolution è³?æ??伺æ??å?¨"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "ç?¡æ³?寫å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "é ?設å?ªå??é ?åº?:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2210,7 +1874,7 @@ msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -2225,10 +1889,10 @@ msgstr "��解�(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -2241,11 +1905,11 @@ msgid "_Dismiss"
 msgstr "解�(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:153
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
@@ -2255,10 +1919,10 @@ msgid "_Snooze"
 msgstr "延æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "å°?æ??"
 
@@ -2266,40 +1930,41 @@ msgstr "å°?æ??"
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "ä½ æ?? %d å??鬧é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2311,7 +1976,7 @@ msgstr ""
 "é??å?ºé?»å­?é?µä»¶ã??  Evolution æ??顯示\n"
 "æ?®é??ç??æ??é??å°?話ç??ä¾?代æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2328,7 +1993,7 @@ msgstr ""
 "\n"
 "你確å®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -2370,7 +2035,7 @@ msgid "Alarm programs"
 msgstr "鬧���"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
 
@@ -2391,524 +2056,512 @@ msgid "Calendars to run alarms for"
 msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "æ ¸å??æ­¤é?¸é ?æ??å?¨ Evolution 中使ç?¨ç³»çµ±æ??å??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©(ç??空表示使ç?¨é ?設å?¼)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "æ¸?空æ??確èª?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "æ?°äº?件ç??é ?設é?±æ??æ?§æ¬¡æ?¸ã?? -1 代表永é? ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "é ?設ç??ç´?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "é ?設æ??é??ç??å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "é ?設æ??é??ç??æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "ç?¨ä¾?å­?æ?¾é¬§é?´é?³æ??æª?ç??ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "äº?件漸è®?è?²æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "äº?件é??æ??æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "è¡?äº?æ??檢è¦?中ç??äº?件漸è®?è?²æ??æ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "é?±è??å·¥ä½?å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "é?±è??å·¥ä½?æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "水平�格�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "å·¥ä½?æ?¥çµ?æ??æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "å·¥ä½?æ?¥é??å§?æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示工ä½?é ?覽çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "ä¸?次鬧é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "æ??è¨?é??ç??é?µä»¶ç­?ç´?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼ä½?ç??伺æ??å?¨ URL æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸­è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "決å®?é ?設æ??é??ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?覽è¡?äº?æ??ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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 "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "主è¦?è¡?äº?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "主è¦?å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "主�工���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "以é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "å?¨äº?件/æ??è­°/å·¥ä½?編輯å?¨ä¸­é¡¯ç¤º å??é¡? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
-msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?顯示é?±æ?¸"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?覽顯示é?±æ?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr "å¦?æ??設å®?å??æ??å?¨æ?¥æª¢è¦?中顯示第äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??設å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "工��覽�格�置�水平�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, 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 è¦?æ?¿æ??ç?ºç¶²å??å??稱ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 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\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "é??è£?å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè­¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?次鬧é?´å?·è¡?ç??æ??é??(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "è¡?äº?æ??檢è¦?中ç??äº?件é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "çª?顯ç??(ã??主è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "çª?顯ç??(ã??主è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?設æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "使ç?¨ç³»çµ±æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "使ç?¨ç³»çµ±æ??å??å??代å?¨ Evolution 中é?¸å??ç??æ??å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å?­ (6)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "æ?¯å?¦å£?縮æ??檢è¦?中ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸­ç??é?±å?­è??é?±æ?¥ç½®æ?¼ä¸?å??空ä½?中ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??中繪å?º Marcus Bains ç·?ï¼?代表ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?ï¼?è??é??以æ??ç?ºå?®ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "æ?¯å?¦å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "æ?¯å?¦å?¨æ?¥æ??å°?覽中顯示é?±æ?¸ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "工��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
@@ -2958,17 +2611,17 @@ msgid "Classification"
 msgstr "歸�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../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
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -2989,7 +2642,7 @@ msgid "Exist"
 msgstr "å­?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../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:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3002,25 +2655,26 @@ msgid "Organizer"
 msgstr "æ??è­°å?¬é??人"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "�人"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../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/tasktypes.xml.h:22
@@ -3082,6 +2736,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -3097,7 +2752,7 @@ msgstr "��鬧���"
 msgid "Mes_sage:"
 msgstr "��(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "��"
 
@@ -3137,18 +2792,20 @@ msgstr "æ??æ?¼"
 msgid "before"
 msgstr "æ?©æ?¼"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "天"
 
@@ -3156,19 +2813,20 @@ msgstr "天"
 msgid "end of appointment"
 msgstr "ç´?æ??çµ?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "å°?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "å??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ç´?æ??é??å§?"
 
@@ -3182,35 +2840,35 @@ msgstr "å? å?¥(_A)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "鬧�"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "é?¸æ??..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "æ??å?»å??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "æ??å?»å??æ?¥æ??(_M):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "å?ªæ??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "å?ªæ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3241,12 +2899,12 @@ msgstr "30 å??é??"
 msgid "60 minutes"
 msgstr "60 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "警示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
@@ -3272,20 +2930,20 @@ msgid "Display alarms in _notification area only"
 msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "��"
 
@@ -3298,7 +2956,7 @@ msgid "Minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
@@ -3312,182 +2970,190 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "��(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "æ??æ??å?­"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "以é?±æ?²å??æ??檢è¦?(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "第äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "顯示æ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸(_U)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+msgid "Show week _numbers"
+msgstr "顯示��(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "樣�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æ??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "æ??å?»æ ¼å¼?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "使ç?¨ç³»çµ±æ??å??(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "工��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "工��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "��(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "��(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "��(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "��(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "å??"
 
@@ -3496,12 +3162,12 @@ msgid "Type:"
 msgstr "é¡?å??:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3520,35 +3186,35 @@ msgstr "�製工����容���以便���業(_Y)"
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "è¤?製å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "��工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "å??å¿?é??æ¸?å?®å±¬æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -3601,264 +3267,240 @@ msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??編輯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "確èª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " å?° "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (å·²å®?æ??) "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "å·²å®?æ?? "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr "(æ??é??)"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "æ??é?? "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "�����件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "編輯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è­° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "工� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "æ??é??è£?以é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "æ??é??è£?以檢è¦?å?¯ç?¨ç??說æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1502
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "æ??é??è£?以å?²å­?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1572
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å­?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "歸�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "��(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "é??件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "æ??é??è£?以é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "歸���人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "��(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "歸����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "����(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?使ç?¨æ??件(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "��"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ­¤é ?ç?®æ??å??ç??æ?´æ?¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?使ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "ç?¡æ³?é??å??ä¾?æº?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
@@ -3866,53 +3508,73 @@ msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??信箱中ç??é??å??é ?ç?®(_D)ï¼?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "æ?¶å??註解(_R)"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ï¼?%s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ï¼?%s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -3926,133 +3588,147 @@ msgstr "��給�"
 msgid "Enter Delegate"
 msgstr "輸�代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£?以設å®?æ??å??æ¶?é??å??äº?件ç??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "�此�設�循��件"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "�天�件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "空é??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "ç´?æ??(_M)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "å?°æ??è??"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "æ??å?°é??å??äº?件"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "äº?件ç??é??å§?æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?件ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯äº?件ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "é??å??äº?件å?·æ??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è­°å?¬é??人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "代ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??人已ç¶?æ²?æ??帳è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -4063,130 +3739,140 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../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:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, 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:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "��"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "ç´?æ??å?? 1 天"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "ç´?æ??å?? 1 å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "ç´?æ??å?? 15 å??é??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "å?°æ??è??(_S)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "å?°æ??è??"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "å?°æ??è??(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "��鬧�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "äº?件æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "æ??è¦?(_M):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+msgid "_Summary:"
+msgstr "æ??è¦?(_S):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "å?±"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "æ??å?°é??å??å??å¿?é??"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯å??å¿?é??ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2284
+#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -4195,67 +3881,72 @@ msgstr "æ?¶ä»¶è??"
 msgid "Sta_rt date:"
 msgstr "é??å§?æ?¥(_R):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "æ??è¦?(_M):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "羣�(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "ä½ æ­£å?¨ä¿®æ?¹é?±æ??æ?§äº?件ã??ä½ æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "ä½ æ­£å?¨å§?ä»»é?±æ??æ?§äº?件ã??ä½ æ?³è¦?å§?æ´¾ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "ä½ æ­£å?¨ä¿®æ?¹é?±æ??æ?§å·¥ä½?ã??ä½ æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "ä½ æ­£å?¨ä¿®æ?¹é?±æ??æ?§å??å¿?é??ã??ä½ æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "é??æ­¤ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "æ­¤ä¾?é ?å??å??å??ç??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "æ­¤ä¾?é ?å??以å¾?ç??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?編輯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ç??"
 
@@ -4263,7 +3954,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "�"
 
@@ -4272,7 +3963,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "�"
 
@@ -4280,7 +3971,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "�"
 
@@ -4288,7 +3979,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "å??"
 
@@ -4296,7 +3987,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "第�"
 
@@ -4304,13 +3995,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -4318,7 +4009,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1��10�"
 
@@ -4326,7 +4017,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11��20�"
 
@@ -4334,45 +4025,45 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?編輯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "編輯��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -4384,7 +4075,7 @@ msgstr "�"
 msgid "Exceptions"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "�覽"
 
@@ -4392,48 +4083,64 @@ msgstr "�覽"
 msgid "This appointment rec_urs"
 msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "永�"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "é?±"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??鬧é?´è??é??å??äº?件ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 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:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, 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:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
@@ -4441,35 +4148,35 @@ msgstr "å·²å®?æ??"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "��中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "��"
@@ -4477,10 +4184,10 @@ msgstr "��"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4496,8 +4203,8 @@ 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:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4506,7 +4213,7 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
@@ -4516,7 +4223,7 @@ msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
@@ -4524,53 +4231,62 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "ç??æ??詳細è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£?æ?¹è®?/檢è¦?該工ä½?ç??ç??æ??詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "工�(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "工�"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "å·¥ä½?詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "æ??å?°é??é ?å·¥ä½?"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯工ä½?ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è­°å?¬é??人(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "å?°æ??è??(_N)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "å??é¡?(_I)..."
@@ -4668,7 +4384,7 @@ msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
@@ -4683,8 +4399,8 @@ msgstr "æ?ªæ­¢æ?¥æ??ï¼?"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
@@ -4693,8 +4409,8 @@ msgid "Priority:"
 msgstr "å?ªå??ç­?ç´?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
@@ -4709,32 +4425,32 @@ msgstr "網��"
 msgid "Created"
 msgstr "已建�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "çµ?æ??æ?¥æ??"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "ä¿®æ?¹æ?¥æ??"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "空é??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4745,63 +4461,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "�設客�端��"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Shell 設��"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "æ??ç?¨ç¨?å¼?設å®?å?¼"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "循�模�"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4838,97 +4538,97 @@ msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 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:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, 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:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -4971,8 +4671,8 @@ msgstr "顯示第äº?æ??å??"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4982,10 +4682,10 @@ msgstr "%A %d %B"
 #. %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:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:907
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -4994,31 +4694,35 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:943
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "第 %d �"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "循�模��"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??循ç?°)"
@@ -5100,7 +4804,7 @@ msgstr "çµ?æ??"
 msgid "Due"
 msgstr "�止"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar ��"
 
@@ -5109,303 +4813,303 @@ msgstr "iCalendar ��"
 msgid "iCalendar Error"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "ä¸?æ??人士"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "æ??è­°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??è¡?äº?æ??中æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
+msgid "%s has published meeting information."
+msgstr "%s å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "æ??è­°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> é??è«?ä½ å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
+msgid "%s requests your presence at a meeting."
+msgstr "%s é??è«?ä½ å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "æ??è­°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "æ??è­°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "æ??è­°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
+msgid "%s has replied to a meeting request."
+msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "æ??è­°ç­?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> å·²ç¶?æ¶?å??æ??è­°ã??"
+msgid "%s has canceled a meeting."
+msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "æ??è­°å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
+msgid "%s has sent an unintelligible message."
+msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
+msgid "%s has published task information."
+msgstr "%s å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "工���"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
+msgid "%s requests %s to perform a task."
+msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> è¦?æ±?ä½ é?²è¡?å·¥ä½?ã??"
+msgid "%s requests you perform a task."
+msgstr "%s è¦?æ±?ä½ é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
+msgid "%s wishes to be added to an existing task."
+msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "工���"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
+msgid "%s wishes to receive the latest task information."
+msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "工�����"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
+msgid "%s has replied to a task assignment."
+msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?å·¥ä½?ã??"
+msgid "%s has canceled a task."
+msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
+msgid "%s has published free/busy information."
+msgstr "%s å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> è«?æ±?ä½ ç??空é??/å¿?ç¢?è³?è¨?ã??"
+msgid "%s requests your free/busy information."
+msgstr "%s è«?æ±?ä½ ç??空é??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "空é??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
+msgid "%s has replied to a free/busy request."
+msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "空é??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??件並æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -5454,72 +5158,72 @@ msgid "Resources"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "羣�"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "缺席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "��中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -5528,7 +5232,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -5538,67 +5242,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "��辦�室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "å?°æ??è??(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "��(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "顯示縮�(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "æ??æ??人å?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "æ??æ??人å?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "å¿?è¦?ç??人å?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?人å?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -5626,45 +5326,47 @@ msgstr "��"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:404
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:468
 #: ../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
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?製é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5672,142 +5374,107 @@ msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 msgid "Click to add a memo"
 msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:364
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:429
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "工�"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?製é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "��貼簿貼�工�"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "å®?å?·æ??鬧é?´ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è­°ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?件ï¼?æ??è¦?ç?º %sã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?件ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "è¡?äº?æ??檢è¦?äº?件"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "����"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "���天�件"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "æ?°å¢?æ??è­°"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "移���"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "移è?³æ?¥æ??"
 
@@ -5816,7 +5483,7 @@ msgstr "移è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?檢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??表格"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5825,14 +5492,14 @@ 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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?件ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5840,47 +5507,47 @@ msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:936
-#: ../modules/calendar/e-cal-shell-view-private.c:947
-#: ../modules/calendar/e-cal-shell-view-private.c:954
-#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5902,15 +5569,15 @@ msgstr "æ??檢è¦?ï¼?%sã??%s"
 msgid "Week View: %s. %s"
 msgstr "é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "��"
 
@@ -5963,39 +5630,40 @@ msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "ä¹?æ??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "é?¸æ??ä»?天(_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "é?¸æ??ä»?天(_S)"
+msgid "September"
+msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "�件��"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "工���"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -6003,7 +5671,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -6012,7 +5680,7 @@ msgstr "å·²æ?¥å??"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -6024,7 +5692,7 @@ 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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -6033,7 +5701,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已�派"
@@ -6041,7 +5709,7 @@ msgstr "已�派"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已��"
@@ -6049,7 +5717,7 @@ msgstr "已��"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -6057,7 +5725,7 @@ msgstr "å??æ¶?"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -6065,29 +5733,29 @@ msgstr "é??æ?°æ?´ç??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??票表å?³"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空é??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar ��"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?æ?°ç??äº?件è??å?¶ä»?äº?件æ??æ??é??ç??ã??"
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "ä½ å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
@@ -6243,49 +5911,73 @@ msgstr "�"
 msgid "Sa"
 msgstr "å?­"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "ç´?æ??"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " å?° "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "工�"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (å·²å®?æ??) "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "å·²å®?æ?? "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr "(æ??é??)"
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "æ??é?? "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6294,10 +5986,6 @@ msgstr "�絡人: "
 msgid "% Completed"
 msgstr "% å·²å®?æ??"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "正���"
@@ -6310,44 +5998,189 @@ msgstr "大�"
 msgid "is less than"
 msgstr "å°?æ?¼"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è­°"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar �� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸��"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "æ??é??ï¼?"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar �� (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar �� (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸��"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?件"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "æ??è­°"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "�件"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "工�"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "å??å¿?é??"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "å?·æ??é?±æ??æ?§"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "æ?¯ä¸?å??實é«?"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "å?·æ??鬧é?´"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "å?·æ??é??件"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "å?¬é??"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "�人"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "��"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "歸�"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "æ??è¦?"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "é??å§?"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "å?°æ??"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "çµ?æ??"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "å??é¡?"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "æ??è­°å?¬é??人"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "å?°æ??è??"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "æ??è¿°"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "é¡?å??"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -7897,287 +7730,256 @@ msgstr "太平�/���"
 msgid "Pacific/Yap"
 msgstr "太平æ´?/é??浦島"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "æ?ªå?½å??ç??é?µä»¶"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "����..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "æ??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "é ?覽æ??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "����(_A)..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "以å?¦ä¸?å??å??稱å?²å­?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "å?²å­?ç?ºè??稿(_D)"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "å?²å­?ç?ºè??稿"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "�寫��件(_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "�符編碼(_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PG_P ��"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "使ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨ä½ ç?? PGP å¯?碼å??ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?設ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨ä½ ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME ��"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使ç?¨ä½ ç?? S/MIME å? å¯?è­?æ?¸å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨ä½ ç?? S/MIME 簽署è­?æ?¸ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "�件����(_B)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?件å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "����(_C)"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "å¯?件è??æ¬?ä½?(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "å??æ??å¯?件è??é?¸æ??å?¨ç??顯示ç??æ??"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "å?²å­?è??稿"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "顯示"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "é?±è??"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "輸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 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:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "å¯?件è??(_O):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "å¯?件è??"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
-msgstr "å??è¦?å?°å??(_R):"
+msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "��(_C):"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "��(CC)"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "�件��(_B):"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "�件��(BCC)"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "張貼�(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "主�(_U):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?張貼ç??è³?æ??夾"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "復å??ä¸?ä¸?次ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "å??æ¶?ä¸?ä¸?次復å??ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "æ??å°?æ??å­?"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "æ??å°?å??å??代æ??å­?"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "å?²å­?è??稿"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1029
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?簽署é??å?ºç??é?µä»¶ï¼?此帳è??æ²?æ??設å®?簽署è­?æ?¸"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1041
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?è­?æ?¸(此帳è??)"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr "ç?¡æ³?å¾?è?ªå??å?²å­?ç??æª?æ¡?é??建é?µä»¶"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>ï¼?é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??ï¼?<b>"
+#: ../composer/e-msg-composer.c:3538
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "æ?ªå?½å??ç??é?µä»¶"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8249,8 +8051,8 @@ msgid ""
 msgstr "ç?¶ä½ æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??復å??é?µä»¶å?¯ä»¥è®?ä½ å¾?å??ä¾?中æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "æª?æ¡? `{0}' ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸­å?³é??ã??"
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "æª?æ¡?ã??{0}ã??ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸­å?³é??ã??"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8268,8 +8070,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "ä½ ç?¡æ³?å°?æª?æ¡? â??{0}â?? é??å? å?°æ­¤é?µä»¶ã??"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "ä½ ç?¡æ³?å°?æª?æ¡?ã??{0}ã??é??å? å?°æ­¤é?µä»¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8291,251 +8093,291 @@ msgstr "復å??(_R)"
 msgid "_Save Draft"
 msgstr "å?²å­?è??稿(_S)"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "以å??å?¥è¦?çª?å?·è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "以 Anjal å??ç?ºé ?設é?µä»¶å®¢æ?¶ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "socket ç?? IDï¼?å?§åµ?æ?¼"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Anjal ���件客�端"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "æ?°å¢?å??é ?"
-
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "è«?輸å?¥ä½ ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "è«?輸å?¥ä½ ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "你輸å?¥ç??é?»å­?é?µä»¶ä½?å??æ?¯ç?¡æ??ç??ã??"
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">å??人詳細è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "è«?輸å?¥ä½ ç??å¯?碼ã??"
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "å??人詳細è³?æ??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "å§?å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Email ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨æ?¥æ?¶è©³ç´°è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">詳細è³?æ??ï¼?</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">正���</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "伺æ??å?¨é¡?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "伺æ??å?¨ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "使����"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "永�"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??詳細è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:585
 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:357
+#: ../capplet/settings/mail-account-view.c:587
 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:359
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "ä½ å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?設å®?é??å??帳è??ç??é?¸é ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:591
 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:362
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "ä½ å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?設設å®?å?¼ã??"
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:593
 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:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "身å??"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "��步 - 正����件"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "正����件"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "ä¸?ä¸?æ­¥ - 身å??è­?å?¥"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "��步 - 正�����"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "正�����"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "��步 - 正����件"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "ä¸?ä¸?æ­¥ - 檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "ä¸?ä¸?æ­¥ - 詳細è³?æ??"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "��步 - 正�����"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "�設�"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??"
 
 #: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+msgid "Setup Google contacts with Evolution"
+msgstr "� Google �絡人�� Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "å°? Google æ?¥æ??å? å?¥ Evolution"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "ä½ å?¯è?½é??è¦?å??ç?¨ IMAP å­?å??ã??"
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google 帳æ?¶è©³ç´°è³?æ??ï¼?</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+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:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo 帳è??設å®?å?¼ï¼?</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo è¡?äº?æ??å??稱ï¼?"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "�碼�"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "é??é??å??é ?"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "帳è??ç²¾é??"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "���件設��"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-msgid "Quit"
-msgstr "çµ?æ??"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../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:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1655
+#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "修�"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "å? å?¥æ?°ç??帳è??"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">帳è??管ç??</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "帳è??管ç??"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "設��"
 
@@ -8547,8 +8389,8 @@ msgstr "è¡?äº?æ??äº?件é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8568,13 +8410,9 @@ msgstr "管ç??ä½ ç??é?µä»¶ã??è?¯çµ¡äººå??è¡?ç¨?"
 msgid "Configure email accounts"
 msgstr "設å®?é?µä»¶å¸³è??"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "å?°å??å?¡"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "è¡?äº?æ??è³?è¨?"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "���件設��"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8600,15 +8438,15 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Evolution �誤"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Evolution è­¦å??"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -8669,56 +8507,66 @@ msgstr "西��系"
 msgid "Western European, New"
 msgstr "西��系��"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "ç¹?é«?"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. 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:97
 msgid "Simplified"
 msgstr "ç°¡é«?"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ç??å??è?­èª?"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "�覺"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1751
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "�天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "�天"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "���起 %d 天"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "���起 %d 天"
+msgstr[1] "���起 %d 天"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d 天å??"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天å??"
+msgstr[1] "%d 天å??"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "格��"
 
@@ -8739,18 +8587,6 @@ msgstr "æ­£å?¨å¯«å?¥ã??%sã??"
 msgid "Writing \"%s\" to %s"
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "è¨?é??å?¨å??稱"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "æª?æ¡?å??稱"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "模çµ?ç??æª?æ¡?å??稱"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "é?¤é?¯ç´?é??æª?"
@@ -8773,13 +8609,15 @@ msgstr "ç´?é??æª?è¨?æ?¯:"
 msgid "Log Level"
 msgstr "ç´?é??ç­?ç´?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "�件"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
@@ -8803,32 +8641,21 @@ msgstr "��"
 msgid "Error, Warnings and Debug messages"
 msgstr "é?¯èª¤ã??è­¦å??è??é?¤é?¯è¨?æ?¯"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "å·²å??ç?¨"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é?±"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "æ??å?°æ??ç?¼ç??é?¯èª¤"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "æ??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ­¤é?¯èª¤ç??詳細è³?è¨?ï¼?"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
@@ -8837,7 +8664,7 @@ msgstr "æ??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
@@ -8857,15 +8684,15 @@ msgstr "��寫�?"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å­?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "�寫(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??該é?£çµ?ã??"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?顯示 Evolution ç??æ±?å?©æ??件ã??"
 
@@ -8878,214 +8705,222 @@ msgstr "GConf �誤�%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ­¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?端æ©?中顯示ã??"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "å¯?件è??"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
+#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
+#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "��"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
+#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
+#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾£çµ?"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1310
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1370
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1533
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1546
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1547
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1723
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??簽署格å¼?"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
 msgid "Error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
+#: ../em-format/em-format.c:1890
 msgid "Unknown error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
+#: ../em-format/em-format.c:1970
+msgid "Could not parse PGP message: "
+msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, 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:74
 #, 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:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, 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:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, 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:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, 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:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, 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:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, 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:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, 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:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -9138,11 +8973,11 @@ msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "��"
 
@@ -9174,7 +9009,7 @@ msgstr "缺å°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "缺å°?æª?æ¡?å??稱ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "缺å°?å??稱ã??"
 
@@ -9230,7 +9065,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??濾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "é??濾å?¨è¦?å??(_F)"
 
@@ -9251,7 +9086,7 @@ msgstr "å¾?"
 msgid "months"
 msgstr "å??æ??"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "�"
 
@@ -9267,44 +9102,28 @@ msgstr "ä½ æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 msgstr[1] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "å??示檢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "��追蹤�"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Shell 模�"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "�件 shell �端��"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "顯示已��"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "顯示已���件"
+#: ../mail/e-mail-browser.c:266
+msgid "(No Subject)"
+msgstr "(æ²?æ??主æ?¨)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9351,7 +9170,7 @@ msgid "_Later"
 msgstr "��(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "���籤"
 
@@ -9371,114 +9190,57 @@ msgstr ""
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "å??稱"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:959
 msgid "Inbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "��"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "é??è¦?"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "�辦"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "��"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "正�移�..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "移�"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æ­£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?°è³?æ??夾 `%s'ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ç?¡æ³?è¤?製製è³?æ??夾 `%s' è?³ `%s'ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "æ­£å?¨è½?移è³?æ??夾"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ä¿¡ç®±è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "ç?¡æ³?建ç«? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?è¤?製 POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?¬å?°é?µä»¶å?²å­?å?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9489,43 +9251,46 @@ msgstr ""
 "\n"
 "ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ç?¡æ³?å?¨ `%s' 建ç«?æ?¬å?°é?µä»¶è³?æ??夾:%s"
-
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr "ç?¡æ³?å¾?以å??ç?? Evolution è®?å??設å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å­?å?¨æ??æ??æ¯?ã??"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "ç?¡æ³?å?¨ã??%sã??建ç«?æ?¬å?°é?µä»¶è³?æ??夾ï¼?%s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:265 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?製è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:265 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "�製(_O)"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:639 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:639 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "移å??(_M)"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:854 ../mail/e-mail-reader.c:964
+#: ../mail/e-mail-reader.c:998
+msgid "_Do not ask me again."
+msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
+
+#: ../mail/e-mail-reader.c:1002
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
+
+#: ../mail/e-mail-reader.c:1087
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "���件"
@@ -9537,541 +9302,557 @@ 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:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1108
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "�件"
 msgstr[1] "�件"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1366
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?件è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1368
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?件è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1373
 msgid "Check for _Junk"
 msgstr "檢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1375
 msgid "Filter the selected messages for junk status"
 msgstr "篩é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1380
 msgid "_Copy to Folder..."
 msgstr "è¤?製è?³è³?æ??夾(_C)..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1382
 msgid "Copy selected messages to another folder"
 msgstr "è¤?製已é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1387
 msgid "_Delete Message"
 msgstr "���件(_D)"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1389
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1394
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1396
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1401
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??濾å?¨(_R)..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1403
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1408
 msgid "Filter on Se_nder..."
 msgstr "å¯?件è??é??濾å?¨(_N)..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1410
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1415
 msgid "Filter on _Subject..."
 msgstr "主æ?¨é??濾å?¨(_S)..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1417
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1422
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??濾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1424
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??濾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1429
 msgid "_Find in Message..."
 msgstr "��件���(_F)..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1431
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?顯示ç??é?µä»¶æ?¬æ??中ç??æ??å­?"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1436
 msgid "_Clear Flag"
 msgstr "����(_C)"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1438
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1443
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1445
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?設ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1450
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1452
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1457
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1459 ../mail/e-mail-reader.c:1466
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??件形å¼?è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1464
 msgid "Forward As _Attached"
 msgstr "以é??件è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1471
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1473 ../mail/e-mail-reader.c:1480
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??中"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1478
 msgid "Forward As _Inline"
 msgstr "以����(_I)"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1485
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1487 ../mail/e-mail-reader.c:1494
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1492
 msgid "Forward As _Quoted"
 msgstr "以å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1499
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1501
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1506
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1508
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1513
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1520
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1522
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?示æ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1527
 msgid "_Read"
 msgstr "已��(_R)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1529
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1534
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1536
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1541
 msgid "_Unread"
 msgstr "���(_U)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1543
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1548
 msgid "_Edit as New Message..."
 msgstr "編輯���件(_E)..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1550
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1555
 msgid "Compose _New Message"
 msgstr "�寫��件(_N)"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1557
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?以便æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1562
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1564
 msgid "Open the selected messages in a new window"
 msgstr "使ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1569
 msgid "_Move to Folder..."
 msgstr "移è?³è³?æ??夾(_M)..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1571
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1576
 msgid "_Next Message"
 msgstr "����件(_N)"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1578
 msgid "Display the next message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1583
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1585
 msgid "Display the next important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1590
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1592
 msgid "Display the next thread"
 msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1597
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1599
 msgid "Display the next unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1604
 msgid "_Previous Message"
 msgstr "����件(_P)"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1606
 msgid "Display the previous message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1611
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1613
 msgid "Display the previous important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1618
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1620
 msgid "Display the previous unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1627
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1634
 msgid "Preview the message to be printed"
 msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1639
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1641
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??給æ??人"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1646 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1648
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1653 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1655
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1660
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1662
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?件è??"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1667
 msgid "_Save as mbox..."
 msgstr "å?²å­?æ?? mbox(_S)..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1669
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å­?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1674
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1676
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1681
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1683
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1688
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1690
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1695
 msgid "Search Folder from S_ubject..."
 msgstr "主æ?¨æ??å°?è³?æ??夾(_U)..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1697
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1702
 msgid "_Message Source"
 msgstr "�件��(_M)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1704
 msgid "Show the raw email source of the message"
 msgstr "顯示é?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1716
 msgid "_Undelete Message"
 msgstr "復å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1718
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1723
 msgid "_Normal Size"
 msgstr "正常大�(_N)"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1725
 msgid "Reset the text to its original size"
 msgstr "é??設æ??å­?ç?ºå??å§?大å°?"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1730
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1732
 msgid "Increase the text size"
 msgstr "å°?æ??å­?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1737
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1739
 msgid "Decrease the text size"
 msgstr "å°?æ??å­?縮å°?"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1746
 msgid "Create R_ule"
 msgstr "建ç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1753
 msgid "Ch_aracter Encoding"
 msgstr "�符編碼(_A)"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1760
 msgid "F_orward As"
 msgstr "���(_O)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1767
+msgid "_Group Reply"
+msgstr "ç¾£çµ?å??è¦?(_G)"
+
+#: ../mail/e-mail-reader.c:1774
 msgid "_Go To"
 msgstr "移�(_G)"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1781
 msgid "Mar_k As"
 msgstr "æ¨?示æ??(_K)"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1788
 msgid "_Message"
 msgstr "�件(_M)"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1795
 msgid "_Zoom"
 msgstr "縮�(_Z)"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1820
 msgid "Mark for Follo_w Up..."
 msgstr "�示���(_W)..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1828
 msgid "Mark as _Important"
 msgstr "æ¨?示æ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1832
 msgid "Mark as _Junk"
 msgstr "æ¨?示æ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1836
 msgid "Mark as _Not Junk"
 msgstr "æ¨?示æ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1840
 msgid "Mar_k as Read"
 msgstr "æ¨?示æ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1844
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?示æ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1848
 msgid "Mark as _Unread"
 msgstr "æ¨?示æ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1884
 msgid "_Caret Mode"
 msgstr "��模�(_C)"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1886
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??中顯示é??ç??游æ¨?"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1892
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é ­(_H)"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1894
 msgid "Show messages with all email headers"
 msgstr "顯示é?µä»¶å??詳細æª?é ­"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2115
 msgid "Unable to retrieve message"
 msgstr "�����件"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2175 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ­£å?¨å??å??é?µä»¶ã??%sã??"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2701 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2841
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2842
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#. Likewise the "mail-reply-group" action
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. (if possible and if that configuration option is enabled), or else
+#. it will reply to all. The word "Group" was chosen because it covers
+#. either of those, without too strongly implying one or the other.
+#: ../mail/e-mail-reader.c:2860
+msgid "Group Reply"
+msgstr "ç¾£çµ?å??è¦?"
+
+#: ../mail/e-mail-reader.c:2861
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
+
+#: ../mail/e-mail-reader.c:2906 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../mail/e-mail-reader.c:2918
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../mail/e-mail-reader.c:2922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2932 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "å??è¦?"
 
@@ -10081,33 +9862,33 @@ 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10121,34 +9902,34 @@ msgstr ""
 "並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10158,37 +9939,37 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2099
 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:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2105
 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:2073
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10196,11 +9977,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10214,74 +9995,70 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836
+msgid "Please select a folder from the current account."
+msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
+
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "���"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "帳è??編輯å?¨"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Evolution 帳è??å?©ç??"
-
 #. 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:1578
+#: ../mail/em-composer-utils.c:1539
 #, 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:1626
+#: ../mail/em-composer-utils.c:1587
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1991
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?件è??"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:2038
 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:2141
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??夾"
 
@@ -10298,10 +10075,18 @@ msgstr "æ??å®?è?²å½©"
 msgid "Assign Score"
 msgstr "æ??å®?ç?®æ¨?"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "�件��(BCC)"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "��"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "��(CC)"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
@@ -10362,6 +10147,10 @@ msgstr "è·?é?¨"
 msgid "Forward to"
 msgstr "���"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "æ?¯ä¹?å¾?ç??"
@@ -10386,7 +10175,7 @@ msgstr "�設�"
 msgid "is set"
 msgstr "設�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10435,7 +10224,7 @@ msgid "Play Sound"
 msgstr "æ?­æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "已�"
 
@@ -10516,16 +10305,16 @@ msgid "Unset Status"
 msgstr "å??æ¶?設å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "æ?¥ç??æ ¹æ??"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "���件:"
@@ -10533,24 +10322,24 @@ msgstr[1] "���件:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "æ??æ??é?µä»¶:"
 msgstr[1] "æ??æ??é?µä»¶:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¡?使ç?¨é?? (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "è³?æ??夾å?§å®¹"
 
@@ -10558,32 +10347,32 @@ msgstr "è³?æ??夾å?§å®¹"
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??夾>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 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:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
 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:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "��中..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
@@ -10610,286 +10399,306 @@ msgstr "è³?æ??夾å??稱ä¸?è?½å??å?«æ??ç·?ã??"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??夾樹"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ­£å?¨ç§»å??è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ­£å?¨è¤?製è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ­£å?¨å°?é?µä»¶ç§»è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ­£å?¨è¤?製é?µä»¶è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?層ç??å?²å­?å??"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "移å??è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "è¤?製è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "æ­£å?¨å»ºç«?è³?æ??夾 `%s'"
+msgid "Creating folder '%s'"
+msgstr "æ­£å?¨å»ºç«?è³?æ??夾ã??%sã??"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?建ç«?è³?æ??夾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
 msgid "Unsigned"
 msgstr "�簽署"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æ­¤é?µä»¶æ?ªç°½ç½²ã??ä¸?ä¿?è­?æ­¤é?µä»¶å·²é©?è­?ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
 msgid "Valid signature"
 msgstr "æ??æ??ç??簽署"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??簽署"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "é?µä»¶ç??簽署ç?¡æ³?檢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??被æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽署æ??æ??ï¼?ä½?æ?¯ç?¡æ³?檢é©?å¯?件è??"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
 msgid "Signature exists, but need public key"
 msgstr "簽署å­?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?碼å??"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??簽署ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??å¯?碼å??ã??"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
 msgid "Unencrypted"
 msgstr "���"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ­¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??被檢é?±ã??"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
 msgid "Encrypted, weak"
 msgstr "已������"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
 msgid "Encrypted"
 msgstr "已��"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
 msgid "Encrypted, strong"
 msgstr "已�����"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "檢���(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "此����檢�"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 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:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 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:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "以...é??å??(_O)"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:151
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:347
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "æ­£å?¨æ?·å?? `%s'"
+msgid "Retrieving '%s'"
+msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1896
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1904
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1934
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1945
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1947
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1968
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1979
 #, 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:2628
+#: ../mail/em-format-html.c:2642
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "é??å°?é?µä»¶æ?¯ç?± <b>%s</b> 代表 <b>%s</b> å¯?å?º"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../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-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ­¤å?²å­?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "已��"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "è³?æ??夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??伺æ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??伺æ??å?¨"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "你確å®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
+msgstr[1] "你確å®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
@@ -10898,7 +10707,7 @@ msgstr "ä¾?è?ª %s ç??é?µä»¶"
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??夾"
 
@@ -10939,138 +10748,134 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é??度"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "å??許 evolution 顯示å?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??表æ??辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "�寫���設�度"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "æ?°å¯«è¦?çª?é ?設é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "編輯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?縮å?¨ TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 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:23
+#: ../mail/evolution-mail.schemas.in.h:22
 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:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 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:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "é ?設è½?é??樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "è¨?é?±å°?話ç??ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??æ??大å??ç??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "é ?設å??è¦?樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?設æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "è¨?é?±å°?話ç??ç??é ?設é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å­?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11078,35 +10883,39 @@ msgid ""
 "autocompletion."
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??度å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決å®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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:45
+#: ../mail/evolution-mail.schemas.in.h:44
 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:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??件ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å­?é?µä»¶å??件æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥å??è?½"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "å?ªé¡¯ç¤ºä¸?è¶?é??æ??å??大å°?ç??é?µä»¶æ??å­?"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??符è??"
@@ -11174,18 +10983,28 @@ msgid ""
 msgstr "å??ç?¨æ­¤é?¸é ?å?¯å?¨é?µä»¶é ?覽ã??é?µä»¶æ¸?å?®å??è³?æ??夾中使ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å­?ã??"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr "å??ç?¨å??å?ªæ??顯示ä¸?è¶?é??ã??message_text_part_limitã??設å®?é?µä¸­æ??å®?義ç??大å°?ç??é?µä»¶æ??å­?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "å??ç?¨ä»¥å?¨æ??æ??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "å??ç?¨æ­¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??模å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??稱編碼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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, "
@@ -11193,50 +11012,62 @@ msgid ""
 "standard."
 msgstr "å°?é?µä»¶æ¨?頭中ç??æª?æ¡?å??稱編碼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?好è®?å®?å??è?½æ­£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å­?符æª?æ¡?å??稱ï¼?å? ç?ºå®?å??並æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?正確ç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "é??濾å¾?æ¸?空å¯?件å?£"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "ç¾£çµ?å??è¦?å??ä¿¡å?°é??ä¿¡è«?å£?"
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "�件���格�度"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??夾é ?覽並移é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 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:72
+#: ../mail/evolution-mail.schemas.in.h:76
 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:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "忽ç?¥é??ä¿¡è«?å£? Reply-To:"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 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:74
+#: ../mail/evolution-mail.schemas.in.h:79
 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:75
+#: ../mail/evolution-mail.schemas.in.h:80
 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:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11244,7 +11075,7 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11252,7 +11083,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11261,414 +11092,456 @@ msgid ""
 "detail."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 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:80
+#: ../mail/evolution-mail.schemas.in.h:85
 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:81
+#: ../mail/evolution-mail.schemas.in.h:86
 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:82
+#: ../mail/evolution-mail.schemas.in.h:87
+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:88
 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:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+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:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr "å®?æ??å??ç?¨/å??ç?¨è­¦å??ä½ ã??ä½ æ­£å??è¦?給å¾?å¤?人ã??ç??é??è¦?æ??示ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:91
+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:92
+msgid "Last time Empty Junk was run"
 msgstr "ä¸?次æ¸?空å??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Last time Empty Trash was run"
 msgstr "ä¸?次æ¸?空å??æ?¶ç­?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "é??置樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?籤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?檢æ?¥ Bonobo å??件檢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "帳è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 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:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªé?¸æª?頭以å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å­?檢æ?¥ç??å­?å?¸èª?è¨?碼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "è¨?é??é??濾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??濾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "é?µä»¶ç??覽å?¨é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "é?µä»¶ç??覽å?¨æ??大å??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "é?µä»¶ç??覽å?¨é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨ã??"
 
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr "顯示é?µä»¶æ??å­?é??å?¶"
+
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ­]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示æ?¼ TO/CC/BCC 中ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??主æ?¨æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??試æ¸?空è³?æ??夾æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??夾中ç??é?µä»¶æ??顯示æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "ç?¶é??ä¿¡è«?å£?å?«æ??ç§?人å??è¦?æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "使ç?¨è??æ¸?空æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?件å?¯æ?¬æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??試ä¸?次é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 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:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??人å??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?端"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?游æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "辨èª?æ??å­?中ç??表æ??符è??並å??代æ??å??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "辨èª?æ??å­?中ç??é?£çµ?並å°?ä¹?å??代ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "å?²å­?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?件è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "é ?設å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "é ?設å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?件è??é?»å­?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "伺æ??å?¨å??æ­¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 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:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??ç¾£çµ?æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??ç¾£çµ?æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "顯示å??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "顯示æ??æ??é?µä»¶æª?é ­"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "檢è¦?é?µä»¶æ??顯示æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "æ?­æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "顯示å??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "顯示å??å§?ç??ã??æ?¥æ??ã??æ¨?é ­æ?¸å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "顯示å¯?件è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 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:154
+#: ../mail/evolution-mail.schemas.in.h:166
 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:155
+#: ../mail/evolution-mail.schemas.in.h:167
 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:156
-msgid ""
-"Show the \"From\" 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:157
+#: ../mail/evolution-mail.schemas.in.h:168
 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:158
+#: ../mail/evolution-mail.schemas.in.h:169
 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:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??中以å??é?¢ç??æ¬?ä½?顯示å¯?件è??ç??é?»å­?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 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:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?格中顯示å¯?件è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+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:174
 msgid "Spell check inline"
 msgstr "����檢�"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?話ç??é ?設é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?話ç??é ?設é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "çµ?端æ©?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "æ??å­?é?µä»¶é??å?¶"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?設å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾?é?»è?¦ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾?ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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 "
@@ -11676,40 +11549,41 @@ msgid ""
 "message list."
 msgstr "é??ç½®æ?¹å¼?決å®?äº?å?¨é?µä»¶æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?端æ©?å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??é??度å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 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:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
-msgstr "é??è£?決å®?äº?é?µä»¶å?§æ??å?¨ Evolution 中å?¯æ??ç??ç??æ??大容é??ã??é ?設ç??大å°?æ?¯ 4MB / 4096 KBï¼?以 KB ä¾?æ??å®?ã??"
+"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:177
+#: ../mail/evolution-mail.schemas.in.h:188
 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:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -11717,179 +11591,201 @@ msgid ""
 "mail view."
 msgstr "æ­¤å¯?碼å??æ??該å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªé?¸æª?é ­ï¼?以å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é ­æ??顯示å?¨é?µä»¶æª¢è¦?ï¼?å??設å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 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:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 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:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?設ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 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:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "以主����串��件��"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "é ?設帳è??ç?? UID å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "使ç?¨è¡?å?§æ?¼å­?檢æ?¥æ??å°?æ?¼é?¯å­?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "使ç?¨è?ªé?¸å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "使ç?¨è?ªé?¸å­?å??ä¾?顯示é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 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:197
+#: ../mail/evolution-mail.schemas.in.h:208
 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:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "è®?å??é??度å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?設å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 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:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦æ ¹æ??é?µä»¶ç¾£çµ?中æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+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:215
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é??度ã??"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "輸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "�件"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸��"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "ç?®ç??å?°è³?æ??夾:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "ç?®ç??端è³?æ??夾(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??夾"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??夾ä¾?輸å?¥"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "主�"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "å¯?件è??"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley �件信箱 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??夾"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "正���信箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-msgid "Importing `%s'"
-msgstr "æ­£å?¨å?¯å?¥ â??%sâ??"
+msgid "Importing '%s'"
+msgstr "æ­£å?¨å?¯å?¥ã??%sã??"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
@@ -11898,470 +11794,550 @@ msgstr "æ??æ?? %s"
 msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Evolution 管é??輸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "�件�� %s "
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "主�� %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??表"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??濾å?¨è¦?å??"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+msgstr[1] ""
+"ä¸?å??é??濾å?¨è¦?å??\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>置�張貼��</b> (�建議)"
+msgid "(Not Recommended)"
+msgstr "(�建議)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使ç?¨æ­¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½ç½²(_W)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) 給:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (_Bcc) 給:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??å¯?碼å??å??è£?ç??å¯?碼å??(_T)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "é©?è­?"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??符è??(_E)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "å­?符é??(_H):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "檢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "以è?ªé?¸æ¨?頭檢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "檢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??輸å?¥æ??檢æ?¥æ?¼å­?(_T)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "��(_A)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "��(_R)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å­?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "正�編輯�件"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "çµ?æ??"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??夾æ??確èª?(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "�設��"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "�設�符編碼(_N):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "���件"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½² [é ?設å?¼] (_U)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "顯示ç??é?µä»¶æª?é ­(_H)"
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "顯示ç??é?µä»¶æª?é ­"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
+#: ../mail/mail-config.ui.h:40
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "ä¸?顯示é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?件è??å?¨æ??ç??é??è¨?é??中就ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "ä¸?使ç?¨å¼?æ??"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "è??稿å?£(_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "é?»å­?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?空å??æ?¶ç­?è³?æ??夾(_X)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é­?è¡?空ç?½é?µ(_P)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??夾(_R)"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "����(_P):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?設å?¼)(_E)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "å?ºå®?é??度(_X):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?é??度å­?å??(_E):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "å­?å??å?§å®¹"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "å¦?æ??å?¯è?½ï¼?ç¾£çµ?å??è¦?å?ªç?¨æ?¼é??ä¿¡è«?å£?"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML �件"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP 代ç??伺æ??å?¨:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "�頭"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "強調å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "忽ç?¥é??ä¿¡è«?å£?ç?? Reply-To:"
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "è¡?å?§"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "���Outlook 風格�"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "�籤"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "��表"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "æ­£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "�件�頭表"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "信箱�置"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "�件顯示"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "é?µä»¶å­?å??"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "æ²?æ??代ç??伺æ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注æ??ï¼?å?¨é¦?次é?£ç·?ä¹?å??å°?ä¸?æ??æ??示你輸å?¥å¯?碼"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªé?¸å??å?¾é?µä»¶æ¨?é ­é??å??é?¸é ?å°±æ??被忽ç?¥ã??"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "é?¸æ??æ?§ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG å¯?碼å?? ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "�碼(_W):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "���:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??æ??顯示æ??示(_O)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "����� (PGP/GPG)"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr "ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?æ??å??æ??é??"
+
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示(_L)"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示(_M)"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "代ç??伺æ??å?¨è¨­å®?å?¼"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "å¼?æ??"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "���碼(_M)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "���碼(_P)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "å¿?è¦?ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ­¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??中ç??å¯?件è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å­?å??(_T):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "��� MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "é?¸æ??è??稿è³?æ??夾"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?ºå®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?¯è®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "é?¸æ??å??å?¾é?µä»¶è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "é?¸æ??å¯?件è³?æ??夾"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "é?¸æ??å??æ?¶ç­?è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "å¯?件è??ç?¸ç??"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??夾(_M):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "å¯?件è??è??稿é?µä»¶"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "伺æ??å?¨è¦?æ±?é©?è­?(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "伺æ??å?¨çµ?æ??"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "伺æ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "簽署���(_G):"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "ç°½å??æª?(_N)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "簽署��(_N):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "簽署���(_A):"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?輸å?¥(_T)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12371,7 +12347,12 @@ msgstr ""
 "ç°½å??æª?ã??ä½ æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "置�張貼��"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12379,183 +12360,193 @@ msgstr ""
 "輸å?¥æ?³ç?¨ä¾?代表é??å??帳è??ç??å??稱ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??人ã??"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "使ç?¨è??å??稱(_E):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "使���(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "使ç?¨è??å??稱(_N):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "å?¯è®?é??度(_A):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "é©?è­?é¡?å??(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "é ?設å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "�������網(_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?簽署æ??è­°é??è«? (å?¼å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "����(_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "å??å?¾é?µä»¶è³?æ??夾(_J):"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??簽署(_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "��(_L)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±è?¯çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "設ç?ºæ??ç??é ?設帳è??(_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??代ç??伺æ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "�示�件�已���(_M)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "路�(_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??è?¯çµ¡äººæ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "�令稿(_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "伺æ??å?¨(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "顯示å??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?覽顯示å¯?件è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮� _To / Cc / Bcc �頭�"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "å??æ?¶ç­?è³?æ??夾(_T):"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "使�����(_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "使�系統�設�(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "使ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å­?å??(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "�彩"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "æ??è¿°"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "æ??æ??å?¯ç?¨ç??é? ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "æ??æ??æ?¬å?°ç«¯å??å?¯ç?¨ç??é? ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "å??å§?ä½?ç½®"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "���起(_A)"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "�碼簽署"
@@ -12565,58 +12556,66 @@ msgid "Do Not Forward"
 msgstr "����"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "å?¨é?¨å±?é??(_X)"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "è³?æ??夾è¨?é?±"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "給你ç??è³?è¨?"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
-msgstr "å?¨é?¨å??è¦?"
+msgstr "å??è¦?å?¨é?¨"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "檢�"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "伺æ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "å?ªé¡¯ç¤ºé ?ç?®å?«æ??(_S):"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "æ??å°?è³?æ??夾ä¾?æº?"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "�����"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12624,183 +12623,178 @@ msgstr ""
 "ä½ é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸­é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "��(_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "é??濾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "���件"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
-"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??ã??"
+"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:654
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??ï¼?%s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "å?²å­?é??件"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12809,142 +12803,178 @@ msgstr ""
 "��建�輸����%s�\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?%s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "檢æ?¥æ??å??"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "æ­£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "��中..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "正���..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "輸��碼"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:723
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:732
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é?? `%s'ï¼?%s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é??ã??%sã??ï¼?%s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº? `%s' ç??é?µä»¶"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº?ã??%sã??ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "è³?æ??夾ç?¡æ??:`%s'"
+msgid "Invalid folder: '%s'"
+msgstr "ç?¡æ??ç??è³?æ??夾ï¼?ã??%sã??"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設å®?æ??å°?è³?æ??夾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+msgstr[1] ""
+"ä¸?å??æ??å°?è³?æ??夾\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+
+#: ../mail/mail-vfolder.c:1179
 msgid "Edit Search Folder"
 msgstr "編輯æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1284
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??夾"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "ã??檢æ?¥å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "ã??å??å ±å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "ã??å??å ±ç?ºé??å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{0}ã??ç??è³?æ??夾å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{1}ã??ç??è³?æ??夾å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -12955,252 +12985,239 @@ msgstr ""
 "\n"
 "ä½ å?¯ä»¥é?¸æ??忽ç?¥æ­¤è³?æ??夾ã??è¦?寫æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?給 {0}ï¼?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{0}ã??ç??ç°½å??æª?å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:8
+#: ../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."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??義ç??主æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??ä½ ç??é?µä»¶å??ä»?麼äº?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??以å??å®?æ??æ??ç??代ç??伺æ??å?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??ï¼?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??以å??å®?æ??æ??ç??代ç??伺æ??å?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "你確å®?è¦?ä¸?次é??é??å?? {0} å°?é?µä»¶ï¼?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "è¦?æ°¸ä¹?移é?¤æ??æ??è³?æ??夾中æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "確å®?è¦?æ°¸ä¹?移é?¤è³?æ??夾ã??{0}ã??中æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "è¦?å?³é?? HTML æ ¼å¼?ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "è¦?å?³é??é?»å­?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "è¦?å?³é??é?»å­?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "è¦?å?³é??å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "è¦?å?³é??æ²?æ??主æ?¨ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "å? ç?ºã??{0}ã??ã??"
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "å? ç?ºã??{2}ã??ã??"
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "空ç?½ç°½å??æª?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ä¸?è?½å? å?¥æ??å°?è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ç?¡æ³?å°?ã??{0}ã??è³?æ??夾è¤?製è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "ç?¡æ³?建ç«?æ?«æ??å?²å­?ç?®é??ã??"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ä¸?è?½å»ºç«?å?²å­?ç?®é??ï¼?å? ç?ºã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤ç³»çµ±è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ä¸?è?½ç·¨è¼¯æ??å°?è³?æ??夾ã??{0}ã??ï¼?å? ç?ºå®?ä¸?å­?å?¨ã??"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?è³?æ??夾ã??{0}ã??移è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:36
+#: ../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}ã??ï¼?æ??該æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨ä½ å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?使ç?¨å®?ã??"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?ã??{0}ã??é??æ?°å?½å??æ??ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ä¸?è?½é??æ?°å?½å??æ??移å??系統è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "ç?¡æ³?å?²å­?帳è??æ?´æ?¹ã??"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ä¸?è?½å?²å­?è?³ç?®é??ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "ä¸?è?½å?²å­?è?³æª?æ¡?ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ä¸?è?½è¨­å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "檢æ?¥å??å?¾é?µä»¶å¤±æ??"
-
 # (Abel) é?µç?¤ç??é?µæ??好ä¸?è­¯äº?
-#: ../mail/mail.error.xml.h:44
+#: ../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ã??"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ç?¡æ³?å?²å­?簽署æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??夾ã??{0}ã??中ç??é?µä»¶ï¼?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "ä¸?è¦?å??ç?¨(_N)"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "����(_E)"
+msgid "Do _Not Send"
+msgstr "ä¸?è¦?å?³é??(_N)"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "����"
+msgid "Do _Not Synchronize"
+msgstr "ä¸?è¦?å??æ­¥(_N)"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "ä¸?è¦?å??ç?¨"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ­¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "輸å?¥å¯?碼ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??濾å?¨å®?義æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?業æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å­?å?¨ä½?ç?¡æ³?è¦?寫ã??"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å­?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?復å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
-msgstr "å¦?æ??ä½ é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? æ¶?失ã??"
+msgstr "å¦?æ??ä½ å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??ä½ é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?失ã??"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??代ç??伺æ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13208,33 +13225,33 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?該帳è??ç??è³?è¨?以å??\n"
 "å®?æ??æ??ç??代ç??伺æ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?帳è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??ä½ é?¸æ??çµ?æ??ï¼?å??次å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è­?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??濾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13242,33 +13259,33 @@ msgid ""
 "recipient."
 msgstr "å¾?å¤?é?»å­?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é ­è?³å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ­¤æª?é ­ï¼?æ??æ°¸é? å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?次é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "è«?檢æ?¥å¸³è??設å®?並å??試ä¸?次ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??使ç?¨å?¶ä»?帳è??å?³é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 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:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13277,69 +13294,65 @@ msgstr ""
 "è«?確å®?以ä¸?æ?¶ä»¶è??å¸?æ??並ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å­?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?輸å?¥å?¯ä¾?辨è­?é??å??ç°½å??æª?ç??ç?¨ç?¹å??稱ã??"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?移è??é?µä»¶è³?æ??夾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??伺æ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è­?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??以å??å®?æ??æ??ç??å­?è³?æ??夾?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??ï¼?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "å??å ±å??å?¾é?µä»¶å¤±æ??"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "å??å ±ç?ºé??å??å?¾é?µä»¶å¤±æ??"
-
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "ç§?人å??è¦?(_P)"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??夾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "å?³é??å??æ¢?"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "æ?¯å?¦å?³é??ç§?人å??è¦?ï¼?"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "æ?¯å?¦å??è¦?給æ??æ??ç??æ?¶ä»¶è??ï¼?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å­?å?¨"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "å??æ­¥å??"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ­¥è³?æ??夾以ä¾?é?¢ç·?使ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "Evolution é??è¦?系統è³?æ??夾æ??è?½æ­£å¸¸ä½?業ï¼?è??ä¸?該è³?æ??夾ä¸?å?¯ä»¥é??æ?°å?½å??ã??移å??æ??å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13352,35 +13365,7 @@ msgstr ""
 "\n"
 "å¾?å¤?é?»å­?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é ­è?³å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?æ­¤æª?é ­ï¼?æ??å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?ä½ æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"以ä¸?æ??å°?è³?æ??夾ï¼?\n"
-"{0}\n"
-"使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾:\n"
-"    ã??{1}ã??\n"
-"è??ä¸?å·²æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"以ä¸?é??濾è¦?å??ï¼?\n"
-"{0}\n"
-"使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾ï¼?\n"
-"    ã??{1}ã??\n"
-"è??ä¸?å·²æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13388,7 +13373,7 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?»å­?é?µä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13396,11 +13381,11 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?»å­?é?µä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å­?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13408,56 +13393,60 @@ msgstr ""
 "æ­¤è³?æ??夾å?¯è?½å·²ç¶?è?ªå??æ?°å¢?ã??\n"
 "é??è¦?æ??ï¼?è«?移è?³æ??å°?è³?æ??夾編輯å?¨ï¼?以æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å? ç?ºä½ æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??帳è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºä½ æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´æ­¤é©?è­?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è­?ã??"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽署已ç¶?æ?´æ?¹ï¼?ä½?å°?æ?ªå?²å­?ã??"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "é??æ??å°?æ¨?示é?¸å®?ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "é??æ??å°?æ¨?示é?¸å??ç??è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "ç?¡æ³?é??å??此帳è??ç??è??稿è³?æ??夾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??稿è³?æ??夾代æ?¿ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "ç?¡æ³?è®?å??æ??æ¬?æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "使��設�(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "使ç?¨é ?設ç??è??稿è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13466,31 +13455,51 @@ msgstr ""
 "è­¦å??ï¼?å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶å°?æ??è?ªä½ ç??æ?¬å?°æ??é? ç«¯è³?æ??夾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??麼å??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+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:123
+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:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr "ä½ æ­£å?¨å??è¦?ç??信件æ??å?³é??給許å¤?æ?¶ä»¶è??ã??你確å®?å??信給ä»?å??å?¨é?¨ï¼?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ä½ æ²?æ??足夠ç??æ¬?é??å?ªé?¤æ­¤å°?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "ä½ æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ä½ æ??æ?ªå¯?å?ºç??é?µä»¶ï¼?ä½ ç?¡è«?å¦?ä½?é?½è¦?é?¢é??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "ä½ ä¸?è?½ç?¨ç?¸å??ç??å??稱建ç«?å?©å??帳è??ã??"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "ä½ å¿?é ?å?½å??æ­¤æ??å°?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "ä½ å¿?é ?æ??å®?ä¸?å??è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13499,127 +13508,127 @@ msgstr ""
 "ä½ å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??夾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??夾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??夾ã??æ??æ??é? ç«¯è³?æ??夾æ??äº?è??ç??é?¸ã??"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ä½ ç?»å?¥ä¼ºæ??å?¨ã??{0}ã??ç??帳è??ç?ºã??{0}ã??ï¼?ä½?失æ??äº?ã??"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "添�(_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "å??ç?¨(_D)"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "����(_D)"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "ä¸?è¦?å??æ­¥(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "��(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1122
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "å?³é??å??æ¢?(_S)"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "å??æ­¥å??(_S)"
+
+#: ../mail/message-list.c:1159
 msgid "Unseen"
 msgstr "���"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1160
 msgid "Seen"
 msgstr "已��"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1161
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1162
 msgid "Forwarded"
 msgstr "��"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1163
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1164
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1168
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1169
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1173
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1174
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1800
 msgid "Yesterday %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1812
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1820
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1822
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2582
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Shell �端��"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4329 ../mail/message-list.c:4721
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4560
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr "å?¨é??å??è³?æ??夾中å?ªæ??é?±è??ç??é?µä»¶ã??使ç?¨ 檢è¦?->顯示é?±è??ç??é?µä»¶ ä¾?顯示å®?å??ã??"
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4562
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??夾中æ²?æ??é?µä»¶ã??"
 
@@ -13648,7 +13657,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "大�"
 
@@ -13657,27 +13666,27 @@ msgid "Subject - Trimmed"
 msgstr "主� - 已��"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "å¯?件è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "主æ?¨å??å?«"
 
@@ -13704,29 +13713,29 @@ msgid ""
 "vulnerable to security exploits."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?ä½ ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示你ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_B)"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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:810
+#: ../modules/addressbook/addressbook-config.c:820
 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:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -13734,29 +13743,29 @@ msgid ""
 "one level beneath your base."
 msgstr "æ??å°?ç¯?å??æ??å®?義你æ?³å¾?網絡ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -13832,9 +13841,11 @@ msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸­è?ªå??è£?é½?ç??è?¯çµ¡äººå§?å??è??é?»å­?é?µ
 msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦é¡¯ç¤ºé ?覽çª?æ ¼ã??"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "表格��"
+#: ../modules/mail/em-mailer-prefs.c:1165
+msgid "_Table column:"
+msgstr "表格�(_T):"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -13845,396 +13856,294 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??è?¯çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "�絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "建ç«?æ?°ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "�絡人��(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "建ç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "建ç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "�絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "����"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "é??è¨?é??ç??註å??表"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "ç?®å??檢è¦?"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "ç?®å??é?¸å??ç??é??è¨?é??檢è¦?"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "é ?覽ç??è?¯çµ¡äºº"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "è¦?顯示å?¨é ?覽çª?æ ¼ç??è?¯çµ¡äºº"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "é ?覽ç?ºé¡¯ç¤ºç??æ??"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "�覽�格�����"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP 伺æ??å?¨"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "è?ªå??å®?æ??設å®?"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution è?¯çµ¡äººè³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"é?µå¯?æ¸?å?®è?¯çµ¡äººç??æ ¼å¼?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å?²å­?é?¨ä»½é?»è©±è??碼ç??æ?¹å¼?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution ç?? Palm Sync æ?´æ?¹è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?æ?´æ?¹ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??件"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??ç¾£çµ?"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "��� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "è¤?製æ??æ??ç??è?¯çµ¡äººå?°(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??è?¯çµ¡äººè¤?製å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "å?ªé?¤é??è¨?é??(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??è?¯çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "æ?°å¢?é??è¨?é??(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "é??è¨?é??屬æ?§(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "顯示é?¸å??é??è¨?é??ç??屬æ?§"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "å°?é??è¨?é??å?¦å­?ç?º vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??è?¯çµ¡äººå?²å­?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "å??æ­¢è¼?å?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "�製�絡人�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººè¤?製å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "���絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "��絡人���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "æ??å°?顯示ç??è?¯çµ¡äººä¸­ç??æ??å­?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "���絡人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "å?³é??é?¸å??è?¯çµ¡äººçµ¦å?¶ä»?使ç?¨è??ã??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "��絡人移�(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "���絡人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "���絡人��(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "é??å??è?¯çµ¡äºº(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "檢è¦?ç?®å??ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "�覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1474
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "��(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "å?²å­?æ?? _vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "�絡人�覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "顯示�絡人�覽��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "�統檢�(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "��絡人����顯示�絡人�覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "å?¨è?¯çµ¡äººæ¸?å?®æ??é??顯示è?¯çµ¡äººé ?覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "��� vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "å°?é?¸å??ç??è?¯çµ¡äººå?²å­?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "���絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "���絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)"
 
@@ -14258,112 +14167,103 @@ msgstr "�絡人��"
 msgid "Contact information for %s"
 msgstr "%s ç??è?¯çµ¡äººè³?è¨?"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "å?¿å??"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "ç??覽é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "��(_G):"
 
 #. 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:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "��"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "æ??å°?é??濾å?¨"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "æ??å°?èµ·é»?(_B):"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "æ??å°?é??濾å?¨(_F):"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../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ã??ç?©ä»¶é¡?å??ã??"
 
 #. 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:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "å­?é ?"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "使ç?¨è¾¨èª?ç??å??稱 (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "使ç?¨é?»å­?é?µä»¶å?°å??"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ä¸?è¼?é??å?¶(_D):"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "����(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "���(_P):"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "æ??å°?ç¯?å??(_S):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "使�����(_U):"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "å?¡ç??"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "��(_M)"
 
@@ -14384,99 +14284,71 @@ msgid "I_mport to Tasks"
 msgstr "���工�(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "�網��"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "天氣"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "建ç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "建ç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è­°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "建ç«?æ?°æ??è­°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "è¡?äº?æ??ç??註å??表"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution è¡?äº?æ??è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "ç?¡æ³?å¾? evolution/config.xmldb 移è½?è??設å®?"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "ç?¡æ³?移è½?移è¡?äº?æ?? `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14485,36 +14357,20 @@ msgstr ""
 "%s ç?¼ç??é?¯èª¤\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:237
 msgid "Loading calendars"
 msgstr "æ­£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:664
+msgid "_New Calendar..."
+msgstr "æ?°å¢?è¡?äº?æ??(_N)..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:681
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "æ?¥æ??ç??覽è¦?çª?å??件"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "é ?設è¡?äº?æ??客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "è¡?äº?æ??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??ç¾£çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14542,300 +14398,300 @@ msgstr "æ¸?é?¤æ?©æ?¼é??段æ??é??ç??äº?件"
 msgid "Copying Items"
 msgstr "�製��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "移å??é ?ç?®"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "�件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "��� iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "�製(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
-msgid "Select _Today"
-msgstr "é?¸æ??ä»?天(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "��(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "è¤?製è?³è¡?äº?æ??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è­°(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "å?ªé?¤é??次ç?¼ç??ç??äº?件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ­¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "���天�件(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "建ç«?æ?°ç??å?¨å¤©äº?件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar ��..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "æ?°å¢?æ??è­°(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "建ç«?æ?°ç??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "移è?³è¡?äº?æ??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?件æ¨?示æ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "檢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "��� iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "æ??è­°æ??ç¨?(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "è½?æ??ç?ºç´?æ??(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è­°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1572
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "çµ?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "顯示�天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "顯示æ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "顯示ä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "顯示��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "顯示ä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "é?²è¡?中ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 天ç??ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "主æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "移�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "建ç«?æ?°ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "檢è¦?é?¸å??ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "é??å??網é ?(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14844,22 +14700,22 @@ msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "工�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "æ??派工ä½?(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "æ¨?示ç?ºå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??å®?æ??"
 
@@ -14868,96 +14724,76 @@ msgid "_Mark as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??æ?ªå®?æ??"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "��工�(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "建ç«?ä¸?å??æ?°ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "檢è¦?é?¸å??ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "��� iCalendar[_S]..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "æ??å?°é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "建ç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "建ç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "å??å¿?é??æ¸?å?®ç??註å??表"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "å??å¿?é??表格模å??"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:231
 msgid "Loading memos"
 msgstr "æ­£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:603
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "é ?設å??å¿?é??客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "å??å¿?é??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??ç¾£çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:908
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14968,65 +14804,65 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?顯示ç??å??å¿?é??中ç??æ??å­?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ­¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??顯示å??å¿?é??é ?覽"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
@@ -15051,77 +14887,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "工�(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "建ç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工���(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "建��工���"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "å·¥ä½?æ¸?å?®ç??註å??表"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "å·¥ä½?表格模å??"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å·¥ä½?è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.xå¾?å°±æ?´æ?¹äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "��移�工� `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:231
 msgid "Loading tasks"
 msgstr "正���工�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:603
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "�設工�客�端��"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "å·¥ä½?æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??ç¾£çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:908
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -15131,7 +14930,7 @@ msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 msgid "Print Tasks"
 msgstr "æ??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15142,97 +14941,97 @@ msgstr ""
 "\n"
 "確å®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "��工�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "�工����(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?顯示ç??å·¥ä½?中ç??æ??å­?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "�製..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "��工���(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "��工���(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "�顯示此工���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "工��覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "�工�����顯示工��覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??顯示工ä½?é ?覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "é?²è¡?中ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 天ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "æ??é??件ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
@@ -15256,401 +15055,368 @@ msgid "Delete Task"
 msgstr "��工�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, 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:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "�件��(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "編輯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "建ç«?æ?°é?µä»¶è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "網絡å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "æ?¯å?¦æ ¹æ??ç?¸é??é?µä»¶ä»¥ç¾£çµ?æ?¹å¼?顯示"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:871
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??è³?æ??夾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?使ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??帳è??è??è³?æ??夾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?件å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "è¤?製è³?æ??夾å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?製已é?¸å®?ç??è³?æ??夾å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?移é?¤é??å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "��(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?移é?¤å?¨é??å??è³?æ??夾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?示æ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "移å??è³?æ??夾å?°(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??夾移è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "��(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "建ç«?ä¸?å??æ?°è³?æ??夾以å?²å­?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??夾ç??屬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??夾ç??å??稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å­?ç¾£çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??帳è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "���籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "顯示é?±è??ç??é?µä»¶(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "顯示æ?«æ??é?±è??ç??é?µä»¶"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??編輯é??濾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "建ç«?æ??編輯æ??å°?è³?æ??夾ç??å®?義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "��(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "�籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??夾(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??以å?ªé?¤ç·?ç??å½¢å¼?顯示"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "顯示�件�覽(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "顯示�件�覽�格"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show _Deleted Messages"
+msgstr "顯示已���件(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+msgid "Show deleted messages with a line through them"
+msgstr "顯示已å?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤ç·?)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "��件����顯示�件�覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??顯示é?µä»¶é ?覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 天ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "æ??é??件ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "��籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "已��件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "���件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "æ??æ??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "ç?®å??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:887
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:898
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已��"
 msgstr[1] "%d �已��"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??稿"
 msgstr[1] "%d å??è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:929
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:941
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:944
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15661,87 +15427,108 @@ msgstr[1] "å?± %d å°?"
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:869
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帳è??å?©ç??"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "帳è??編輯å?¨"
+
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "å·²å??ç?¨"
+
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "�次"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "�天�次"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "���次"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?次"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªé?¸å??å?¾é?µä»¶æª?é ­"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "æ¨?é ­å??稱:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "æ¨?é ­æ?¸å?¼å??å?«:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?使ç?¨ã??è«?檢æ?¥æ?¯å?¦æ??å®?è£?該å¥?件ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "表格�(_T):"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "æ?¥æ??æ¨?é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "顯示å??å§?æ¨?é ­æ?¸å?¼(_O)"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+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."
+msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "æ?¯å?¦è¦?å°? Evolution 設ç?ºä½ ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ï¼?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15758,6 +15545,49 @@ msgstr "Python 測試å¤?æ??ç¨?å¼?"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??測試å¤?æ??ç¨?å¼?ã??"
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "è«?é?¸æ??ä½ æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "ä¾?è?ª %sï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+msgid "Importing Files"
+msgstr "正�����"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "å?¯å?¥å·²å??æ¶?ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "å?¯å?¥å·²å®?æ??ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 設å®?å?©ç??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "歡�使�"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"æ­¡è¿?使ç?¨ Evolutionã??以ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³ä½ ç??é?»å­?é?µä»¶å¸³è??ï¼?以å??å¾?å?¶ä»?æ??ç?¨ç¨?å¼?輸å?¥æª?æ¡?ã??\n"
+"\n"
+"è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ­¥ã??æ??é??ç¹¼çº?ã?? "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "å°?æ?¬å?°é??è¨?é??å? å?¥ Evolutionã??"
@@ -15772,14 +15602,8 @@ msgid ""
 "body"
 msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®ã??"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "é??é?µå­?"
 
@@ -15817,58 +15641,58 @@ msgstr "è¡?å?§é?³æ??"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥æ?­æ?¾é?µä»¶ä¸­ç??é?³æ??é??件ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??份æª?æ¡?ç??å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "å??份å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??份æª?æ¡?å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr "ä½ å?¯ä»¥å¾?å??份中é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??è?¯çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??ä½ æ??æ??ç??å??人設å®?ã??é?µä»¶é??濾å?¨ç­?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "å¾?å??份æª?æ¡?é??å?? Evol_ution"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?庫ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "å¾?å??份é??å??"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "å??份設å®?å?¼(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "æ­£å?¨å??份 Evolution ç??設å®?å?¼(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "å°? Evolution ç??è³?æ??è??設å®?å?¼å??份ç?ºæª?æ¡?庫"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "é??å??設å®?å?¼(_E)..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
@@ -15916,7 +15740,7 @@ msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -15946,31 +15770,31 @@ msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份你ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼ä½ ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
@@ -16025,35 +15849,35 @@ msgid ""
 "restore, please enable the toggle button."
 msgstr "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??設å®?å?¼ä¸¦å¾?å??份中é??å??å®?å??ã??Evolution é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??è?¯çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??建ç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??給è?ªå??å? å?¥è?¯çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯è?¯çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "å®?æ??å¾? Pidgin ç??好å??æ¸?å?®å??æ­¥è?¯çµ¡äººè³?è¨?å??å??ç??"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "å¾? Pidgin ç??好å??æ¸?å?®å??æ­¥è?¯çµ¡äººè³?è¨?å??å??ç??(_S)"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??給 Pidgin 好å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ç«?å?³è??好å??æ¸?å?®å??æ­¥(_B)"
 
@@ -16073,28 +15897,28 @@ msgstr ""
 "\n"
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??中填å?¥å§?å??è??é?»å­?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸­å¡«å?¥ IM è?¯çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter å°?æ?ªå??妥ã??è«?å??å®?è£?å®?ã??"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "�� Bogofilter ���中�����..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?管è?³ Bogofilter 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
@@ -16125,15 +15949,15 @@ msgstr "Bogofilter ��"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使ç?¨ Bogofilter é??濾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "é©?è­?失æ??ã??伺æ??å?¨è¦?æ±?正確ç??ç?»å?¥ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16142,36 +15966,31 @@ msgstr ""
 "伺æ??å?¨å?³å??äº?æ?ªé ?æ??ç??è³?æ??ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "ç?¡æ³?å??æ??伺æ??å?¨ç??å??æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "�件"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "使ç?¨è??ç??è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "æ?¾ä¸?å?°ä»»ä½?使ç?¨è??è¡?äº?æ??ã??"
 
@@ -16185,67 +16004,63 @@ msgstr "å??ä¸?次ç??å??試失æ??ï¼?%s"
 msgid "Previous attempt failed with code %d"
 msgstr "å??ä¸?次ç??å??試失æ??代碼ç?º %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "輸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?碼 "
+msgid "Enter password for user %s on server %s"
+msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "æ??å°?è³?æ??夾å?§å®¹..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "��建�����%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "伺æ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "ç??覽 CalDAV è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "網å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "使� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "ç??覽伺æ??å?¨ç??è¡?äº?æ??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -16257,31 +16072,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV ��"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "����(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "æª?æ¡?å??稱(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "æ?¼æ?´æ?¹ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "強���(_O)"
 
@@ -16293,11 +16108,11 @@ msgstr "å°?æ?¬å?°ç«¯è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Local Calendars"
 msgstr "æ?¬å?°è¡?äº?æ??"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "����(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "使ç?¨è??å??稱(_M):"
 
@@ -16345,26 +16160,26 @@ msgstr "天氣ï¼?æ?´æ??ç??å¤?æ??"
 msgid "Weather: Thunderstorms"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "��(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç­?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç­?)"
 
@@ -16393,44 +16208,43 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?顯示è?¯çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "è?¯çµ¡äººç??å?°å??"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "é?¸å??å?¯å?¥ OE è³?æ??夾ç?¨ç??è³?æ??夾"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "æ­£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "å?¨å??å??æ??檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ã??"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "� DBX ���� Outlook Express �件"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "�設�件客�端��"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Outlook DBX ��"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "ä½ æ?¯å?¦è¦?å°? Evolution 設ç?ºä½ ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook Express 5/6 å??人è³?æ??夾 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "æ¨?示ç?ºé ?設é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "æ¨?示ç?ºé ?設è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "�示��設工���(_D)"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "æ¨?示ç?ºé ?設å??å¿?é??æ¸?å?®(_D)"
 
@@ -16481,12 +16295,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "���頭(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16494,12 +16308,12 @@ msgstr ""
 "æ??å®?è?ªé?¸æ¨?é ­é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªé?¸æ¨?é ­é?µå?¼ç??å??稱è«?以ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "設��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "��"
 
@@ -16521,7 +16335,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸­æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?編輯å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16533,11 +16347,11 @@ msgstr "�設��編輯�"
 msgid "The default command that must be used as the editor."
 msgstr "é ?設ç??æ??令å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??編輯å?¨ç??æ??令: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16545,8 +16359,8 @@ msgstr ""
 "Emacs 使ç?¨ã??xemacsã??\n"
 "VI 使ç?¨ã??gvim -fã??"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "���編輯�中�寫"
 
@@ -16614,7 +16428,7 @@ msgstr "é ?設æ??å?¥å¤§é ­ç?§(_I)"
 msgid "Load new _Face picture"
 msgstr "è¼?å?¥æ?°ç??大頭ç?§(_F)"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "å??å?«å¤§é ­ç?§(_F)"
 
@@ -16646,22 +16460,17 @@ msgstr "ä¸?è?½è®?å??é??å??æª?æ¡?"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "ä½ é?¸å??ç??æª?æ¡?ä¼¼ä¹?ä¸?æ?¯æ??æ??ç?? .png å??ç??ã??é?¯èª¤ï¼?{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "伺æ??å?¨"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>伺æ??å?¨</b>"
-
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸å?¥ä½¿ç?¨è?? %s ç??å¯?碼以å­?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16670,18 +16479,18 @@ msgstr ""
 "ä¸?è?½å¾? Google 伺æ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "å??å??æ¸?å?®(_L)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16692,7 +16501,7 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "檢���"
 
@@ -16724,12 +16533,12 @@ msgstr "æ?«æ??å¥?ç?¨"
 msgid "Rese_nd Meeting..."
 msgstr "é??å¯?æ??è­°(_N)..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16754,19 +16563,19 @@ msgstr ""
 "æ??ã??å¥?ç?¨ã??以å®?è£?å??享è³?æ??夾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "å®?è£?å??享è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "å??享è³?æ??夾å®?è£?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "å??å?¾é?µä»¶è¨­å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "å??å?¾é?µä»¶è¨­å®?å?¼"
@@ -16779,11 +16588,6 @@ msgstr "���件:"
 msgid "Junk List:"
 msgstr "å??å?¾é?µä»¶æ¸?å?®ï¼?"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "å??ç?¨(_D)"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
@@ -16802,13 +16606,13 @@ msgstr "移�(_R)"
 msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../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?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?該é?µä»¶è?ªæ?¶ä»¶è??ç??信箱移é?¤ã??你確å®?è¦?é??麼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
@@ -16925,25 +16729,25 @@ msgid "Would you like to decline it?"
 msgstr "ä½ æ?³è¦?æ??çµ?å®?å??ï¼?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>使ç?¨è??ï¼?</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "è?ªé?¸é??ç?¥è¨?æ?¯(_U)"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "�絡人(_T)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "å??享è³?æ??夾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "使ç?¨è??ï¼?"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "æ?ªå??享(_N)"
@@ -17001,50 +16805,57 @@ msgid "Proxy"
 msgstr "代ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>帳è??å??稱</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "帳è??å??稱"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ç?»å?¥ä»£ç??伺æ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?輸å?¥ %s æ??é??ç??å¯?碼(使ç?¨è?? %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å??ç?¨æ­¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+msgctxt "GW"
+msgid "Proxy"
+msgstr "代ç??"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "輸å?¥ä½¿ç?¨è??並設å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "å??享"
 
@@ -17052,67 +16863,59 @@ msgstr "å??享"
 msgid "Custom Notification"
 msgstr "è?ªé?¸é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "��"
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "主�:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "å¯?件è??:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "建ç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "已��:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula ��"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "è¡?å?§å??ç??"
@@ -17121,12 +16924,12 @@ msgstr "è¡?å?§å??ç??"
 msgid "View image attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤ºå??ç??ã??"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "���頭"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP �頭"
@@ -17172,34 +16975,36 @@ msgstr "校調你ç?? IMAP 帳è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??失æ??"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??ã??%sã??(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' 中ç??ç´?æ??å??é??å??æ??è­°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??中ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??中æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
@@ -17335,503 +17140,499 @@ msgid ""
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "�天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "�天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "�天%p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "æ??天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "æ??天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "æ??天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "æ??天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%a %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%-m æ?? %d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "è«?代表 <b>%s</b> å??è¦?"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "代表 <b>%s</b> ��"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgid "Please respond on behalf of %s"
+msgstr "è«?代表 %s å??è¦?"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> å·²ç¶?å§?æ´¾ä¸?å??æ??議給你ï¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s é??è«?ä½ å?ºå¸­ä¸?å??æ??è­°ï¼?"
+msgid "Received on behalf of %s"
+msgstr "代表 %s ��"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> é??è«?ä½ å?ºå¸­ä¸?å??æ??è­°ï¼?"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
+msgid "%s has published the following meeting information:"
+msgstr "%s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s å·²ç¶?å§?æ´¾ä¸?å??æ??議給你ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s é??é?? %s é??è«?ä½ å?ºå¸­ä¸?å??æ??è­°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°å·¥ä½?è³?è¨?ï¼?"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s é??è«?ä½ å?ºå¸­ä¸?å??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ï¼?"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> å·²ç¶?æ¶?å??ä¸?å??æ??è­°ã??"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> é??é?? %s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s é??é?? %s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°æ?´æ?¹ï¼?"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s é??é?? %s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
+msgid "%s has canceled the following meeting."
+msgstr "%s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s é??é?? %s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s é??é?? %s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ??派你ä¸?é ?å·¥ä½?ï¼?"
+msgid "%s has declined the following meeting changes."
+msgstr "%s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> å·²ç¶?æ??派你ä¸?é ?å·¥ä½?ï¼?"
+msgid "%s through %s has published the following task:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
+msgid "%s has published the following task:"
+msgstr "%s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s é??é?? %s å·²ç¶?æ??派你ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s has assigned you a task:"
+msgstr "%s å·²ç¶?æ??派你ä¸?é ?å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+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 "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??æ?´æ?¹ï¼?"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s é??é?? %s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??æ?´æ?¹ï¼?"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s é??é?? %s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??æ?´æ?¹ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s é??é?? %s å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:551
+#, c-format
+msgid "%s has published the following memo:"
+msgstr "%s å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s é??é?? %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
+msgid "%s has canceled the following shared memo:"
+msgstr "%s å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "�天�"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "é??å§?æ?¥ï¼?"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "çµ?æ??æ?¥ï¼?"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
 msgstr "æ?¥å??(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "����(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "��(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "å?¨é?¨æ?¥å??(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "å?¨é?¨æ?¥å??(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸­ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??實é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "顯示æ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "工�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -17844,16 +17645,14 @@ msgid "Itip Formatter"
 msgstr "Itip 格��"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "ã??{0}ã??已代ç??æ­¤æ??è­°ã??æ?¯å?¦é??è¦?å? å?¥ä»£ç??人ã??{1}ã??ï¼?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "é??å??æ??è­°å·²å§?æ´¾"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../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?"
 msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?件人å? å?¥ç?ºå?°æ??è??ï¼?"
@@ -17932,16 +17731,15 @@ msgstr "å??示æ?¯å?¦è¦?é??ç??ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:513
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17956,67 +17754,69 @@ msgstr[1] ""
 "ä½ å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "From: %s"
 msgstr "å¯?件è??ï¼?%s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:548
 #, 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:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:577
 msgid "New email"
 msgstr "��件"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:638
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??中顯示å??示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:666
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??示é??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:676
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??示ä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "_Beep"
 msgstr "��(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:905
 msgid "Use sound _theme"
 msgstr "使ç?¨é?³æ??主é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:924
 msgid "Play _file:"
 msgstr "����(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:935
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:993
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1002
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -18029,51 +17829,63 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥ä½ ã??"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å¾? %s ç??é?µä»¶æ??建ç«?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«äº?件ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«å·¥ä½?ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«å??å¿?é??ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. 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?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. 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?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. 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:543
+#. 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?"
@@ -18083,7 +17895,10 @@ msgid_plural ""
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. 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?"
@@ -18093,7 +17908,10 @@ msgid_plural ""
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. 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?"
@@ -18103,76 +17921,76 @@ msgid_plural ""
 msgstr[0] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 msgstr[1] "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[æ²?æ??æ??è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "å¾?伺æ??å?¨å?³å??ç?¡æ??ç??ç?©ä»¶"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨è??ç??æ??é??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??è£?建ç«?äº?件ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "é?¸å®?ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??è£?建ç«?å·¥ä½?ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??è£?建ç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "建��件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "建ç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "建�工�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "建ç«?æ??è­°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 
@@ -18180,55 +17998,55 @@ msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 msgid "Convert a mail message to a task."
 msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??æª?æ¡?庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??使ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "è?¯çµ¡æ­¤é?µä»¶æ??屬é??ä¿¡è«?å£?ç??管ç??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æ?°å¯«é?µä»¶çµ¦æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "����(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "å??æ¶?è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
@@ -18323,15 +18141,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "ä½ è¦?å°?ç?®å??ç??è³?æ??夾中ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "�示�件�已�(_S)"
 
@@ -18390,39 +18208,39 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18446,31 +18264,35 @@ msgstr "Outlook PST ��"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??人è³?æ??夾 (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "�件(_M)"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "ç?®ç??å?°è³?æ??夾:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "工�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "����(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
@@ -18628,55 +18450,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "編輯�置"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "��� SpamAssassin�代碼�%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "建ç«?å°?管失æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "�� SpamAssassin ���中�����..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?管è?³ SpamAssassin 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ç?¡æ³?使ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??度è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18793,76 +18615,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF 格� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "格�(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "å°?é?¸å??ç??è¡?äº?æ??å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "æ??å¼?ä½ å®?æ??å??å§?帳è??設å®?ã??"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "設å®?å?©ç??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Evolution 設å®?å?©ç??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "歡�使�"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"æ­¡è¿?使ç?¨ Evolutionã??以ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³ä½ ç??é?»å­?é?µä»¶å¸³è??ï¼?以å??å¾?å?¶ä»?æ??ç?¨ç¨?å¼?輸å?¥æª?æ¡?ã??\n"
-"\n"
-"è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ­¥ã??æ??é??ç¹¼çº?ã?? "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "è«?é?¸æ??ä½ æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "ä¾?è?ª %sï¼?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "����"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "å?¯å?¥è³?æ??ã??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "è«?ç¨?å??"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "以主æ?¨ç?ºå?ºç¤?串æ?¥é?µä»¶ã??"
@@ -18876,7 +18648,7 @@ msgid "Thread messages by subject"
 msgstr "以主����串��件"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "é??å??å?°æ ¹æ??主æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
@@ -18890,15 +18662,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "�����"
 
@@ -18918,27 +18690,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "顯示å®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "顯示精簡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "é??æ??è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "å­?å?¥é??è¨?é??"
 
@@ -18954,11 +18726,11 @@ msgstr "WebDAV �絡人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "網å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??使ç?¨ Apache < 2.2.8)"
 
@@ -19250,143 +19022,46 @@ msgstr "è¦?çª?æ??é??風格"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "å?²å­?æ??å°?çµ?æ??"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * 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:883
+#: ../shell/e-shell-searchbar.c:921
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "å·¥å?·å??樣å¼?"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "å??æ??ç¨?å¼?å·¥å?·å??樣å¼?"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "å·¥å?·å??å?¯è¦?æ?§"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "å??æ??ç¨?å¼?å??ä½?"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "é??å?? shell 檢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "�碼"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "é??å?? shell 檢è¦?ç??ç­?è¨?æ?¬é ?æ?¸"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "æ??å°?è¦?å??"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?件"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "é??å?? shell 檢è¦?ç?? EShell å¾?端ç¨?å¼?"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Shell å?§å®¹å??件"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "å?§å®¹å??件顯示æ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Shell å?´é??æ¬?å??件"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "å?´é??æ¬?å??件顯示æ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Shell å·¥ä½?å??å??件"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "å·¥ä½?å??å??件顯示æ?¼ shell è¦?çª?ç??åº?é?¨"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Shell ��"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "é??å?? shell 檢è¦?æ??屬ç??è¦?çª?"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "å­?æ?¾è¦?çª?å??件ç??æ??è³?æ??ç??設å®?é?µæª?æ¡?"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "shell 檢è¦?ç??æ¨?é¡?"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ç?®å??ç??檢è¦? ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "ç?®å??ç?? GAL 檢è¦? ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19405,406 +19080,303 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution 網�"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy is not installed."
 msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1418
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution ç?¸é??è³?è¨?"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Close Window"
 msgstr "é??é??è¦?çª?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Open the Evolution User Guide"
 msgstr "é??å?? Evolution 使ç?¨è??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "é??å??常è¦?å??é¡?(FAQ)網é ?"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "���碼(_F)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Forget all remembered passwords"
 msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?碼"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1486
 msgid "I_mport..."
 msgstr "��(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Import data from other programs"
 msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1493
 msgid "New _Window"
 msgstr "é??æ?°è¦?çª?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Create a new window displaying this view"
 msgstr "建ç«?ä¸?å??æ?°ç??è¦?çª?ä¾?顯示é??å??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Configure Evolution"
 msgstr "設� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Quick Reference"
 msgstr "å¿«é??å??好設å®?(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution ç??æ?·å¾?é?µ"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Exit the program"
 msgstr "é?¢é??é??å??ç¨?å¼?"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Advanced Search..."
 msgstr "é?²é??æ??å°?(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Construct a more advanced search"
 msgstr "建ç«?æ?´é?²é??ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Clear the current search parameters"
 msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Edit Saved Searches..."
 msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Manage your saved searches"
 msgstr "管ç??ä½ å·²å?²å­?ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Click here to change the search type"
 msgstr "æ??é??è£?以æ?¹è®?æ??å°?é¡?å??"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Execute the current search parameters"
 msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Save Search..."
 msgstr "å?²å­?æ??å°?çµ?æ??(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Save the current search parameters"
 msgstr "å?²å­?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Send / _Receive"
 msgstr "å?³é??/æ?¥æ?¶(_R)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Send queued items and retrieve new items"
 msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Submit _Bug Report..."
 msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot å??æ­¥å??(_S)..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "設å®? GNOME Pilot çµ?æ??"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Work Offline"
 msgstr "��工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Put Evolution into offline mode"
 msgstr "� Evolution ����模�"
 
 # zh_HK: msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Online"
 msgstr "��工�(_W)"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Lay_out"
 msgstr "ä½?å±?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_New"
 msgstr "��(_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Switcher Appearance"
 msgstr "å??æ??å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Window"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show Side _Bar"
 msgstr "顯示å?´é??æ¬?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the side bar"
 msgstr "顯示å?´é??å??"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show _Buttons"
 msgstr "顯示æ??é??(_B)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1702
 msgid "Show the switcher buttons"
 msgstr "顯示å??æ??ç¨?å¼?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show _Status Bar"
 msgstr "顯示ç??æ??å??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the status bar"
 msgstr "顯示ç??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Tool Bar"
 msgstr "顯示工å?·å??(_T)"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the tool bar"
 msgstr "顯示工å?·å??"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1740
 msgid "_Icons Only"
 msgstr "å?ªæ??å??示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons with icons only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??示"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with text only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Icons _and Text"
 msgstr "å??示å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons and text"
 msgstr "顯示è¦?çª?æ??é??ç??å??示å??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Tool_bar Style"
 msgstr "å·¥å?·å??風格(_B)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·å??設å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Define Views..."
 msgstr "�義檢�..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Create or edit views"
 msgstr "建ç«?æ??編輯檢è¦?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save Custom View..."
 msgstr "����檢�..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Save current custom view"
 msgstr "å?²å­?ç?®å??ç??è?ªé?¸æª¢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1787
 msgid "C_urrent View"
 msgstr "ç?®å??檢è¦?(_U)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Custom View"
 msgstr "��檢�"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??檢è¦?æ?¹å¼?æ?¯è?ªé?¸ç??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1809
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ?¹ç?®å??æ??å?°æ©?ç??é ?é?¢æ??å?°è¨­å®?"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2182
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2395
 msgid "Execute these search parameters"
 msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "��"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "使ç?¨ä¸­ç?? Shell 檢è¦?"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "使ç?¨ä¸­ Shell 檢è¦?ç??å??稱"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "shell è¦?çª?ç?? EFocus 追蹤ç¨?å¼?"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "�置大�"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "è¦?çª?å??å§?大å°?å­?串"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "��模�"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "shell �������模�"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "å?´é??æ¬?å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "å·¥ä½?å??å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI 管ç??ç¨?å¼?"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "shell è¦?çª?ç?? GtkUIManager"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "æº?å??é?²å?¥é?¢ç·?..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "æº?å??é?²å?¥ä¸?ç·?..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "模çµ?ç?®é??"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "網絡�使�"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "網絡���以使�"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "��"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "shell ����"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:175
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19839,7 +19411,7 @@ msgstr ""
 "æ??å??å¸?æ??你享å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:199
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19847,7 +19419,7 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:206
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
@@ -19872,35 +19444,31 @@ msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:344
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:346
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:469
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:531
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19914,87 +19482,39 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "你確å®?è¦?é?ºå¿?æ??æ??è¨?æ?¶ç??å¯?碼ï¼?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "繼�"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ä¸?è?½ç?´æ?¥å¾? {0} ç??å??ç´?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
+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ã??"
+
+#: ../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 "é?ºå¿?ä½ ç??å¯?碼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?碼ã??å?¨ä¸?次é??è¦?使ç?¨å¯?碼æ??å°?æ??æ??示你輸å?¥ã??"
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "ç£?ç¢?空é??ä¸?足ï¼?ç?¡æ³?å??ç´?ã??"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "確å®?è¦?å?ªé?¤è??è³?æ??ï¼?"
+msgid "Quit Now"
+msgstr "ç«?å?³çµ?æ??"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?移é?¤ã??\n"
-"\n"
-"建議你æ??å??檢æ?¥æ??æ??ç??é?»å­?é?µä»¶ã??è?¯çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ­¤ Evolution ç??æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ­£ç¢ºä½?業ã??\n"
-"\n"
-"å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?便ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å­?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
-"\n"
-"å¦?æ??é?¸æ??移é?¤æ­¤è³?æ??ï¼?å°?æ??æ°¸ä¹?移é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?æ??é?¸æ??ä¿?ç??æ­¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??移é?¤ &quot;evolution&quot; ç??å?§å®¹ã??\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "å¾?以å??ç??ç??æ?¬å??ç´?失æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"å??ç´?ä½ ç??è³?æ??å??設å®?å?¼æ??å¤?æ??é??è¦? {0} ç£?ç¢?空é??ï¼?ä½?æ?¯ä½ å?ªæ?? {1} å?¯ç?¨ã??\n"
-"\n"
-"ä½ å°?é??è¦?å?¨ä¸»ç?®é??å??å¾?æ?´å¤?å?¯ç?¨ç©ºé??ï¼?æ??è?½ç¹¼çº?ã??"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "��(_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ä¿?ç??è³?æ??(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ç¨?å¾?æ??é??æ??(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20086,7 +19606,7 @@ msgstr "ä½?業é??段管ç??é?¸é ?ï¼?"
 msgid "Show session management options"
 msgstr "顯示ä½?業é??段管ç??é?¸é ?"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20111,67 +19631,79 @@ msgid ""
 "unless otherwise indicated here"
 msgstr "å? ç?ºä½ ä¸?ä¿¡ä»»ç?¼å?ºæ­¤è­?æ?¸ç??è­?æ?¸å?®ä½?ï¼?æ??以é?¤é??å?¨æ­¤æ??示ï¼?å?¦å??ä½ å°?ä¸?信任此è­?æ?¸ç??æ??æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??è­?æ?¸..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "æ??æ??ç?? PKCS12 æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "ç?¡æ³?å?¯å?¥ä½¿ç?¨è??ç??è­?æ?¸"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "è­?æ?¸å??稱"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å­?é?µä»¶è­?æ?¸æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "ç?¡æ³?å?¯å?¥è?¯çµ¡äººç??è­?æ?¸"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "é?»å­?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA è­?æ?¸æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "ç?¡æ³?å?¯å?¥è­?æ?¸ä¸­å¿?ç??è­?æ?¸"
+
+#: ../smime/gui/certificate-manager.c:1156
 msgid "Certificates"
 msgstr "è­?æ?¸"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "��檢��:%s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "輸å?¥ `%s' ç??å¯?碼"
+msgid "Enter the password for '%s'"
+msgstr "輸å?¥ã??%sã??ç??å¯?碼 "
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20201,7 +19733,7 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  主��%s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "é?¸å??è­?æ?¸"
 
@@ -20211,177 +19743,164 @@ msgstr "<ä¸?æ?¯è­?æ?¸ç??é?¨ä»½>"
 
 #: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
-msgstr "��"
+msgstr "��中�"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "å??份"
+msgid "Backup _All"
+msgstr "å?¨é?¨å??份(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "å?¨é?¨å??份"
-
-#: ../smime/gui/smime-ui.ui.h:5
 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:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "æ ¸è­?æ©?é??信任度"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "����"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "è­?æ?¸é??層"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "��詳細��"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "��表格"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ä¸?è?¬å??稱 (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "�絡人��"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ä¸?信任此è­?æ?¸ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "編輯"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "���件��信任設��"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "é?»å­?é?µä»¶ç°½ç½²è??è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "å?°æ??æ?¥æ??"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "����"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "æ?¸ç¢¼æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "��"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ç?¼ç?§æ?¥æ??"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "�給"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "çµ?ç¹? (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "���� (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../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:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL 伺æ??å?¨è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "æ­¤è­?æ?¸å·²ç¶?檢é©?ç?¨æ?¼ä¸?å??ç?¨é??ï¼?"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此è­?æ?¸ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "信任此核è­?æ©?é?? (CA) ä¾?è­?å?¥é?»å­?é?µä»¶ä½¿ç?¨è??ã??"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "信任此核è­?æ©?é?? (CA) ä¾?è­?å?¥è»?件é??ç?¼äººå?¡ã??"
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "信任此核è­?æ©?é?? (CA) ä¾?è­?å?¥ç¶²ç«?ã??"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "檢�"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "ä½ å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥ä½ ç??身份:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥é??äº?æ ¸è­?æ©?é??:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥é??äº?人å?¡:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "ä½ ç??è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "å??份(_B)"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "編輯核è­?æ©?é?? (_CA) 信任度"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "��已���"
 
@@ -20426,125 +19945,143 @@ msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ��"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "è­?æ?¸å¯?碼å??使ç?¨"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape è­?æ?¸é¡?å??"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "æ ¸è­?æ©?é??å¯?碼å??è­?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "�件��碼 (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "�����碼"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "æ¼?ç®?æ³?å??æ?¸"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "主æ?¨å?¬é??å¯?碼å??è³?è¨?"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "主æ?¨å?¬é??å¯?碼å??æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "主æ?¨ç??å?¬é??å¯?碼å??"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??延伸"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL ����"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "���件��"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "簽署中"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "ä¸?å?¯æ??çµ?"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "å¯?碼å??å? å¯?"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "è³?æ??å¯?碼"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "å¯?碼å??å??å??"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "è­?æ?¸ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL 簽署è??"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "延伸"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "��簽署���"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ç?¼ç?§è??ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "主æ?¨ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "��簽署�"
 
@@ -20633,11 +20170,11 @@ msgid "With _Status"
 msgstr "設å®?ç??æ??(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -20666,19 +20203,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "é?¸æ??ç¯?å??(_S) "
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "æ?¶é??"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "å®?義 %s ç??檢è¦?"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "�義檢�"
 
@@ -20691,11 +20223,7 @@ msgstr "å®?義ã??%sã??ç??檢è¦?"
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "實�"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "å?²å­?ç?®å??檢è¦?"
 
@@ -20707,11 +20235,7 @@ msgstr "建ç«?æ?°ç??檢è¦?(_C)"
 msgid "_Replace existing view"
 msgstr "ç½®æ??ç?¾å­?ç??檢è¦?(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "工廠"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "å®?義æ?°ç??檢è¦?"
 
@@ -20731,22 +20255,10 @@ msgstr "檢è¦?ç??é¡?å??:"
 msgid "De_fault"
 msgstr "�設�(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "帳è??å??稱"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "å??ä½?"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "é??件å?§å®¹"
@@ -20764,11 +20276,11 @@ msgstr "MIME é¡?å??ï¼?"
 msgid "_Suggest automatic display of attachment"
 msgstr "建議è?ªå??顯示é??件(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "ç?¡æ³?設ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "設ç?ºè??æ?¯(_B)"
 
@@ -20786,13 +20298,13 @@ msgstr "å?³é??è?³(_S)..."
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??件å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "��中"
 
@@ -20801,13 +20313,10 @@ msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??件å??(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "Show Attachment _Bar"
 msgstr "顯示é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "顯示é??件å??(_A)"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "å? å?¥é??件"
@@ -20824,32 +20333,32 @@ msgstr[1] "å?²å­?é??件"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??件(_A)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "檢���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "以ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s 中é??å??é??å??é??件"
@@ -20858,59 +20367,59 @@ 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:1002
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../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:1828 ../widgets/misc/e-attachment.c:2629
+#: ../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:1920
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??件"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??件"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å­?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-é»?é?¸ä»¥é??å??é?£çµ?"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
@@ -20918,65 +20427,6 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "填��彩"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK å¡«è?²"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "填�網�"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "æ??å°?é??度"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "æ??å°?é??度"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "é??è·?"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "�符編碼"
@@ -20989,108 +20439,126 @@ msgstr "輸å?¥è¦?使ç?¨ç??å­?符é??"
 msgid "Other..."
 msgstr "��..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?輸å?¥æ?¥æ??ç??æ??å­?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "æ??æ­¤æ??é??以顯示è¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "��(_W)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../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:698
+#: ../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:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 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:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??稱(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??此輸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?輸å?¥è³?æ??å??設å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "������(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "é?¸æ??ä½ æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 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:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+msgid "_Cancel Import"
+msgstr "å??æ¶?å?¯å?¥(_C)"
+
+#: ../widgets/misc/e-import-assistant.c:908
+msgid "Preview data to be imported"
+msgstr "é ?覽é??è¦?å?¯å?¥ç??è³?æ??"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1351
+msgid "Import Data"
+msgstr "å?¯å?¥è³?æ??"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr "é?¸æ??ä½ æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
+
+#: ../widgets/misc/e-import-assistant.c:1268
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Import Location"
 msgstr "輸��置"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21099,32 +20567,27 @@ msgstr ""
 "æ­¡è¿?使ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?ä½ å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "輸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1323
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "å?¯å?¥è³?æ??"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21145,55 +20608,7 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "水平�置"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "ç?¶æ??å??æ?¹å??ç?ºæ°´å¹³æ??ç??çª?æ ¼ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "å??ç?´ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "ç?¶æ??å??æ?¹å??ç?ºå??ç?´æ??ç??çª?æ ¼ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "��"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "第äº?çª?格尺寸ç??æ¯?ä¾?"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "��調�大�"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "å?¨é??å®?尺寸æ??å?ºå®?第äº?çª?æ ¼"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "å??æ­¥å°?象:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "å??æ­¥ç§?人è¨?é??:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "å??æ­¥å??é¡?:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolution å??好設å®?"
 
@@ -21202,68 +20617,46 @@ msgstr "Evolution å??好設å®?"
 msgid "Matches: %d"
 msgstr "符å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ­¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "å??å??大å°?寫(_C)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?端繼çº?"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?端ï¼?å¾?åº?é?¨ç¹¼çº?"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "游æ¨?å??"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "游��"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "å??é¡?å?¨"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "é?¸æ??å??模å¼?"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "游�模�"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
@@ -21336,43 +20729,46 @@ msgstr "ç?¶å®?æ??æ??(_M):"
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "��(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "ä¹?å¾?(_A):"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "æ??æ?¼(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "歸�(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "延é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "設å®?é?¾æ??æ?¥æ??(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "��(_U):"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "ç?´å?°(_U)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "ç?¶æ??空æ??(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
@@ -21429,41 +20825,41 @@ msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 msgid "Click here to go to URL"
 msgstr "æ??é??è£?以移è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "è¤?製é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??覽å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??覽å?¨ä¸­é??å??æ­¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å­?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?­è??給 %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??è£?é?±è??/解é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -21482,7 +20878,7 @@ msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "evolution è¡?äº?æ??é ?ç?®"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "�����"
 
@@ -21500,7 +20896,7 @@ msgstr "æ²?æ??"
 msgid "OK"
 msgstr "確�"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ­¤æ ¼å¼?ï¼?%s"
@@ -21509,48 +20905,12 @@ msgstr "æ??é??å¿?é ?ç?ºæ­¤æ ¼å¼?ï¼?%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å­?"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "é?¸æ??ç??æ¬?"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "è??ç?¦ç??æ¬?"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "æ?ªé?¸æ??ç??æ¬?"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "����"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "���"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "���"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "�彩�"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "è??æ?¯è?²å½©æ¬?"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ç??æ??"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
@@ -21567,12 +20927,12 @@ msgstr "æ?ªæ??åº?"
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾£çµ?"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "顯示��"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -21581,7 +20941,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21594,7 +20954,7 @@ msgid "Clear _All"
 msgstr "����(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21654,7 +21014,7 @@ msgstr "æ ¹æ??åº?顯示é??äº?æ¬?ä½?(_S):"
 msgid "_Sort..."
 msgstr "æ??åº?(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "����"
 
@@ -21666,247 +21026,112 @@ msgstr ""
 "æ?³å?¨ä½ ç??表格中å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³ä½ å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d å??é ?ç?®)"
-msgstr[1] "%s : %s (%d å??é ?ç?®)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%sï¼?%s (%d å??é ?ç?®)"
+msgstr[1] "%sï¼?%s (%d å??é ?ç?®)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "å??è??å??é??交æ?¿ä½¿ç?¨ç??è?²å½©"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "水平繪å??æ ¼"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "å??ç?´ç¹ªå??æ ¼"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "繪å??ç?¦é»?"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "游�模�"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "é?¸æ??å??模å??"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "ç??é??é?·åº¦"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "æ¨?æº?å??é«?"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "å??çµ?"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "è?ªé?¸ç?®å??ç??檢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "æ ¹æ??æ­¤æ¬?ä½?å??ç¾£çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "æ ¹æ??æ?¹å¡?ç?ºç¾£çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "移�此�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "����(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "è?ªé?¸ç?®å??ç??檢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "��(_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "表格��"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "表格模å??"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "游æ¨?å??"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "æ??åº?è³?è¨?"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "總æ?¯æ??å°?"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "è«?æ??é??è£?å? å?¥"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "å??ç?´æ¬?é??è·?"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?端å??åº?é?¨"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree 表格���"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "æ?·è??å¤?è§?"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "å±?é??å?¨å¤§å°?"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "å±?é??å?¨ç®­è??ç??大å°?"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "å½?å?º"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "�����"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "編輯"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "é??å§?編輯此å?²å­?æ ¼"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "å??æ??"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "å??æ??å?²å­?æ ¼"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "å±?é??"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "å±?é?? ETree 中å??å?«æ­¤å?²å­?æ ¼ç??å??"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "��"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æ??ç?? ETree 中å??å?«æ­¤å?²å­?æ ¼ç??å??"
 
@@ -21922,118 +21147,1186 @@ msgstr "é»?é?¸"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "輸��"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "äº?件è??ç??å?¨"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "é ?設ç??å??æ­¥å?°å??:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Web Log:"
+#~ msgstr "網��"
+
+#~ msgid "_Web Log:"
+#~ msgstr "網�(_W):"
+
+#~ msgid "Editable"
+#~ msgstr "�編輯"
+
+#~ msgid "Source Book"
+#~ msgstr "ä¾?æº?é??è¨?é??"
+
+#~ msgid "Target Book"
+#~ msgstr "ç?®æ¨?é??è¨?é??"
+
+#~ msgid "Is New Contact"
+#~ msgstr "���絡人"
+
+#~ msgid "Writable Fields"
+#~ msgstr "å?¯å¯«ç??æ¬?ä½?"
+
+#~ msgid "Required Fields"
+#~ msgstr "����"
+
+#~ msgid "Changed"
+#~ msgstr "已��"
+
+#~ msgid "Shell"
+#~ msgstr "Shell"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell ��"
+
+#~ msgid "Book"
+#~ msgstr "��"
+
+#~ msgid "Is New List"
+#~ msgstr "æ?¯æ?°ç??æ¸?å?®"
+
+#~ msgid "Query"
+#~ msgstr "�詢"
+
+#~ msgid "Model"
+#~ msgstr "模å??"
+
+#~ msgid "Shell View"
+#~ msgstr "Shell 檢�"
+
+#~ msgid "Source"
+#~ msgstr "��"
+
+#~ msgid "Width"
+#~ msgstr "寬度"
+
+#~ msgid "Height"
+#~ msgstr "�度"
+
+#~ msgid "Has Focus"
+#~ msgstr "����"
+
+#~ msgid "Field"
+#~ msgstr "��"
+
+#~ msgid "Field Name"
+#~ msgstr "æ¬?ä½?å??稱"
+
+#~ msgid "Text Model"
+#~ msgstr "æ??å­?模å??"
+
+#~ msgid "Max field name length"
+#~ msgstr "æ??大æ¬?ä½?å??稱é?·åº¦"
+
+#~ msgid "Column Width"
+#~ msgstr "�寬"
+
+#~ msgid "Adapter"
+#~ msgstr "���"
+
+#~ msgid "Selected"
+#~ msgstr "å·²é?¸æ??"
+
+#~ msgid "Has Cursor"
+#~ msgstr "æ??游æ¨?"
+
+#~ msgid "Success"
+#~ msgstr "æ??å??"
+
+#~ msgid "Backend busy"
+#~ msgstr "�端��"
+
+#~ msgid "Repository offline"
+#~ msgstr "è³?æ??庫é?¢ç·?"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "é??è¨?é??ä¸?å­?å?¨"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "æ²?æ??å®?義è?ªæ??é?£çµ¡äºº"
+
+#~ msgid "Permission denied"
+#~ msgstr "æ¬?é??ä¸?足"
+
+#~ msgid "Contact not found"
+#~ msgstr "����絡人"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "�絡人 ID 已���"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
+
+#~ msgid "Could not cancel"
+#~ msgstr "ç?¡æ³?å??æ¶?"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "é©?証失æ??"
+
+#~ msgid "Authentication Required"
+#~ msgstr "����"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS ��使�"
+
+#~ msgid "No such source"
+#~ msgstr "��此��"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "�����模��使�"
+
+#~ msgid "Other error"
+#~ msgstr "���誤"
+
+#~ msgid "Invalid server version"
+#~ msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "è¡?äº?æ??è³?æ??庫已é?¢ç·?ã??"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
+
+#~ msgid "No response from the server."
+#~ msgstr "伺æ??å?¨æ²?æ??å??æ??ã??"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "å??å?²å¤?æ?¥äº?件:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "ç?¡æ³?å??å?? Evolution è³?æ??伺æ??å?¨"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "ç?¡æ³?寫å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Default Priority:"
+#~ msgstr "é ?設å?ªå??é ?åº?:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "æ ¸å??æ­¤é?¸é ?æ??å?¨ Evolution 中使ç?¨ç³»çµ±æ??å??ã??"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "æ?¯å?¦å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸ã??"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸(_U)"
+
+#~ msgid "Save"
+#~ msgstr "��"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "ç´?æ??(_M)"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "å?°æ??è??(_S)..."
+
+#~ msgid "_Task"
+#~ msgstr "工�(_T)"
+
+#~ msgid "Default Client"
+#~ msgstr "�設客�端��"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Shell 設��"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "æ??ç?¨ç¨?å¼?設å®?å?¼"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "å?°æ??è??(_T)..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "é?¸æ??ä»?天(_S)"
+
+#~ msgid "_From Field"
+#~ msgstr "å¯?件è??æ¬?ä½?(_F)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "å??æ??å¯?件è??é?¸æ??å?¨ç??顯示ç??æ??"
+
+#~ msgid "Show"
+#~ msgstr "顯示"
+
+#~ msgid "Hide"
+#~ msgstr "é?±è??"
+
+#~ msgid "New Tab"
+#~ msgstr "æ?°å¢?å??é ?"
+
+#~ msgid "address card"
+#~ msgstr "å?°å??å?¡"
+
+#~ msgid "calendar information"
+#~ msgstr "è¡?äº?æ??è³?è¨?"
+
+#~ msgid "Name of the logger"
+#~ msgstr "è¨?é??å?¨å??稱"
+
+#~ msgid "Filename"
+#~ msgstr "æª?æ¡?å??稱"
+
+#~ msgid "The filename of the module"
+#~ msgstr "模çµ?ç??æª?æ¡?å??稱"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "��追蹤�"
+
+#~ msgid "Shell Module"
+#~ msgstr "Shell 模�"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "�件 shell �端��"
+
+#~ msgid "Show Deleted"
+#~ msgstr "顯示已��"
+
+#~ msgid "To Do"
+#~ msgstr "�辦"
+
+#~ msgid "Later"
+#~ msgstr "��"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«?æ?°è³?æ??夾 `%s'ï¼?%s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "ç?¡æ³?è¤?製製è³?æ??夾 `%s' è?³ `%s'ï¼?%s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution ä¿¡ç®±è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "ç?¡æ³?è¤?製 POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«?æ?¬å?°é?µä»¶å?²å­?å?? `%s':%s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "ç?¡æ³?å¾?以å??ç?? Evolution è®?å??設å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å­?å?¨æ??æ??æ¯?ã??"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "å??許 evolution 顯示å?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å­?ã??"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+
+#~ msgid "Text message part limit"
+#~ msgstr "æ??å­?é?µä»¶é??å?¶"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>置�張貼��</b> (�建議)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "å? ç?ºã??{0}ã??ã??"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "å? ç?ºã??{2}ã??ã??"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "����(_E)"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "以ä¸?æ??å°?è³?æ??夾ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾:\n"
+#~ "    ã??{1}ã??\n"
+#~ "è??ä¸?å·²æ?´æ?°ã??"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "以ä¸?é??濾è¦?å??ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾ï¼?\n"
+#~ "    ã??{1}ã??\n"
+#~ "è??ä¸?å·²æ?´æ?°ã??"
+
+#~ msgid "Shell Backend"
+#~ msgstr "Shell �端��"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "å?¨é??å??è³?æ??夾中å?ªæ??é?±è??ç??é?µä»¶ã??使ç?¨ 檢è¦?->顯示é?±è??ç??é?µä»¶ ä¾?顯示å®?å??ã??"
+
+#~ msgid "Table column:"
+#~ msgstr "表格��"
+
+#~ msgid "Source List"
+#~ msgstr "����"
+
+#~ msgid "The registry of address books"
+#~ msgstr "é??è¨?é??ç??註å??表"
+
+#~ msgid "Current View"
+#~ msgstr "ç?®å??檢è¦?"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "ç?®å??é?¸å??ç??é??è¨?é??檢è¦?"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "é ?覽ç??é?£çµ¡äºº"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "è¦?顯示å?¨é ?覽çª?æ ¼ç??é?£çµ¡äºº"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "é ?覽ç?ºé¡¯ç¤ºç??æ??"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "�覽�格�����"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP 伺æ??å?¨"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "è?ªå??å®?æ??設å®?"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution é?£çµ¡äººè³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "é?µå¯?æ¸?å?®é?£çµ¡äººç??æ ¼å¼?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution å?²å­?é?¨ä»½é?»è©±è??碼ç??æ?¹å¼?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution ç?? Palm Sync è®?æ?´è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??件"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??群çµ?"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "��� vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "è¡?äº?æ??ç??註å??表"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution è¡?äº?æ??è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "ç?¡æ³?å¾? evolution/config.xmldb 移è½?è??設å®?"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "ç?¡æ³?移è½?移è¡?äº?æ?? `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "æ?¥æ??ç??覽è¦?çª?å??件"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "é ?設è¡?äº?æ??客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "è¡?äº?æ??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??群çµ?"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "å??å¿?é??æ¸?å?®ç??註å??表"
+
+#~ msgid "The memo table model"
+#~ msgstr "å??å¿?é??表格模å??"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "é ?設å??å¿?é??客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "å??å¿?é??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??群çµ?"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "å·¥ä½?æ¸?å?®ç??註å??表"
+
+#~ msgid "The task table model"
+#~ msgstr "å·¥ä½?表格模å??"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution å·¥ä½?è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.xå¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "��移�工� `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "�設工�客�端��"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "å·¥ä½?æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??群çµ?"
+
+#~ msgid "Group by Threads"
+#~ msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "æ?¯å?¦ä¾?ç?¸é??é?µä»¶ä»¥ç¾¤çµ?æ?¹å¼?顯示"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "顯示é?±è??ç??é?µä»¶(_N)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "顯示æ?«æ??é?±è??ç??é?µä»¶"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??以å?ªé?¤ç·?ç??å½¢å¼?顯示"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®ã??"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "å?¨å??å??æ??檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ã??"
+
+#~ msgid "Default Mail Client"
+#~ msgstr "�設�件客�端��"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>伺æ??å?¨</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>使ç?¨è??ï¼?</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>帳è??å??稱</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula ��"
+
+#~ msgid "_Accept"
+#~ msgstr "æ?¥å??(_A)"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "æ??å¼?æ?¨å®?æ??å??å§?帳è??設å®?ã??"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "設å®?å?©ç??"
+
+#~ msgid "Importing data."
+#~ msgstr "å?¯å?¥è³?æ??ã??"
+
+#~ msgid "Please wait"
+#~ msgstr "è«?ç¨?å??"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "å·¥å?·å??樣å¼?"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "å??æ??ç¨?å¼?å·¥å?·å??樣å¼?"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "å·¥å?·å??å?¯è¦?æ?§"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
+
+#~ msgid "Switcher Action"
+#~ msgstr "å??æ??ç¨?å¼?å??ä½?"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
+
+#~ msgid "Page Number"
+#~ msgstr "�碼"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç??ç­?è¨?æ?¬é ?æ?¸"
+
+#~ msgid "Search Rule"
+#~ msgstr "æ??å°?è¦?å??"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?件"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç?? EShell å¾?端ç¨?å¼?"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Shell å?§å®¹å??件"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "å?§å®¹å??件顯示æ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Shell å?´é??æ¬?å??件"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "å?´é??æ¬?å??件顯示æ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Shell å·¥ä½?å??å??件"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "å·¥ä½?å??å??件顯示æ?¼ shell è¦?çª?ç??åº?é?¨"
+
+#~ msgid "Shell Window"
+#~ msgstr "Shell ��"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "é??å?? shell 檢è¦?æ??屬ç??è¦?çª?"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "å­?æ?¾è¦?çª?å??件ç??æ??è³?æ??ç??設å®?é?µæª?æ¡?"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "shell 檢è¦?ç??æ¨?é¡?"
+
+#~ msgid "Current View ID"
+#~ msgstr "ç?®å??ç??檢è¦? ID"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "ç?®å??ç?? GAL 檢è¦? ID"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot å??æ­¥å??(_S)..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "設å®? GNOME Pilot çµ?æ??"
+
+#~ msgid "Active Shell View"
+#~ msgstr "使ç?¨ä¸­ç?? Shell 檢è¦?"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "使ç?¨ä¸­ Shell 檢è¦?ç??å??稱"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "shell è¦?çª?ç?? EFocus 追蹤ç¨?å¼?"
+
+#~ msgid "Geometry"
+#~ msgstr "�置大�"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "è¦?çª?å??å§?大å°?å­?串"
+
+#~ msgid "Safe Mode"
+#~ msgstr "��模�"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "shell �������模�"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "å?´é??æ¬?å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "å·¥ä½?å??å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI 管ç??ç¨?å¼?"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "shell è¦?çª?ç?? GtkUIManager"
+
+#~ msgid "Module Directory"
+#~ msgstr "模çµ?ç?®é??"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
+
+#~ msgid "Network Available"
+#~ msgstr "網路�使�"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "網路���以使�"
+
+#~ msgid "Online"
+#~ msgstr "��"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "shell ����"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "ç£?ç¢?空é??ä¸?足ï¼?ç?¡æ³?å??ç´?ã??"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "確å®?è¦?å?ªé?¤è??è³?æ??ï¼?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?移é?¤ã??\n"
+#~ "\n"
+#~ "建議æ?¨æ??å??檢æ?¥æ??æ??ç??é?»å­?é?µä»¶ã??é?£çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ­¤ "
+#~ "Evolution ç??æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ­£ç¢ºä½?業ã??\n"
+#~ "\n"
+#~ "å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?便ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å­?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
+#~ "\n"
+#~ "å¦?æ??é?¸æ??移é?¤æ­¤è³?æ??ï¼?å°?æ??æ°¸ä¹?移é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?"
+#~ "æ??é?¸æ??ä¿?ç??æ­¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??移é?¤ &quot;evolution&quot; ç??å?§"
+#~ "容ã??\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "å??ç´?æ?¨ç??è³?æ??å??設å®?å?¼æ??å¤?æ??é??è¦? {0} ç£?ç¢?空é??ï¼?ä½?æ?¯æ?¨å?ªæ?? {1} å?¯ç?¨ã??\n"
+#~ "\n"
+#~ "æ?¨å°?é??è¦?å?¨ä¸»ç?®é??å??å¾?æ?´å¤?å?¯ç?¨ç©ºé??ï¼?æ??è?½ç¹¼çº?ã??"
+
+#~ msgid "_Keep Data"
+#~ msgstr "ä¿?ç??è³?æ??(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "ç¨?å¾?æ??é??æ??(_R)"
+
+#~ msgid "Edit"
+#~ msgstr "編輯"
+
+#~ msgid "Import"
+#~ msgstr "��"
+
+#~ msgid "View"
+#~ msgstr "檢�"
+
+#~ msgid "Collection"
+#~ msgstr "æ?¶é??"
+
+#~ msgid "Instance"
+#~ msgstr "實�"
+
+#~ msgid "Factory"
+#~ msgstr "工廠"
+
+#~ msgid "Action"
+#~ msgstr "å??ä½?"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "顯示é??件å??(_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "填��彩"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK å¡«è?²"
+
+#~ msgid "Fill stipple"
+#~ msgstr "填�網�"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "æ??å°?寬度"
+
+#~ msgid "Minimum Width"
+#~ msgstr "æ??å°?寬度"
+
+#~ msgid "Spacing"
+#~ msgstr "é??è·?"
+
+#~ msgid "The button state is online"
+#~ msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "水平�置"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºæ°´å¹³æ??ç??çª?æ ¼ä½?ç½®"
+
+#~ msgid "Vertical Position"
+#~ msgstr "å??ç?´ä½?ç½®"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºå??ç?´æ??ç??çª?æ ¼ä½?ç½®"
+
+#~ msgid "Proportion"
+#~ msgstr "��"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "第äº?çª?格尺寸ç??æ¯?ä¾?"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "��調�大�"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "å?¨é??å®?尺寸æ??å?ºå®?第äº?çª?æ ¼"
+
+#~ msgid "Sync with:"
+#~ msgstr "å??æ­¥å°?象:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "å??æ­¥ç§?人è¨?é??:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "å??æ­¥å??é¡?:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "游æ¨?å??"
+
+#~ msgid "Cursor Column"
+#~ msgstr "游��"
+
+#~ msgid "Sorter"
+#~ msgstr "å??é¡?å?¨"
+
+#~ msgid "Selection Mode"
+#~ msgstr "é?¸æ??å??模å¼?"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "游�模�"
+
+#~ msgid "Selected Column"
+#~ msgstr "é?¸æ??ç??æ¬?"
+
+#~ msgid "Focused Column"
+#~ msgstr "è??ç?¦ç??æ¬?"
+
+#~ msgid "Unselected Column"
+#~ msgstr "æ?ªé?¸æ??ç??æ¬?"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "����"
+
+#~ msgid "Underline Column"
+#~ msgstr "���"
+
+#~ msgid "Bold Column"
+#~ msgstr "���"
+
+#~ msgid "Color Column"
+#~ msgstr "�彩�"
+
+#~ msgid "BG Color Column"
+#~ msgstr "è??æ?¯è?²å½©æ¬?"
+
+#~ msgid "State"
+#~ msgstr "ç??æ??"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "å??è??å??é??交æ?¿ä½¿ç?¨ç??è?²å½©"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "水平繪å??æ ¼"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "å??ç?´ç¹ªå??æ ¼"
+
+#~ msgid "Draw focus"
+#~ msgstr "繪å??ç?¦é»?"
+
+#~ msgid "Cursor mode"
+#~ msgstr "游�模�"
+
+#~ msgid "Selection model"
+#~ msgstr "é?¸æ??å??模å??"
+
+#~ msgid "Length Threshold"
+#~ msgstr "ç??é??é?·åº¦"
+
+#~ msgid "Uniform row height"
+#~ msgstr "æ¨?æº?å??é«?"
+
+#~ msgid "Frozen"
+#~ msgstr "å??çµ?"
+
+#~ msgid "Table header"
+#~ msgstr "表格��"
+
+#~ msgid "Table model"
+#~ msgstr "表格模å??"
+
+#~ msgid "Cursor row"
+#~ msgstr "游æ¨?å??"
+
+#~ msgid "Sort Info"
+#~ msgstr "æ??åº?è³?è¨?"
+
+#~ msgid "Always search"
+#~ msgstr "總æ?¯æ??å°?"
+
+#~ msgid "Use click to add"
+#~ msgstr "è«?æ??é??裡å? å?¥"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "å??ç?´æ¬?é??è·?"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?端å??åº?é?¨"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree 表格���"
+
+#~ msgid "Retro Look"
+#~ msgstr "æ?·è??å¤?è§?"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
+
+#~ msgid "Expander Size"
+#~ msgstr "å±?é??å?¨å¤§å°?"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "å±?é??å?¨ç®­è??ç??大å°?"
+
+#~ msgid "popup"
+#~ msgstr "å½?å?º"
+
+#~ msgid "edit"
+#~ msgstr "編輯"
+
+#~ msgid "toggle"
+#~ msgstr "å??æ??"
+
+#~ msgid "expand"
+#~ msgstr "å±?é??"
+
+#~ msgid "Event Processor"
+#~ msgstr "äº?件è??ç??å?¨"
+
+#~ msgid "Text"
+#~ msgstr "æ??å­?"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "æ??å­?"
+#~ msgid "Bold"
+#~ msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "ç²?é«?"
+#~ msgid "Strikeout"
+#~ msgstr "���"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "���"
+#~ msgid "Anchor"
+#~ msgstr "��"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "��"
+#~ msgid "Justification"
+#~ msgstr "左���"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "左���"
+#~ msgid "Clip Width"
+#~ msgstr "�輯寬度"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "å?ªè¼¯é??度"
+#~ msgid "Clip Height"
+#~ msgstr "�輯�度"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "�輯�度"
+#~ msgid "Clip"
+#~ msgstr "�輯"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "�輯"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "填滿�輯��"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "填滿�輯��"
+#~ msgid "X Offset"
+#~ msgstr "X �移"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X �移"
+#~ msgid "Y Offset"
+#~ msgstr "Y �移"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y �移"
+#~ msgid "Text width"
+#~ msgstr "æ??å­?寬度"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "æ??å­?é??度"
+#~ msgid "Text height"
+#~ msgstr "æ??å­?é«?度"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "æ??å­?é«?度"
+#~ msgid "Use ellipsis"
+#~ msgstr "使ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "使ç?¨ç??ç?¥è??"
+#~ msgid "Ellipsis"
+#~ msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "æ©¢å??"
+#~ msgid "Line wrap"
+#~ msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "æ??è¡?"
+#~ msgid "Break characters"
+#~ msgstr "中æ?·å­?å??"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "中��符"
+#~ msgid "Max lines"
+#~ msgstr "æ??大è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "æ??大è¡?æ?¸"
+#~ msgid "Draw borders"
+#~ msgstr "繪製��"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "繪製��"
+#~ msgid "Allow newlines"
+#~ msgstr "å??許æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "å??許æ?°è¡?"
+#~ msgid "Draw background"
+#~ msgstr "繪製è??æ?¯"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "繪製è??æ?¯"
+#~ msgid "Draw button"
+#~ msgstr "繪製æ??é??"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "繪製æ??é??"
+#~ msgid "Cursor position"
+#~ msgstr "游��置"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "游��置"
+#~ msgid "IM Context"
+#~ msgstr "IM 快顯��"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM 快顯��"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+#~ msgid "Handle Popup"
+#~ msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "è¼?å?¥ %s ç??ç´?æ??"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7e2a789..7023c1d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,13 +5,13 @@
 # Craig Jeffares <cjeffares novell com>,2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005, 2010.
 # Abel Cheung <abelcheung gmail com>, 2006.
-#: ../shell/main.c:479
+#: ../shell/main.c:519
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.30.0\n"
+"Project-Id-Version: evolution 2.31.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-20 19:29+0800\n"
-"PO-Revision-Date: 2010-03-20 08:28+0800\n"
+"POT-Creation-Date: 2010-07-20 14:48+0800\n"
+"PO-Revision-Date: 2010-07-16 19:48+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,9 @@ msgstr ""
 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}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ã??è«?å¾?é??è¨?é??檢è¦?ç??å?´é??æ¬?中é?¸æ??ä¸?å??ç??é??è¨?é??ã??"
+msgstr ""
+"ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??é??è¨?é??ï¼?ä¸?è?½è¢«ä¿®æ?¹ã??è«?å¾?é?£çµ¡äººæª¢è¦?ç??å?´é??æ¬?中é?¸æ??ä¸?å??ç??é??è¨?"
+"é??ã??"
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid ""
@@ -81,41 +83,46 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "����(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "å°? {0} å?²å­?è?³ {1} ç?¼ç??é?¯èª¤ï¼? {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "ç?¡æ³?é©?è­? LDAP 伺æ??å?¨ã??"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise é??è¨?é??ç??建ç«?"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺æ??å?¨æ?ªå??æ??æ??æ??ç??綱è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution é??è¨?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "ä½ æ??é?¸æ??ç??å??ç??太大ã??æ?¨æ?¯å?¦è¦?æ?¹è®?大å°?å¾?æ??å?²å­?å®?ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../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 "
@@ -124,45 +131,45 @@ msgstr ""
 "æ­¤ LDAP 伺æ??å?¨å?¯è?½ä½¿ç?¨è??ç?? LDAP ç??æ?¬ï¼?å®?ä¸?æ?¯æ?´æ­¤å??è?½ï¼?æ??å?¯è?½è¨­å®?é?¯èª¤ã??è«?洽詢"
 "管ç??å?¡ï¼?ç?­è§£æ?¯æ?´ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "ç?¡æ³?é??å??æ­¤é??è¨?é??ã??"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "æ­¤é??è¨?é??伺æ??å?¨æ²?æ??ä»»ä½?建議ç??æ??å°?å?ºç¤?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../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."
 msgstr "æ­¤é??è¨?é??伺æ??å?¨ç?¡æ³?é?£ç·?ï¼?æ??伺æ??å?¨å??稱å?¯è?½æ?¼é?¯ï¼?æ??æ?¨ç??網路é?£ç·?å·²ç¶?å??æ­¢ã??"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "æ­¤é??è¨?é??å°?被永é? ç§»é?¤ã??"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´ LDAPv3 綱è¦?è³?è¨?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "ç?¡æ³?å?·è¡?æ??å°?ã??"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "ç?¡æ³?å?²å­? {0}ã??"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../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?"
@@ -170,7 +177,7 @@ msgstr ""
 "æ?¨æ­£å?¨å??試å¾?æ??ä¸?å??é??è¨?é??ï¼?å°?é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??ï¼?ä½?æ?¯å®?ç?¡æ³?å¾?ä¾?æº?移é?¤ã??æ?¨"
 "æ?³è¦?å?²å­?ä¸?å??å?¯æ?¬ä¾?代æ?¿å??ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../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 "
@@ -179,71 +186,47 @@ msgstr ""
 "æ?¨æ­£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise 伺æ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??好ç??"
 "解決æ?¹æ¡?æ?¯å°?該伺æ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??太"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../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:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "æ?¨å·²ç¶?ä¿®æ?¹æ­¤é?£çµ¡äººã??è¦?å?²å­?é??äº?è®?æ?´ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ {0} ç??é?£çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "��(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "����(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "調�大�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "����(_U)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "é ?設ç??å??æ­¥å?°å??:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -254,261 +237,236 @@ msgstr "�年�念�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:118
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "��格�"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "å??é¡?(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "è¡?äº?æ??ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2520
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "�絡人編輯�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../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:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "���件"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "空é??/å¿?ç¢?ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "å?¨å??(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�家"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "���"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "å?³æ??é??è¨?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "工�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "é?µå¯?å?°å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "é??é ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "�稱(_K):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "å??註"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "��"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "�話"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "è¦?è¨?è??天ï¼?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "網å??"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "網��"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "網å??"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "工�"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "å?°å??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "�年�念�(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "å?©ç??(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "ç??æ?¥(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "��格(_B):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "縣/�(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "��(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "å??家/å?°å??(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "é?¨é??(_D):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "歸��(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "空é??/å¿?ç¢?(_F):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "��(_H):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "主管(_M):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "辦�室(_O):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "�箱(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "�業(_P):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "é??å?¶(_S):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "å·?/ç??(_S):"
 
 # (Abel) è?·ç¨±å??輸å?¥é?£çµ¡äººæ??ç?? Title (Dr., Ms.) æ??è¡?çª?
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "é ­é??(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "��交�(_V):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "å?¯æ?¥å?? H_TML é?µä»¶"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "網�(_W):"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "é??è¨?é??(_W):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "å??稱"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "�編輯"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -550,7 +508,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
@@ -562,45 +520,21 @@ msgstr "ä¿®æ?¹é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 msgid "Error removing contact"
 msgstr "移é?¤é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "ä¾?æº?é??è¨?é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "ç?®æ¨?é??è¨?é??"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "���絡人"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "å?¯å¯«ç??æ¬?ä½?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "����"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "已��"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2515
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2912
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??代表此é?£çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2913
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -608,56 +542,46 @@ msgstr ""
 "é?£çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3212
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3223
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3237
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "å¿«é??æ?°å¢?é?£çµ¡äºº"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "編輯��(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "å?¨å??(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "���件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "é?¸æ??é??è¨?é??(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Shell"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell ��"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr."
@@ -724,7 +648,7 @@ msgid "_Suffix:"
 msgstr "(_Suffix):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "�絡人��編輯�"
 
@@ -741,7 +665,7 @@ msgid "_List name:"
 msgstr "å??å?ºå??稱(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "é?¸å??(_S)..."
 
@@ -749,39 +673,27 @@ 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:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "é?£çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "編輯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "移é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "��"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "æ?¯æ?°ç??æ¸?å?®"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "è®?æ?´å¾?ç??é?£çµ¡äºº:"
@@ -818,134 +730,111 @@ msgstr ""
 "æ?¼æ­¤è³?æ??夾ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "å·²å??æ¶?"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 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/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "é?»å­?é?µä»¶é??å§?æ?¼"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "å??稱å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "æ²?æ??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??é?£çµ¡äºº"
 msgstr[1] "%d å??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "�詢"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "æ??å°?被中æ?·"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "模å??"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "編輯å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?製é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Paste contacts from the clipboard"
 msgstr "��貼簿貼��絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Shell 檢�"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "��"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -954,11 +843,11 @@ msgstr ""
 "é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "確å®?è¦?顯示é??裡æ??æ??ç??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 msgid "Display _All Contacts"
 msgstr "顯示æ??æ??ç??é?£çµ¡äºº(_A)"
 
@@ -992,7 +881,7 @@ msgid "Car Phone"
 msgstr "汽��話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1093,7 +982,7 @@ msgid "Radio"
 msgstr "����話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "��"
@@ -1118,7 +1007,6 @@ msgid "Telex"
 msgstr "�報"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "é ­é??"
 
@@ -1130,59 +1018,7 @@ msgstr "��"
 msgid "Web Site"
 msgstr "網å??"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "寬度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "�度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "����"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "��"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "æ¬?ä½?å??稱"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "æ??å­?模å??"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "æ??大æ¬?ä½?å??稱é?·åº¦"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "�寬"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1192,7 +1028,7 @@ msgstr ""
 "\n"
 "æ??å°?é?£çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1206,7 +1042,7 @@ msgstr ""
 "\n"
 "é??æ??é??裡以建ç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1220,7 +1056,7 @@ msgstr ""
 "\n"
 "é??æ??é??裡以建ç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1230,7 +1066,7 @@ msgstr ""
 "\n"
 "å°?æ?¾é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1240,10 +1076,6 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??種檢è¦?æ?¹å¼?顯示ã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "���"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "工����件"
@@ -1253,21 +1085,13 @@ msgid "Home Email"
 msgstr "�家���件"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "�����件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "å·²é?¸æ??"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "æ??游æ¨?"
-
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "evolution é??è¨?é??"
 
@@ -1279,7 +1103,7 @@ msgstr "���絡人"
 msgid "New Contact List"
 msgstr "���絡人��"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1307,17 +1131,17 @@ msgid "Copy _Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
@@ -1353,22 +1177,22 @@ msgid "Video Chat"
 msgstr "��交�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../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:495
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "è¡?äº?æ??"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "空é??/å¿?ç¢?"
@@ -1396,21 +1220,19 @@ msgid "Web Log"
 msgstr "網�"
 
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "å??人"
@@ -1425,138 +1247,32 @@ msgstr "��"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
-msgstr "Blog"
+msgstr "��格"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "æ??å??"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "�端��"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "è³?æ??庫é?¢ç·?"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "é??è¨?é??ä¸?å­?å?¨"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "æ²?æ??å®?義è?ªæ??é?£çµ¡äºº"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "æ¬?é??ä¸?足"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "����絡人"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "�絡人 ID 已���"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "å·²å??æ¶?"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "ç?¡æ³?å??æ¶?"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "é©?証失æ??"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "����"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS ��使�"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "��此��"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "�����模��使�"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "���誤"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
 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:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, 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 æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
+"æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
 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."
@@ -1564,17 +1280,17 @@ msgstr ""
 "æ­¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è­¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution 使ç?¨ LDAPï¼?å¿?é ?"
 "å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?件ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
-msgstr "æ??å??ç?¡æ³?é??å??é??å??é??è¨?é??ã??é??表示æ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
+msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示æ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
-msgstr "詳細ç??é?¯èª¤è¨?æ?¯:"
+msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1586,7 +1302,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1598,44 +1314,50 @@ msgstr ""
 "æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??伺æ??å?¨å??好設å®?中ç??\n"
 "æ??é??ä¸?é??ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1643,54 +1365,61 @@ msgstr "�製�絡人�"
 msgid "Card View"
 msgstr "å??ç??檢è¦?模å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "��..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??交æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸��"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ����"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+msgid "Page %d"
+msgstr "第 %d �"
+
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1764,21 +1493,21 @@ msgstr "æ?ªè??ç??ç??é?¯èª¤"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以å?¿å??æ?¹å¼?å­?å?? LDAP 伺æ??å?¨"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "é©?è­?æ??è­?失æ??ã??\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1802,15 +1531,15 @@ msgstr "ã??{0}ã??æ?¯ä¸?å??å?¯è®?ç??è¡?äº?æ??ä¾?æº?ã??è«?é?¸å??ä¸?å??è?½å? å?¥ç´?
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
-msgstr "æ?°å¢?æ??æ??義ç??æ??è¦?å?°æ?¨ç??ç´?æ??å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??ç´?æ??å??ä»?麼äº?æ??é??ã??"
+"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 your recipients an idea "
-"of what your task is about."
-msgstr "æ?°å¢?æ??æ??義ç??æ??è¦?å?°æ?¨ç??å·¥ä½?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??å·¥ä½?å??ä»?麼äº?æ??é??ã??"
+"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
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1899,38 +1628,34 @@ msgid "Are you sure you want to delete this task?"
 msgstr "確����此工��"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "æ?¨ç¢ºå®?è¦?å?²å­?æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "æ?¨ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??ç´?æ??ï¼?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "確å®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å??å¿?é??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
-msgstr "æ?¨ç¢ºå®?è¦?å?³é??æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "æ?¨ç¢ºå®?è¦?å?²å­?æ²?æ??æ??è¦?ç??å·¥ä½?ï¼?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "è¡?äº?æ??è³?æ??庫已é?¢ç·?ã??"
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "ä¸?è?½å»ºç«?æ?°ç??äº?件"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "�����件"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "å?ªé?¤è¡?äº?æ??ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®ã??{0}ã??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "å?ªé?¤å·¥ä½?æ¸?å?®ã??{0}ã??ï¼?"
 
@@ -1973,146 +1698,133 @@ msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
-
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 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:47
+#: ../calendar/calendar.error.xml.h:45
 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:48
+#: ../calendar/calendar.error.xml.h:46
 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:49
-msgid "No response from the server."
-msgstr "伺æ??å?¨æ²?æ??å??æ??ã??"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??許å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??裡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?æ­¤ç´?æ??å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "é??裡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?此工ä½?å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "æ­¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "æ­¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "此工ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å­?å°?æ­¤ç´?æ??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "è¦?å?²å­?å°?æ­¤æ??è­°æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å­?å°?æ­¤å??å¿?é??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å­?å°?此工ä½?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ­¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è­°é??è«?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??此工ä½?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è­°æ?´æ?°è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2121,103 +1833,57 @@ msgstr ""
 "æ?¨æ­£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise 伺æ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??好ç??"
 "解決æ?¹æ¡?æ?¯å°?該伺æ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤æ??è­°ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å­?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "����(_D)"
 
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "��(_S)"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "����(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "å??å?²å¤?æ?¥äº?件:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "ç?¡æ³?å??å?? Evolution è³?æ??伺æ??å?¨"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "ç?¡æ³?寫å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "é ?設å?ªå??é ?åº?:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
-
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
@@ -2230,7 +1896,7 @@ msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -2245,10 +1911,10 @@ msgstr "��解�(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -2261,11 +1927,11 @@ msgid "_Dismiss"
 msgstr "解�(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:153
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1607
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
@@ -2275,10 +1941,10 @@ msgid "_Snooze"
 msgstr "延æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "å°?æ??"
 
@@ -2286,40 +1952,41 @@ msgstr "å°?æ??"
 msgid "location of appointment"
 msgstr "ç´?æ??ç??å?°é»?"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "æ²?æ??ä»»ä½?æ??è¿°ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "æ?¨æ?? %d å??鬧é?´"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2331,7 +1998,7 @@ msgstr ""
 "é??å?ºé?»å­?é?µä»¶ã??  Evolution æ??顯示\n"
 "æ?®é??ç??æ??é??å°?話ç??ä¾?代æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2348,7 +2015,7 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -2390,7 +2057,7 @@ msgid "Alarm programs"
 msgstr "鬧���"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
 
@@ -2411,335 +2078,327 @@ msgid "Calendars to run alarms for"
 msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "æ ¸å??æ­¤é?¸é ?æ??å?¨ Evolution 中使ç?¨ç³»çµ±æ??å??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "å?¨æ??å?»å??中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©(ç??空表示使ç?¨é ?設å?¼)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "æ¸?空æ??確èª?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "æ?°äº?件ç??é ?設é?±æ??æ?§æ¬¡æ?¸ã?? -1 代表永é? ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "é ?設ç??ç´?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "é ?設æ??é??ç??å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "é ?設æ??é??ç??æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "ç?¨ä¾?å­?æ?¾é¬§é?´é?³æ??æª?ç??ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "äº?件漸層æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "äº?件é??æ??æ??æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "è¡?äº?æ??檢è¦?中ç??äº?件漸層æ??æ??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "é?±è??å·¥ä½?å?®ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "é?±è??å·¥ä½?æ?¸å?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "水平�格�置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "å·¥ä½?æ?¥çµ?æ??æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "å·¥ä½?æ?¥é??å§?æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示工ä½?é ?覽çª?æ ¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "ä¸?次鬧é?´æ??å?»"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "æ??è¨?é??ç??é?µä»¶ç­?ç´?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼ä½?ç??伺æ??å?¨ URL æ¸?å?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç·?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸­è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "決å®?é ?設æ??é??ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "é??æ??ç??å·¥ä½?è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?覽è¡?äº?æ??ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 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 ""
 "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary calendar"
 msgstr "主è¦?è¡?äº?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "主è¦?å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "主�工���"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "以é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "å?¨äº?件/æ??è­°/å·¥ä½?編輯å?¨ä¸­é¡¯ç¤º å??é¡? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
-msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?顯示é?±æ?¸"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?覽顯示é?±æ?¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 "å¦?æ??設å®?å??æ??å?¨æ?¥æª¢è¦?中顯示第äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??設å®?é?µç??ç?¨æ³?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "工��覽�格�置�水平�"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2748,7 +2407,7 @@ msgstr ""
 "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??網å??ç¯?æ?¬ï¼?%u è¦?以é?»å­?é?µä»¶ä½?å??ç??使ç?¨è??å??稱é?¨å??ä¾?å??"
 "代ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??稱ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -2756,7 +2415,7 @@ msgstr ""
 "ç?¨æ?¼è¡?äº?æ??中æ?¥æ??è??æ??å?»ç??é ?設æ??å??ï¼?æ?ªç¿»è­¯ç?? Olsen æ??å??è³?æ??庫ä½?置就å?? "
 "\"America/New York\"ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 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 "
@@ -2765,7 +2424,7 @@ msgstr ""
 "é??ç½®æ?¹å¼?決å®?äº?å?¨å??å¿?é??æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??"
 "å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 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 "
@@ -2774,176 +2433,172 @@ msgstr ""
 "é??ç½®æ?¹å¼?決å®?äº?å?¨å·¥ä½?æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?"
 "æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "é??裡å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè­¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "æ??é??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "ä¸?次鬧é?´å?·è¡?ç??æ??é??(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 "è¡?äº?æ??檢è¦?中ç??äº?件é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24 å°?æ??å?¶æ ¼å¼?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "çª?顯ç??(ã??主è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "çª?顯ç??(ã??主è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "é ?設æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
 # (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "使ç?¨ç³»çµ±æ??å??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
 msgstr "使ç?¨ç³»çµ±æ??å??å??代å?¨ Evolution 中é?¸å??ç??æ??å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "å??ç?´çª?æ ¼ä½?ç½®"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "ä¸?é?±é??å§?æ?¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å?­ (6)ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "æ?¯å?¦å£?縮æ??檢è¦?中ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸­ç??é?±å?­è??é?±æ?¥ç½®æ?¼ä¸?å??空ä½?中ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "æ?¯å?¦å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "æ?¯å?¦å?¨è¡?äº?æ??中繪å?º Marcus Bains ç·?ï¼?代表ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?ï¼?è??é??以æ??ç?ºå?®ä½?ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "æ?¯å?¦å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
-msgstr "æ?¯å?¦å?¨æ?¥æ??å°?覽中顯示é?±æ?¸ã??"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "工��"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "å·¥ä½?æ?¥é??å§?å??é??"
 
@@ -2993,17 +2648,17 @@ msgid "Classification"
 msgstr "歸�"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../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
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -3024,7 +2679,7 @@ msgid "Exist"
 msgstr "å­?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../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:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
@@ -3037,25 +2692,26 @@ msgid "Organizer"
 msgstr "æ??è­°å?¬é??人"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "�人"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../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/tasktypes.xml.h:22
@@ -3117,6 +2773,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -3132,7 +2789,7 @@ msgstr "��鬧���"
 msgid "Mes_sage:"
 msgstr "��(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "��"
 
@@ -3172,18 +2829,20 @@ msgstr "æ??æ?¼"
 msgid "before"
 msgstr "æ?©æ?¼"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "天"
 
@@ -3191,19 +2850,20 @@ msgstr "天"
 msgid "end of appointment"
 msgstr "ç´?æ??çµ?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "æ??é??é??é??æ¯?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "å°?æ??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "å??é??"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "ç´?æ??é??å§?"
 
@@ -3217,35 +2877,35 @@ msgstr "å? å?¥(_A)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "鬧�"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "é?¸æ??..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "æ??å?»å??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "æ??å?»å??æ?¥æ??(_M):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "å?ªæ??æ?¥æ??ï¼?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "å?ªæ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3276,12 +2936,12 @@ msgstr "30 å??é??"
 msgid "60 minutes"
 msgstr "60 å??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "警示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:153
 msgid "Date/Time Format"
 msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
@@ -3307,20 +2967,20 @@ msgid "Display alarms in _notification area only"
 msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "æ??æ??äº?"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "��"
 
@@ -3333,7 +2993,7 @@ msgid "Minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "æ??æ??ä¸?"
@@ -3347,182 +3007,190 @@ msgid "None"
 msgstr "æ²?æ??"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "æ??é?¸é¡?è?²"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "��(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "æ??æ??å?­"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "以é?±æ?²å??æ??檢è¦?(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "第äº?æ??å??(_C):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "顯示æ??é??(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸(_U)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+msgid "Show week _numbers"
+msgstr "顯示��(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "æ??æ??æ?¥"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "é?±å??(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "樣�:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "æ??æ??å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æ??é??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "æ??å??(_Z):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "æ??å?»æ ¼å¼?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "æ??æ??äº?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "使ç?¨ç³»çµ±æ??å??(_Y)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "æ??æ??ä¸?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "ä¸?é?±é??å§?æ?¼(_K):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "工��"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "工��:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 å°?æ?? (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 å°?æ??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "��(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "é??æ??ç??å·¥ä½?(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "��(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "æ??é??é??é??(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "��(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "��(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "å??"
 
@@ -3531,12 +3199,12 @@ msgid "Type:"
 msgstr "é¡?å??:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3555,35 +3223,35 @@ msgstr "�製工����容���以便���業(_Y)"
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "è¤?製å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "��工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "å??å¿?é??æ¸?å?®å±¬æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -3636,264 +3304,240 @@ msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??編輯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "確èª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " å?° "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (å·²å®?æ??) "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "å·²å®?æ?? "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr "(æ??é??)"
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "æ??é?? "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "�����件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "編輯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è­° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "工� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "æ??é??裡以é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1453
 #: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1460
 #: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "æ??é??裡以檢è¦?å?¯ç?¨ç??說æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1502
 #: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "æ??é??裡以å?²å­?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1572
 #: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å­?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "歸�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1621
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "��(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "é??件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "æ??é??裡以é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "歸���人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "��(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "歸����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "����(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?使ç?¨æ??件(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "��"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ­¤é ?ç?®æ??å??ç??è®?æ?´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?使ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "ç?¡æ³?é??å??ä¾?æº?"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
@@ -3901,53 +3545,73 @@ msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??信箱中ç??é??å??é ?ç?®(_D)ï¼?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "æ?¶å??註解(_R)"
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, c-format
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ï¼?%s"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "ç?±æ?¼ dbus é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "å? ç?ºæ¬?é??被æ??çµ?ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ï¼?%s"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "ç?±æ?¼é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, c-format
+msgid "The item could not be deleted due to an error: %s"
+msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -3961,133 +3625,147 @@ msgstr "��給�"
 msgid "Enter Delegate"
 msgstr "輸�代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??裡以設å®?æ??å??æ¶?é??å??äº?件ç??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "�此�設�循��件"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "�天�件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "空é??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "ç´?æ??(_M)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "ç´?æ??"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "å?°æ??è??"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "å??å?°é??å??äº?件"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "äº?件ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?件ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯äº?件ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "é??å??äº?件å?·æ??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è­°å?¬é??人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "代ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??人已ç¶?æ²?æ??帳è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -4098,130 +3776,140 @@ 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../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:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, 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:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, 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:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, 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:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "��"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "ç´?æ??å?? 1 天"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "ç´?æ??å?? 1 å°?æ??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "ç´?æ??å?? 15 å??é??"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "å?°æ??è??(_S)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "å?°æ??è??"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "å?°æ??è??(_N)..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "��鬧�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "äº?件æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "æ??è¦?(_M):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+msgid "_Summary:"
+msgstr "æ??è¦?(_S):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "å?±"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "å??å?°é??å??å??å¿?é??"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯å??å¿?é??ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301 ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:942 ../mail/em-format-html.c:2284
+#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -4230,67 +3918,72 @@ msgstr "æ?¶ä»¶è??"
 msgid "Sta_rt date:"
 msgstr "é??å§?æ?¥(_R):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "æ??è¦?(_M):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "群�(_G):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "æ?¨æ­£å?¨ä¿®æ?¹é?±æ??æ?§äº?件ã??æ?¨æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "æ?¨æ­£å?¨å§?ä»»é?±æ??æ?§äº?件ã??æ?¨æ?³è¦?å§?æ´¾ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "æ?¨æ­£å?¨ä¿®æ?¹é?±æ??æ?§å·¥ä½?ã??æ?¨æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "æ?¨æ­£å?¨ä¿®æ?¹é?±æ??æ?§å??å¿?é??ã??æ?¨æ?³è¦?ä¿®æ?¹ä»?麼ï¼?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "é??æ­¤ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "æ­¤ä¾?é ?å??å??å??ç??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "æ­¤ä¾?é ?å??以å¾?ç??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?編輯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 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:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "ç??"
 
@@ -4298,7 +3991,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "�"
 
@@ -4307,7 +4000,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "�"
 
@@ -4315,7 +4008,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "�"
 
@@ -4323,7 +4016,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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "å??"
 
@@ -4331,7 +4024,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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "第�"
 
@@ -4339,13 +4032,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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -4353,7 +4046,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "1��10�"
 
@@ -4361,7 +4054,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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "11��20�"
 
@@ -4369,45 +4062,45 @@ 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr "�第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?編輯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "編輯��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -4419,7 +4112,7 @@ msgstr "�"
 msgid "Exceptions"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "�覽"
 
@@ -4427,48 +4120,64 @@ msgstr "�覽"
 msgid "This appointment rec_urs"
 msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "永�"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "é?±"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??鬧é?´è??é??å??äº?件ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 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:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, 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:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
@@ -4476,35 +4185,35 @@ msgstr "å·²å®?æ??"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "��中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "��"
@@ -4512,10 +4221,10 @@ msgstr "��"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4531,8 +4240,8 @@ 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:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4541,7 +4250,7 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
@@ -4551,7 +4260,7 @@ msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
@@ -4559,53 +4268,62 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "ç??æ??詳細è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??裡æ?¹è®?/檢è¦?該工ä½?ç??ç??æ??詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "工�(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "工�"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "å·¥ä½?詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "å??å?°é??é ?å·¥ä½?"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯工ä½?ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è­°å?¬é??人(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "å?°æ??è??(_N)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "å??é¡?(_I)..."
@@ -4703,7 +4421,7 @@ msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
@@ -4718,8 +4436,8 @@ msgstr "æ?ªæ­¢æ?¥æ??ï¼?"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
@@ -4728,8 +4446,8 @@ msgid "Priority:"
 msgstr "å?ªå??ç­?ç´?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
@@ -4744,32 +4462,32 @@ msgstr "網��"
 msgid "Created"
 msgstr "已建�"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "çµ?æ??æ?¥æ??"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "ä¿®æ?¹æ?¥æ??"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "空é??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4780,63 +4498,47 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "å?¦"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "�設客�端��"
-
-#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Shell 設��"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "æ??ç?¨ç¨?å¼?設å®?å?¼"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "循�模�"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4873,97 +4575,97 @@ msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 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:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, 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:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -5006,8 +4708,8 @@ msgstr "顯示第äº?æ??å??"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5017,10 +4719,10 @@ msgstr "%A %d %B"
 #. %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:868 ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:907
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -5029,31 +4731,35 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:943
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%-m æ?? %-d æ?¥"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "第 %d �"
 
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "循�模��"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "æ?¯ã??(è¤?é??循ç?°)"
@@ -5135,7 +4841,7 @@ msgstr "çµ?æ??"
 msgid "Due"
 msgstr "�止"
 
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iCalendar ��"
 
@@ -5144,303 +4850,303 @@ msgstr "iCalendar ��"
 msgid "iCalendar Error"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "ä¸?æ??人士"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
 msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
 
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "æ??è­°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??è¡?äº?æ??中æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
 
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
+msgid "%s has published meeting information."
+msgstr "%s å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "æ??è­°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
 #, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> é??è«?æ?¨å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
+msgid "%s requests your presence at a meeting."
+msgstr "%s é??è«?æ?¨å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "æ??è­°æ??æ¡?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "æ??è­°æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "æ??è­°æ?´æ?°è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
+msgid "%s has replied to a meeting request."
+msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "æ??è­°ç­?è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
 #, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> å·²ç¶?æ¶?å??æ??è­°ã??"
+msgid "%s has canceled a meeting."
+msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "æ??è­°å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
 #, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
+msgid "%s has sent an unintelligible message."
+msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
 #, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
+msgid "%s has published task information."
+msgstr "%s å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "工���"
 
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
 #, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
+msgid "%s requests %s to perform a task."
+msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
+msgid "%s requests you perform a task."
+msgstr "%s è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "å·¥ä½?è¨?å??"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
+msgid "%s wishes to be added to an existing task."
+msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "工���"
 
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
+msgid "%s wishes to receive the latest task information."
+msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "工�����"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
 #, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
+msgid "%s has replied to a task assignment."
+msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "å·¥ä½?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
 #, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?å·¥ä½?ã??"
+msgid "%s has canceled a task."
+msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "å·¥ä½?å??æ¶?"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
 #, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
+msgid "%s has published free/busy information."
+msgstr "%s å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
 #, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> è«?æ±?æ?¨ç??空é??/å¿?ç¢?è³?è¨?ã??"
+msgid "%s requests your free/busy information."
+msgstr "%s è«?æ±?æ?¨ç??空é??/å¿?ç¢?è³?è¨?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "空é??/å¿?ç¢?è«?æ±?"
 
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
 #, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
+msgid "%s has replied to a free/busy request."
+msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "空é??/å¿?ç¢?å??è¦?"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "é??件並æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "æ?´æ?°å®?æ??\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "æ?´æ?°"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "æ?«æ??æ?¥å??"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "æ??çµ?"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "å??æ¶?"
 
@@ -5489,72 +5195,72 @@ msgid "Resources"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 #: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "群�"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 #: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "缺席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "��中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -5563,7 +5269,7 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
@@ -5573,67 +5279,63 @@ msgstr "%Y/%m/%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "��辦�室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "å?°æ??è??(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "��(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "顯示縮�(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "æ??æ??人å?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "æ??æ??人å?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "å¿?è¦?ç??人å?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?人å?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -5661,45 +5363,47 @@ msgstr "��"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:404
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:468
 #: ../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
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "é??å§?:"
 
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?製é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5707,142 +5411,107 @@ msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 msgid "Click to add a memo"
 msgstr "è«?æ??é??裡å¢?å? æ?°ç??å??å¿?é??"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:364
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:429
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "工�"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?製é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "��貼簿貼�工�"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "å®?å?·æ??鬧é?´ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "å®?æ?¯é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "é??æ?¯ä¸?é ?æ??è­°ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "è¡?äº?æ??äº?件ï¼?æ??è¦?ç?º %sã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "è¡?äº?æ??äº?件ï¼?æ²?æ??æ??è¦?ã??"
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "è¡?äº?æ??檢è¦?äº?件"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "����"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "���天�件"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "æ?°å¢?æ??è­°"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "移���"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "移è?³æ?¥æ??"
 
@@ -5851,7 +5520,7 @@ msgstr "移è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?檢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??表格"
 
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5860,14 +5529,14 @@ 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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?件ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5875,47 +5544,47 @@ msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:916
-#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:936
-#: ../modules/calendar/e-cal-shell-view-private.c:947
-#: ../modules/calendar/e-cal-shell-view-private.c:954
-#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5937,15 +5606,15 @@ msgstr "æ??檢è¦?ï¼?%sã??%s"
 msgid "Week View: %s. %s"
 msgstr "é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "��"
 
@@ -5998,39 +5667,40 @@ msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "ä¹?æ??"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "é?¸æ??ä»?天(_T)"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "é?¸æ??ä»?天(_S)"
+msgid "September"
+msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "�件��"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "工���"
 
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -6038,7 +5708,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -6047,7 +5717,7 @@ msgstr "å·²æ?¥å??"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -6059,7 +5729,7 @@ 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:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -6068,7 +5738,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已�派"
@@ -6076,7 +5746,7 @@ msgstr "已�派"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已��"
@@ -6084,7 +5754,7 @@ msgstr "已��"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -6092,7 +5762,7 @@ msgstr "å??æ¶?"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -6100,29 +5770,29 @@ msgstr "é??æ?°æ?´ç??"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??票表å?³"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空é??/å¿?ç¢?è³?è¨? (%s å?° %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iCalendar ��"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?æ?°ç??äº?件è??å?¶ä»?äº?件æ??æ??é??ç??ã??"
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
@@ -6278,49 +5948,73 @@ msgstr "�"
 msgid "Sa"
 msgstr "å?­"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "ç´?æ??"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " å?° "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "工�"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (å·²å®?æ??) "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "å·²å®?æ?? "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr "(æ??é??)"
+
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "æ??é?? "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6329,10 +6023,6 @@ msgstr "�絡人: "
 msgid "% Completed"
 msgstr "% å·²å®?æ??"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "å·²å??æ¶?"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "正���"
@@ -6345,44 +6035,189 @@ msgstr "大�"
 msgid "is less than"
 msgstr "å°?æ?¼"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "ç´?æ??å??æ??è­°"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar �� (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸��"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "æ??é??ï¼?"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar �� (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar �� (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸��"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "è¡?äº?æ??äº?件"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution è¡?äº?æ??æ?ºæ?§è¼¸å?¥å?¨"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "æ??è­°"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "�件"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "工�"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "å??å¿?é??"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "å?·æ??é?±æ??æ?§"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "æ?¯ä¸?å??實é«?"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "å?·æ??鬧é?´"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "å?·æ??é??件"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "å?¬é??"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "�人"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "��"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "歸�"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "æ??è¦?"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "é??å§?"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "å?°æ??"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "çµ?æ??"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "å??é¡?"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "å·²å®?æ??"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "æ??è­°å?¬é??人"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "å?°æ??è??"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "æ??è¿°"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "é¡?å??"
+
 #.
 #. *
 #. * This program is free software; you can redistribute it and/or
@@ -7932,288 +7767,257 @@ msgstr "太平�/���"
 msgid "Pacific/Yap"
 msgstr "太平æ´?/é??浦島"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "æ?ªå?½å??ç??é?µä»¶"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "����..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:329
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "å??å?°(_P)..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "é ?覽å??å?°(_V)"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "����(_A)..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "以å?¦ä¸?å??å??稱å?²å­?ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "å?²å­?ç?ºè??稿(_D)"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "å?²å­?ç?ºè??稿"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "�寫��件(_M)"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "å­?å??編碼(_E)"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PG_P ��"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "使ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP é??é?°ç?ºé?µä»¶å? ä¸?æ?¸ä½?簽章"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?設ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨æ?¨ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME ��"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使ç?¨æ?¨ç?? S/MIME å? å¯?æ??è­?å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç°½å??æ??è­?ç?ºé?µä»¶å? ä¸?æ?¸ä½?簽章"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "�件����(_B)"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?件å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "����(_C)"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "å¯?件è??æ¬?ä½?(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "å??æ??å¯?件è??é?¸æ??å?¨ç??顯示ç??æ??"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "å?²å­?è??稿"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "顯示"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "é?±è??"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "輸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
 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:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "å¯?件è??(_O):"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "å¯?件è??"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
-msgstr "å??è¦?å?°å??(_R):"
+msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "��(_C):"
 
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "��(CC)"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "�件��(_B):"
 
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "�件��(BCC)"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "張貼�(_P):"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "主�(_U):"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "æ??é??裡æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??裡ï¼?é?¸å??è¦?張貼ç??è³?æ??夾"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "復å??ä¸?ä¸?次ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "å??æ¶?ä¸?ä¸?次復å??ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "æ??å°?æ??å­?"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "æ??å°?å??å??代æ??å­?"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "å?²å­?è??稿"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
 
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1029
+#, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?簽署é??å?ºç??é?µä»¶ï¼?此帳è??æ²?æ??設å®?簽章æ??è­?"
 
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1041
+#, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?æ??è­?(此帳è??)"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr "ç?¡æ³?å¾?è?ªå??å?²å­?ç??æª?æ¡?é??建é?µä»¶"
 
-#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3310
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>ï¼?é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??ï¼?<b>"
+#: ../composer/e-msg-composer.c:3538
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "æ?ªå?½å??ç??é?µä»¶"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -8288,8 +8092,8 @@ msgstr ""
 "ç?¶æ?¨æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??復å??é?µä»¶å?¯ä»¥è®?æ?¨å¾?å??ä¾?中æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "æª?æ¡? `{0}' ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸­å?³é??ã??"
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "æª?æ¡?ã??{0}ã??ä¸?æ?¯ä¸?è?¬æª?æ¡?è??ä¸?ç?¡æ³?å?¨é?µä»¶ä¸­å?³é??ã??"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
@@ -8307,8 +8111,8 @@ msgid "Unable to activate the address selector control."
 msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "æ?¨ç?¡æ³?å°?æª?æ¡? â??{0}â?? é??å? å?°æ­¤é?µä»¶ã??"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "æ?¨ç?¡æ³?å°?æª?æ¡?ã??{0}ã??é??å? å?°æ­¤é?µä»¶ã??"
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
@@ -8330,89 +8134,100 @@ msgstr "復å??(_R)"
 msgid "_Save Draft"
 msgstr "å?²å­?è??稿(_S)"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "以å??å?¥è¦?çª?å?·è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:203
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "以 Anjal å??ç?ºé ?設é?µä»¶å®¢æ?¶ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "socket ç?? IDï¼?å?§åµ?æ?¼"
 
-#: ../capplet/anjal-settings-main.c:211
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:225
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Anjal ���件客�端"
 
-#: ../capplet/settings/mail-view.c:244
-msgid "New Tab"
-msgstr "æ?°å¢?å??é ?"
-
-#: ../capplet/settings/mail-account-view.c:56
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "è«?輸å?¥æ?¨ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:57
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "è«?輸å?¥æ?¨ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "æ?¨è¼¸å?¥ç??é?»å­?é?µä»¶ä½?å??æ?¯ç?¡æ??ç??ã??"
 
-#: ../capplet/settings/mail-account-view.c:224
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">å??人詳細è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "è«?輸å?¥æ?¨ç??å¯?碼ã??"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "å??人詳細è³?æ??ï¼?"
+
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "å§?å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:238
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Email ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:248
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨æ?¥æ?¶è©³ç´°è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">詳細è³?æ??ï¼?</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">正���</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "伺æ??å?¨é¡?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "伺æ??å?¨ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "使����"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "永�"
 
-#: ../capplet/settings/mail-account-view.c:298
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??詳細è³?æ??ï¼?</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
+#: ../capplet/settings/mail-account-view.c:585
 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. "
@@ -8422,7 +8237,7 @@ msgstr ""
 "碼ï¼?æ??å??æ??å??試並æ?¾å?ºæ??æ??ç??設å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ­¥é©?ï¼?æ?¨å°±é??è¦?使ç?¨"
 "è?ªå·±å¸³è??ç??伺æ??å?¨è©³ç´°è³?æ??ã??"
 
-#: ../capplet/settings/mail-account-view.c:357
+#: ../capplet/settings/mail-account-view.c:587
 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 "
@@ -8431,11 +8246,11 @@ msgstr ""
 "æ?±æ­?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºæ?¨ç??é?µä»¶è¨­å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??以æ?¨å??å??輸å?¥ç??"
 "詳細è³?æ??試è??é??å§?ï¼?ä½?æ?¯æ?¨ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:359
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?設å®?é??å??帳è??ç??é?¸é ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:361
+#: ../capplet/settings/mail-account-view.c:591
 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."
@@ -8443,145 +8258,176 @@ msgstr ""
 "ç?¾å?¨æ??å??é??è¦?æ?¨ç??設å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?試è??ç??測é?¨å??設å®?ï¼?ä½?æ?¯æ?¨æ??該檢æ?¥"
 "å®?å??以é?²è¡?確èª?ã??"
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "æ?¨å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?設設å®?å?¼ã??"
 
-#: ../capplet/settings/mail-account-view.c:363
+#: ../capplet/settings/mail-account-view.c:593
 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:378
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "身å??"
 
-#: ../capplet/settings/mail-account-view.c:378
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "��步 - 正����件"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "正����件"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "ä¸?ä¸?æ­¥ - 身å??è­?å?¥"
 
-#: ../capplet/settings/mail-account-view.c:379
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "��步 - 正�����"
 
-#: ../capplet/settings/mail-account-view.c:380
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "正�����"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "��步 - 正����件"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "ä¸?ä¸?æ­¥ - 檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "ä¸?ä¸?æ­¥ - 詳細è³?æ??"
 
-#: ../capplet/settings/mail-account-view.c:382
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "��步 - 正�����"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "�設�"
 
-#: ../capplet/settings/mail-account-view.c:383
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:385
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??"
 
 #: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
+msgid "Setup Google contacts with Evolution"
+msgstr "� Google �絡人�� Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "å°? Google æ?¥æ??å? å?¥ Evolution"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "æ?¨å?¯è?½é??è¦?å??ç?¨ IMAP å­?å??ã??"
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google 帳æ?¶è©³ç´°è³?æ??ï¼?</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+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:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo 帳è??設å®?å?¼ï¼?</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo è¡?äº?æ??å??稱ï¼?"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "�碼�"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "é??é??å??é ?"
 
-#: ../capplet/settings/mail-account-view.c:729
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "帳è??ç²¾é??"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "���件設��"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-msgid "Quit"
-msgstr "çµ?æ??"
-
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453 ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229 ../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:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1655
+#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "修�"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "å? å?¥æ?°ç??帳è??"
 
-#: ../capplet/settings/mail-settings-view.c:185
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">帳è??管ç??</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "帳è??管ç??"
 
-#: ../capplet/settings/mail-settings-view.c:276
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "設��"
 
@@ -8593,8 +8439,8 @@ msgstr "è¡?äº?æ??äº?件é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8614,13 +8460,9 @@ msgstr "管ç??æ?¨ç??é?µä»¶ã??é?£çµ¡äººå??è¡?ç¨?"
 msgid "Configure email accounts"
 msgstr "設å®?é?µä»¶å¸³è??"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "å?°å??å?¡"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "è¡?äº?æ??è³?è¨?"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "���件設��"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8646,15 +8488,15 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% å®?æ??)"
 
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Evolution �誤"
 
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Evolution è­¦å??"
 
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
@@ -8715,56 +8557,66 @@ msgstr "西��系"
 msgid "Western European, New"
 msgstr "西��系��"
 
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "正�"
 
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. 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:97
 msgid "Simplified"
 msgstr "ç°¡é«?"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "ç??å??è?­èª?"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "�覺"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1751
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "�天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "�天"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "���起 %d 天"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "���起 %d 天"
+msgstr[1] "���起 %d 天"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "%d 天å??"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天å??"
+msgstr[1] "%d 天å??"
 
-#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "格��"
 
@@ -8785,18 +8637,6 @@ msgstr "æ­£å?¨å¯«å?¥ã??%sã??"
 msgid "Writing \"%s\" to %s"
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "è¨?é??å?¨å??稱"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "æª?æ¡?å??稱"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "模çµ?ç??æª?æ¡?å??稱"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "é?¤é?¯ç´?é??æª?"
@@ -8819,13 +8659,15 @@ msgstr "ç´?é??æª?è¨?æ?¯:"
 msgid "Log Level"
 msgstr "ç´?é??ç­?ç´?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "�件"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
 msgid "Close this window"
 msgstr "é??é??æ?¬è¦?çª?"
 
@@ -8849,32 +8691,21 @@ msgstr "��"
 msgid "Error, Warnings and Debug messages"
 msgstr "é?¯èª¤ã??è­¦å??è??é?¤é?¯è¨?æ?¯"
 
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "å·²å??ç?¨"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é?±"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "å??å?°æ??ç?¼ç??é?¯èª¤"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "å??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ­¤é?¯èª¤ç??詳細è³?è¨?ï¼?"
 
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "å??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
@@ -8883,7 +8714,7 @@ msgstr "å??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
 msgid "Because \"{1}\"."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
@@ -8903,15 +8734,15 @@ msgstr "��寫�?"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å­?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "�寫(_O)"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??該é?£çµ?ã??"
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?顯示 Evolution ç??æ±?å?©æ??件ã??"
 
@@ -8924,214 +8755,222 @@ msgstr "GConf �誤�%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ­¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?端æ©?中顯示ã??"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "å¯?件è??"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:943
+#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
+#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "��"
 
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:944
+#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
+#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:945
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:946 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:947 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "æ?°è??群çµ?"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:948 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1310
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1370
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1525 ../em-format/em-format.c:1699
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1533
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1546
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1547
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1723
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1733 ../em-format/em-format.c:1889
 msgid "Error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1734 ../em-format/em-format.c:1877
+#: ../em-format/em-format.c:1890
 msgid "Unknown error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶"
+#: ../em-format/em-format.c:1970
+msgid "Could not parse PGP message: "
+msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+#: ../em-format/em-format.c:1976 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, 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:74
 #, 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:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, 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:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, 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:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 æ?¥å??"
 msgstr[1] "%d æ?¥å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, 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:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, 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:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, 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:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, 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:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
@@ -9184,11 +9023,11 @@ msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
 #: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "��"
 
@@ -9220,7 +9059,7 @@ msgstr "缺å°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "缺å°?æª?æ¡?å??稱ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "缺å°?å??稱ã??"
 
@@ -9276,7 +9115,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??濾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "é??濾å?¨è¦?å??(_F)"
 
@@ -9297,7 +9136,7 @@ msgstr "å¾?"
 msgid "months"
 msgstr "å??æ??"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "�"
 
@@ -9313,44 +9152,28 @@ msgstr "æ?¨æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 msgstr[1] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "å??示檢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:732 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "��追蹤�"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Shell 模�"
-
-#: ../mail/e-mail-browser.c:743 ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "�件 shell �端��"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "顯示已��"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "顯示已���件"
+#: ../mail/e-mail-browser.c:266
+msgid "(No Subject)"
+msgstr "(æ²?æ??主æ?¨)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9397,7 +9220,7 @@ msgid "_Later"
 msgstr "��(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "���籤"
 
@@ -9417,114 +9240,57 @@ msgstr ""
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "å??稱"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:959
 msgid "Inbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "��"
 
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "é??è¦?"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "�辦"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "��"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "正�移�..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "移�"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "æ­£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?°è³?æ??夾 `%s'ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "ç?¡æ³?è¤?製製è³?æ??夾 `%s' è?³ `%s'ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "æ­£å?¨è½?移è³?æ??夾"
 
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution ä¿¡ç®±è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "ç?¡æ³?建ç«? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "ç?¡æ³?è¤?製 POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?¬å?°é?µä»¶å?²å­?å?? `%s':%s"
-
-#: ../mail/e-mail-migrate.c:2934
+#: ../mail/e-mail-migrate.c:650
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9535,44 +9301,46 @@ msgstr ""
 "\n"
 "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "ç?¡æ³?å?¨ `%s' 建ç«?æ?¬å?°é?µä»¶è³?æ??夾:%s"
-
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"ç?¡æ³?å¾?以å??ç?? Evolution è®?å??設å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å­?å?¨æ??æ??æ¯?ã??"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "ç?¡æ³?å?¨ã??%sã??建ç«?æ?¬å?°é?µä»¶è³?æ??夾ï¼?%s"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:265 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?製è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:265 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "�製(_O)"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:639 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:639 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "移å??(_M)"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:854 ../mail/e-mail-reader.c:964
+#: ../mail/e-mail-reader.c:998
+msgid "_Do not ask me again."
+msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
+
+#: ../mail/e-mail-reader.c:1002
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
+
+#: ../mail/e-mail-reader.c:1087
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "���件"
@@ -9584,541 +9352,557 @@ 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:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1108
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "�件"
 msgstr[1] "�件"
 
-#: ../mail/e-mail-reader.c:1143
+#: ../mail/e-mail-reader.c:1366
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?件è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1368
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?件è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1373
 msgid "Check for _Junk"
 msgstr "檢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1375
 msgid "Filter the selected messages for junk status"
 msgstr "篩é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1380
 msgid "_Copy to Folder..."
 msgstr "è¤?製è?³è³?æ??夾(_C)..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1382
 msgid "Copy selected messages to another folder"
 msgstr "è¤?製已é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1387
 msgid "_Delete Message"
 msgstr "���件(_D)"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1389
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1394
 msgid "Filter on Mailing _List..."
 msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1396
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1401
 msgid "Filter on _Recipients..."
 msgstr "æ?¶ä»¶è??é??濾å?¨(_R)..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1403
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1408
 msgid "Filter on Se_nder..."
 msgstr "å¯?件è??é??濾å?¨(_N)..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1410
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1415
 msgid "Filter on _Subject..."
 msgstr "主æ?¨é??濾å?¨(_S)..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1417
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1422
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??濾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1424
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??濾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1429
 msgid "_Find in Message..."
 msgstr "��件���(_F)..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1431
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?顯示ç??é?µä»¶æ?¬æ??中ç??æ??å­?"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1436
 msgid "_Clear Flag"
 msgstr "����(_C)"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1438
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1443
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1445
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?設ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1450
 msgid "Follow _Up..."
 msgstr "è·?é?¨(_U)..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1452
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1457
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1459 ../mail/e-mail-reader.c:1466
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??件形å¼?è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1464
 msgid "Forward As _Attached"
 msgstr "以é??件è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1471
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1473 ../mail/e-mail-reader.c:1480
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??中"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1478
 msgid "Forward As _Inline"
 msgstr "以����(_I)"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1485
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1487 ../mail/e-mail-reader.c:1494
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1492
 msgid "Forward As _Quoted"
 msgstr "以å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1499
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1501
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1506
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1508
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1513
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1515
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1520
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1522
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?示æ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1527
 msgid "_Read"
 msgstr "已��(_R)"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1529
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1534
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1536
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1541
 msgid "_Unread"
 msgstr "���(_U)"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1543
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1548
 msgid "_Edit as New Message..."
 msgstr "編輯���件(_E)..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1550
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1555
 msgid "Compose _New Message"
 msgstr "�寫��件(_N)"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1557
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?以便æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1562
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1564
 msgid "Open the selected messages in a new window"
 msgstr "使ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1569
 msgid "_Move to Folder..."
 msgstr "移è?³è³?æ??夾(_M)..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1571
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1576
 msgid "_Next Message"
 msgstr "����件(_N)"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1578
 msgid "Display the next message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1583
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1585
 msgid "Display the next important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1590
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1592
 msgid "Display the next thread"
 msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1597
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1599
 msgid "Display the next unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1604
 msgid "_Previous Message"
 msgstr "����件(_P)"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1606
 msgid "Display the previous message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1611
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1613
 msgid "Display the previous important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1618
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1620
 msgid "Display the previous unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1627
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1634
 msgid "Preview the message to be printed"
 msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1639
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1641
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??給æ??人"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1646 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1648
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1653 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1655
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1660
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1662
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?件è??"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1667
 msgid "_Save as mbox..."
 msgstr "å?²å­?æ?? mbox(_S)..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1669
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å­?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1674
 msgid "Search Folder from Mailing _List..."
 msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1676
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1681
 msgid "Search Folder from Recipien_ts..."
 msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1683
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1688
 msgid "Search Folder from Sen_der..."
 msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1690
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1695
 msgid "Search Folder from S_ubject..."
 msgstr "主æ?¨æ??å°?è³?æ??夾(_U)..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1697
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1702
 msgid "_Message Source"
 msgstr "�件��(_M)"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1704
 msgid "Show the raw email source of the message"
 msgstr "顯示é?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1716
 msgid "_Undelete Message"
 msgstr "復å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1718
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1723
 msgid "_Normal Size"
 msgstr "正常大�(_N)"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1725
 msgid "Reset the text to its original size"
 msgstr "é??設æ??å­?ç?ºå??å§?大å°?"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1730
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1732
 msgid "Increase the text size"
 msgstr "å°?æ??å­?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1737
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1739
 msgid "Decrease the text size"
 msgstr "å°?æ??å­?縮å°?"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1746
 msgid "Create R_ule"
 msgstr "建ç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1753
 msgid "Ch_aracter Encoding"
 msgstr "å­?å??編碼(_A)"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1760
 msgid "F_orward As"
 msgstr "���(_O)"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1767
+msgid "_Group Reply"
+msgstr "群çµ?å??è¦?(_G)"
+
+#: ../mail/e-mail-reader.c:1774
 msgid "_Go To"
 msgstr "移�(_G)"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1781
 msgid "Mar_k As"
 msgstr "æ¨?示æ??(_K)"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1788
 msgid "_Message"
 msgstr "�件(_M)"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1795
 msgid "_Zoom"
 msgstr "縮�(_Z)"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1820
 msgid "Mark for Follo_w Up..."
 msgstr "�示���(_W)..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1828
 msgid "Mark as _Important"
 msgstr "æ¨?示æ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1832
 msgid "Mark as _Junk"
 msgstr "æ¨?示æ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1836
 msgid "Mark as _Not Junk"
 msgstr "æ¨?示æ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1840
 msgid "Mar_k as Read"
 msgstr "æ¨?示æ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1844
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?示æ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1848
 msgid "Mark as _Unread"
 msgstr "æ¨?示æ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1884
 msgid "_Caret Mode"
 msgstr "��模�(_C)"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1886
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??中顯示é??ç??游æ¨?"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1892
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é ­(_H)"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1894
 msgid "Show messages with all email headers"
 msgstr "顯示é?µä»¶å??詳細æª?é ­"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2115
 msgid "Unable to retrieve message"
 msgstr "�����件"
 
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2175 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æ­£å?¨å??å??é?µä»¶ã??%sã??"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2701 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2841
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:2842
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:2633 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#. Likewise the "mail-reply-group" action
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. (if possible and if that configuration option is enabled), or else
+#. it will reply to all. The word "Group" was chosen because it covers
+#. either of those, without too strongly implying one or the other.
+#: ../mail/e-mail-reader.c:2860
+msgid "Group Reply"
+msgstr "群çµ?å??è¦?"
+
+#: ../mail/e-mail-reader.c:2861
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
+
+#: ../mail/e-mail-reader.c:2906 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../mail/e-mail-reader.c:2918
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../mail/e-mail-reader.c:2922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:2645 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2932 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "å??è¦?"
 
@@ -10128,33 +9912,33 @@ 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:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 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:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 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:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s æ??æ¬?å??ç´?"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10168,34 +9952,34 @@ msgstr ""
 "並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10205,7 +9989,7 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2099
 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 "
@@ -10214,20 +9998,20 @@ msgstr ""
 "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??稱å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
 "ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10235,11 +10019,11 @@ msgstr ""
 "è«?輸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??網路æ??å??ä¾?"
 "æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10247,11 +10031,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10265,56 +10049,52 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836
+msgid "Please select a folder from the current account."
+msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
+
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "���"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "帳è??編輯å?¨"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Evolution 帳è??å?©ç??"
-
 #. 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:1578
+#: ../mail/em-composer-utils.c:1539
 #, 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:1626
+#: ../mail/em-composer-utils.c:1587
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1991
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?件è??"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:2038
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -10322,19 +10102,19 @@ msgstr ""
 "æ?¼ ${AbbrevWeekdayName}ï¼?${Year}-${Month}-${Day} æ?¼ ${24Hour}:${Minute} "
 "${TimeZone}ï¼?${Sender} æ??å?°ï¼?"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "-----å??å§?é?µä»¶-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??夾"
 
@@ -10351,10 +10131,18 @@ msgstr "æ??å®?è?²å½©"
 msgid "Assign Score"
 msgstr "æ??å®?ç?®æ¨?"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "�件��(BCC)"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "��"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "��(CC)"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "å·²å®?æ??æ?¼"
@@ -10415,6 +10203,10 @@ msgstr "è·?é?¨"
 msgid "Forward to"
 msgstr "���"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "é??è¦?"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "æ?¯ä¹?å¾?ç??"
@@ -10439,7 +10231,7 @@ msgstr "�設�"
 msgid "is set"
 msgstr "設�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10488,7 +10280,7 @@ msgid "Play Sound"
 msgstr "æ?­æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "已�"
 
@@ -10569,16 +10361,16 @@ msgid "Unset Status"
 msgstr "å??æ¶?設å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "æ?¥è??ä¾?"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "���件:"
@@ -10586,24 +10378,24 @@ msgstr[1] "���件:"
 
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "æ??æ??é?µä»¶:"
 msgstr[1] "æ??æ??é?µä»¶:"
 
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¡?使ç?¨é?? (%s):"
 
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "è³?æ??夾å?§å®¹"
 
@@ -10611,32 +10403,32 @@ msgstr "è³?æ??夾å?§å®¹"
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??夾>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 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:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
 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:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "��中..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
@@ -10663,134 +10455,135 @@ msgstr "è³?æ??夾å??稱ä¸?è?½å??å?«æ??ç·?ã??"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??夾樹"
 
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ­£å?¨ç§»å??è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ­£å?¨è¤?製è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ­£å?¨å°?é?µä»¶ç§»è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ­£å?¨è¤?製é?µä»¶è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?層ç??å?²å­?å??"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "移å??è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "è¤?製è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
 #, c-format
-msgid "Creating folder `%s'"
-msgstr "æ­£å?¨å»ºç«?è³?æ??夾 `%s'"
+msgid "Creating folder '%s'"
+msgstr "æ­£å?¨å»ºç«?è³?æ??夾ã??%sã??"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?建ç«?è³?æ??夾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
 msgid "Unsigned"
 msgstr "æ?ªç°½å??"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æ­¤é?µä»¶æ?ªç°½å??ã??ä¸?ä¿?è­?æ­¤é?µä»¶å·²é©?è­?ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
 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:105 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "é?µä»¶ç??ç°½å??ç?¡æ³?檢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??被æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?檢é©?å¯?件è??"
 
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
 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:107 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
 msgid "Signature exists, but need public key"
 msgstr "簽章å­?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??é??é?°ã??"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
 msgid "Unencrypted"
 msgstr "���"
 
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ­¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??網é??網路å?³é??å?¯è?½æ??被檢é?±ã??"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
 msgid "Encrypted, weak"
 msgstr "已������"
 
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
 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 "
@@ -10799,21 +10592,21 @@ msgstr ""
 "æ­¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??人å¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??"
 "æ?¥ï¼?並ä¸?æ?¯ç?¡æ³?檢è¦?æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
 msgid "Encrypted"
 msgstr "已��"
 
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
 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:117 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
 msgid "Encrypted, strong"
 msgstr "已�����"
 
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
 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 "
@@ -10822,15 +10615,15 @@ msgstr ""
 "æ­¤é?µä»¶å·²å? å¯?ï¼?使ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??縱使ç¶?é??ä¸?段æ??é??ï¼?å¤?é?¢ç??人å¾?é?£æª¢é?±æ­¤é?µä»¶"
 "ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "檢è¦?æ??è­?(_V)"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "æ­¤æ??è­?ç?¡æ³?檢è¦?"
 
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10838,117 +10631,136 @@ msgstr ""
 "Evolution ç?¡æ³?顯示此å°?é?»å­?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??大å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹"
 "å¼?æ??使ç?¨å¤?é?¨æ??å­?編輯å?¨ä¾?é?±è®?å®?ã??"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 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:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:954
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1019
 msgid "O_pen With"
 msgstr "以...é??å??(_O)"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:151
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:347
 msgid "Formatting Message..."
 msgstr "æ ¼å¼?å??é?µä»¶..."
 
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "æ­£å?¨æ?·å?? `%s'"
+msgid "Retrieving '%s'"
+msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1896
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1904
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1934
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1945
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1947
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1968
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1979
 #, 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:2628
+#: ../mail/em-format-html.c:2642
 #, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "é??å°?é?µä»¶æ?¯ç?± <b>%s</b> 代表 <b>%s</b> å¯?å?º"
+msgid "This message was sent by %s on behalf of %s"
+msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../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-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "æ­¤å?²å­?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "已��"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "è³?æ??夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "è«?é?¸æ??ä¸?å??伺æ??å?¨ã??"
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "å°?æ?ªé?¸æ??伺æ??å?¨"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "æ?¨ç¢ºå®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
+msgstr[1] "æ?¨ç¢ºå®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
@@ -10957,7 +10769,7 @@ msgstr "ä¾?è?ª %s ç??é?µä»¶"
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??夾"
 
@@ -10998,139 +10810,135 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?寬度"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "å??許 evolution 顯示å?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??表æ??辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "�寫���設�度"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "�寫���設寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "編輯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?縮å?¨ TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
 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:23
+#: ../mail/evolution-mail.schemas.in.h:22
 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:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
 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:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "é ?設è½?é??樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "è¨?é?±å°?話ç??ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??æ??大å??ç??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "é ?設å??è¦?樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?設æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設寬度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設寬度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "è¨?é?±å°?話ç??ç??é ?設寬度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å­?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 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 "
@@ -11141,11 +10949,11 @@ msgstr ""
 "æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??"
 "é??度å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決å®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 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 "
@@ -11154,24 +10962,28 @@ msgstr ""
 "決å®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?並ä¸?æ??ä¾?æ¨?é ­ï¼?å°?æ??æ??å??å??"
 "å?¾é?µä»¶æª¢æ?¥ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 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:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Directory for loading/attaching files to composer."
 msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??件ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å­?é?µä»¶å??件æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥å??è?½"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "å?ªé¡¯ç¤ºä¸?è¶?é??æ??å??大å°?ç??é?µä»¶æ??å­?"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??符è??"
@@ -11241,18 +11053,30 @@ msgid ""
 msgstr "å??ç?¨æ­¤é?¸é ?å?¯å?¨é?µä»¶é ?覽ã??é?µä»¶æ¸?å?®å??è³?æ??夾中使ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å­?ã??"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"å??ç?¨å??å?ªæ??顯示ä¸?è¶?é??ã??message_text_part_limitã??設å®?é?µä¸­æ??å®?義ç??大å°?ç??é?µä»¶æ??"
+"å­?ã??"
 
 #: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "å??ç?¨ä»¥å?¨æ??æ??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼"
+
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "å??ç?¨æ­¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??模å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??稱編碼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
 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, "
@@ -11263,25 +11087,33 @@ msgstr ""
 "Evolution å¯?å?ºç?? UTF-8 å­?å??æª?æ¡?å??稱ï¼?å? ç?ºå®?å??並æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?"
 "正確ç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr "é??濾å¾?æ¸?空å¯?件å?£"
+
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Group Reply replies to list"
+msgstr "群çµ?å??è¦?å??ä¿¡å?°é??ä¿¡è«?å£?"
+
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Height of the message-list pane"
 msgstr "�件���格�度"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??夾é ?覽並移é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:75
 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:72
+#: ../mail/evolution-mail.schemas.in.h:76
 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 "
@@ -11291,26 +11123,30 @@ msgstr ""
 "MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??庫ä¹? Bonobo å??件檢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§"
 "容ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "Ignore list Reply-To:"
+msgstr "忽ç?¥é??ä¿¡è«?å£? Reply-To:"
+
+#: ../mail/evolution-mail.schemas.in.h:78
 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:74
+#: ../mail/evolution-mail.schemas.in.h:79
 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:75
+#: ../mail/evolution-mail.schemas.in.h:80
 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:76
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11321,7 +11157,7 @@ msgstr ""
 "è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??é??濾æ¢?件編輯"
 "å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11332,7 +11168,7 @@ msgstr ""
 "å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??夾編"
 "輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11344,26 +11180,36 @@ msgstr ""
 "è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µ"
 "件ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:84
 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:80
+#: ../mail/evolution-mail.schemas.in.h:85
 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:81
+#: ../mail/evolution-mail.schemas.in.h:86
 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:82
+#: ../mail/evolution-mail.schemas.in.h:87
+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:88
 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 "
@@ -11372,35 +11218,56 @@ msgstr ""
 "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??示以警å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??"
 "é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??中移é?¤ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
+#: ../mail/evolution-mail.schemas.in.h:89
+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:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr "å®?æ??å??ç?¨/å??ç?¨è­¦å??æ?¨ã??æ?¨æ­£å??è¦?給å¾?å¤?人ã??ç??é??è¦?æ??示ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:91
+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:92
+msgid "Last time Empty Junk was run"
 msgstr "ä¸?次æ¸?空å??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Last time Empty Trash was run"
 msgstr "ä¸?次æ¸?空å??æ?¶ç­?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "é??置樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?籤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?檢æ?¥ Bonobo å??件檢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "帳è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11408,15 +11275,15 @@ msgstr ""
 "Evolution ç??é?µä»¶å??件已ç?¥ç??帳è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts "
 "ç?¸é??ç??å­?串å?½å??å­?ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªè¨?æª?頭以å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å­?檢æ?¥ç??å­?å?¸èª?è¨?碼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 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."
@@ -11424,15 +11291,15 @@ msgstr ""
 "Evolution ç??é?µä»¶å??件已ç?¥ç??æ¨?籤æ¸?å?®ã??æ¸?å?®å??å?«å­?串ï¼?å?¶ä¸­å??å?« name:colorï¼?color "
 "使ç?¨ HTML å??å?­é?²ä½?編碼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 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 "
@@ -11441,280 +11308,285 @@ msgstr ""
 "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?網路è¼?å?¥å??ç??ã??"
 "ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?件è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?網路è¼?å?¥å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "è¨?é??é??濾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??濾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "é?µä»¶ç??覽å?¨é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "é?µä»¶ç??覽å?¨æ??大å??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "é?µä»¶ç??覽å?¨å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨ã??"
 
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Message text limit for display"
+msgstr "顯示é?µä»¶æ??å­?é??å?¶"
+
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ­]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示æ?¼ TO/CC/BCC 中ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??主æ?¨æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??試æ¸?空è³?æ??夾æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??夾中ç??é?µä»¶æ??顯示æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "ç?¶é??ä¿¡è«?å£?å?«æ??ç§?人å??è¦?æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Prompt when replying privately to list messages"
+msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Prompt when replying to many recipients"
+msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "使ç?¨è??æ¸?空æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?件å?¯æ?¬æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??試ä¸?次é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:135
 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:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??人å??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?端"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?游æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "辨èª?æ??å­?中ç??表æ??符è??並å??代æ??å??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "辨èª?æ??å­?中ç??é?£çµ?並å°?ä¹?å??代ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "å?²å­?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?件è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "é ?設å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "é ?設å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?件è??é?»å­?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "伺æ??å?¨å??æ­¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:150
 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:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??群çµ?æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??群çµ?æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "顯示å??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "顯示æ??æ??é?µä»¶æª?é ­"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "檢è¦?é?µä»¶æ??顯示æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "æ?­æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "顯示å??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "顯示å??å§?ç??ã??æ?¥æ??ã??æ¨?é ­æ?¸å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "顯示å¯?件è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:165
 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:154
+#: ../mail/evolution-mail.schemas.in.h:166
 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:155
+#: ../mail/evolution-mail.schemas.in.h:167
 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:156
-msgid ""
-"Show the \"From\" 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:157
+#: ../mail/evolution-mail.schemas.in.h:168
 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:158
+#: ../mail/evolution-mail.schemas.in.h:169
 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:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??中以å??é?¢ç??æ¬?ä½?顯示å¯?件è??ç??é?»å­?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 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 "
@@ -11723,51 +11595,65 @@ msgstr ""
 "顯示å??å§?ç??ã??æ?¥æ??ã??æª?é ­ï¼?è?¥æ??å??ä¸?å??æ??æ??使ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??好ç??"
 "æ ¼å¼?å??æ?¬å?°æ??å??顯示ã??æ?¥æ??ã??æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?格中顯示å¯?件è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+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:174
 msgid "Spell check inline"
 msgstr "����檢�"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "è¨?é?±å°?話ç??é ?設é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "è¨?é?±å°?話ç??é ?設寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "çµ?端æ©?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "æ??å­?é?µä»¶é??å?¶"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?設å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾?é?»è?¦ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
+#: ../mail/evolution-mail.schemas.in.h:181
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾?ç´?å??å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 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 "
@@ -11777,29 +11663,30 @@ msgstr ""
 "é??ç½®æ?¹å¼?決å®?äº?å?¨é?µä»¶æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶"
 "æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?端æ©?å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??寬度å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 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:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"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 中å?¯æ??ç??ç??æ??大容é??ã??é ?設ç??大å°?æ?¯ 4MB / 4096 "
-"KBï¼?以 KB ä¾?æ??å®?ã??"
+"é??裡決å®?äº?é?µä»¶å?§æ??å?¨ Evolution 中å?¯é¡¯ç¤ºç??æ??大容é??ï¼?以 KB ç?ºå?®ä½?æ??å®?ã??é ?設å?¼"
+"ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??設å®?é?µæ??æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:188
 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 "
@@ -11808,7 +11695,7 @@ msgstr ""
 "é??æ?¯é ?設ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??裡å??å?ºç??é ?"
 "設å¤?æ??ç¨?å¼?ï¼?並ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:189
 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."
@@ -11816,7 +11703,7 @@ msgstr ""
 "é??å??é?µå?¼å?ªè?½è®?å??ä¸?次ï¼?並æ??å?¨è®?å??å¾?設ç?ºã??falseã??ã??é??樣æ??å??æ¶?å?¨æ¸?å?®ä¸­å°?該é?µä»¶ç??"
 "é?¸å??並移é?¤å°?該è³?æ??夾ç??é ?覽ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:190
 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;"
@@ -11826,7 +11713,7 @@ msgstr ""
 "æ­¤é??é?°æ??該å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ­ï¼?以å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?"
 "æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é ­æ??顯示å?¨é?µä»¶æª¢è¦?ï¼?å??設å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:191
 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 "
@@ -11835,24 +11722,24 @@ msgstr ""
 "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中æ?¥"
 "è©¢é?»å­?é?µä»¶ä½?å??以ç?¨æ?¼å??å?¾é?µä»¶é??濾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:193
 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:183
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?設ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:195
 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 "
@@ -11861,51 +11748,51 @@ msgstr ""
 "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??"
 "Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "以主����串��件��"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "é ?設帳è??ç?? UID å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "使ç?¨è¡?å?§æ?¼å­?檢æ?¥æ??å°?æ?¼é?¯å­?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "使ç?¨è?ªè¨?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "使ç?¨è?ªè¨?å­?å??ä¾?顯示é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:207
 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 "
@@ -11913,7 +11800,7 @@ msgid ""
 msgstr ""
 "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??游æ¨?å??å?¨ä½?è??ã??é??æ??決å®?游æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:208
 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 "
@@ -11922,92 +11809,116 @@ msgstr ""
 "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??決å®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?"
 "é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "è®?å??寬度å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?設å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:212
 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:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä¾?é?µä»¶ç¾¤çµ?中æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+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:215
 msgid "Width of the message-list pane"
 msgstr "�件���格寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??寬度ã??"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "輸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
 #: ../modules/mail/e-mail-shell-view.c:952
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "�件"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸��"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
-msgstr "ç?®ç??å?°è³?æ??夾:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+msgid "_Destination folder:"
+msgstr "ç?®ç??端è³?æ??夾(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??夾"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??夾ä¾?輸å?¥"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "主�"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+msgctxt "mboxImp"
+msgid "From"
+msgstr "å¯?件è??"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley �件信箱 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??夾"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "正���信箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
 #, c-format
-msgid "Importing `%s'"
-msgstr "æ­£å?¨å?¯å?¥ â??%sâ??"
+msgid "Importing '%s'"
+msgstr "æ­£å?¨å?¯å?¥ã??%sã??"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
@@ -12016,470 +11927,550 @@ msgstr "æ??æ?? %s"
 msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Evolution 管é??輸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "é?µä»¶é??å?° %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "�件�� %s "
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "主�� %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??表"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??濾å?¨è¦?å??"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+msgstr[1] ""
+"ä¸?å??é??濾å?¨è¦?å??\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>置�張貼��</b> (�建議)"
+msgid "(Not Recommended)"
+msgstr "(�建議)"
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使ç?¨æ­¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½å??(_W)"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) 給:"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (_Bcc) 給:"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??é?°å??å??裡ç??é??é?°(_T)"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "é©?è­?"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??符è??(_E)"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "å­?å??é??(_H):"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "檢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "以è?ªè¨?æ¨?頭檢æ?¥å??å?¾é?µä»¶(_S)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "檢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "ç?¶æ??輸å?¥æ??檢æ?¥æ?¼å­?(_T)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "��(_A)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "��(_R)"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å­?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "正�編輯�件"
 
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "çµ?æ??"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??夾æ??確èª?(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "�設��"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "é ?設å­?å??編碼(_N):"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "���件"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ä½?簽章 [é ?設å?¼] (_U)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
-msgstr "顯示ç??é?µä»¶æª?é ­(_H)"
+#: ../mail/mail-config.ui.h:39
+msgid "Displayed Message Headers"
+msgstr "顯示ç??é?µä»¶æª?é ­"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
-msgstr "ä¸?æ??ç??é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
+#: ../mail/mail-config.ui.h:40
+msgid "Do not display messages when text si_ze exceeds"
+msgstr "ä¸?顯示é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?件è??å?¨æ??ç??é??è¨?é??中就ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "ä¸?使ç?¨å¼?æ??"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "è??稿å?£(_F):"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "é?»å­?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?空å??æ?¶ç­?è³?æ??夾(_X)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "å??ç?¨é­?è¡?空ç?½é?µ(_P)"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "å??ç?¨æ??å°?è³?æ??夾(_R)"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?æ??è­?(_P):"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?設å?¼)(_E)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "��寬度(_X):"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "å?ºå®?寬度å­?å??(_E):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "å­?å??å?§å®¹"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr "å¦?æ??å?¯è?½ï¼?群çµ?å??è¦?å?ªç?¨æ?¼é??ä¿¡è«?å£?"
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML �件"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP 代ç??伺æ??å?¨:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "�頭"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "強調å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr "忽ç?¥é??ä¿¡è«?å£?ç?? Reply-To:"
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "è¡?å?§"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "���Outlook 風格�"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "�籤"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "��表"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "æ­£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "�件�頭表"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "信箱�置"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "�件顯示"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "é?µä»¶å­?å??"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "æ²?æ??代ç??伺æ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注æ??ï¼?å?¨é¦?次é?£ç·?ä¹?å??å°?ä¸?æ??æ??示æ?¨è¼¸å?¥å¯?碼"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªè¨?å??å?¾é?µä»¶æ¨?é ­é??å??é?¸é ?å°±æ??被忽ç?¥ã??"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "é?¸æ??æ?§ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG é??é?° ID:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "�碼(_W):"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "���:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??æ??顯示æ??示(_O)"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "����� (PGP/GPG)"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "å??å?°ç?¨å­?å??"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr "ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?æ??å??æ??é??"
+
+#: ../mail/mail-config.ui.h:92
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示(_L)"
+
+#: ../mail/mail-config.ui.h:93
+msgid "Prompt when sending replies to _many recipients"
+msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示(_M)"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "代ç??伺æ??å?¨è¨­å®?å?¼"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "å¼?æ??"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "���碼(_M)"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "���碼(_P)"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "å¿?è¦?ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr "SHA1"
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr "SHA256"
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr "SHA384"
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ­¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??中ç??å¯?件è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "é?¸å??(_E)..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å­?å??(_T):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "��� MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "é?¸æ??è??稿è³?æ??夾"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?ºå®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?¯è®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+msgid "Select Junk Folder"
+msgstr "é?¸æ??å??å?¾é?µä»¶è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "é?¸æ??å¯?件è³?æ??夾"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+msgid "Select Trash Folder"
+msgstr "é?¸æ??å??æ?¶ç­?è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "å¯?件è??ç?¸ç??"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "å?³é??é?µä»¶"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??夾(_M):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "å¯?件è??è??稿é?µä»¶"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "伺æ??å?¨è¦?æ±?é©?è­?(_V)"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "伺æ??å?¨çµ?æ??"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "伺æ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+msgid "Si_gning algorithm:"
+msgstr "簽章���(_G):"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "ç°½å??æª?(_N)"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "ç°½å??æ??è­?(_N):"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+msgid "Signing _algorithm:"
+msgstr "簽章���(_A):"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?輸å?¥(_T)"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??裡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12489,7 +12480,12 @@ msgstr ""
 "ç°½å??æª?ã??æ?¨æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+msgid "Top Posting Option"
+msgstr "置�張貼��"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12497,183 +12493,193 @@ msgstr ""
 "輸å?¥æ?³ç?¨ä¾?代表é??å??帳è??ç??å??稱ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??人ã??"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "使ç?¨è??å??稱(_E):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "使���(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "使ç?¨è??å??稱(_N):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "��寬度(_A):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²è·¯ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "é©?è­?é¡?å??(_A)"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "é ?設å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°ç¶²é??網路(_D)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?簽署æ??è­°é??è«? (ç?¸å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "����(_F):"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:157
+msgid "_Junk Folder:"
+msgstr "å??å?¾é?µä»¶è³?æ??夾(_J):"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½å??(_K)"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "��(_L)"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "è¼?å?¥ç?±é?£çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "設ç?ºæ??ç??é ?設帳è??(_M)"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??代ç??伺æ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "�示�件�已���(_M)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²è·¯ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "路�(_P):"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??é?£çµ¡äººæ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "ç?¶å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "�令稿(_S):"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "伺æ??å?¨(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "顯示å??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?覽顯示å¯?件è??ç?¸ç??(_S)"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮� _To / Cc / Bcc �頭�"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+msgid "_Trash Folder:"
+msgstr "å??æ?¶ç­?è³?æ??夾(_T):"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "使�����(_U):"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "使�系統�設�(_U)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "使ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å­?å??(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "å?°å??"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "�彩"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "æ??è¿°"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "æ??æ??å?¯ç?¨ç??é? ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "æ??æ??æ?¬å?°ç«¯å??å?¯ç?¨ç??é? ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "æ??æ??æ?¬å?°ç«¯è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "å??å§?ä½?ç½®"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
+#: ../mail/mail-dialogs.ui.h:6
+msgid "Collapse _all"
+msgstr "���起(_A)"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "��簽章"
@@ -12683,58 +12689,66 @@ msgid "Do Not Forward"
 msgstr "����"
 
 #: ../mail/mail-dialogs.ui.h:9
+msgid "E_xpand all"
+msgstr "å?¨é?¨å±?é??(_X)"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "è³?æ??夾è¨?é?±"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "給æ?¨ç??è³?è¨?"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
-msgstr "å?¨é?¨å??è¦?"
+msgstr "å??è¦?å?¨é?¨"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "檢�"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "伺æ??å?¨(_E):"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr "å?ªé¡¯ç¤ºé ?ç?®å?«æ??(_S):"
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "æ??å°?è³?æ??夾ä¾?æº?"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "�����"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12742,183 +12756,178 @@ msgstr ""
 "æ?¨é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸­é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "��(_F):"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "é??濾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "���件"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
 
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "ç?¡æ³?é??å? è?³ %sï¼?%s\n"
-"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??ã??"
+"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
 
-#: ../mail/mail-ops.c:641
+#: ../mail/mail-ops.c:654
 #, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??ï¼?%s"
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
 
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "æ­£å?¨å?³é??é?µä»¶"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "é??å??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-"å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
-" %s"
+msgid "Error saving messages to: %s:\n"
+msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "å?²å­?é??件"
 
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12927,142 +12936,178 @@ msgstr ""
 "��建�輸����%s�\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?%s"
+#: ../mail/mail-ops.c:2310
+msgid "Could not write data: "
+msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "檢æ?¥æ??å??"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "æ­£å?¨å??æ¶?..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "��中..."
 
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "正���..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "輸���"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "輸��碼"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
 
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:723
+#, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:732
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
 
-#: ../mail/mail-tools.c:123
+#: ../mail/mail-tools.c:128
 #, c-format
-msgid "Could not create spool directory `%s': %s"
-msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é?? `%s'ï¼?%s"
+msgid "Could not create spool directory '%s': %s"
+msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é??ã??%sã??ï¼?%s"
 
-#: ../mail/mail-tools.c:153
+#: ../mail/mail-tools.c:161
 #, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº? `%s' ç??é?µä»¶"
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº?ã??%sã??ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:301
+#: ../mail/mail-tools.c:318
 #, c-format
-msgid "Invalid folder: `%s'"
-msgstr "è³?æ??夾ç?¡æ??:`%s'"
+msgid "Invalid folder: '%s'"
+msgstr "ç?¡æ??ç??è³?æ??夾ï¼?ã??%sã??"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設å®?æ??å°?è³?æ??夾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+msgstr[1] ""
+"ä¸?å??æ??å°?è³?æ??夾\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"ã??%sã??ã??"
+
+#: ../mail/mail-vfolder.c:1179
 msgid "Edit Search Folder"
 msgstr "編輯æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1284
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??夾"
 
 #: ../mail/mail.error.xml.h:1
+msgid "\"Check Junk\" Failed"
+msgstr "ã??檢æ?¥å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:2
+msgid "\"Report Junk\" Failed"
+msgstr "ã??å??å ±å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:3
+msgid "\"Report Not Junk\" Failed"
+msgstr "ã??å??å ±ç?ºé??å??å?¾é?µä»¶ã??失æ??"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{0}ã??ç??è³?æ??夾å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{1}ã??ç??è³?æ??夾å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -13073,134 +13118,122 @@ msgstr ""
 "\n"
 "æ?¨å?¯ä»¥é?¸æ??忽ç?¥æ­¤è³?æ??夾ã??è¦?寫æ??é??å? å®?ç??å?§å®¹æ??è??çµ?æ??ã??"
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
 msgstr "ã??{1}ã??å·²è¦?æ±?å?³é??è®?ä¿¡å??æ¢?ã??æ?¯å?¦å?³é??è®?ä¿¡å??æ¢?給 {0}ï¼?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr "å·²ç¶?æ??å??稱ç?ºã??{0}ã??ç??ç°½å??æª?å­?å?¨ã??è«?使ç?¨ä¸?å??ç??å??稱ã??"
 
-#: ../mail/mail.error.xml.h:8
+#: ../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."
 msgstr "ç?ºé?µä»¶å? ä¸?æ??æ??義ç??主æ?¨ï¼?å?¯ä»¥è®?æ?¶ä»¶è??ç?¥é??æ?¨ç??é?µä»¶å??ä»?麼äº?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??以å??å®?æ??æ??ç??代ç??伺æ??å?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??ï¼?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確å®?è¦?å?ªé?¤é??å??帳è??以å??å®?æ??æ??ç??代ç??伺æ??å?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "æ?¨ç¢ºå®?è¦?ä¸?次é??é??å?? {0} å°?é?µä»¶ï¼?"
-
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "è¦?æ°¸ä¹?移é?¤æ??æ??è³?æ??夾中æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "確å®?è¦?æ°¸ä¹?移é?¤è³?æ??夾ã??{0}ã??中æ??æ??å?ªé?¤ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "è¦?å?³é?? HTML æ ¼å¼?ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "è¦?å?³é??é?»å­?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "è¦?å?³é??é?»å­?é?µä»¶ä½?å??ç?¡æ??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "è¦?å?³é??å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "è¦?å?³é??æ²?æ??主æ?¨ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "å? ç?ºã??{0}ã??ã??"
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "å? ç?ºã??{2}ã??ã??"
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "空ç?½ç°½å??æª?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "ä¸?è?½å? å?¥æ??å°?è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "ç?¡æ³?å°?ã??{0}ã??è³?æ??夾è¤?製è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "ä¸?è?½å»ºç«?è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "ç?¡æ³?建ç«?æ?«æ??å?²å­?ç?®é??ã??"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "ä¸?è?½å»ºç«?å?²å­?ç?®é??ï¼?å? ç?ºã??{1}ã??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "ä¸?è?½å?ªé?¤ç³»çµ±è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "ä¸?è?½ç·¨è¼¯æ??å°?è³?æ??夾ã??{0}ã??ï¼?å? ç?ºå®?ä¸?å­?å?¨ã??"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?è³?æ??夾ã??{0}ã??移è?³ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
-msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??"
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open source \"{1}\"."
+msgstr "ä¸?è?½é??å??ä¾?æº?ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "ä¸?è?½é??å??ä¾?æº?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "ä¸?è?½é??å??ç?®æ¨?ã??{2}ã??ã??"
 
-#: ../mail/mail.error.xml.h:36
+#: ../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."
@@ -13208,120 +13241,119 @@ msgstr ""
 "ä¸?è?½è®?å??æ??æ¬?æ¢?款æª?æ¡?ã??{0}ã??ï¼?æ??該æ?¯å®?è£?å??é¡?é? æ??ç??ã??å?¨æ?¨å??æ??é??é ?æ??æ¬?ä¹?å??å°?ç?¡æ³?"
 "使ç?¨å®?ã??"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "ä¸?è?½å°?ã??{0}ã??é??æ?°å?½å??æ??ã??{1}ã??ã??"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "ä¸?è?½é??æ?°å?½å??æ??移å??系統è³?æ??夾ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "ç?¡æ³?å?²å­?帳è??è®?æ?´ã??"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "ä¸?è?½å?²å­?è?³ç?®é??ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "ä¸?è?½å?²å­?è?³æª?æ¡?ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "ä¸?è?½è¨­å®?ç°½å??æª?å?½ä»¤ç¨¿ã??{0}ã??ã??"
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "檢æ?¥å??å?¾é?µä»¶å¤±æ??"
-
 # (Abel) é?µç?¤ç??é?µæ??好ä¸?è­¯äº?
-#: ../mail/mail.error.xml.h:44
+#: ../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ã??"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "ç?¡æ³?å?²å­?簽章æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??夾ã??{0}ã??中ç??é?µä»¶ï¼?"
 
+#: ../mail/mail.error.xml.h:46
+msgid "Do _Not Disable"
+msgstr "ä¸?è¦?å??ç?¨(_N)"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "����(_E)"
+msgid "Do _Not Send"
+msgstr "ä¸?è¦?å?³é??(_N)"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "����"
+msgid "Do _Not Synchronize"
+msgstr "ä¸?è¦?å??æ­¥(_N)"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "ä¸?è¦?å??ç?¨"
-
-#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ­¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "輸å?¥å¯?碼ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??濾å?¨å®?義æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?業æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å­?å?¨ä½?ç?¡æ³?è¦?寫ã??"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å­?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?復å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
-msgstr "å¦?æ??æ?¨é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? æ¶?失ã??"
+msgstr "å¦?æ??æ?¨å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?失ã??"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??代ç??伺æ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13329,33 +13361,33 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?該帳è??ç??è³?è¨?以å??\n"
 "å®?æ??æ??ç??代ç??伺æ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?帳è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??æ?¨é?¸æ??çµ?æ??ï¼?å??次å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è­?"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??濾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
 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 "
@@ -13366,27 +13398,27 @@ msgstr ""
 "äº?æ­¤æª?é ­ï¼?æ??æ°¸é? å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
 "è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?次é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "è«?檢æ?¥å¸³è??設å®?並å??試ä¸?次ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??使ç?¨å?¶ä»?帳è??å?³é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
 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."
@@ -13394,7 +13426,7 @@ msgstr ""
 "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?輸å?¥ä¸?å??æ??æ??ç??é?»å­?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?輸å?¥æ?¹å¡?æ??é??ç??"
 "ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å­?é?µä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13403,63 +13435,59 @@ msgstr ""
 "è«?確å®?以ä¸?æ?¶ä»¶è??å¸?æ??並ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å­?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?輸å?¥å?¯ä¾?辨è­?é??å??ç°½å??æª?ç??ç?¨ç?¹å??稱ã??"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?移è??é?µä»¶è³?æ??夾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??伺æ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è­?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??以å??å®?æ??æ??ç??å­?è³?æ??夾?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??ï¼?"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "å??å ±å??å?¾é?µä»¶å¤±æ??"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "å??å ±ç?ºé??å??å?¾é?µä»¶å¤±æ??"
-
 #: ../mail/mail.error.xml.h:90
+msgid "Reply _Privately"
+msgstr "ç§?人å??è¦?(_P)"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??夾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "å?³é??å??æ¢?"
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr "æ?¯å?¦å?³é??ç§?人å??è¦?ï¼?"
+
+#: ../mail/mail.error.xml.h:95
+msgid "Send reply to all recipients?"
+msgstr "æ?¯å?¦å??è¦?給æ??æ??ç??æ?¶ä»¶è??ï¼?"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å­?å?¨"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "å??æ­¥å??"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ­¥è³?æ??夾以ä¾?é?¢ç·?使ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13467,7 +13495,7 @@ msgstr ""
 "Evolution é??è¦?系統è³?æ??夾æ??è?½æ­£å¸¸ä½?業ï¼?è??ä¸?該è³?æ??夾ä¸?å?¯ä»¥é??æ?°å?½å??ã??移å??æ??å?ª"
 "é?¤ã??"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13482,35 +13510,7 @@ msgstr ""
 "æ­¤æª?é ­ï¼?æ??å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ?¨æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
 "è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"以ä¸?æ??å°?è³?æ??夾ï¼?\n"
-"{0}\n"
-"使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾:\n"
-"    ã??{1}ã??\n"
-"è??ä¸?å·²æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"以ä¸?é??濾è¦?å??ï¼?\n"
-"{0}\n"
-"使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾ï¼?\n"
-"    ã??{1}ã??\n"
-"è??ä¸?å·²æ?´æ?°ã??"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13518,7 +13518,7 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13526,11 +13526,11 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å­?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13538,56 +13538,60 @@ msgstr ""
 "æ­¤è³?æ??夾å?¯è?½å·²ç¶?è?ªå??æ?°å¢?ã??\n"
 "é??è¦?æ??ï¼?è«?移è?³æ??å°?è³?æ??夾編輯å?¨ï¼?以æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å? ç?ºæ?¨æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??帳è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºæ?¨æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´æ­¤é©?è­?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è­?ã??"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已ç¶?è®?æ?´ï¼?ä½?å°?æ?ªå?²å­?ã??"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "é??æ??å°?æ¨?示é?¸å®?ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:114
+msgid "This will mark all messages as read in the selected folder."
+msgstr "é??æ??å°?æ¨?示é?¸å??ç??è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
+
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "ç?¡æ³?é??å??此帳è??ç??è??稿è³?æ??夾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??稿è³?æ??夾代æ?¿ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "ç?¡æ³?è®?å??æ??æ¬?æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "使��設�(_D)"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "使ç?¨é ?設ç??è??稿è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13596,31 +13600,55 @@ msgstr ""
 "è­¦å??ï¼?å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶å°?æ??è?ªæ?¨ç??æ?¬å?°æ??é? ç«¯è³?æ??夾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??麼å??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+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:123
+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:124
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr "æ?¨æ­£å?¨å??è¦?ç??信件æ??å?³é??給許å¤?æ?¶ä»¶è??ã??æ?¨ç¢ºå®?å??信給ä»?å??å?¨é?¨ï¼?"
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ?¨æ²?æ??足夠ç??æ¬?é??å?ªé?¤æ­¤å°?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "æ?¨æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æ?¨æ??æ?ªå¯?å?ºç??é?µä»¶ï¼?æ?¨ç?¡è«?å¦?ä½?é?½è¦?é?¢é??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "æ?¨ä¸?è?½ç?¨ç?¸å??ç??å??稱建ç«?å?©å??帳è??ã??"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "æ?¨å¿?é ?å?½å??æ­¤æ??å°?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "æ?¨å¿?é ?æ??å®?ä¸?å??è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13629,128 +13657,128 @@ msgstr ""
 "æ?¨å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??夾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??夾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??夾ã??æ??æ??é? ç«¯è³?æ??夾æ??äº?è??ç??é?¸ã??"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æ?¨ç?»å?¥ä¼ºæ??å?¨ã??{0}ã??ç??帳è??ç?ºã??{0}ã??ï¼?ä½?失æ??äº?ã??"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "添�(_A)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "å??ç?¨(_D)"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "����(_D)"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "ä¸?è¦?å??æ­¥(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_E)"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "��(_E)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/message-list.c:1122
+#: ../mail/mail.error.xml.h:142
+msgid "_Send Receipt"
+msgstr "å?³é??å??æ¢?(_S)"
+
+#: ../mail/mail.error.xml.h:143
+msgid "_Synchronize"
+msgstr "å??æ­¥å??(_S)"
+
+#: ../mail/message-list.c:1159
 msgid "Unseen"
 msgstr "���"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1160
 msgid "Seen"
 msgstr "已��"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1161
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1162
 msgid "Forwarded"
 msgstr "��"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1163
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1164
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1168
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1169
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1173
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1174
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1800
 msgid "Yesterday %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1812
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1820
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1822
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2582
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
-#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Shell �端��"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399 ../mail/message-list.c:4895
+#: ../mail/message-list.c:4329 ../mail/message-list.c:4721
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4726
+#: ../mail/message-list.c:4560
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4728
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr "å?¨é??å??è³?æ??夾中å?ªæ??é?±è??ç??é?µä»¶ã??使ç?¨ 檢è¦?->顯示é?±è??ç??é?µä»¶ ä¾?顯示å®?å??ã??"
-
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4562
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??夾中æ²?æ??é?µä»¶ã??"
 
@@ -13779,7 +13807,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "大�"
 
@@ -13788,27 +13816,27 @@ msgid "Subject - Trimmed"
 msgstr "主� - 已��"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "å¯?件è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "主æ?¨å??å?«"
 
@@ -13841,15 +13869,15 @@ msgstr ""
 "é?¸å??æ­¤é?¸é ?表示ï¼?æ?¨ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示æ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??"
 "å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
-msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_B)"
+#: ../modules/addressbook/addressbook-config.c:602
+msgid "U_se in Birthday & Anniversaries calendar"
+msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
 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 "
@@ -13858,7 +13886,7 @@ msgstr ""
 "é??æ?¯ LDAP 伺æ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??試é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?"
 "洽詢æ?¨ç??系統管ç??å?¡ï¼?ç?­è§£æ?¨æ??該æ??å®?ç??å? ã??"
 
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13867,7 +13895,7 @@ msgstr ""
 "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è­?æ?¨ç??æ?¹æ³?ã??注æ??è¦?設å®?æ­¤é ?è?³ã??é?»å­?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿"
 "å??å­?å??æ?¨ç?? LDAP 伺æ??å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
 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 "
@@ -13877,29 +13905,29 @@ msgstr ""
 "æ??å°?ç¯?å??æ??å®?義æ?¨æ?³å¾?網路ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??"
 "æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -13977,9 +14005,11 @@ msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸­è?ªå??è£?é½?ç??é?£çµ¡äººå§?å??è??é?»å­?é?µ
 msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦é¡¯ç¤ºé ?覽çª?æ ¼ã??"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "表格��"
+#: ../modules/mail/em-mailer-prefs.c:1165
+msgid "_Table column:"
+msgstr "表格�(_T):"
 
 #: ../modules/addressbook/autocompletion-config.c:162
 msgid "Autocompletion"
@@ -13990,396 +14020,294 @@ msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??é?£çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "�絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "建ç«?æ?°ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "�絡人��(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "建ç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "建ç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "�絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "����"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "é??è¨?é??ç??註å??表"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "ç?®å??檢è¦?"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "ç?®å??é?¸å??ç??é??è¨?é??檢è¦?"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "é ?覽ç??é?£çµ¡äºº"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "è¦?顯示å?¨é ?覽çª?æ ¼ç??é?£çµ¡äºº"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "é ?覽ç?ºé¡¯ç¤ºç??æ??"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "�覽�格�����"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP 伺æ??å?¨"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "è?ªå??å®?æ??設å®?"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution é?£çµ¡äººè³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"é?µå¯?æ¸?å?®é?£çµ¡äººç??æ ¼å¼?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å?²å­?é?¨ä»½é?»è©±è??碼ç??æ?¹å¼?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution ç?? Palm Sync è®?æ?´è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?è®?æ?´ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??件"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??群çµ?"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "��� vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "è¤?製æ??æ??ç??é?£çµ¡äººå?°(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??é?£çµ¡äººè¤?製å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "å?ªé?¤é??è¨?é??(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??é?£çµ¡äººç§»å??å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "æ?°å¢?é??è¨?é??(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "é??è¨?é??屬æ?§(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "顯示é?¸å??é??è¨?é??ç??屬æ?§"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1315
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "é??æ?°å?½å??(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "é??æ?°å?½å??é?¸å??ç??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "å°?é??è¨?é??å?¦å­?ç?º vC_ard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "å°?å·²é?¸å??é??è¨?é??中ç??é?£çµ¡äººå?²å­?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "å??æ­¢è¼?å?¥"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "�製�絡人�(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººè¤?製å?°å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "���絡人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "��絡人���(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "æ??å°?顯示ç??é?£çµ¡äººä¸­ç??æ??å­?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "���絡人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "å?³é??é?¸å??é?£çµ¡äººçµ¦å?¶ä»?使ç?¨è??ã??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "��絡人移�(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "���絡人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "���絡人��(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "é??å??é?£çµ¡äºº(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "檢è¦?ç?®å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "�覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1474
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "��(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "屬�(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "å?²å­?æ?? _vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "�絡人�覽(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "顯示�絡人�覽��"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "�統檢�(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "��絡人����顯示�絡人�覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "å?¨é?£çµ¡äººæ¸?å?®æ??é??顯示é?£çµ¡äººé ?覽"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "å??å?°æ??æ??顯示ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??é?£çµ¡äºº"
 
 # zh_HK: msgstr "å??å?°é?¸å®?ç??é?£çµ¡äºº"
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "å??å?°å·²é?¸å??ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "��� vCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "å°?é?¸å??ç??é?£çµ¡äººå?²å­?ç?º vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
 msgid "_Forward Contacts"
 msgstr "���絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Forward Contact"
 msgstr "���絡人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
 msgid "_Send Message to Contacts"
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
 msgid "_Send Message to List"
 msgstr "å?³é??é?µä»¶çµ¦æ¸?å?®(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contact"
 msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)"
 
@@ -14403,57 +14331,47 @@ msgstr "�絡人��"
 msgid "Contact information for %s"
 msgstr "%s ç??é?£çµ¡äººè³?è¨?"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "å?¿å??"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "ç??覽é??å??é??è¨?é??ç?´å?°é??å?¶(_R)"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "��(_G):"
 
 #. 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:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "��"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "æ??å°?é??濾å?¨"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "æ??å°?èµ·é»?(_B):"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "æ??å°?é??濾å?¨(_F):"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../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\"."
@@ -14462,55 +14380,56 @@ 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:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "å­?é ?"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "æ?¯æ?´ç??æ??å°?èµ·é»?"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "使ç?¨è¾¨èª?ç??å??稱 (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "使ç?¨é?»å­?é?µä»¶å?°å??"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "ä¸?è¼?é??å?¶(_D):"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "å°?æ?¾å?¯è?½ç??æ??å°?å?ºç¤?(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "����(_L):"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "���(_P):"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "æ??å°?ç¯?å??(_S):"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "æ??é??(_T):"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "使�����(_U):"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "å??ç??"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "��(_M)"
 
@@ -14531,99 +14450,71 @@ msgid "I_mport to Tasks"
 msgstr "���工�(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "�網��"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "天氣"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "建ç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "建ç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è­°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "建ç«?æ?°æ??è­°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "è¡?äº?æ??ç??註å??表"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution è¡?äº?æ??è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "ç?¡æ³?å¾? evolution/config.xmldb 移è½?è??設å®?"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "ç?¡æ³?移è½?移è¡?äº?æ?? `%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14632,36 +14523,20 @@ msgstr ""
 "%s ç?¼ç??é?¯èª¤\n"
 "%s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:237
 msgid "Loading calendars"
 msgstr "æ­£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:664
+msgid "_New Calendar..."
+msgstr "æ?°å¢?è¡?äº?æ??(_N)..."
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:681
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "æ?¥æ??ç??覽è¦?çª?å??件"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "é ?設è¡?äº?æ??客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "è¡?äº?æ??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??群çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14690,300 +14565,300 @@ msgstr "æ¸?é?¤æ?©æ?¼é??段æ??é??ç??äº?件"
 msgid "Copying Items"
 msgstr "�製��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "移å??é ?ç?®"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "�件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "��� iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1245
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "�製(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
-msgid "Select _Today"
-msgstr "é?¸æ??ä»?天(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1287
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "��(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "è¤?製è?³è¡?äº?æ??(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "å§?æ´¾æ??è­°(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "å?ªé?¤é??次ç?¼ç??ç??äº?件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ­¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "���天�件(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "建ç«?æ?°ç??å?¨å¤©äº?件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar ��..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "æ?°å¢?æ??è­°(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "建ç«?æ?°ç??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "移è?³è¡?äº?æ??(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "æ?°å¢?ç´?æ??(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?件æ¨?示æ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "檢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "��� iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "æ??è­°æ??ç¨?(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "è½?æ??ç?ºç´?æ??(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è­°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1572
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "çµ?æ??"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "顯示�天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "顯示æ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "顯示ä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "顯示��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "顯示ä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "é?²è¡?中ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 天ç??ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1655
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "主æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "移�"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "建ç«?æ?°ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "檢è¦?é?¸å??ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "é??å??網é ?(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14992,22 +14867,22 @@ msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "工�"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "æ??派工ä½?(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "æ¨?示ç?ºå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??å®?æ??"
 
@@ -15016,96 +14891,76 @@ msgid "_Mark as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??æ?ªå®?æ??"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "��工�(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "建ç«?ä¸?å??æ?°ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "檢è¦?é?¸å??ç??å·¥ä½?"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "��� iCalendar[_S]..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "å??å?°é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "建ç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "建ç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "å??å¿?é??æ¸?å?®ç??註å??表"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "å??å¿?é??表格模å??"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:231
 msgid "Loading memos"
 msgstr "æ­£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:603
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "é ?設å??å¿?é??客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "å??å¿?é??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??群çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:908
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -15116,65 +14971,65 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?顯示ç??å??å¿?é??中ç??æ??å­?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ­¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??顯示å??å¿?é??é ?覽"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
@@ -15199,77 +15054,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "工�(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "建ç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工���(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "建��工���"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "å·¥ä½?æ¸?å?®ç??註å??表"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "å·¥ä½?表格模å??"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution å·¥ä½?è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.xå¾?å°±è®?æ?´äº?ã??\n"
-"\n"
-"ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "��移�工� `%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:231
 msgid "Loading tasks"
 msgstr "正���工�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:603
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "�設工�客�端��"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "å·¥ä½?æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??群çµ?"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:908
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -15279,7 +15097,7 @@ msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 msgid "Print Tasks"
 msgstr "å??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15291,97 +15109,97 @@ msgstr ""
 "\n"
 "確å®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "��工�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "�工����(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?顯示ç??å·¥ä½?中ç??æ??å­?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "�製..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "��工���(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "��工���(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "�顯示此工���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "工��覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "�工�����顯示工��覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??顯示工ä½?é ?覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "é?²è¡?中ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 天ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "æ??é??件ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
@@ -15405,401 +15223,368 @@ msgid "Delete Task"
 msgstr "��工�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, 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:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "�件��(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
 msgid "Compose a new mail message"
 msgstr "編輯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
 msgid "Create a new mail folder"
 msgstr "建ç«?æ?°é?µä»¶è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
 msgid "Network Preferences"
 msgstr "網路å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "æ?¯å?¦ä¾?ç?¸é??é?µä»¶ä»¥ç¾¤çµ?æ?¹å¼?顯示"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:871
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??è³?æ??夾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?使ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??帳è??è??è³?æ??夾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?件å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "è¤?製è³?æ??夾å?°(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?製已é?¸å®?ç??è³?æ??夾å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?移é?¤é??å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "��(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?移é?¤å?¨é??å??è³?æ??夾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?示æ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "移å??è³?æ??夾å?°(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??夾移è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "��(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "建ç«?ä¸?å??æ?°è³?æ??夾以å?²å­?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "è®?æ?´é??å??è³?æ??夾ç??屬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "è®?æ?´é??å??è³?æ??夾ç??å??稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å­?群çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??帳è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "���籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "顯示é?±è??ç??é?µä»¶(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "顯示æ?«æ??é?±è??ç??é?µä»¶"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??編輯é??濾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "建ç«?æ??編輯æ??å°?è³?æ??夾ç??å®?義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "��(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "�籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "æ?°å¢?è³?æ??夾(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??以å?ªé?¤ç·?ç??å½¢å¼?顯示"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "顯示�件�覽(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "顯示�件�覽�格"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+msgid "Show _Deleted Messages"
+msgstr "顯示已���件(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+msgid "Show deleted messages with a line through them"
+msgstr "顯示已å?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤ç·?)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "��件����顯示�件�覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??顯示é?µä»¶é ?覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 天ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "æ??é??件ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "��籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "已��件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "���件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "æ??æ??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "ç?®å??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:887
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:898
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已��"
 msgstr[1] "%d �已��"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:911
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:917
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??稿"
 msgstr[1] "%d å??è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:923
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:929
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:941
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:944
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -15810,87 +15595,108 @@ msgstr[1] "å?± %d å°?"
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:869
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帳è??å?©ç??"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "帳è??編輯å?¨"
+
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "å·²å??ç?¨"
+
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "�次"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "�天�次"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "���次"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?次"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªè¨?å??å?¾é?µä»¶æª?é ­"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "æ¨?é ­å??稱:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "æ¨?é ­æ?¸å?¼å??å?«:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, 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:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?使ç?¨ã??è«?檢æ?¥æ?¯å?¦æ??å®?è£?該å¥?件ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "表格�(_T):"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "æ?¥æ??æ¨?é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "顯示å??å§?æ¨?é ­æ?¸å?¼(_O)"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+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."
+msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+msgid "Do you want to make Evolution your default email client?"
+msgstr "æ?¯å?¦è¦?å°? Evolution 設ç?ºæ?¨ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ï¼?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15907,6 +15713,50 @@ msgstr "Python 測試å¤?æ??ç¨?å¼?"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python EPlugin è¼?å?¥ç¨?å¼?ç??測試å¤?æ??ç¨?å¼?ã??"
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "è«?é?¸æ??æ?¨æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "ä¾?è?ª %sï¼?"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+msgid "Importing Files"
+msgstr "正�����"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr "å?¯å?¥å·²å??æ¶?ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr "å?¯å?¥å·²å®?æ??ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 設å®?å?©ç??"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "歡�使�"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"æ­¡è¿?使ç?¨ Evolutionã??以ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³æ?¨ç??é?»å­?é?µä»¶å¸³è??ï¼?以å??å¾?å?¶ä»?"
+"æ??ç?¨ç¨?å¼?輸å?¥æª?æ¡?ã??\n"
+"\n"
+"è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ­¥ã??æ??é??ç¹¼çº?ã?? "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "å°?æ?¬å?°é??è¨?é??å? å?¥ Evolutionã??"
@@ -15921,14 +15771,8 @@ msgid ""
 "body"
 msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®ã??"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "é??é?µå­?"
 
@@ -15966,23 +15810,23 @@ msgstr "è¡?å?§é?³æ??"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥æ?­æ?¾é?µä»¶ä¸­ç??é?³æ??é??件ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "é?¸æ?? Evolution å??份æª?æ¡?ç??å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "å??份å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??份æª?æ¡?å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -15991,35 +15835,35 @@ msgstr ""
 "æ?¨å?¯ä»¥å¾?å??份中é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£"
 "絡人ã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??人設å®?ã??é?µä»¶é??濾å?¨ç­?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "å¾?å??份æª?æ¡?é??å?? Evol_ution"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?庫ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "å¾?å??份é??å??"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
-msgstr "å??份設å®?å?¼(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:361
+msgid "_Backup Evolution Settings..."
+msgstr "æ­£å?¨å??份 Evolution ç??設å®?å?¼(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "å°? Evolution ç??è³?æ??è??設å®?å?¼å??份ç?ºæª?æ¡?庫"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
-msgstr "é??å??設å®?å?¼(_E)..."
+#: ../plugins/backup-restore/backup-restore.c:368
+msgid "R_estore Evolution Settings..."
+msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
@@ -16067,7 +15911,7 @@ msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16097,31 +15941,31 @@ msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼æ?¨ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
@@ -16181,35 +16025,35 @@ msgstr ""
 "å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??å??ï¼?è«?"
 "å??ç?¨å??æ??æ??é??ã??"
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "è?ªå??å? å?¥ç??é?£çµ¡äºº"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "å?¨å?³é??é?µä»¶æ??è?ªå??建ç«?é??è¨?é??é ?ç?®(_A)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "é?¸æ??給è?ªå??å? å?¥é?£çµ¡äººç?¨ç??é??è¨?é??"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "å?³æ??è¨?æ?¯é?£çµ¡äºº"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr "å®?æ??å¾? Pidgin ç??好å??æ¸?å?®å??æ­¥é?£çµ¡äººè³?è¨?å??å??ç??"
+#: ../plugins/bbdb/bbdb.c:745
+msgid "_Synchronize contact info and images from Pidgin buddy list"
+msgstr "å¾? Pidgin ç??好å??æ¸?å?®å??æ­¥é?£çµ¡äººè³?è¨?å??å??ç??(_S)"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "é?¸æ??給 Pidgin 好å??å??å?®ç?¨ç??é??è¨?é??"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "ç«?å?³è??好å??æ¸?å?®å??æ­¥(_B)"
 
@@ -16230,28 +16074,28 @@ msgstr ""
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??中填å?¥å§?å??è??é?»å­?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸­å¡«å?¥ IM "
 "é?£çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter å°?æ?ªå??妥ã??è«?å??å®?è£?å®?ã??"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "�� Bogofilter ���中�����..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?管è?³ Bogofilter 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
@@ -16282,15 +16126,15 @@ msgstr "Bogofilter ��"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使ç?¨ Bogofilter é??濾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "é©?è­?失æ??ã??伺æ??å?¨è¦?æ±?正確ç??ç?»å?¥ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16299,36 +16143,31 @@ msgstr ""
 "伺æ??å?¨å?³å??äº?æ?ªé ?æ??ç??è³?æ??ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "ç?¡æ³?å??æ??伺æ??å?¨ç??å??æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "�件"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "使ç?¨è??ç??è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "æ?¾ä¸?å?°ä»»ä½?使ç?¨è??è¡?äº?æ??ã??"
 
@@ -16342,67 +16181,63 @@ msgstr "å??ä¸?次ç??å??試失æ??ï¼?%s"
 msgid "Previous attempt failed with code %d"
 msgstr "å??ä¸?次ç??å??試失æ??代碼ç?º %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
 #, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
-msgstr "輸å?¥ä½¿ç?¨è?? <b>%s</b> å?¨ä¼ºæ??å?¨ <b>%s</b> ä¸?ç??å¯?碼 "
+msgid "Enter password for user %s on server %s"
+msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "æ??å°?è³?æ??夾å?§å®¹..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "��建�����%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "伺æ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "ç??覽 CalDAV è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "網å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "使� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "ç??覽伺æ??å?¨ç??è¡?äº?æ??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -16414,31 +16249,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV ��"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "����(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "æª?æ¡?å??稱(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "æ?¼è®?æ?´ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "強���(_O)"
 
@@ -16450,11 +16285,11 @@ msgstr "å°?æ?¬å?°ç«¯è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Local Calendars"
 msgstr "æ?¬å?°è¡?äº?æ??"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "����(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "使ç?¨è??å??稱(_M):"
 
@@ -16502,26 +16337,26 @@ msgstr "天氣ï¼?æ?´æ??ç??å¤?æ??"
 msgid "Weather: Thunderstorms"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "��(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å?¬å??ç­?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç­?)"
 
@@ -16550,44 +16385,43 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?顯示é?£çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "é?£çµ¡äººç??å?°å??"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?"
+#: ../plugins/dbx-import/dbx-importer.c:232
+msgid "Select folder to import OE folder into"
+msgstr "é?¸å??å?¯å?¥ OE è³?æ??夾ç?¨ç??è³?æ??夾"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
+#: ../plugins/dbx-import/dbx-importer.c:251
+msgid "Importing Outlook Express data"
+msgstr "æ­£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "å?¨å??å??æ??檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ã??"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+msgid "Import Outlook Express messages from DBX file"
+msgstr "� DBX ���� Outlook Express �件"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "�設�件客�端��"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+msgid "Outlook DBX import"
+msgstr "Outlook DBX ��"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "æ?¨æ?¯å?¦è¦?å°? Evolution 設ç?ºæ?¨ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ï¼?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook Express 5/6 å??人è³?æ??夾 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "æ¨?示ç?ºé ?設é??è¨?é??(_D)"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "ç?¨é??å??é??è¨?é??é?²è¡?è?ªå??å®?æ??(_U)"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "æ¨?示ç?ºé ?設è¡?äº?æ??(_D)"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "�示��設工���(_D)"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "æ¨?示ç?ºé ?設å??å¿?é??æ¸?å?®(_D)"
 
@@ -16640,12 +16474,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "���頭(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16653,12 +16487,12 @@ msgstr ""
 "æ??å®?è?ªè¨?æ¨?é ­é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªè¨?æ¨?é ­é?µå?¼ç??å??稱è«?以ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "設��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "��"
 
@@ -16680,7 +16514,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸­æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?編輯å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16692,11 +16526,11 @@ msgstr "�設��編輯�"
 msgid "The default command that must be used as the editor."
 msgstr "é ?設ç??æ??令å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??編輯å?¨ç??æ??令: "
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16704,8 +16538,8 @@ msgstr ""
 "Emacs 使ç?¨ã??xemacsã??\n"
 "VI 使ç?¨ã??gvim -fã??"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "���編輯�中�寫"
 
@@ -16776,7 +16610,7 @@ msgstr "é ?設æ??å?¥å¤§é ­ç?§(_I)"
 msgid "Load new _Face picture"
 msgstr "è¼?å?¥æ?°ç??大頭ç?§(_F)"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "å??å?«å¤§é ­ç?§(_F)"
 
@@ -16808,22 +16642,17 @@ msgstr "ä¸?è?½è®?å??é??å??æª?æ¡?"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "æ?¨é?¸å??ç??æª?æ¡?ä¼¼ä¹?ä¸?æ?¯æ??æ??ç?? .png å??ç??ã??é?¯èª¤ï¼?{0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>伺æ??å?¨</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+msgid "Server"
+msgstr "伺æ??å?¨"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸å?¥ä½¿ç?¨è?? %s ç??å¯?碼以å­?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16832,18 +16661,18 @@ msgstr ""
 "ä¸?è?½å¾? Google 伺æ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+msgid "Retrieve _List"
 msgstr "å??å??æ¸?å?®(_L)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16854,7 +16683,7 @@ msgstr "å°? Google æ?¥æ??å? å?¥ Evolutionã??"
 msgid "Google Calendars"
 msgstr "Google æ?¥æ??"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "檢���"
 
@@ -16886,12 +16715,12 @@ msgstr "æ?«æ??å¥?ç?¨"
 msgid "Rese_nd Meeting..."
 msgstr "é??å¯?æ??è­°(_N)..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16916,19 +16745,19 @@ msgstr ""
 "æ??ã??å¥?ç?¨ã??以å®?è£?å??享è³?æ??夾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "å®?è£?å??享è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "å??享è³?æ??夾å®?è£?"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "å??å?¾é?µä»¶è¨­å®?å?¼"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "å??å?¾é?µä»¶è¨­å®?å?¼"
@@ -16941,11 +16770,6 @@ msgstr "���件:"
 msgid "Junk List:"
 msgstr "å??å?¾é?µä»¶æ¸?å?®ï¼?"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "å??ç?¨(_D)"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
@@ -16964,13 +16788,13 @@ msgstr "移�(_R)"
 msgid "Message Retract"
 msgstr "é?µä»¶æ?¶å??"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../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?"
 msgstr "æ?¶å??é?µä»¶å?¯è?½æ??å°?該é?µä»¶è?ªæ?¶ä»¶è??ç??信箱移é?¤ã??æ?¨ç¢ºå®?è¦?é??麼å??ï¼?"
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 
@@ -17089,25 +16913,25 @@ msgid "Would you like to decline it?"
 msgstr "æ?¨æ?³è¦?æ??çµ?å®?å??ï¼?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>使ç?¨è??ï¼?</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "è?ªè¨?é??ç?¥è¨?æ?¯(_U)"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "�絡人(_T)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "å??享è³?æ??夾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+msgid "Users:"
+msgstr "使ç?¨è??ï¼?"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "æ?ªå??享(_N)"
@@ -17165,50 +16989,57 @@ msgid "Proxy"
 msgstr "代ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>帳è??å??稱</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "帳è??å??稱"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "ç?»å?¥ä»£ç??伺æ??å?¨"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?輸å?¥ %s æ??é??ç??å¯?碼(使ç?¨è?? %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å??ç?¨æ­¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+msgctxt "GW"
+msgid "Proxy"
+msgstr "代ç??"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "輸å?¥ä½¿ç?¨è??並設å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "å??享"
 
@@ -17216,67 +17047,59 @@ msgstr "å??享"
 msgid "Custom Notification"
 msgstr "è?ªè¨?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "��"
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "主�:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "å¯?件è??:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "建ç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "已��:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula ��"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "è¡?å?§å??ç??"
@@ -17285,12 +17108,12 @@ msgstr "è¡?å?§å??ç??"
 msgid "View image attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤ºå??ç??ã??"
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "���頭"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP �頭"
@@ -17336,34 +17159,36 @@ msgstr "校調æ?¨ç?? IMAP 帳è??ã??"
 msgid "IMAP Features"
 msgstr "IMAP å??è?½"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
 #, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "è¼?å?¥è¡?äº?æ??ã??%sã??失æ??"
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??ã??%sã??(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' 中ç??ç´?æ??å??é??å??æ??è­°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??中ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??中æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
@@ -17500,503 +17325,499 @@ msgid ""
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "�天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "�天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "�天%p %l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "æ??天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "æ??天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "æ??天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "æ??天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%a %p %l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%-m æ?? %d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m æ?? %d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m æ?? %d æ?¥ (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
-msgid "Please respond on behalf of <b>%s</b>"
-msgstr "è«?代表 <b>%s</b> å??è¦?"
-
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
-msgstr "代表 <b>%s</b> ��"
-
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgid "Please respond on behalf of %s"
+msgstr "è«?代表 %s å??è¦?"
 
 #: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr "<b>%s</b> å·²ç¶?å§?æ´¾ä¸?å??æ??議給æ?¨ï¼?"
-
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s é??è«?æ?¨å?ºå¸­ä¸?å??æ??è­°ï¼?"
+msgid "Received on behalf of %s"
+msgstr "代表 %s ��"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr "<b>%s</b> é??è«?æ?¨å?ºå¸­ä¸?å??æ??è­°ï¼?"
+msgid "%s through %s has published the following meeting information:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
+msgid "%s has published the following meeting information:"
+msgstr "%s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
+msgid "%s has delegated the following meeting to you:"
+msgstr "%s å·²ç¶?å§?æ´¾ä¸?å??æ??議給æ?¨ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
-msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s through %s requests your presence at the following meeting:"
+msgstr "%s é??é?? %s é??è«?æ?¨å?ºå¸­ä¸?å??æ??è­°ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°å·¥ä½?è³?è¨?ï¼?"
+msgid "%s requests your presence at the following meeting:"
+msgstr "%s é??è«?æ?¨å?ºå¸­ä¸?å??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
+msgid "%s through %s wishes to add to an existing meeting:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
+msgid "%s wishes to add to an existing meeting:"
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ï¼?"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr "%s é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
-msgid "<b>%s</b> has canceled the following meeting."
-msgstr "<b>%s</b> å·²ç¶?æ¶?å??ä¸?å??æ??è­°ã??"
+msgid "%s wishes to receive the latest information for the following meeting:"
+msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??è­°ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> é??é?? %s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°è®?æ?´ã??"
+msgid "%s through %s has sent back the following meeting response:"
+msgstr "%s é??é?? %s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr "<b>%s</b> å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°è®?æ?´ã??"
+msgid "%s has sent back the following meeting response:"
+msgstr "%s å?³é??äº?ä¸?å??æ??è­°ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°è®?æ?´ï¼?"
+msgid "%s through %s has canceled the following meeting:"
+msgstr "%s é??é?? %s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
-msgstr "<b>%s</b> å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°è®?æ?´ã??"
+msgid "%s has canceled the following meeting."
+msgstr "%s å·²ç¶?æ¶?å??ä¸?å??æ??è­°ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
-msgid "<b>%s</b> through %s has published the following task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
+msgid "%s through %s has proposed the following meeting changes."
+msgstr "%s é??é?? %s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°è®?æ?´ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
-msgid "<b>%s</b> has published the following task:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
+msgid "%s has proposed the following meeting changes."
+msgstr "%s å·²ç¶?ç­?è¦?äº?ä¸?å??æ??è­°è®?æ?´ã??"
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
+msgid "%s through %s has declined the following meeting changes:"
+msgstr "%s é??é?? %s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
+msgid "%s has declined the following meeting changes."
+msgstr "%s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°è®?æ?´ã??"
 
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
-msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
+msgid "%s through %s has published the following task:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
+msgid "%s has published the following task:"
+msgstr "%s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
+msgid "%s requests the assignment of %s to the following task:"
+msgstr "%s æ??æ´¾ %s å? å?¥ä¸?å??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:472
 #, c-format
-msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
-msgstr "<b>%s</b> é??é?? %s å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s through %s has assigned you a task:"
+msgstr "%s é??é?? %s å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
-msgstr "<b>%s</b> å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
+msgid "%s has assigned you a task:"
+msgstr "%s å·²ç¶?æ??æ´¾æ?¨ä¸?é ?å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> é??é?? %s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
+msgid "%s through %s wishes to add to an existing task:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr "<b>%s</b> å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
+msgid "%s wishes to add to an existing task:"
+msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+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 "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr "%s å¸?æ??æ?¶å?°ä¸?å??æ??派工ä½?ç??æ??æ?°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??è®?æ?´ï¼?"
+msgid "%s through %s has sent back the following assigned task response:"
+msgstr "%s é??é?? %s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??è®?æ?´ï¼?"
+msgid "%s has sent back the following assigned task response:"
+msgstr "%s å?³é??äº?ä¸?å??æ??派工ä½?ç??å??è¦?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid "%s through %s has canceled the following assigned task:"
+msgstr "%s é??é?? %s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
-msgstr "<b>%s</b> å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+msgid "%s has canceled the following assigned task:"
+msgstr "%s å·²ç¶?å??æ¶?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:537
+#: ../plugins/itip-formatter/itip-view.c:504
 #, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+msgid "%s through %s has proposed the following task assignment changes:"
+msgstr "%s é??é?? %s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
-msgid "<b>%s</b> has published the following memo:"
-msgstr "<b>%s</b> å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
+msgid "%s has proposed the following task assignment changes:"
+msgstr "%s å·²ç¶?å??è¦?ä¸?å??æ??派工ä½?ç??è®?æ?´ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:510
+#, c-format
+msgid "%s through %s has declined the following assigned task:"
+msgstr "%s é??é?? %s å·²å©?æ??äº?ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:512
+#, c-format
+msgid "%s has declined the following assigned task:"
+msgstr "%s å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:549
+#, c-format
+msgid "%s through %s has published the following memo:"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
+msgid "%s has published the following memo:"
+msgstr "%s å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
-msgstr "<b>%s</b> å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
+msgid "%s through %s wishes to add to an existing memo:"
+msgstr "%s é??é?? %s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:550
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ç?±æ?¼ %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
+msgid "%s wishes to add to an existing memo:"
+msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:552
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
-msgstr "<b>%s</b> å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
+msgid "%s through %s has canceled the following shared memo:"
+msgstr "%s é??é?? %s å·²ç¶?æ¶?å??ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:564
+#, c-format
+msgid "%s has canceled the following shared memo:"
+msgstr "%s å·²ç¶?å??æ¶?ä¸?å??å?±ç?¨å??å¿?é??ï¼?"
+
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "�天�"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "é??å§?æ?¥ï¼?"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "çµ?æ??æ?¥ï¼?"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "é??å??è¡?äº?æ??(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+msgid "A_ccept"
 msgstr "æ?¥å??(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "å?¨é?¨æ??çµ?(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "����(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "��(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
-msgstr "å?¨é?¨æ?¥å??(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+msgid "A_ccept all"
+msgstr "å?¨é?¨æ?¥å??(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "å?³é??è³?è¨?(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "æ?´æ?°å?ºå¸­ç??æ??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??實é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "顯示æ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "工�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -18009,16 +17830,14 @@ msgid "Itip Formatter"
 msgstr "Itip 格��"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "ã??{0}ã??已代ç??æ­¤æ??è­°ã??æ?¯å?¦é??è¦?å? å?¥ä»£ç??人ã??{1}ã??ï¼?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "é??å??æ??è­°å·²å§?æ´¾"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../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?"
 msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?å¯?件人å? å?¥ç?ºå?°æ??è??ï¼?"
@@ -18097,16 +17916,15 @@ msgstr "å??示æ?¯å?¦è¦?é??ç??ã??"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:355
 msgid "Evolution's Mail Notification"
 msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:377
 msgid "Mail Notification Properties"
 msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:513
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18121,67 +17939,69 @@ msgstr[1] ""
 "æ?¨å·²ç¶?æ?¥æ?¶ %d å°?é?µä»¶ ã?? \n"
 "ä½?æ?¼ %sã??"
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:525
 #, c-format
 msgid "From: %s"
 msgstr "å¯?件è??ï¼?%s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:548
 #, 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:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:577
 msgid "New email"
 msgstr "��件"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:638
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??中顯示å??示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:666
 msgid "B_link icon in notification area"
 msgstr "è®?é??ç?¥å??å??示é??ç??(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:676
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??示ä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:863
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:892
 msgid "_Beep"
 msgstr "��(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:905
 msgid "Use sound _theme"
 msgstr "使ç?¨é?³æ??主é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:924
 msgid "Play _file:"
 msgstr "����(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:935
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:993
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1002
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -18194,52 +18014,64 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??é??ç?¥æ?¨ã??"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å¾? %s ç??é?µä»¶æ??建ç«?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«äº?件ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«å·¥ä½?ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«å??å¿?é??ã??%sã??ã??æ?¯å?¦è¦?編輯此è??ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. 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?"
 msgstr "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. 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?"
 msgstr "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??äº?æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. 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:543
+#. 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?"
@@ -18249,7 +18081,10 @@ msgid_plural ""
 msgstr[0] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 msgstr[1] "é?¸å??ç??è¡?äº?æ??å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??äº?件ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??äº?件ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. 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?"
@@ -18259,7 +18094,10 @@ msgid_plural ""
 msgstr[0] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 msgstr[1] "é?¸å??ç??å·¥ä½?æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å·¥ä½?ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å·¥ä½?ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. 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?"
@@ -18271,76 +18109,76 @@ msgstr[0] ""
 msgstr[1] ""
 "é?¸å??ç??å??å¿?é??æ¸?å?®å·²ç¶?å??å?«æ??å®?é?µä»¶ä¸­ç??å??å¿?é??ã??æ?¯å?¦è¦?å¼·å?¶å»ºç«?æ?°ç??å??å¿?é??ï¼?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[æ²?æ??æ??è¦?]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "å¾?伺æ??å?¨å?³å??ç?¡æ??ç??ç?©ä»¶"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "å?¨è??ç??æ??é??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "ç?¡æ³?é??å??è¡?äº?æ??ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??裡建ç«?äº?件ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "é?¸å®?ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??裡建ç«?å·¥ä½?ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??裡建ç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "建��件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "建ç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "建�工�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "建ç«?æ??è­°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 
@@ -18348,55 +18186,55 @@ msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 msgid "Convert a mail message to a task."
 msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??æª?æ¡?庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??使ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "é?£çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "é?£çµ¡æ­¤é?µä»¶æ??屬é??ä¿¡è«?å£?ç??管ç??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æ?°å¯«é?µä»¶çµ¦æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "����(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "å??æ¶?è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
@@ -18496,15 +18334,15 @@ msgstr ""
 "æ?¨è¦?å°?ç?®å??ç??è³?æ??夾中ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µ"
 "件ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "�示�件�已�(_S)"
 
@@ -18563,39 +18401,39 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18619,31 +18457,35 @@ msgstr "Outlook PST ��"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??人è³?æ??夾 (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "�件(_M)"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "ç?®ç??å?°è³?æ??夾:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "工�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "����(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
@@ -18801,55 +18643,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "編輯�置"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "��� SpamAssassin�代碼�%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "建ç«?å°?管失æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "�� SpamAssassin ���中�����..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?管è?³ SpamAssassin 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ç?¡æ³?使ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??度è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18966,77 +18808,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF 格� (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "格�(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "é?¸å??ç?®ç??æª?æ¡?"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "å°?é?¸å??ç??è¡?äº?æ??å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "æ??å¼?æ?¨å®?æ??å??å§?帳è??設å®?ã??"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "設å®?å?©ç??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Evolution 設å®?å?©ç??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "歡�使�"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"æ­¡è¿?使ç?¨ Evolutionã??以ä¸?ç?«é?¢æ??è®? Evolution é?£ç·?è?³æ?¨ç??é?»å­?é?µä»¶å¸³è??ï¼?以å??å¾?å?¶ä»?"
-"æ??ç?¨ç¨?å¼?輸å?¥æª?æ¡?ã??\n"
-"\n"
-"è«?æ??ä¸?ä¸?ã??ä¸?ä¸?æ­¥ã??æ??é??ç¹¼çº?ã?? "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "è«?é?¸æ??æ?¨æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "ä¾?è?ª %sï¼?"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "����"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "å?¯å?¥è³?æ??ã??"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "è«?ç¨?å??"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "以主æ?¨ç?ºå?ºç¤?串æ?¥é?µä»¶ã??"
@@ -19050,7 +18841,7 @@ msgid "Thread messages by subject"
 msgstr "以主����串��件"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "é??å??å?°ä¾?主æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
@@ -19064,15 +18855,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "�����"
 
@@ -19092,27 +18883,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "顯示å®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "顯示精簡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "é??æ??é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
 msgstr[1] "é??æ?? %d å??å?¶ä»?é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "å­?å?¥é??è¨?é??"
 
@@ -19128,11 +18919,11 @@ msgstr "WebDAV �絡人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "網å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??使ç?¨ Apache < 2.2.8)"
 
@@ -19445,143 +19236,46 @@ msgstr "è¦?çª?æ??é??風格"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "å?²å­?æ??å°?çµ?æ??"
 
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * 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:883
+#: ../shell/e-shell-searchbar.c:921
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "å·¥å?·å??樣å¼?"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "å??æ??ç¨?å¼?å·¥å?·å??樣å¼?"
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "å·¥å?·å??å?¯è¦?æ?§"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "å??æ??ç¨?å¼?å??ä½?"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "é??å?? shell 檢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "�碼"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "é??å?? shell 檢è¦?ç??ç­?è¨?æ?¬é ?æ?¸"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "æ??å°?è¦?å??"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?件"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "é??å?? shell 檢è¦?ç?? EShell å¾?端ç¨?å¼?"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Shell å?§å®¹å??件"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "å?§å®¹å??件顯示æ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Shell å?´é??æ¬?å??件"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "å?´é??æ¬?å??件顯示æ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Shell å·¥ä½?å??å??件"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "å·¥ä½?å??å??件顯示æ?¼ shell è¦?çª?ç??åº?é?¨"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Shell ��"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "é??å?? shell 檢è¦?æ??屬ç??è¦?çª?"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "å­?æ?¾è¦?çª?å??件ç??æ??è³?æ??ç??設å®?é?µæª?æ¡?"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "shell 檢è¦?ç??æ¨?é¡?"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "ç?®å??ç??檢è¦? ID"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "ç?®å??ç?? GAL 檢è¦? ID"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19600,406 +19294,303 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution 網�"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Bug Buddy is not installed."
 msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1418
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution ç?¸é??è³?è¨?"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
 msgid "_Close Window"
 msgstr "é??é??è¦?çª?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1444
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1446
 msgid "Open the Evolution User Guide"
 msgstr "é??å?? Evolution 使ç?¨è??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1474
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "é??å??常è¦?å??é¡?(FAQ)網é ?"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1479
 msgid "_Forget Passwords"
 msgstr "���碼(_F)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1481
 msgid "Forget all remembered passwords"
 msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?碼"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1486
 msgid "I_mport..."
 msgstr "��(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1488
 msgid "Import data from other programs"
 msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1493
 msgid "New _Window"
 msgstr "é??æ?°è¦?çª?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1495
 msgid "Create a new window displaying this view"
 msgstr "建ç«?ä¸?å??æ?°ç??è¦?çª?ä¾?顯示é??å??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1509
 msgid "Configure Evolution"
 msgstr "設� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1514
 msgid "_Quick Reference"
 msgstr "å¿«é??å??好設å®?(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution ç??æ?·å¾?é?µ"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1523
 msgid "Exit the program"
 msgstr "é?¢é??é??å??ç¨?å¼?"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1528
 msgid "_Advanced Search..."
 msgstr "é?²é??æ??å°?(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1530
 msgid "Construct a more advanced search"
 msgstr "建æ§?æ?´é?²é??ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1537
 msgid "Clear the current search parameters"
 msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1542
 msgid "_Edit Saved Searches..."
 msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1544
 msgid "Manage your saved searches"
 msgstr "管ç??æ?¨å·²å?²å­?ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1551
 msgid "Click here to change the search type"
 msgstr "æ??é??裡以æ?¹è®?æ??å°?é¡?å??"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1556
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Execute the current search parameters"
 msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1563
 msgid "_Save Search..."
 msgstr "å?²å­?æ??å°?çµ?æ??(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1565
 msgid "Save the current search parameters"
 msgstr "å?²å­?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Send / _Receive"
 msgstr "å?³é??/æ?¥æ?¶(_R)"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Send queued items and retrieve new items"
 msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1584
 msgid "Submit _Bug Report..."
 msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1586
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot å??æ­¥å??(_S)..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "設å®? GNOME Pilot çµ?æ??"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1591
 msgid "_Work Offline"
 msgstr "��工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Put Evolution into offline mode"
 msgstr "� Evolution ����模�"
 
 # zh_HK: msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_Work Online"
 msgstr "��工�(_W)"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1600
 msgid "Put Evolution into online mode"
 msgstr "� Evolution ����模�"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1628
 msgid "Lay_out"
 msgstr "ä½?å±?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1635
 msgid "_New"
 msgstr "��(_N)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1642
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1649
 msgid "_Switcher Appearance"
 msgstr "å??æ??å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1663
 msgid "_Window"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show Side _Bar"
 msgstr "顯示å?´é??æ¬?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the side bar"
 msgstr "顯示å?´é??å??"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show _Buttons"
 msgstr "顯示æ??é??(_B)"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1702
 msgid "Show the switcher buttons"
 msgstr "顯示å??æ??ç¨?å¼?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1708
 msgid "Show _Status Bar"
 msgstr "顯示ç??æ??å??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1710
 msgid "Show the status bar"
 msgstr "顯示ç??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Show _Tool Bar"
 msgstr "顯示工å?·å??(_T)"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Show the tool bar"
 msgstr "顯示工å?·å??"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1740
 msgid "_Icons Only"
 msgstr "å?ªæ??å??示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1742
 msgid "Display window buttons with icons only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??示"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1747
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Display window buttons with text only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Icons _and Text"
 msgstr "å??示å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Display window buttons with icons and text"
 msgstr "顯示è¦?çª?æ??é??ç??å??示å??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Tool_bar Style"
 msgstr "å·¥å?·å??風格(_B)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·å??設å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Define Views..."
 msgstr "�義檢�..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Create or edit views"
 msgstr "建ç«?æ??編輯檢è¦?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save Custom View..."
 msgstr "����檢�..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Save current custom view"
 msgstr "å?²å­?ç?®å??ç??è?ªè¨?檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1787
 msgid "C_urrent View"
 msgstr "ç?®å??檢è¦?(_U)"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Custom View"
 msgstr "��檢�"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1799
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??檢è¦?æ?¹å¼?æ?¯è?ªè¨?ç??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1809
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ?¹ç?®å??å?°è¡¨æ©?ç??é ?é?¢å??å?°è¨­å®?"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2182
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2395
 msgid "Execute these search parameters"
 msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "��"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "使ç?¨ä¸­ç?? Shell 檢è¦?"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "使ç?¨ä¸­ Shell 檢è¦?ç??å??稱"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "shell è¦?çª?ç?? EFocus 追蹤ç¨?å¼?"
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "�置大�"
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "è¦?çª?å??å§?大å°?å­?串"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "��模�"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "shell �������模�"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "å?´é??æ¬?å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "å·¥ä½?å??å?¯è¦?æ?§"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI 管ç??ç¨?å¼?"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "shell è¦?çª?ç?? GtkUIManager"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "æº?å??é?²å?¥é?¢ç·?..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "æº?å??é?²å?¥ä¸?ç·?..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "æº?å??çµ?æ??..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "模çµ?ç?®é??"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "網路�使�"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "網路���以使�"
-
-#: ../shell/e-shell.c:851 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "��"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "shell ����"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:175
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20034,7 +19625,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:199
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20042,7 +19633,7 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:206
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
@@ -20067,35 +19658,31 @@ msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:336
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:344
+#: ../shell/main.c:340
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:348
+#: ../shell/main.c:344
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:350
+#: ../shell/main.c:346
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:469
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:531
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20109,90 +19696,42 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "æ?¨ç¢ºå®?è¦?é?ºå¿?æ??æ??è¨?æ?¶ç??å¯?碼ï¼?"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "繼�"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "ä¸?è?½ç?´æ?¥å¾? {0} ç??å??ç´?"
 
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
+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ã??"
+
+#: ../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 ""
 "é?ºå¿?æ?¨ç??å¯?碼æ??å?ªé?¤æ??æ??å·²è¨?æ?¶ç??å¯?碼ã??å?¨ä¸?次é??è¦?使ç?¨å¯?碼æ??å°?æ??æ??示æ?¨è¼¸å?¥ã??"
 
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "ç£?ç¢?空é??ä¸?足ï¼?ç?¡æ³?å??ç´?ã??"
-
 #: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "確å®?è¦?å?ªé?¤è??è³?æ??ï¼?"
+msgid "Quit Now"
+msgstr "ç«?å?³çµ?æ??"
 
 #: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
-msgstr ""
-"ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?移é?¤ã??\n"
-"\n"
-"建議æ?¨æ??å??檢æ?¥æ??æ??ç??é?»å­?é?µä»¶ã??é?£çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ­¤ Evolution ç??"
-"æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ­£ç¢ºä½?業ã??\n"
-"\n"
-"å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?便ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
-
-#: ../shell/shell.error.xml.h:14
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å­?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
-"\n"
-"å¦?æ??é?¸æ??移é?¤æ­¤è³?æ??ï¼?å°?æ??æ°¸ä¹?移é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?æ??é?¸"
-"æ??ä¿?ç??æ­¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??移é?¤ &quot;evolution&quot; ç??å?§å®¹ã??\n"
-
-#: ../shell/shell.error.xml.h:18
 msgid "Upgrade from previous version failed:"
 msgstr "å¾?以å??ç??ç??æ?¬å??ç´?失æ??ï¼?"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"å??ç´?æ?¨ç??è³?æ??å??設å®?å?¼æ??å¤?æ??é??è¦? {0} ç£?ç¢?空é??ï¼?ä½?æ?¯æ?¨å?ªæ?? {1} å?¯ç?¨ã??\n"
-"\n"
-"æ?¨å°?é??è¦?å?¨ä¸»ç?®é??å??å¾?æ?´å¤?å?¯ç?¨ç©ºé??ï¼?æ??è?½ç¹¼çº?ã??"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "��(_F)"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "ä¿?ç??è³?æ??(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "ç¨?å¾?æ??é??æ??(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
@@ -20284,7 +19823,7 @@ msgstr "ä½?業é??段管ç??é?¸é ?ï¼?"
 msgid "Show session management options"
 msgstr "顯示ä½?業é??段管ç??é?¸é ?"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20313,67 +19852,79 @@ msgstr ""
 "å? ç?ºæ?¨ä¸?ä¿¡ä»»ç?¼å?ºæ­¤æ??è­?ç??æ??è­?å?®ä½?ï¼?æ??以é?¤é??å?¨æ­¤æ??示ï¼?å?¦å??æ?¨å°?ä¸?信任此æ??è­?ç??æ??"
 "æ??æ?§ã??"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "é?¸å??è¦?å?¯å?¥ç??æ??è­?..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "æ??æ??ç?? PKCS12 æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+msgid "Failed to import user's certificate"
+msgstr "ç?¡æ³?å?¯å?¥ä½¿ç?¨è??ç??æ??è­?"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "æ??è­?å??稱"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "ç?¨é??"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "åº?è??"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "å?°æ??"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "æ??æ??ç??é?»å­?é?µä»¶æ??è­?æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+msgid "Failed to import contact's certificate"
+msgstr "ç?¡æ³?å?¯å?¥é?£çµ¡äººç??æ??è­?"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "é?»å­?é?µä»¶å?°å??"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "æ??æ??ç?? CA æ??è­?æª?æ¡?"
 
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr "ç?¡æ³?å?¯å?¥æ??è­?中å¿?ç??æ??è­?"
+
+#: ../smime/gui/certificate-manager.c:1156
 msgid "Certificates"
 msgstr "æ??è­?"
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "æ??è­?檢è¦?å?¨:%s"
 
 #: ../smime/gui/component.c:46
 #, c-format
-msgid "Enter the password for `%s'"
-msgstr "輸å?¥ `%s' ç??å¯?碼"
+msgid "Enter the password for '%s'"
+msgstr "輸å?¥ã??%sã??ç??å¯?碼 "
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
@@ -20403,7 +19954,7 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  主��%s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "é?¸å??æ??è­?"
 
@@ -20413,17 +19964,13 @@ msgstr "<ä¸?æ?¯æ??è­?ç??é?¨ä»½>"
 
 #: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
-msgstr "��"
+msgstr "æ??è­?中å¿?"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "å??份"
+msgid "Backup _All"
+msgstr "å?¨é?¨å??份(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
-msgstr "å?¨é?¨å??份"
-
-#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20431,161 +19978,152 @@ msgstr ""
 "信任此æ??è­?管ç??中å¿?ä¹?å??ï¼?å¦?æ??å?¯ä»¥ç??話ï¼?æ?¨æ??該å??檢æ?¥å®?ç??æ??è­?以å??å®?ç??æ?¿ç­?å??ç¨?"
 "åº?ã??"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "æ??è­?管ç??中å¿?信任度"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "æ??è­?æ¬?ä½?"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "æ??è­?é??層"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "æ??è­?詳細è³?è¨?"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "æ??è­?表格"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ä¸?è?¬å??稱 (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "é?£çµ¡äººæ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "ä¸?信任此æ??è­?ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "編輯"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "é?»å­?é?µä»¶æ??è­?信任設å®?å?¼"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "é?»å­?é?µä»¶æ?¶ä»¶è??æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "é?»å­?é?µä»¶ç°½ç½²è??æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "å?°æ??æ?¥æ??"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "����"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "æ?¸ä½?æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "��"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "ç?¼ç?§æ?¥æ??"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "�給"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "çµ?ç¹? (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "���� (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 æ??ç´?"
 
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../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:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "SSL 伺æ??å?¨æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "æ­¤æ??è­?å·²ç¶?檢é©?ç?¨æ?¼ä¸?å??ç?¨é??ï¼?"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此æ??è­?ç??æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "信任此æ??è­?管ç??中å¿? (CA) ä¾?è­?å?¥é?»å­?é?µä»¶ä½¿ç?¨è??ã??"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "信任此æ??è­?管ç??中å¿? (CA) ä¾?è­?å?¥è»?é«?é??ç?¼äººå?¡ã??"
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+msgid "Trust this CA to identify websites."
 msgstr "信任此æ??è­?管ç??中å¿? (CA) ä¾?è­?å?¥ç¶²ç«?ã??"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "æ??æ??æ?§"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "檢�"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "æ?¨å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??æ??è­?ï¼?å?¯ä»¥è­?å?¥æ?¨ç??身份:"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è­?ï¼?å?¯ä»¥è­?å?¥é??äº?æ??è­?管ç??中å¿?:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è­?ï¼?å?¯ä»¥è­?å?¥é??äº?人å?¡:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "æ?¨ç??æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+msgid "_Backup"
+msgstr "å??份(_B)"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "編輯æ??è­?管ç??中å¿? (_CA) 信任度"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "æ??è­?å·²ç¶?å­?å?¨"
 
@@ -20630,125 +20168,143 @@ msgstr "PKCS #1 MD5 é?? RSA å? å¯?"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 é?? RSA å? å¯?"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:642
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:645
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 é?? RSA å? å¯?"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA ��"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "æ??è­?é??é?°ä½¿ç?¨"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape æ??è­?é¡?å??"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "æ??è­?管ç??中å¿?é??é?°è­?å?¥ç¢¼"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "�件��碼 (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "�����碼"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "æ¼?ç®?æ³?å??æ?¸"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "主�����"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "主������"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "主æ?¨ç??å?¬é?°"
 
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "é?¯èª¤ï¼?ç?¡æ³?è??ç??延伸"
 
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "ç?©ä»¶ç°½ç½²è??"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL æ??è­?å?®ä½?"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "���件��"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "簽署中"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "ä¸?å?¯æ??çµ?"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "é??é?°å? å¯?"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "è³?æ??å¯?碼"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "é??é?°å??å??"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "æ??è­?簽署è??"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL 簽署è??"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "é??è¦?"
 
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "ä¸?é??è¦?"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "延伸"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "æ??è­?簽章æ¼?ç®?æ³?"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "ç?¼ç?§è??"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "ç?¼ç?§è??ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "主æ?¨ç?¨æ?? ID"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "æ??è­?簽章å?¼"
 
@@ -20837,11 +20393,11 @@ msgid "With _Status"
 msgstr "設å®?ç??æ??(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -20870,19 +20426,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "é?¸æ??ç¯?å??(_S) "
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "æ?¶é??"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "å®?義 %s ç??檢è¦?"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "�義檢�"
 
@@ -20895,11 +20446,7 @@ msgstr "å®?義ã??%sã??ç??檢è¦?"
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "實�"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "å?²å­?ç?®å??檢è¦?"
 
@@ -20911,11 +20458,7 @@ msgstr "建ç«?æ?°ç??檢è¦?(_C)"
 msgid "_Replace existing view"
 msgstr "ç½®æ??ç?¾å­?ç??檢è¦?(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "工廠"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "å®?義æ?°ç??檢è¦?"
 
@@ -20935,22 +20478,10 @@ msgstr "檢è¦?ç??é¡?å??:"
 msgid "De_fault"
 msgstr "�設�(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "帳è??å??稱"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "å??ä½?"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "é??件å?§å®¹"
@@ -20968,11 +20499,11 @@ msgstr "MIME é¡?å??ï¼?"
 msgid "_Suggest automatic display of attachment"
 msgstr "建議è?ªå??顯示é??件(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "ç?¡æ³?設ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "設ç?ºè??æ?¯(_B)"
 
@@ -20990,13 +20521,13 @@ msgstr "å?³é??è?³(_S)..."
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??件å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "��中"
 
@@ -21005,13 +20536,10 @@ msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??件å??(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "Show Attachment _Bar"
 msgstr "顯示é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "顯示é??件å??(_A)"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "å? å?¥é??件"
@@ -21028,32 +20556,32 @@ msgstr[1] "å?²å­?é??件"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:301
 msgid "S_ave All"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:327
 msgid "A_dd Attachment..."
 msgstr "å? å?¥é??件(_A)..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:351
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:358
 msgid "_View Inline"
 msgstr "檢���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:640
 #, c-format
 msgid "Open with \"%s\""
 msgstr "以ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:643
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s 中é??å??é??å??é??件"
@@ -21062,59 +20590,59 @@ 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:1002
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../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:1828 ../widgets/misc/e-attachment.c:2629
+#: ../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:1920
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??件"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??件"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å­?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-å?®æ??以é??å??é?£çµ?"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
@@ -21122,65 +20650,6 @@ msgstr "%Y å¹´ %-m æ??"
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "填��彩"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK å¡«è?²"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "填�網�"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "æ??å°?寬度"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "æ??å°?寬度"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "é??è·?"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "å­?å??編碼"
@@ -21193,91 +20662,88 @@ msgstr "輸å?¥è¦?使ç?¨ç??å­?å??é??"
 msgid "Other..."
 msgstr "��..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?輸å?¥æ?¥æ??ç??æ??å­?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "æ??æ­¤æ??é??以顯示è¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "��(_W)"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../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:698
+#: ../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:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
 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:255
+#: ../widgets/misc/e-import-assistant.c:259
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??稱(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??此輸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?輸å?¥è³?æ??å??設å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
 msgid "Import a _single file"
 msgstr "������(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr "é?¸æ??æ?¨æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21286,17 +20752,38 @@ msgstr ""
 "Evolution å·²ç¶?檢æ?¥å¾?以ä¸?æ??ç?¨ç¨?å¼?輸å?¥ç??設å®?å?¼ï¼?Pineã??Netscapeã??Elmã??"
 "iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??設å®?å?¼ã??å¦?æ??æ?¨æ?³å??試ä¸?次ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+msgid "_Cancel Import"
+msgstr "å??æ¶?å?¯å?¥(_C)"
+
+#: ../widgets/misc/e-import-assistant.c:908
+msgid "Preview data to be imported"
+msgstr "é ?覽é??è¦?å?¯å?¥ç??è³?æ??"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1351
+msgid "Import Data"
+msgstr "å?¯å?¥è³?æ??"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr "é?¸æ??æ?¨æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
+
+#: ../widgets/misc/e-import-assistant.c:1268
+#: ../widgets/misc/e-import-assistant.c:1300
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Import Location"
 msgstr "輸��置"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21305,32 +20792,27 @@ msgstr ""
 "æ­¡è¿?使ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?æ?¨å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1308
 msgid "Importer Type"
 msgstr "輸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1323
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1337
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "å?¯å?¥è³?æ??"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -21353,55 +20835,7 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "å? ç?ºç¶²è·¯ç?¡æ³?使ç?¨ï¼?Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??"
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "水平�置"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "ç?¶æ??å??æ?¹å??ç?ºæ°´å¹³æ??ç??çª?æ ¼ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "å??ç?´ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "ç?¶æ??å??æ?¹å??ç?ºå??ç?´æ??ç??çª?æ ¼ä½?ç½®"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "��"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "第äº?çª?格尺寸ç??æ¯?ä¾?"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "��調�大�"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "å?¨é??å®?尺寸æ??å?ºå®?第äº?çª?æ ¼"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "å??æ­¥å°?象:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "å??æ­¥ç§?人è¨?é??:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "å??æ­¥å??é¡?:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
 msgid "Evolution Preferences"
 msgstr "Evolution å??好設å®?"
 
@@ -21410,68 +20844,46 @@ msgstr "Evolution å??好設å®?"
 msgid "Matches: %d"
 msgstr "符å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ­¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "å??å??大å°?寫(_C)"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?端繼çº?"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?端ï¼?å¾?åº?é?¨ç¹¼çº?"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "游æ¨?å??"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "游��"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "å??é¡?å?¨"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "é?¸æ??å??模å¼?"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "游�模�"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
@@ -21544,43 +20956,46 @@ msgstr "ç?¶å®?æ??æ??(_M):"
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "��(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "ä¹?å¾?(_A):"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+msgid "_After"
+msgstr "æ??æ?¼(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "歸�(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "延é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "設å®?é?¾æ??æ?¥æ??(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "��(_U):"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "_Until"
+msgstr "ç?´å?°(_U)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "ç?¶æ??空æ??(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
@@ -21637,41 +21052,41 @@ msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 msgid "Click here to go to URL"
 msgstr "æ??é??裡以移è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "è¤?製é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??覽å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??覽å?¨ä¸­é??å??æ­¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å­?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?­è??給 %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??裡é?±è??/解é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -21690,7 +21105,7 @@ msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "evolution è¡?äº?æ??é ?ç?®"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "�����"
 
@@ -21708,7 +21123,7 @@ msgstr "æ²?æ??"
 msgid "OK"
 msgstr "確�"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "æ??é??å¿?é ?ç?ºæ­¤æ ¼å¼?ï¼?%s"
@@ -21717,48 +21132,12 @@ msgstr "æ??é??å¿?é ?ç?ºæ­¤æ ¼å¼?ï¼?%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å­?"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "é?¸æ??ç??æ¬?"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "è??ç?¦ç??æ¬?"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "æ?ªé?¸æ??ç??æ¬?"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "����"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "���"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "���"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "�彩�"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "è??æ?¯è?²å½©æ¬?"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "è«?æ??é??裡å? å?¥"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "ç??æ??"
-
 #: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
@@ -21775,12 +21154,12 @@ msgstr "æ?ªæ??åº?"
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??群çµ?"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "顯示��"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -21789,7 +21168,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21802,7 +21181,7 @@ msgid "Clear _All"
 msgstr "����(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21862,7 +21241,7 @@ msgstr "ä¾?åº?顯示é??äº?æ¬?ä½?(_S):"
 msgid "_Sort..."
 msgstr "æ??åº?(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "����"
 
@@ -21874,247 +21253,112 @@ msgstr ""
 "æ?³å?¨æ?¨ç??表格中å? å?¥æ¬?ä½?ï¼?å?ªè¦?å°?å®?\n"
 "æ??æ?³è?³æ?¨å¸?æ??å®?å?ºç?¾ç??ä½?ç½®å?³å?¯ã??"
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d å??é ?ç?®)"
-msgstr[1] "%s : %s (%d å??é ?ç?®)"
-
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%sï¼?%s (%d å??é ?ç?®)"
+msgstr[1] "%sï¼?%s (%d å??é ?ç?®)"
+
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "å??è??å??é??交æ?¿ä½¿ç?¨ç??è?²å½©"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "水平繪å??æ ¼"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "å??ç?´ç¹ªå??æ ¼"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "繪å??ç?¦é»?"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "游�模�"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "é?¸æ??å??模å??"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "ç??é??é?·åº¦"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "æ¨?æº?å??é«?"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "å??çµ?"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "è?ªè¨?ç?®å??ç??檢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "ä¾?æ­¤æ¬?ä½?å??群çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "����群�(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "移�此�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "����(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "æ ¼å¼?å??æ¬?(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "è?ªè¨?ç?®å??ç??檢è¦?(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "��(_C)"
 
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "表格��"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "表格模å??"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "游æ¨?å??"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "æ??åº?è³?è¨?"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "總æ?¯æ??å°?"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "è«?æ??é??裡å? å?¥"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "å??ç?´æ¬?é??è·?"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?端å??åº?é?¨"
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree 表格���"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "æ?·è??å¤?è§?"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "å±?é??å?¨å¤§å°?"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "å±?é??å?¨ç®­è??ç??大å°?"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "å½?å?º"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "�����"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "編輯"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "é??å§?編輯此å?²å­?æ ¼"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "å??æ??"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "å??æ??å?²å­?æ ¼"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "å±?é??"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "å±?é?? ETree 中å??å?«æ­¤å?²å­?æ ¼ç??å??"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "��"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "æ??ç?? ETree 中å??å?«æ­¤å?²å­?æ ¼ç??å??"
 
@@ -22130,118 +21374,1186 @@ msgstr "å?®æ??"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "輸��"
 
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "äº?件è??ç??å?¨"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "é ?設ç??å??æ­¥å?°å??:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "ç?¡æ³?è¼?å?¥é??è¨?é??"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot é??è¨?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Web Log:"
+#~ msgstr "網��"
+
+#~ msgid "_Web Log:"
+#~ msgstr "網�(_W):"
+
+#~ msgid "Editable"
+#~ msgstr "�編輯"
+
+#~ msgid "Source Book"
+#~ msgstr "ä¾?æº?é??è¨?é??"
+
+#~ msgid "Target Book"
+#~ msgstr "ç?®æ¨?é??è¨?é??"
+
+#~ msgid "Is New Contact"
+#~ msgstr "���絡人"
+
+#~ msgid "Writable Fields"
+#~ msgstr "å?¯å¯«ç??æ¬?ä½?"
+
+#~ msgid "Required Fields"
+#~ msgstr "����"
+
+#~ msgid "Changed"
+#~ msgstr "已��"
+
+#~ msgid "Shell"
+#~ msgstr "Shell"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell ��"
+
+#~ msgid "Book"
+#~ msgstr "��"
+
+#~ msgid "Is New List"
+#~ msgstr "æ?¯æ?°ç??æ¸?å?®"
+
+#~ msgid "Query"
+#~ msgstr "�詢"
+
+#~ msgid "Model"
+#~ msgstr "模å??"
+
+#~ msgid "Shell View"
+#~ msgstr "Shell 檢�"
+
+#~ msgid "Source"
+#~ msgstr "��"
+
+#~ msgid "Width"
+#~ msgstr "寬度"
+
+#~ msgid "Height"
+#~ msgstr "�度"
+
+#~ msgid "Has Focus"
+#~ msgstr "����"
+
+#~ msgid "Field"
+#~ msgstr "��"
+
+#~ msgid "Field Name"
+#~ msgstr "æ¬?ä½?å??稱"
+
+#~ msgid "Text Model"
+#~ msgstr "æ??å­?模å??"
+
+#~ msgid "Max field name length"
+#~ msgstr "æ??大æ¬?ä½?å??稱é?·åº¦"
+
+#~ msgid "Column Width"
+#~ msgstr "�寬"
+
+#~ msgid "Adapter"
+#~ msgstr "���"
+
+#~ msgid "Selected"
+#~ msgstr "å·²é?¸æ??"
+
+#~ msgid "Has Cursor"
+#~ msgstr "æ??游æ¨?"
+
+#~ msgid "Success"
+#~ msgstr "æ??å??"
+
+#~ msgid "Backend busy"
+#~ msgstr "�端��"
+
+#~ msgid "Repository offline"
+#~ msgstr "è³?æ??庫é?¢ç·?"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "é??è¨?é??ä¸?å­?å?¨"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "æ²?æ??å®?義è?ªæ??é?£çµ¡äºº"
+
+#~ msgid "Permission denied"
+#~ msgstr "æ¬?é??ä¸?足"
+
+#~ msgid "Contact not found"
+#~ msgstr "����絡人"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "�絡人 ID 已���"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "é??è¨?å??å®?ä¸?æ?¯æ?´"
+
+#~ msgid "Could not cancel"
+#~ msgstr "ç?¡æ³?å??æ¶?"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "é©?証失æ??"
+
+#~ msgid "Authentication Required"
+#~ msgstr "����"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS ��使�"
+
+#~ msgid "No such source"
+#~ msgstr "��此��"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "�����模��使�"
+
+#~ msgid "Other error"
+#~ msgstr "���誤"
+
+#~ msgid "Invalid server version"
+#~ msgstr "ç?¡æ??ç??伺æ??å?¨ç??æ?¬"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "ä¸?æ?¯æ?´ç??é©?è­?æ?¹æ³?"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "è¡?äº?æ??è³?æ??庫已é?¢ç·?ã??"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "ã??{0}ã??ç?¼ç??é?¯èª¤"
+
+#~ msgid "No response from the server."
+#~ msgstr "伺æ??å?¨æ²?æ??å??æ??ã??"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??"
+
+#~ msgid "{0}."
+#~ msgstr "{0}."
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "å??å?²å¤?æ?¥äº?件:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "ç?¡æ³?å??å?? Evolution è³?æ??伺æ??å?¨"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot è¡?äº?æ??ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å??å¿?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "ç?¡æ³?寫å?¥ pilot å??å¿?é??ç¨?å¼?å??å¡?"
+
+#~ msgid "Default Priority:"
+#~ msgstr "é ?設å?ªå??é ?åº?:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "ç?¡æ³?è®?å?? pilot å¾?辦äº?é ?ç¨?å¼?å??å¡?"
+
+#~ msgid "Check this to use system timezone in Evolution."
+#~ msgstr "æ ¸å??æ­¤é?¸é ?æ??å?¨ Evolution 中使ç?¨ç³»çµ±æ??å??ã??"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "å?¨æ?¥æ??å°?覽顯示é?±æ?¸"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "æ?¯å?¦å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸ã??"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "å?¨æ?¥æª¢è¦?è??å·¥ä½?é?±æª¢è¦?中顯示é?±æ?¸(_U)"
+
+#~ msgid "Save"
+#~ msgstr "��"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "ç´?æ??(_M)"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "å?°æ??è??(_S)..."
+
+#~ msgid "_Task"
+#~ msgstr "工�(_T)"
+
+#~ msgid "Default Client"
+#~ msgstr "�設客�端��"
+
+#~ msgid "Shell Settings"
+#~ msgstr "Shell 設��"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "æ??ç?¨ç¨?å¼?設å®?å?¼"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "å?°æ??è??(_T)..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "é?¸æ??ä»?天(_S)"
+
+#~ msgid "_From Field"
+#~ msgstr "å¯?件è??æ¬?ä½?(_F)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "å??æ??å¯?件è??é?¸æ??å?¨ç??顯示ç??æ??"
+
+#~ msgid "Show"
+#~ msgstr "顯示"
+
+#~ msgid "Hide"
+#~ msgstr "é?±è??"
+
+#~ msgid "New Tab"
+#~ msgstr "æ?°å¢?å??é ?"
+
+#~ msgid "address card"
+#~ msgstr "å?°å??å?¡"
+
+#~ msgid "calendar information"
+#~ msgstr "è¡?äº?æ??è³?è¨?"
+
+#~ msgid "Name of the logger"
+#~ msgstr "è¨?é??å?¨å??稱"
+
+#~ msgid "Filename"
+#~ msgstr "æª?æ¡?å??稱"
+
+#~ msgid "The filename of the module"
+#~ msgstr "模çµ?ç??æª?æ¡?å??稱"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "æ?¯å?¦å??ç?¨å¤?æ??ç¨?å¼?"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "ç?¡æ³?å??æ?? PGP é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
+
+#~ msgid "Focus Tracker"
+#~ msgstr "��追蹤�"
+
+#~ msgid "Shell Module"
+#~ msgstr "Shell 模�"
+
+#~ msgid "The mail shell backend"
+#~ msgstr "�件 shell �端��"
+
+#~ msgid "Show Deleted"
+#~ msgstr "顯示已��"
+
+#~ msgid "To Do"
+#~ msgstr "�辦"
+
+#~ msgid "Later"
+#~ msgstr "��"
+
+#~ msgid "Unable to create new folder `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«?æ?°è³?æ??夾 `%s'ï¼?%s"
+
+#~ msgid "Unable to copy folder `%s' to `%s': %s"
+#~ msgstr "ç?¡æ³?è¤?製製è³?æ??夾 `%s' è?³ `%s'ï¼?%s"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "ç?¡æ³?æ??æ?? `%s' ç?¾æ??ç??ä¿¡ç®±ï¼?%s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution ä¿¡ç®±è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "ç?¡æ³?é??å??è??ç?? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«? POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ??ç?®é?? `%s':%s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "ç?¡æ³?è¤?製 POP å?²å­?å?¨ä¼ºæ??å?¨ä¸?ç??è³?æ?? `%s':%s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "ç?¡æ³?建ç«?æ?¬å?°é?µä»¶å?²å­?å?? `%s':%s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "ç?¡æ³?å¾?以å??ç?? Evolution è®?å??設å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å­?å?¨æ??æ??æ¯?ã??"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "å??許 evolution 顯示å?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å­?ã??"
+
+#~ msgid "Show \"From\" field when sending a mail message"
+#~ msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
+
+#~ msgid ""
+#~ "Show the \"From\" field when sending a mail message. This is controlled "
+#~ "from the View menu when a mail account is chosen."
+#~ msgstr ""
+#~ "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
+
+#~ msgid "Text message part limit"
+#~ msgstr "æ??å­?é?µä»¶é??å?¶"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>置�張貼��</b> (�建議)"
+
+#~ msgid "    "
+#~ msgstr "    "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "å? ç?ºã??{0}ã??ã??"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "å? ç?ºã??{2}ã??ã??"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "����(_E)"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "以ä¸?æ??å°?è³?æ??夾ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾:\n"
+#~ "    ã??{1}ã??\n"
+#~ "è??ä¸?å·²æ?´æ?°ã??"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "以ä¸?é??濾è¦?å??ï¼?\n"
+#~ "{0}\n"
+#~ "使ç?¨ç?¾å?¨ç§»é?¤ç??è³?æ??夾ï¼?\n"
+#~ "    ã??{1}ã??\n"
+#~ "è??ä¸?å·²æ?´æ?°ã??"
+
+#~ msgid "Shell Backend"
+#~ msgstr "Shell �端��"
+
+#~ msgid ""
+#~ "There are only hidden messages in this folder. Use View->Show Hidden "
+#~ "Messages to show them."
+#~ msgstr ""
+#~ "å?¨é??å??è³?æ??夾中å?ªæ??é?±è??ç??é?µä»¶ã??使ç?¨ 檢è¦?->顯示é?±è??ç??é?µä»¶ ä¾?顯示å®?å??ã??"
+
+#~ msgid "Table column:"
+#~ msgstr "表格��"
+
+#~ msgid "Source List"
+#~ msgstr "����"
+
+#~ msgid "The registry of address books"
+#~ msgstr "é??è¨?é??ç??註å??表"
+
+#~ msgid "Current View"
+#~ msgstr "ç?®å??檢è¦?"
+
+#~ msgid "The currently selected address book view"
+#~ msgstr "ç?®å??é?¸å??ç??é??è¨?é??檢è¦?"
+
+#~ msgid "Previewed Contact"
+#~ msgstr "é ?覽ç??é?£çµ¡äºº"
+
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "è¦?顯示å?¨é ?覽çª?æ ¼ç??é?£çµ¡äºº"
+
+#~ msgid "Preview is Visible"
+#~ msgstr "é ?覽ç?ºé¡¯ç¤ºç??æ??"
+
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "�覽�格�����"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP 伺æ??å?¨"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "è?ªå??å®?æ??設å®?"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution é?£çµ¡äººè³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "é?µå¯?æ¸?å?®é?£çµ¡äººç??æ ¼å¼?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution å?²å­?é?¨ä»½é?»è©±è??碼ç??æ?¹å¼?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution ç?? Palm Sync è®?æ?´è¨?é??å??æ? å°?æª?æ¡?å·²ç¶?è®?æ?´ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç?? Pilot Sync è³?æ??æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Source Selector Widget"
+#~ msgstr "ä¾?æº?é?¸æ??å?¨è¦?çª?å??件"
+
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºé??è¨?é??ç??群çµ?"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "��� vCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid "The registry of calendars"
+#~ msgstr "è¡?äº?æ??ç??註å??表"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution è¡?äº?æ??è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.x å¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "ç?¡æ³?å¾? evolution/config.xmldb 移è½?è??設å®?"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "ç?¡æ³?移è½?移è¡?äº?æ?? `%s'"
+
+#~ msgid "Date Navigator Widget"
+#~ msgstr "æ?¥æ??ç??覽è¦?çª?å??件"
+
+#~ msgid "This widget displays a miniature calendar"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºä¸?å??å°?å??è¡?äº?æ??"
+
+#~ msgid "Default Calendar Client"
+#~ msgstr "é ?設è¡?äº?æ??客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "Default client for calendar operations"
+#~ msgstr "è¡?äº?æ??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of calendars"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºè¡?äº?æ??ç??群çµ?"
+
+#~ msgid "The registry of memo lists"
+#~ msgstr "å??å¿?é??æ¸?å?®ç??註å??表"
+
+#~ msgid "The memo table model"
+#~ msgstr "å??å¿?é??表格模å??"
+
+#~ msgid "Default Memo Client"
+#~ msgstr "é ?設å??å¿?é??客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "Default client for memo operations"
+#~ msgstr "å??å¿?é??æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of memo lists"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå??å¿?é??æ¸?å?®ç??群çµ?"
+
+#~ msgid "The registry of task lists"
+#~ msgstr "å·¥ä½?æ¸?å?®ç??註å??表"
+
+#~ msgid "The task table model"
+#~ msgstr "å·¥ä½?表格模å??"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution å·¥ä½?è³?æ??夾ç??ä½?ç½®å??é??層å¾? Evolution 1.xå¾?å°±è®?æ?´äº?ã??\n"
+#~ "\n"
+#~ "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "��移�工� `%s'"
+
+#~ msgid "Default Task Client"
+#~ msgstr "�設工�客�端��"
+
+#~ msgid "Default client for task operations"
+#~ msgstr "å·¥ä½?æ??ä½?ç??é ?設客æ?¶ç«¯ç¨?å¼?"
+
+#~ msgid "This widget displays groups of task lists"
+#~ msgstr "é??å??è¦?çª?å??件å?¯ä»¥é¡¯ç¤ºå·¥ä½?æ¸?å?®ç??群çµ?"
+
+#~ msgid "Group by Threads"
+#~ msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?"
+
+#~ msgid "Whether to group messages by threads"
+#~ msgstr "æ?¯å?¦ä¾?ç?¸é??é?µä»¶ä»¥ç¾¤çµ?æ?¹å¼?顯示"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "é?±è??å·²é?±è®?ç??é?µä»¶(_R)"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "å°?å·²é?±è®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "é?±è??é?¸æ??ç??é?µä»¶(_E)"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "å°?é?¸å®?ç??é?µä»¶æ?«æ??é?±è??"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "顯示é?±è??ç??é?µä»¶(_N)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "顯示æ?«æ??é?±è??ç??é?µä»¶"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "é?±è??å·²å?ªé?¤é?µä»¶(_D)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??以å?ªé?¤ç·?ç??å½¢å¼?顯示"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®ã??"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "å?¨å??å??æ??檢æ?¥ Evolution æ?¯å?¦ç?ºé ?設ç??é?µä»¶å®¢æ?¶ç«¯ç¨?å¼?ã??"
+
+#~ msgid "Default Mail Client"
+#~ msgstr "�設�件客�端��"
+
+#~ msgid "<b>Server</b>"
+#~ msgstr "<b>伺æ??å?¨</b>"
+
+#~ msgid "<b>Users:</b>"
+#~ msgstr "<b>使ç?¨è??ï¼?</b>"
+
+#~ msgid "<b>Account Name</b>"
+#~ msgstr "<b>帳è??å??稱</b>"
+
+#~ msgid "Add Hula support to Evolution."
+#~ msgstr "å? å?¥ Evolution å°? Hula ç??æ?¯æ?´ã??"
+
+#~ msgid "Hula Support"
+#~ msgstr "Hula ��"
+
+#~ msgid "_Accept"
+#~ msgstr "æ?¥å??(_A)"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "æ??å¼?æ?¨å®?æ??å??å§?帳è??設å®?ã??"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "設å®?å?©ç??"
+
+#~ msgid "Importing data."
+#~ msgstr "å?¯å?¥è³?æ??ã??"
+
+#~ msgid "Please wait"
+#~ msgstr "è«?ç¨?å??"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "å·¥å?·å??樣å¼?"
+
+#~ msgid "The switcher's toolbar style"
+#~ msgstr "å??æ??ç¨?å¼?å·¥å?·å??樣å¼?"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "å·¥å?·å??å?¯è¦?æ?§"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
+
+#~ msgid "Switcher Action"
+#~ msgstr "å??æ??ç¨?å¼?å??ä½?"
+
+#~ msgid "The switcher action for this shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
+
+#~ msgid "Page Number"
+#~ msgstr "�碼"
+
+#~ msgid "The notebook page number of the shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç??ç­?è¨?æ?¬é ?æ?¸"
+
+#~ msgid "Search Rule"
+#~ msgstr "æ??å°?è¦?å??"
+
+#~ msgid "Criteria for the current search results"
+#~ msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?件"
+
+#~ msgid "The EShellBackend for this shell view"
+#~ msgstr "é??å?? shell 檢è¦?ç?? EShell å¾?端ç¨?å¼?"
+
+#~ msgid "Shell Content Widget"
+#~ msgstr "Shell å?§å®¹å??件"
+
+#~ msgid "The content widget appears in a shell window's right pane"
+#~ msgstr "å?§å®¹å??件顯示æ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
+
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "Shell å?´é??æ¬?å??件"
+
+#~ msgid "The sidebar widget appears in a shell window's left pane"
+#~ msgstr "å?´é??æ¬?å??件顯示æ?¼ shell è¦?çª?ç??å·¦çª?æ ¼"
+
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "Shell å·¥ä½?å??å??件"
+
+#~ msgid "The taskbar widget appears at the bottom of a shell window"
+#~ msgstr "å·¥ä½?å??å??件顯示æ?¼ shell è¦?çª?ç??åº?é?¨"
+
+#~ msgid "Shell Window"
+#~ msgstr "Shell ��"
+
+#~ msgid "The window to which the shell view belongs"
+#~ msgstr "é??å?? shell 檢è¦?æ??屬ç??è¦?çª?"
+
+#~ msgid "The key file holding widget state data"
+#~ msgstr "å­?æ?¾è¦?çª?å??件ç??æ??è³?æ??ç??設å®?é?µæª?æ¡?"
+
+#~ msgid "The title of the shell view"
+#~ msgstr "shell 檢è¦?ç??æ¨?é¡?"
+
+#~ msgid "Current View ID"
+#~ msgstr "ç?®å??ç??檢è¦? ID"
+
+#~ msgid "The current GAL view ID"
+#~ msgstr "ç?®å??ç?? GAL 檢è¦? ID"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot å??æ­¥å??(_S)..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "設å®? GNOME Pilot çµ?æ??"
+
+#~ msgid "Active Shell View"
+#~ msgstr "使ç?¨ä¸­ç?? Shell 檢è¦?"
+
+#~ msgid "Name of the active shell view"
+#~ msgstr "使ç?¨ä¸­ Shell 檢è¦?ç??å??稱"
+
+#~ msgid "The shell window's EFocusTracker"
+#~ msgstr "shell è¦?çª?ç?? EFocus 追蹤ç¨?å¼?"
+
+#~ msgid "Geometry"
+#~ msgstr "�置大�"
+
+#~ msgid "Initial window geometry string"
+#~ msgstr "è¦?çª?å??å§?大å°?å­?串"
+
+#~ msgid "Safe Mode"
+#~ msgstr "��模�"
+
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "shell �������模�"
+
+#~ msgid "Sidebar Visible"
+#~ msgstr "å?´é??æ¬?å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Switcher Visible"
+#~ msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "å·¥ä½?å??å?¯è¦?æ?§"
+
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI 管ç??ç¨?å¼?"
+
+#~ msgid "The shell window's GtkUIManager"
+#~ msgstr "shell è¦?çª?ç?? GtkUIManager"
+
+#~ msgid "Module Directory"
+#~ msgstr "模çµ?ç?®é??"
+
+#~ msgid "The directory from which to load EModules"
+#~ msgstr "ç?¨ä¾?è¼?å?¥ EModules ç??ç?®é??"
+
+#~ msgid "Network Available"
+#~ msgstr "網路�使�"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "網路���以使�"
+
+#~ msgid "Online"
+#~ msgstr "��"
+
+#~ msgid "Whether the shell is online"
+#~ msgstr "shell ����"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "å¼·å?¶å¾? Evolution 1.4 é??æ?°ç§»è½?"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "ç£?ç¢?空é??ä¸?足ï¼?ç?¡æ³?å??ç´?ã??"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "確å®?è¦?å?ªé?¤è??è³?æ??ï¼?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "ã??evolutionã??ç?®é??ç??æ??æ??å?§å®¹å?³å°?æ°¸ä¹?移é?¤ã??\n"
+#~ "\n"
+#~ "建議æ?¨æ??å??檢æ?¥æ??æ??ç??é?»å­?é?µä»¶ã??é?£çµ¡äººå??è¡?äº?æ??è³?æ??æ?¯å?¦é¡¯ç¤ºï¼?è??ä¸?æ­¤ "
+#~ "Evolution ç??æ?¬å?¨å?ªé?¤è??è³?æ??å??è?½æ­£ç¢ºä½?業ã??\n"
+#~ "\n"
+#~ "å?ªé?¤ä¹?å¾?ï¼?æ?ªç¶?æ??å??æ??ä½?ï¼?便ç?¡æ³?é??ç´?è?³è??ç?? Evolution ç??æ?¬ã??\n"
+
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "è??ç?? Evolution ç??æ?¬å°?å?¶è³?æ??å?²å­?å?¨ä¸?å??ç??ä½?ç½®ã??\n"
+#~ "\n"
+#~ "å¦?æ??é?¸æ??移é?¤æ­¤è³?æ??ï¼?å°?æ??æ°¸ä¹?移é?¤ &quot;evolution&quot; ç?®é??ç??æ??æ??å?§å®¹ã??å¦?"
+#~ "æ??é?¸æ??ä¿?ç??æ­¤è³?æ??ï¼?å°±å?¯ä»¥å?¨æ?¹ä¾¿ç??æ??å??ï¼?æ??å??移é?¤ &quot;evolution&quot; ç??å?§"
+#~ "容ã??\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "å??ç´?æ?¨ç??è³?æ??å??設å®?å?¼æ??å¤?æ??é??è¦? {0} ç£?ç¢?空é??ï¼?ä½?æ?¯æ?¨å?ªæ?? {1} å?¯ç?¨ã??\n"
+#~ "\n"
+#~ "æ?¨å°?é??è¦?å?¨ä¸»ç?®é??å??å¾?æ?´å¤?å?¯ç?¨ç©ºé??ï¼?æ??è?½ç¹¼çº?ã??"
+
+#~ msgid "_Keep Data"
+#~ msgstr "ä¿?ç??è³?æ??(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "ç¨?å¾?æ??é??æ??(_R)"
+
+#~ msgid "Edit"
+#~ msgstr "編輯"
+
+#~ msgid "Import"
+#~ msgstr "��"
+
+#~ msgid "View"
+#~ msgstr "檢�"
+
+#~ msgid "Collection"
+#~ msgstr "æ?¶é??"
+
+#~ msgid "Instance"
+#~ msgstr "實�"
+
+#~ msgid "Factory"
+#~ msgstr "工廠"
+
+#~ msgid "Action"
+#~ msgstr "å??ä½?"
+
+#~ msgid "A GtkRadioAction"
+#~ msgstr "GtkRadioAction"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "顯示é??件å??(_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "填��彩"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK å¡«è?²"
+
+#~ msgid "Fill stipple"
+#~ msgstr "填�網�"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "æ??å°?寬度"
+
+#~ msgid "Minimum Width"
+#~ msgstr "æ??å°?寬度"
+
+#~ msgid "Spacing"
+#~ msgstr "é??è·?"
+
+#~ msgid "The button state is online"
+#~ msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
+
+#~ msgid "Horizontal Position"
+#~ msgstr "水平�置"
+
+#~ msgid "Pane position when oriented horizontally"
+#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºæ°´å¹³æ??ç??çª?æ ¼ä½?ç½®"
+
+#~ msgid "Vertical Position"
+#~ msgstr "å??ç?´ä½?ç½®"
+
+#~ msgid "Pane position when oriented vertically"
+#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºå??ç?´æ??ç??çª?æ ¼ä½?ç½®"
+
+#~ msgid "Proportion"
+#~ msgstr "��"
+
+#~ msgid "Proportion of the 2nd pane size"
+#~ msgstr "第äº?çª?格尺寸ç??æ¯?ä¾?"
+
+#~ msgid "Fixed Resize"
+#~ msgstr "��調�大�"
+
+#~ msgid "Keep the 2nd pane fixed during resize"
+#~ msgstr "å?¨é??å®?尺寸æ??å?ºå®?第äº?çª?æ ¼"
+
+#~ msgid "Sync with:"
+#~ msgstr "å??æ­¥å°?象:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "å??æ­¥ç§?人è¨?é??:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "å??æ­¥å??é¡?:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "游æ¨?å??"
+
+#~ msgid "Cursor Column"
+#~ msgstr "游��"
+
+#~ msgid "Sorter"
+#~ msgstr "å??é¡?å?¨"
+
+#~ msgid "Selection Mode"
+#~ msgstr "é?¸æ??å??模å¼?"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "游�模�"
+
+#~ msgid "Selected Column"
+#~ msgstr "é?¸æ??ç??æ¬?"
+
+#~ msgid "Focused Column"
+#~ msgstr "è??ç?¦ç??æ¬?"
+
+#~ msgid "Unselected Column"
+#~ msgstr "æ?ªé?¸æ??ç??æ¬?"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "����"
+
+#~ msgid "Underline Column"
+#~ msgstr "���"
+
+#~ msgid "Bold Column"
+#~ msgstr "���"
+
+#~ msgid "Color Column"
+#~ msgstr "�彩�"
+
+#~ msgid "BG Color Column"
+#~ msgstr "è??æ?¯è?²å½©æ¬?"
+
+#~ msgid "State"
+#~ msgstr "ç??æ??"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "å??è??å??é??交æ?¿ä½¿ç?¨ç??è?²å½©"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "水平繪å??æ ¼"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "å??ç?´ç¹ªå??æ ¼"
+
+#~ msgid "Draw focus"
+#~ msgstr "繪å??ç?¦é»?"
+
+#~ msgid "Cursor mode"
+#~ msgstr "游�模�"
+
+#~ msgid "Selection model"
+#~ msgstr "é?¸æ??å??模å??"
+
+#~ msgid "Length Threshold"
+#~ msgstr "ç??é??é?·åº¦"
+
+#~ msgid "Uniform row height"
+#~ msgstr "æ¨?æº?å??é«?"
+
+#~ msgid "Frozen"
+#~ msgstr "å??çµ?"
+
+#~ msgid "Table header"
+#~ msgstr "表格��"
+
+#~ msgid "Table model"
+#~ msgstr "表格模å??"
+
+#~ msgid "Cursor row"
+#~ msgstr "游æ¨?å??"
+
+#~ msgid "Sort Info"
+#~ msgstr "æ??åº?è³?è¨?"
+
+#~ msgid "Always search"
+#~ msgstr "總æ?¯æ??å°?"
+
+#~ msgid "Use click to add"
+#~ msgstr "è«?æ??é??裡å? å?¥"
+
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "å??ç?´æ¬?é??è·?"
+
+#~ msgid ""
+#~ "Vertical space between rows. It is added to top and to bottom of a row"
+#~ msgstr "å??å??ä¹?é??ç??å??ç?´é??è·?ã??å®?æ??å? å?¥å?°æ¯?å??ç??é ?端å??åº?é?¨"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree 表格���"
+
+#~ msgid "Retro Look"
+#~ msgstr "æ?·è??å¤?è§?"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
+
+#~ msgid "Expander Size"
+#~ msgstr "å±?é??å?¨å¤§å°?"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "å±?é??å?¨ç®­è??ç??大å°?"
+
+#~ msgid "popup"
+#~ msgstr "å½?å?º"
+
+#~ msgid "edit"
+#~ msgstr "編輯"
+
+#~ msgid "toggle"
+#~ msgstr "å??æ??"
+
+#~ msgid "expand"
+#~ msgstr "å±?é??"
+
+#~ msgid "Event Processor"
+#~ msgstr "äº?件è??ç??å?¨"
+
+#~ msgid "Text"
+#~ msgstr "æ??å­?"
 
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "æ??å­?"
+#~ msgid "Bold"
+#~ msgstr "ç²?é«?"
 
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "ç²?é«?"
+#~ msgid "Strikeout"
+#~ msgstr "���"
 
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "���"
+#~ msgid "Anchor"
+#~ msgstr "��"
 
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "��"
+#~ msgid "Justification"
+#~ msgstr "左���"
 
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "左���"
+#~ msgid "Clip Width"
+#~ msgstr "�輯寬度"
 
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "�輯寬度"
+#~ msgid "Clip Height"
+#~ msgstr "�輯�度"
 
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "�輯�度"
+#~ msgid "Clip"
+#~ msgstr "�輯"
 
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "�輯"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "填滿�輯��"
 
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "填滿�輯��"
+#~ msgid "X Offset"
+#~ msgstr "X �移"
 
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X �移"
+#~ msgid "Y Offset"
+#~ msgstr "Y �移"
 
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y �移"
+#~ msgid "Text width"
+#~ msgstr "æ??å­?寬度"
 
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "æ??å­?寬度"
+#~ msgid "Text height"
+#~ msgstr "æ??å­?é«?度"
 
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "æ??å­?é«?度"
+#~ msgid "Use ellipsis"
+#~ msgstr "使ç?¨ç??ç?¥è??"
 
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "使ç?¨ç??ç?¥è??"
+#~ msgid "Ellipsis"
+#~ msgstr "æ©¢å??"
 
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "æ©¢å??"
+#~ msgid "Line wrap"
+#~ msgstr "æ??è¡?"
 
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "æ??è¡?"
+#~ msgid "Break characters"
+#~ msgstr "中æ?·å­?å??"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "中æ?·å­?å??"
+#~ msgid "Max lines"
+#~ msgstr "æ??大è¡?æ?¸"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "æ??大è¡?æ?¸"
+#~ msgid "Draw borders"
+#~ msgstr "繪製��"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "繪製��"
+#~ msgid "Allow newlines"
+#~ msgstr "å??許æ?°è¡?"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "å??許æ?°è¡?"
+#~ msgid "Draw background"
+#~ msgstr "繪製è??æ?¯"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "繪製è??æ?¯"
+#~ msgid "Draw button"
+#~ msgstr "繪製æ??é??"
 
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "繪製æ??é??"
+#~ msgid "Cursor position"
+#~ msgstr "游��置"
 
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "游��置"
+#~ msgid "IM Context"
+#~ msgstr "IM 快顯��"
 
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "IM 快顯��"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+#~ msgid "Handle Popup"
+#~ msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
 
 #~ msgid "Loading appointments at %s"
 #~ msgstr "è¼?å?¥ %s ç??ç´?æ??"



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