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



commit 427bd300e5acdbfb38d32b3dbfbeb0302e03772e
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Dec 9 20:17:05 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |11020 ++++++++++++++++++++++++++--------------------------------
 po/zh_TW.po |11073 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 9923 insertions(+), 12170 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4223fd6..fde5620 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,22 +2,24 @@
 # Copyright (C) 2001, 03, 04, 05, 06 Free Software Foundation, Inc.
 # Joe Man <trmetal yahoo com hk>, 2001.
 # Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
-# Craig Jeffares <cjeffares novell com>,2004.
+# 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:533
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#
+#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.31.91\n"
+"Project-Id-Version: evolution 2.91.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 20:09+0800\n"
-"PO-Revision-Date: 2010-08-21 20:10+0800\n"
+"POT-Creation-Date: 2010-12-09 20:14+0800\n"
+"PO-Revision-Date: 2010-12-09 20:15+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -76,7 +78,7 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 msgid "Do _Not Delete"
 msgstr "����(_N)"
 
@@ -90,7 +92,7 @@ msgstr "ç?¡æ³?é©?è­? LDAP 伺æ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤è?¯çµ¡äººå¤±æ??"
 
@@ -183,37 +185,38 @@ msgid ""
 "changes?"
 msgstr "ä½ å·²ç¶?ä¿®æ?¹æ­¤è?¯çµ¡äººã??è¦?å?²å­?é??äº?æ?´æ?¹ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ {0} ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "��(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "����(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "調�大�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "����(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2084
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -224,8 +227,8 @@ msgstr "�年�念�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -235,34 +238,34 @@ msgid "Blog:"
 msgstr "��格�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
-msgstr "å??é¡?(_T)..."
+msgstr "å??é¡?(_T)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "è¡?äº?æ??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:957
 msgid "Contact"
 msgstr "�絡人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid "Contact Editor"
 msgstr "�絡人編輯�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../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:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "���件"
 
@@ -272,10 +275,10 @@ msgstr "空é??/å¿?ç¢?ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
-msgstr "å?¨å??(_N)..."
+msgstr "å?¨å??(_N)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�家"
@@ -310,7 +313,7 @@ msgid "Nic_kname:"
 msgstr "網å??(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
@@ -318,10 +321,10 @@ msgid "Notes"
 msgstr "å??註"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "Other"
 msgstr "��"
 
@@ -346,7 +349,7 @@ msgid "Web addresses"
 msgstr "網å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -373,9 +376,9 @@ 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
+#: ../calendar/gui/dialogs/event-page.c:887
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
@@ -454,74 +457,74 @@ msgstr "é??è¨?é??(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "æ?°å¢?è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "ä¿®æ?¹è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "移é?¤è?¯çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??代表此è?¯çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -529,23 +532,23 @@ msgstr ""
 "è?¯çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??è?¯çµ¡äººã??"
 
@@ -635,7 +638,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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "�絡人��編輯�"
 
@@ -652,32 +655,32 @@ msgid "_List name:"
 msgstr "å??å?ºå??稱(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
-msgstr "é?¸å??(_S)..."
+msgstr "é?¸å??(_S)â?¦"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸å?¥é?»å­?é?µä»¶å?°å??æ??æ??æ?³è?¯çµ¡äººå?°ä»¥ä¸?æ¸?å?®(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "編輯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "移é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -717,17 +720,17 @@ msgstr ""
 "æ?¼æ­¤è³?æ??夾ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
 msgstr "å??ä½µè?¯çµ¡äºº"
 
@@ -735,9 +738,9 @@ msgstr "å??ä½µè?¯çµ¡äºº"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
@@ -751,22 +754,22 @@ msgstr "é?»å­?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??稱å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "æ²?æ??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??è?¯çµ¡äºº"
 msgstr[1] "%d å??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
 msgstr "æ??å°?被中æ?·"
 
@@ -774,67 +777,74 @@ msgstr "æ??å°?被中æ?·"
 msgid "Error modifying card"
 msgstr "編輯å?¡ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?製é?¸å??ç??è?¯çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 msgid "Paste contacts from the clipboard"
 msgstr "��貼簿貼��絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??è?¯çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "你確å®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "你確å®?è¦?å?ªé?¤é??äº?è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "你確å®?è¦?å?ªé?¤é??å??è?¯çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#. Translators: This is shown for more than 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
+"確å®?è¦?顯示é??è£?æ??æ??ç??è?¯çµ¡äººï¼?"
+msgstr[1] ""
 "é??å?? %d å??è?¯çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "確å®?è¦?顯示é??è£?æ??æ??ç??è?¯çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "顯示æ??æ??ç??è?¯çµ¡äºº(_A)"
 
@@ -868,7 +878,7 @@ msgid "Car Phone"
 msgstr "汽��話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -969,7 +979,7 @@ msgid "Radio"
 msgstr "����話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:571
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "��"
@@ -1005,7 +1015,7 @@ msgstr "��"
 msgid "Web Site"
 msgstr "網å??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1015,7 +1025,7 @@ msgstr ""
 "\n"
 "æ??å°?è?¯çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1029,7 +1039,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?以建ç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1043,7 +1053,7 @@ msgstr ""
 "\n"
 "é?£æ??å?©ä¸?é??è£?以建ç«?æ?°ç??è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1053,7 +1063,7 @@ msgstr ""
 "\n"
 "å°?æ?¾è?¯çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1063,16 +1073,16 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??種檢è¦?æ?¹å¼?顯示ã??"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "工����件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "�家���件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "�����件"
 
@@ -1118,17 +1128,17 @@ msgid "Copy _Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:395
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
@@ -1164,22 +1174,22 @@ msgid "Video Chat"
 msgstr "è¦?å??交è«?"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:499
 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:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "空é??/å¿?ç¢?"
@@ -1211,16 +1221,15 @@ msgstr "網�"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:366
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../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
+#: ../modules/addressbook/e-book-shell-migrate.c:143
+#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-migrate.c:159
+#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:126
 msgid "Personal"
 msgstr "å??人"
 
@@ -1237,7 +1246,7 @@ msgid "Blog"
 msgstr "��格"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
@@ -1249,30 +1258,30 @@ msgid ""
 "load the address book once in online mode to download its contents."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ­¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??ç?®é??æ??å??以ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "æ­¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è­¯é?²å?»ã??å¦?æ??ä½ æ?³å?¨ Evolution 使ç?¨ LDAPï¼?å¿?é ?å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?件ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示你輸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1284,7 +1293,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1297,49 +1306,49 @@ msgstr ""
 "æ??é??ä¸?é??ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1347,51 +1356,51 @@ msgstr "�製�絡人�"
 msgid "Card View"
 msgstr "å?¡ç??檢è¦?模å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../addressbook/importers/evolution-csv-importer.c:721
+#: ../addressbook/importers/evolution-ldif-importer.c:519
+#: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "��..."
+msgstr "���"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1021
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1022
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1030
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1031
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1039
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:757
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??交æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:758
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸��"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ����"
 
@@ -1416,58 +1425,58 @@ msgstr "ç?¡æ³?å??å¾?é??è¨?é??æ¸?å?®"
 msgid "failed to open book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "æ??å®?輸å?ºæª?æ¡?è??ä¸?æ?¯æ¨?æº?輸å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "輸���"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "å??å?ºæ?¬å?°é??è¨?é??è³?æ??夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "å°?å?¡ç??顯示æ?? vcard æ?? csv æª?æ¡?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??步模å¼?å?¯å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "é??å??步模å¼?ä¸?ï¼?ä¸?å??輸å?ºæª?æ¡?中ç??å?¡ç??æ?¸ç?®ï¼?é ?設大å°?æ?¯ 100ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "æ?¸é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "æ??令å??å¼?æ?¸é?¯èª¤ï¼?è«?使ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "å??æ?¯æ?´ csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "å?¨é??å??步模å¼?ä¸?ï¼?輸å?ºå¿?é ?æ?¯æª?æ¡?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨ä¸?è?¬æ¨¡å¼?ä¸?ï¼?ä¸?é??è¦?大å°?é?¸é ?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
@@ -1487,10 +1496,11 @@ msgid "Enter password for %s (user %s)"
 msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
 
 #: ../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
+#: ../calendar/common/authentication.c:53
+#: ../calendar/gui/e-meeting-store.c:1770
+#: ../plugins/caldav/caldav-browse-server.c:922
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "輸��碼"
@@ -1590,19 +1600,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤æ??è­°ï¼?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤å??å¿?é??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確����此工��"
@@ -1678,203 +1688,209 @@ msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:44
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:46
+msgid "Error on {0}: {1}"
+msgstr "{0} ç?¼ç??é?¯èª¤ï¼?{1}"
+
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è­°å·²ç¶?å??æ¶?ã??"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??該å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??許å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?æ­¤ç´?æ??å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "é??è£?æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?此工ä½?å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨ä½ ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "æ­¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "æ­¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "此工ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å­?å°?æ­¤ç´?æ??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
 msgstr "è¦?å?²å­?å°?æ­¤æ??è­°æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å­?å°?æ­¤å??å¿?é??æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å­?å°?此工ä½?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ­¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è­°é??è«?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??此工ä½?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è­°æ?´æ?°è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr "ä½ æ­£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise 伺æ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??好ç??解決æ?¹æ¡?æ?¯å°?該伺æ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤æ??è­°ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "ä½ å·²ç¶?æ?´æ?¹æ­¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å­?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ä½ ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "����(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "��(_S)"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "����(_S)"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -1889,10 +1905,9 @@ msgstr "��解�(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -1900,7 +1915,8 @@ msgstr "ä½?ç½®:"
 msgid "Snooze _time:"
 msgstr "忽ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "解�(_D)"
 
@@ -1910,9 +1926,9 @@ msgstr "延æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "å°?æ??"
 
@@ -1923,14 +1939,14 @@ msgstr "ç´?æ??ç??å?°é»?"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
@@ -1945,16 +1961,17 @@ msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
-msgid "You have %d alarms"
-msgstr "ä½ æ?? %d å??鬧é?´"
+msgid "You have %d alarm"
+msgid_plural "You have %d alarms"
+msgstr[0] "ä½ æ?? %d å??鬧é?´"
+msgstr[1] "ä½ æ?? %d å??鬧é?´"
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1966,7 +1983,7 @@ msgstr ""
 "é??å?ºé?»å­?é?µä»¶ã??  Evolution æ??顯示\n"
 "æ?®é??ç??æ??é??å°?話ç??ä¾?代æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1983,7 +2000,7 @@ msgstr ""
 "\n"
 "你確å®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -2020,541 +2037,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d �"
 msgstr[1] "%d �"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "鬧���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ä»?天å?°æ??ç??å·¥ä½?è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "é??æ??å·¥ä½?ç??è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-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:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "æ¸?空æ??確èª?"
-
-#: ../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:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "é ?設ç??ç´?æ??æ??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "é ?設æ??é??ç??å?®ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "é ?設æ??é??ç??æ?¸å?¼"
-
-#: ../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:18
-msgid "Event Gradient"
-msgstr "äº?件漸è®?è?²æ??æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "äº?件é??æ??æ??æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
-
-#: ../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:23
-msgid "Hide completed tasks"
-msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "é?±è??å·¥ä½?å?®ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "é?±è??å·¥ä½?æ?¸å?¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "水平�格�置"
-
-#: ../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: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:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
-
-#: ../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:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "ä¸?次鬧é?´æ??å?»"
-
-#: ../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:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
-
-#: ../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:36
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains ç·?"
-
-#: ../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:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
-
-#: ../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:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
-
-#: ../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:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../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:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "é??æ??ç??å·¥ä½?è?²å½©"
-
-#: ../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: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:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
-
-#: ../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:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
-
-#: ../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: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: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:59
-msgid "Primary calendar"
-msgstr "主è¦?è¡?äº?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "主è¦?å??å¿?é??æ¸?å?®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "主�工���"
-
-#: ../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:63
-msgid "Recently used second time zones in a Day View"
-msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
-
-#: ../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:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
-
-#: ../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:68
-msgid "Show appointment end times in week and month views"
-msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
-
-#: ../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:70
-msgid "Show display alarms in notification tray"
-msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
-
-#: ../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:72
-msgid "Show the memo preview pane"
-msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the task preview pane"
-msgstr "顯示工��覽�格"
-
-#: ../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:75
-msgid "Show type field in the event/task/meeting editor"
-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: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:78
-msgid "Task layout style"
-msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task preview pane position (horizontal)"
-msgstr "工��覽�格�置�水平�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (vertical)"
-msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
-
-#: ../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: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: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: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:87
-msgid "The second timezone for a Day View"
-msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
-
-#: ../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:89
-msgid "Time divisions"
-msgstr "æ??é??å??é??"
-
-#: ../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:91
-msgid "Timezone"
-msgstr "æ??å??"
-
-#: ../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:93
-msgid "Twenty four hour time format"
-msgstr "24 å°?æ??å?¶æ ¼å¼?"
-
-#: ../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:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
-
-#: ../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: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: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:99
-msgid "Use system timezone"
-msgstr "使ç?¨ç³»çµ±æ??å??"
-
-#: ../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:101
-msgid "Vertical pane position"
-msgstr "å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "ä¸?é?±é??å§?æ?¼"
-
-#: ../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:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
-
-#: ../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:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
-
-#: ../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: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: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:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
-
-#: ../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:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
-
-#: ../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:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
-
-#: ../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:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
-
-#: ../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:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
-
-#: ../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:120
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "工��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "å·¥ä½?æ?¥é??å§?å??é??"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
@@ -2600,18 +2082,16 @@ msgstr "å??é¡?"
 msgid "Classification"
 msgstr "歸�"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:530
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -2633,7 +2113,7 @@ msgstr "å­?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../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.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2644,21 +2124,21 @@ msgstr "ä½?ç½®"
 msgid "Organizer"
 msgstr "æ??è­°å?¬é??人"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "�人"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
@@ -2726,7 +2206,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -2742,7 +2222,7 @@ msgstr "��鬧���"
 msgid "Mes_sage:"
 msgstr "��(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "��"
 
@@ -2782,20 +2262,16 @@ msgstr "æ??æ?¼"
 msgid "before"
 msgstr "æ?©æ?¼"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "天"
 
@@ -2829,382 +2305,86 @@ msgid "A_dd"
 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:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "鬧�"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../calendar/gui/e-day-view-time-item.c:797
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "é?¸æ??..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
-msgid "Selected Calendars for Alarms"
-msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Ti_me and date:"
-msgstr "æ??å?»å??æ?¥æ??(_M):"
-
-#: ../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
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u è?? %d æ??被æ?¿æ??ç?ºé?»å­?é?µä»¶ä½?å??中ç??使ç?¨è??è??網å??å??稱ã??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(顯示��檢�)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "05 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "10 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "15 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "30 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "60 å??é??"
-
-#: ../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:30
-#: ../modules/addressbook/autocompletion-config.c:156
-msgid "Date/Time Format"
-msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "天"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "é ?設ç??空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "顯示"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Friday"
-msgstr "æ??æ??äº?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2676
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "å°?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "æ??æ??ä¸?"
-
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "æ??é?¸é¡?è?²"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-msgid "S_un"
-msgstr "��(_U)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Saturday"
-msgstr "æ??æ??å?­"
-
-#: ../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:29
-msgid "Se_cond zone:"
-msgstr "第äº?æ??å??(_C):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
-msgid "Select the calendars for alarm notification"
-msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Sh_ow a reminder"
-msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show a _reminder"
-msgstr "顯示æ??é??(_R)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week _numbers"
-msgstr "顯示��(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
-msgid "Sunday"
-msgstr "æ??æ??æ?¥"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-msgid "T_asks due today:"
-msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-msgid "T_hu"
-msgstr "é?±å??(_H)"
-
-#: ../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:41
-msgid "Template:"
-msgstr "樣�:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Thursday"
-msgstr "æ??æ??å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "æ??é??"
-
-#: ../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:45
-msgid "Time format:"
-msgstr "æ??å?»æ ¼å¼?:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Tuesday"
-msgstr "æ??æ??äº?"
-
-#: ../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:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "æ??æ??ä¸?"
-
-#. 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:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "工��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "Work days:"
-msgstr "工��:"
-
-#: ../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:54
-msgid "_24 hour"
-msgstr "_24 å°?æ??"
-
-#: ../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:56
-msgid "_Compress weekends in month view"
-msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
-msgid "_Day begins:"
-msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Fri"
-msgstr "��(_F)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Mon"
-msgstr "��(_M)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
-msgid "_Overdue tasks:"
-msgstr "é??æ??ç??å·¥ä½?(_O):"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Sat"
-msgstr "��(_S)"
-
-#: ../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:67
-msgid "_Time divisions:"
-msgstr "æ??é??é??é??(_T):"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
-msgid "_Tue"
-msgstr "��(_T)"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
-msgid "_Wed"
-msgstr "��(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
-msgid "before every anniversary/birthday"
-msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-msgid "before every appointment"
-msgstr "å??"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "é¡?å??:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "è¤?製è¡?äº?æ??å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "�製工����容���以便���業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "è¤?製å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "��"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "工���"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "��工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "å??å¿?é??æ¸?å?®å±¬æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -3257,237 +2437,237 @@ msgstr "%s  ä½ æ²?æ??å??ä»»ä½?æ?´æ?¹ï¼?æ?´æ?°é??å??編輯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "確èª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:543
 msgid "Could not update object"
 msgstr "�����件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:658
 msgid "Edit Appointment"
 msgstr "編輯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è­° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:673
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:675
 #, c-format
 msgid "Task - %s"
 msgstr "工� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:680
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:696
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:817
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to close the current window"
 msgstr "æ??é??è£?以é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1434
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1441
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1034
+#: ../shell/e-shell-window-actions.c:1448
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to view help available"
 msgstr "æ??é??è£?以檢è¦?å?¯ç?¨ç??說æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1069
 msgid "Click here to save the current window"
 msgstr "æ??é??è£?以å?²å­?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1553
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å­?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Classification"
 msgstr "歸�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1581
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1588
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "��(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
-msgstr "é??件(_A)..."
+msgstr "é??件(_A)â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Click here to attach a file"
 msgstr "æ??é??è£?以é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Classify as private"
 msgstr "歸���人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "_Confidential"
 msgstr "��(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "Classify as confidential"
 msgstr "歸����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "R_ole Field"
 msgstr "����(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?使ç?¨æ??件(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../composer/e-composer-actions.c:461
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2252
+#: ../calendar/gui/dialogs/comp-editor.c:2415
+#: ../calendar/gui/dialogs/comp-editor.c:3382
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ­¤é ?ç?®æ??å??ç??æ?´æ?¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3346
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3414
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?使ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -3503,11 +2683,11 @@ msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??信箱中ç??é??å??é ?ç?®(_D)ï¼?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
 msgstr "æ?¶å??註解(_R)"
 
@@ -3577,7 +2757,7 @@ msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
-msgstr "�絡人..."
+msgstr "�絡人�"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
@@ -3587,147 +2767,147 @@ msgstr "��給�"
 msgid "Enter Delegate"
 msgstr "輸�代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??è£?以設å®?æ??å??æ¶?é??å??äº?件ç??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
-msgstr "�此�設�循��件"
+msgstr "å°?æ­¤é ?設ç?ºé?±æ??æ?§äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "�天�件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "空é??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "æ??å?°é??å??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
 msgstr "äº?件ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:812
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?件ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:816
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯äº?件ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
 msgstr "é??å??äº?件å?·æ??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è­°å?¬é??人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
 msgstr "代ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??人已ç¶?æ²?æ??帳è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -3738,140 +2918,146 @@ msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ä½ æ­£æ??ä»» %s ç??代ç??人"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3013
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3019
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3025
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3044
 msgid "Customize"
 msgstr "��"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3050
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "ç´?æ??å?? 1 天"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "ç´?æ??å?? 1 å°?æ??"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "ç´?æ??å?? 15 å??é??"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
-msgstr "å?°æ??è??(_N)..."
+msgstr "å?°æ??è??(_N)â?¦"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
 msgstr "��鬧�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "äº?件æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "æ??å??(_Z):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "æ??è¦?(_S):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "ç´?æ??å?? 1 天"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "ç´?æ??å?? 1 å°?æ??"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "ç´?æ??å?? 15 å??é??"
+
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "eventpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "æ??å?°é??å??å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
 msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯å??å¿?é??ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1030 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -3890,7 +3076,7 @@ msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "羣�(_G):"
@@ -3931,21 +3117,21 @@ msgstr "æ­¤ä¾?é ?å??以å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?編輯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 msgid "End time of the recurrence was before event's start"
 msgstr "é?±æ??æ?§äº?件ç??çµ?æ??æ??å?»æ?©æ?¼é??å§?æ??å?»"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "ç??"
 
@@ -3953,7 +3139,7 @@ msgstr "ç??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "�"
 
@@ -3962,7 +3148,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "�"
 
@@ -3970,7 +3156,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "�"
 
@@ -3978,7 +3164,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "å??"
 
@@ -3986,7 +3172,7 @@ msgstr "å??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "第�"
 
@@ -3994,13 +3180,13 @@ msgstr "第�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "last"
 msgstr "æ??å¾?"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -4008,7 +3194,7 @@ msgstr "å?¶ä»?æ?¥æ??"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "1��10�"
 
@@ -4016,7 +3202,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "11��20�"
 
@@ -4024,45 +3210,80 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 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
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "天"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "æ??æ??å??"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "æ??æ??å?­"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "æ??æ??æ?¥"
+
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "�第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
 msgstr "����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?編輯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
 msgstr "編輯��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -4074,119 +3295,140 @@ msgstr "�"
 msgid "Exceptions"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "�覽"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
-msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
+msgstr "é??å??ç´?æ??ç??é?±æ??æ?§è¦?å??ç?º(_U)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "天"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "å?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "永�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
 msgid "month(s)"
-msgstr "æ??"
+msgstr "å??æ??"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "ç?´å?°"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "é?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:193
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??鬧é?´è??é??å??äº?件ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:195
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 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
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:442
+#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:714
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712
+#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3224
 msgid "In Progress"
 msgstr "��中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "��"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4202,8 +3444,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:1773
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../calendar/gui/e-calendar-view.c:1837
+#: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4212,8 +3454,8 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
@@ -4222,7 +3464,7 @@ msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
@@ -4230,65 +3472,65 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "ç??æ??詳細è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??è£?æ?¹è®?/檢è¦?該工ä½?ç??ç??æ??詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
+#: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "工�"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "Task Details"
 msgstr "å·¥ä½?詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:376
 msgid "Print this task"
 msgstr "æ??å?°é??é ?å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
 msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
 msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:381
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:385
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯工ä½?ï¼?å? ç?ºä½ ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è­°å?¬é??人(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
-msgstr "å??é¡?(_I)..."
+msgstr "å??é¡?(_I)â?¦"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
@@ -4374,7 +3616,7 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??觸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "���"
 
@@ -4383,37 +3625,33 @@ msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "æ?ªæ­¢æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "å?ªå??ç­?ç´?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "網��"
 
@@ -4440,16 +3678,16 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "空é??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4460,47 +3698,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "å?¦"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2343
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
-msgstr "循�模�"
+msgstr "é?±æ??æ?§æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2608
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4537,97 +3772,95 @@ msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:588
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "å?¬é??人: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1983
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -4655,23 +3888,38 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 msgid "Show the second time zone"
 msgstr "顯示第äº?æ??å??"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "é?¸æ??â?¦"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %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-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4681,10 +3929,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: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
+#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:223
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -4693,453 +3941,33 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
-#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-week-view-main-item.c:237
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2645
+#: ../calendar/gui/e-day-view.c:2609
 #, 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 "æ?¯ã??(è¤?é??循ç?°)"
-
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "�天"
-msgstr[1] "� %d 天"
-
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "��"
-msgstr[1] "� %d �"
-
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "���"
-msgstr[1] "� %d ��"
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " å?? "
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "%s �� "
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr "%s %s �� "
-
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "æ¯?æ??"
-msgstr[1] "æ¯? %d æ??"
-
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "�年"
-msgstr[1] "� %d 年"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] "總� %d 次"
-msgstr[1] "總� %d 次"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr "ï¼?çµ?æ??æ?¼ "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "é??å§?"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "çµ?æ??"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "�止"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "iCalendar ��"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "iCalendar �誤"
-
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../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:1145
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
-msgctxt "cal-itip"
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
-msgid "Tentatively Accepted"
-msgstr "æ?«æ??æ?¥å??"
-
-#: ../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:1292
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨ä½ ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
-
-#: ../calendar/gui/e-itip-control.c:1369
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "æ??è­°è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1378
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s é??è«?ä½ å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1379
-msgid "Meeting Proposal"
-msgstr "æ??è­°æ??æ¡?"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1386
-msgid "Meeting Update"
-msgstr "æ??è­°æ?´æ?°"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1391
-msgid "Meeting Update Request"
-msgstr "æ??è­°æ?´æ?°è«?æ±?"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "æ??è­°ç­?è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "æ??è­°å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, c-format
-msgid "%s has published task information."
-msgstr "%s å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "工���"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s è¦?æ±?ä½ é?²è¡?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1456
-msgid "Task Proposal"
-msgstr "å·¥ä½?è¨?å??"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1463
-msgid "Task Update"
-msgstr "工���"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1468
-msgid "Task Update Request"
-msgstr "工�����"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "å·¥ä½?å??è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "å·¥ä½?å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "空é??/å¿?ç¢?è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s è«?æ±?ä½ ç??空é??/å¿?ç¢?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "空é??/å¿?ç¢?è«?æ±?"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "空é??/å¿?ç¢?å??è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1611
-msgid "The message does not appear to be properly formed"
-msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
-
-#: ../calendar/gui/e-itip-control.c:1670
-msgid "The message contains only unsupported requests."
-msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1703
-msgid "The attachment does not contain a valid calendar message"
-msgstr "é??件並æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1741
-msgid "The attachment has no viewable calendar items"
-msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
-
-#: ../calendar/gui/e-itip-control.c:1983
-msgid "Update complete\n"
-msgstr "æ?´æ?°å®?æ??\n"
-
-#: ../calendar/gui/e-itip-control.c:2017
-msgid "Object is invalid and cannot be updated\n"
-msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
-
-#: ../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:2053
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
-
-#: ../calendar/gui/e-itip-control.c:2077
-msgid "Attendee status updated\n"
-msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
-
-#: ../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:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "é ?ç?®å?³é??ï¼?\n"
-
-#: ../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:2273
-msgid "Choose an action:"
-msgstr "é?¸æ??ä¸?å??å??ä½?:"
-
-#. To translators: RSVP means "please reply"
-#: ../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:2342
-msgid "Update"
-msgstr "æ?´æ?°"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "æ?«æ??æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "æ??çµ?"
-
-#: ../calendar/gui/e-itip-control.c:2393
-msgid "Send Free/Busy Information"
-msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:2417
-msgid "Update respondent status"
-msgstr "æ?´æ?°å??æ??ç??æ??"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "é??å?ºæ??æ?°è³?è¨?"
-
-#: ../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 "å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--å?°--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "è¡?äº?æ??è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "æ?¥æ??:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "è¼?å?¥è¡?äº?æ??"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "è¼?å?¥è¡?äº?æ??..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "æ??è­°å?¬é??人:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "伺æ??å?¨è¨?æ?¯:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席"
@@ -5157,72 +3985,90 @@ msgid "Resources"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "羣�"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "缺席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:539
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "��中"
 
+#: ../calendar/gui/e-meeting-store.c:1760
+#, fuzzy, c-format
+#| msgid "Enter password for user %s on server %s"
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
+
+#: ../calendar/gui/e-meeting-store.c:1767
+#, fuzzy, c-format
+#| msgid "Failed to create thread: %s"
+msgid "Failure reason: %s"
+msgstr "��建�����%s"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -5230,74 +4076,74 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "��辦�室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "��(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "顯示縮�(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "æ??æ??人å?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "æ??æ??人å?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "å¿?è¦?ç??人å?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?人å?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -5325,47 +4171,47 @@ msgstr "��"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:419
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:431
+#: ../plugins/caldav/caldav-browse-server.c:439
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
 msgid "Start: "
 msgstr "é??å§?:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?製é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:728
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5377,43 +4223,43 @@ msgstr "è«?æ??é??è£?å¢?å? æ?°ç??å??å¿?é??"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../modules/calendar/e-task-shell-view.c:444
+#: ../plugins/caldav/caldav-browse-server.c:437
 #: ../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:933
+#: ../calendar/gui/e-task-table.c:943
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:949
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?製é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:955
 msgid "Paste tasks from the clipboard"
 msgstr "��貼簿貼�工�"
 
-#: ../calendar/gui/e-task-table.c:951
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:961
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:967
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
@@ -5424,7 +4270,7 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5457,23 +4303,23 @@ msgstr "è¡?äº?æ??檢è¦?äº?件"
 msgid "Grab Focus"
 msgstr "����"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "���天�件"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "æ?°å¢?æ??è­°"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "移���"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "移è?³æ?¥æ??"
 
@@ -5482,7 +4328,7 @@ msgstr "移è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?檢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??表格"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5491,14 +4337,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?件ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5506,47 +4352,47 @@ msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../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:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5558,25 +4404,25 @@ msgstr "è·³èº?æ??é??"
 msgid "Click here, you can find more events."
 msgstr "æ??é??è£?ï¼?ä½ å?¯ä»¥æ?¾å?°æ?´å¤?äº?件ã??"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "æ??檢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2287
+#: ../calendar/gui/gnome-cal.c:2201
 msgid "Purging"
 msgstr "��"
 
@@ -5629,7 +4475,7 @@ msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
 msgid "Select _Today"
 msgstr "é?¸æ??ä»?天(_T)"
 
@@ -5637,32 +4483,32 @@ msgstr "é?¸æ??ä»?天(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "�件��"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "工���"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -5670,7 +4516,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -5679,7 +4525,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:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -5691,7 +4537,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:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -5700,7 +4546,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已�派"
@@ -5708,7 +4554,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:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已��"
@@ -5716,7 +4562,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:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -5724,7 +4570,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:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -5732,7 +4578,7 @@ 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:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??票表å?³"
@@ -5758,225 +4604,213 @@ msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 msgid "You must be an attendee of the event."
 msgstr "ä½ å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "å?­"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " å?° "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2454
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6003,7 +4837,7 @@ msgstr "ç´?æ??å??æ??è­°"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7731,252 +6565,242 @@ msgstr "太平æ´?/é??浦島"
 
 #: ../composer/e-composer-actions.c:163
 msgid "Save as..."
-msgstr "����..."
+msgstr "�����"
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:374
+#: ../composer/e-composer-actions.c:259
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "æ??å?°(_P)..."
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "é ?覽æ??å?°(_V)"
-
 #: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??ç??æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
-msgstr "����(_A)..."
+msgstr "����(_A)�"
 
 #: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "以å?¦ä¸?å??å??稱å?²å­?ç?®å??ç??æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:285
+msgid "New _Message"
+msgstr "�寫��件(_M)"
+
+#: ../composer/e-composer-actions.c:287
+msgid "Open New Message window"
+msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
+
+#: ../composer/e-composer-actions.c:294
+msgid "Character _Encoding"
+msgstr "�符編碼(_E)"
+
+#: ../composer/e-composer-actions.c:311
+msgid "_Print..."
+msgstr "æ??å?°(_P)â?¦"
+
+#: ../composer/e-composer-actions.c:318
+msgid "Print Pre_view"
+msgstr "é ?覽æ??å?°(_V)"
+
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "å?²å­?ç?ºè??稿(_D)"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "å?²å­?ç?ºè??稿"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "�寫��件(_M)"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "�符編碼(_E)"
-
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "PG_P ��"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "使ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨ä½ ç?? PGP å¯?碼å??ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:358
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:360
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?設ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:366
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:368
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨ä½ ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:374
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME ��"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:376
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使ç?¨ä½ ç?? S/MIME å? å¯?è­?æ?¸å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:384
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨ä½ ç?? S/MIME 簽署è­?æ?¸ç?ºé?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½²"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:390
 msgid "_Bcc Field"
 msgstr "�件����(_B)"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:392
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?件å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:398
 msgid "_Cc Field"
 msgstr "����(_C)"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:406
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:464
 msgid "Save Draft"
 msgstr "å?²å­?è??稿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "輸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "輸å?¥é?µä»¶å¯?件å?¯æ?¬ç??æ?¶ä»¶è??ï¼?ä»?å??æ??æ?¶å?°é??å°?é?µä»¶ä½?ä¸?æ??å?ºç?¾å?¨é?µä»¶ç??æ?¶ä»¶è??æ¸?å?®"
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "å¯?件è??(_O):"
 
-#: ../composer/e-composer-header-table.c:1011
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "��(_C):"
 
-#: ../composer/e-composer-header-table.c:1025
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "�件��(_B):"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "張貼�(_P):"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "主�(_U):"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "æ??é??è£?æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??è£?ï¼?é?¸å??è¦?張貼ç??è³?æ??夾"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "復å??ä¸?ä¸?次ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "å??æ¶?ä¸?ä¸?次復å??ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "æ??å°?æ??å­?"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "æ??å°?å??å??代æ??å­?"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "å?²å­?è??稿"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:192
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
-
-#: ../composer/e-msg-composer.c:1024
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?簽署é??å?ºç??é?µä»¶ï¼?此帳è??æ²?æ??設å®?簽署è­?æ?¸"
 
-#: ../composer/e-msg-composer.c:1036
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?è­?æ?¸(此帳è??)"
 
-#: ../composer/e-msg-composer.c:1461
-msgid "Unable to reconstruct message from autosave file"
-msgstr "ç?¡æ³?å¾?è?ªå??å?²å­?ç??æª?æ¡?é??建é?µä»¶"
-
-#: ../composer/e-msg-composer.c:1531 ../composer/e-msg-composer.c:1877
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3562
+#: ../composer/e-msg-composer.c:4085
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4174
+#: ../composer/e-msg-composer.c:4790
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
@@ -7991,392 +6815,418 @@ msgid "All accounts have been removed."
 msgstr "æ??æ??帳è??å·²ç¶?移é?¤ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "ç?¶å?²å­?å?°ä½ ç??è??稿è³?æ??夾æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "ç?¶å?²å­?å?°ä½ ç??å¯?件è³?æ??夾æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "å?¨å¯?ä¿¡æ??ç?¼ç??é?¯èª¤ã??ä½ è¦?å¦?ä½?ç¹¼çº?ï¼?"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "確å®?è¦?æ?¾æ£?æ­£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "å? ç?ºã??{0}ã??ï¼?æ??以你å?¯è?½é??è¦?é?¸å??ä¸?å??ç??é?µä»¶é?¸é ?ã??"
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr "å? ç?ºä½ å?¨é?¢ç·?å·¥ä½?ï¼?é??å??é?µä»¶æ??å?²å­?å?¨ä½ æ?¬å?°ç«¯ç??å¯?件è³?æ??夾è£?ã??ç?¶ä½ å??å?°ç¶²ä¸?å·¥ä½?ï¼?ä½ å?¯ä»¥é»?é?¸ Evolution å·¥å?·å??ç??å?³é??/æ?¥æ?¶æ??é??ä¾?å¯?å?ºé?µä»¶ã??"
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr "é?¤é??ä½ é?¸æ??å?²å­?é?µä»¶è?³ã??è??稿ã??è³?æ??夾ï¼?å?¦å??é??é??æ­¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å­?è??稿å?¯ä»¥è®?你以å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "ç?¡æ³?建ç«?æ?°å¯«è¦?çª?ã??"
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "ç?¡æ³?建ç«?é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "ç?¡æ³?è®?å??ç°½å??æª?ã??{0}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "ç?¡æ³?æ?·å??é?µä»¶ä¾?é??å?  (å¾? {0})ã??"
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "ç?¡æ³?å?²å­?è?³è?ªå??å?²å­?æª?æ¡?ã??{0}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "è¦?復å??æ?ªå®?æ??ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?中ã??æ?¯å?¦å¯?å?ºé?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å­?è?³è?ªå??å?²å­?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr "ç?¶ä½ æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??復å??é?µä»¶å?¯ä»¥è®?ä½ å¾?å??ä¾?中æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "å?²å­?é?µä»¶å?°å¯?件å?£ã??"
+
+#: ../composer/mail-composer.error.xml.h:20
 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
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??"
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
-msgstr ""
-"ç?¡æ³?å??å?? HTML 編輯å?¨æ?§å?¶ã??\n"
-"\n"
-"è«?確å®?ä½ å®?è£?ç??æ?¯æ­£ç¢ºç??gtkhtml å?? libgtkhtml ç??æ?¬ã??"
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å¾?å?¯è?½æ²?æ??å?²å­?ã??"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å°?æ?ªå¯?å?ºã??"
 
-#: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "ä½ ç?¡æ³?å°?æª?æ¡?ã??{0}ã??é??å? å?°æ­¤é?µä»¶ã??"
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "ä½ ç?¡æ³?å°?æª?æ¡? &quot;{0}&quot; é??å? å?°é??å°?é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "æ?°å¯«é?µä»¶å??ï¼?ä½ é??è¦?å??設å®?帳è??ã??"
 
-#: ../composer/mail-composer.error.xml.h:23
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "繼�編輯(_C)"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "ä¸?è¦?復å??(_D)"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "復å??(_R)"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "å?²å­?è??稿(_S)"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save to Outbox"
+msgstr "����件�(_S)"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr "å??試ä¸?次(_T)"
+
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "以å??å?¥è¦?çª?å?·è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "以 Anjal å??ç?ºé ?設é?µä»¶å®¢æ?¶ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "socket ç?? IDï¼?å?§åµ?æ?¼"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Anjal ���件客�端"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "è«?輸å?¥ä½ ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "è«?輸å?¥ä½ ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 msgid "The email address you have entered is invalid."
 msgstr "你輸å?¥ç??é?»å­?é?µä»¶ä½?å??æ?¯ç?¡æ??ç??ã??"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "è«?輸å?¥ä½ ç??å¯?碼ã??"
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../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
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "å??人詳細è³?æ??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "å§?å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "Email ä½?å??ï¼?"
 
-#: ../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:489
+msgid "Details:"
+msgstr "詳細è³?æ??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">正���</span>"
+#: ../capplet/settings/mail-account-view.c:497
+msgid "Receiving"
+msgstr "��中"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "伺æ??å?¨é¡?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "伺æ??å?¨ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "使����"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "永�"
 
-#: ../capplet/settings/mail-account-view.c:545
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??</span>"
+#: ../capplet/settings/mail-account-view.c:548
+msgid "Sending"
+msgstr "å?³é??中"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
 "If we can't do it automatically you'll need your server details as well."
 msgstr "è¦?使ç?¨é??å??é?»å­?é?µä»¶ç¨?å¼?ä½ é??è¦?å??設å®?ä¸?å??帳è??ã??è«?å?¨ä¸?é?¢æ??ä¾?ä½ ç??é?»å­?é?µä»¶ä½?å??å??å¯?碼ï¼?æ??å??æ??å??試並æ?¾å?ºæ??æ??ç??設å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ­¥é©?ï¼?ä½ å°±é??è¦?使ç?¨è?ªå·±å¸³è??ç??伺æ??å?¨è©³ç´°è³?æ??ã??"
 
-#: ../capplet/settings/mail-account-view.c:587
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
 "entered but you may need to change them."
 msgstr "æ?±æ­?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºä½ ç??é?µä»¶è¨­å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??以你å??å??輸å?¥ç??詳細è³?æ??å??試é??å§?ï¼?ä½?æ?¯ä½ ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "ä½ å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?設å®?é??å??帳è??ç??é?¸é ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
 msgstr "ç?¾å?¨æ??å??é??è¦?ä½ ç??設å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?å??試ç??測é?¨å??設å®?ï¼?ä½?æ?¯ä½ æ??該檢æ?¥å®?å??以é?²è¡?確èª?ã??"
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "ä½ å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?設設å®?å?¼ã??"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr "å?¨æ??å??å??試並é?£ç·?å?°ä¼ºæ??å?¨å??å??é?µä»¶å??檢æ?¥äº?é ?ç??æ??é??ã??"
 
-#: ../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
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
 msgid "Identity"
 msgstr "身å??"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
-msgstr "��步 - 正����件"
+msgstr "��步 - ���件"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
-msgstr "正����件"
+msgstr "���件"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Sending mail"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
-msgstr "ä¸?ä¸?æ­¥ - 身å??è­?å?¥"
+msgstr "ä¸?ä¸?æ­¥ - 身å??"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
-msgstr "��步 - 正�����"
+msgstr "��步 - ����"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
-msgstr "正�����"
+msgstr "����"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
-msgstr "��步 - 正����件"
+msgstr "��步 - ���件"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
-msgstr "æ­£å?¨å?³é??é?µä»¶"
+msgstr "å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Review account"
 msgstr "ä¸?ä¸?æ­¥ - 檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "ä¸?ä¸?æ­¥ - 詳細è³?æ??"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
-msgstr "��步 - 正�����"
+msgstr "��步 - ����"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3044
 msgid "Defaults"
 msgstr "�設�"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "� Google �絡人�� Evolution"
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "å°? Google æ?¥æ??å? å?¥ Evolution"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:731
 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:739
+msgid "Google account settings:"
+msgstr "Google 帳è??設å®?å?¼ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:770
 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:777
+msgid "Yahoo account settings:"
+msgstr "Yahoo 帳è??設å®?å?¼ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo è¡?äº?æ??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1023
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "�碼�"
 
-#: ../capplet/settings/mail-account-view.c:1091
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "é??é??å??é ?"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "帳è??ç²¾é??"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/addressbook/e-book-shell-migrate.c:135
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:148
+#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:115
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "修�"
+#: ../capplet/settings/mail-settings-view.c:145
+#, c-format
+msgid "Modify %s..."
+msgstr "修� %s�"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "å? å?¥æ?°ç??帳è??"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "帳è??管ç??"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "設��"
 
@@ -8388,7 +7238,8 @@ msgstr "è¡?äº?æ??äº?件é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8397,7 +7248,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupware ���件"
 
@@ -8414,45 +7265,43 @@ msgid "Email Settings"
 msgstr "���件設��"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ï¼?å·²å??æ¶?ï¼?"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ï¼?å·²å®?æ??ï¼? "
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
 #, c-format
-msgid "%s..."
-msgstr "%s..."
+msgid "%s (waiting)"
+msgstr "%s (正���)"
 
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
 #: ../e-util/e-activity.c:236
 #, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% å®?æ??)"
-
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution �誤"
+msgid "%s (cancelling)"
+msgstr "%s (æ­£å?¨å??æ¶?)"
 
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution è­¦å??"
+#: ../e-util/e-activity.c:238
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-activity.c:243
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% å®?æ??)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
-msgstr "é?¿æ??伯æ??"
+msgstr "é?¿æ??伯èª?"
 
 #: ../e-util/e-charset.c:54
 msgid "Baltic"
@@ -8472,27 +7321,27 @@ msgstr "æ?¯æ??夫èª?ç³»"
 
 #: ../e-util/e-charset.c:58
 msgid "Greek"
-msgstr "å¸?è??æ??"
+msgstr "å¸?è??èª?"
 
 #: ../e-util/e-charset.c:59
 msgid "Hebrew"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��"
 
 #: ../e-util/e-charset.c:60
 msgid "Japanese"
-msgstr "æ?¥æ??"
+msgstr "��"
 
 #: ../e-util/e-charset.c:61
 msgid "Korean"
-msgstr "é??æ??"
+msgstr "é??èª?"
 
 #: ../e-util/e-charset.c:62
 msgid "Thai"
-msgstr "æ³°æ??"
+msgstr "泰�"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
+msgstr "å??è?³å?¶èª?"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -8504,7 +7353,7 @@ msgstr "西��系"
 
 #: ../e-util/e-charset.c:66
 msgid "Western European, New"
-msgstr "西��系��"
+msgstr "�代西��系"
 
 #. Translators: Character set "Chinese, Traditional"
 #: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
@@ -8528,138 +7377,78 @@ msgid "Visual"
 msgstr "�覺"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
 #: ../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:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "�天"
 
-#. 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 day from now"
-msgid_plural "%d days from now"
-msgstr[0] "���起 %d 天"
-msgstr[1] "���起 %d 天"
-
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:214
+#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
+#. ngettext is used to be able to define different translations for different days of week, where
+#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
+#: ../e-util/e-datetime-format.c:218
 #, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天å??"
-msgstr[1] "%d 天å??"
+msgid "Next %a"
+msgid_plural "Next %a"
+msgstr[0] "�%a"
+msgstr[1] "�%a"
 
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:510
 msgid "Format:"
 msgstr "格��"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "ï¼?ä¸?æ??ç??æª?æ¡?å??稱ï¼?"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "é?¤é?¯ç´?é??æª?"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "å?¨ç??æ??å??顯示此é?¯èª¤(_E)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "ç§?ã??"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "ç´?é??æª?è¨?æ?¯:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "ç´?é??ç­?ç´?"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "�件"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "é??é??æ?¬è¦?çª?"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "�誤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "�誤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "è­¦å??è??é?¯èª¤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "��"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "é?¯èª¤ã??è­¦å??è??é?¤é?¯è¨?æ?¯"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é?±"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "æ??å?°æ??ç?¼ç??é?¯èª¤"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "æ??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ­¤é?¯èª¤ç??詳細è³?è¨?ï¼?"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "æ??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:731
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
@@ -8683,15 +7472,15 @@ msgstr "��寫�?"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å­?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
 msgid "_Overwrite"
 msgstr "�寫(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??該é?£çµ?ã??"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?顯示 Evolution ç??æ±?å?©æ??件ã??"
 
@@ -8704,152 +7493,156 @@ msgstr "GConf �誤�%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ­¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?端æ©?中顯示ã??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1028
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1029
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1031
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
+#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "��"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1032
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1033
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1262
+#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:1034 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1035 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "æ?°è??ç¾£çµ?"
 
-#: ../em-format/em-format.c:1036 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1416
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1481
+#: ../em-format/em-format.c:1547
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1639 ../em-format/em-format.c:1823
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1649
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1665
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1666
+#: ../em-format/em-format.c:1760
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??簽署格å¼?"
 
-#: ../em-format/em-format.c:1858 ../em-format/em-format.c:2018
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1859 ../em-format/em-format.c:2006
-#: ../em-format/em-format.c:2019
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "檢é©?簽署ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2106
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2112 ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, 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:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, 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:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, 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:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8870,121 +7663,127 @@ msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, 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:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, 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:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, 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:119
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
 msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:669
 msgid "R_ule name:"
 msgstr "è¦?å??å??稱(_U):"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:699
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?件ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "���件(_D)"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:724
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?件符å??"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:725
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?件符å??"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:728
 msgid "_Find items:"
 msgstr "����(_F):"
 
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:757
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../filter/e-filter-rule.c:758
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:760
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:761
 msgid "No reply or parent"
 msgstr "æ²?æ??å??復æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:764
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾£çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:789
+msgid "A_dd Condition"
+msgstr "���件(_D)"
+
+#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "��"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "編輯è¦?å??"
 
@@ -9008,7 +7807,7 @@ msgstr "缺å°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "缺å°?æª?æ¡?å??稱ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "缺å°?å??稱ã??"
 
@@ -9064,7 +7863,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??濾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "é??濾å?¨è¦?å??(_F)"
 
@@ -9085,7 +7884,7 @@ msgstr "å¾?"
 msgid "months"
 msgstr "å??æ??"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "�"
 
@@ -9101,32 +7900,38 @@ msgstr "ä½ æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:119
-#: ../widgets/misc/e-attachment-paned.c:124
+#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 msgstr[1] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:605
+#: ../mail/e-mail-attachment-bar.c:633
+#: ../widgets/misc/e-attachment-paned.c:624
 msgid "Icon View"
 msgstr "å??示檢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:606
+#: ../mail/e-mail-attachment-bar.c:635
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Close this window"
+msgstr "é??é??æ?¬è¦?çª?"
+
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(æ²?æ??主æ?¨)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
-msgstr "å? å?¥å?°é??è¨?é??(_A)..."
+msgstr "å? å?¥å?°é??è¨?é??(_A)â?¦"
 
 #: ../mail/e-mail-display.c:73
 msgid "_To This Address"
@@ -9140,7 +7945,12 @@ msgstr "å¾?é??å??ä½?å??(_F)"
 msgid "Create Search _Folder"
 msgstr "建ç«?æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-folder-utils.c:88
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
+
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "æ¨?籤å??稱(_L):"
 
@@ -9169,7 +7979,7 @@ msgid "_Later"
 msgstr "��(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "���籤"
 
@@ -9190,41 +8000,48 @@ msgid "Color"
 msgstr "é¡?è?²"
 
 #: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../plugins/caldav/caldav-browse-server.c:1297
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "å??稱"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
+#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../modules/mail/e-mail-shell-view-private.c:1110
 msgid "Inbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 msgid "Outbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1105
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:577
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "��"
 
 #: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
-msgstr "正�移�..."
+msgstr "正�移��"
 
 #: ../mail/e-mail-migrate.c:164
 msgid "Migration"
@@ -9235,11 +8052,11 @@ msgstr "移�"
 msgid "Migrating '%s':"
 msgstr "æ­£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "æ­£å?¨è½?移è³?æ??夾"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9250,50 +8067,63 @@ msgstr ""
 "\n"
 "ç?¶ Evolution 移è½?ä½ ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:1147
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ç?¡æ³?å?¨ã??%sã??建ç«?æ?¬å?°é?µä»¶è³?æ??夾ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:563
+#: ../mail/e-mail-notebook-view.c:565
 msgid "Please select a folder"
 msgstr "è«?é?¸æ??è³?æ??夾"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?製è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "�製(_O)"
 
-#: ../mail/e-mail-reader.c:687 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] "è³?æ??夾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??你確å®?è¦?å?ªé?¤å®?ï¼?"
+msgstr[1] "è³?æ??夾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??你確å®?è¦?å?ªé?¤å®?å??ï¼?"
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:687 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "移å??(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:952 ../mail/e-mail-reader.c:1068
-#: ../mail/e-mail-reader.c:1109
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1114
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
 
-#: ../mail/e-mail-reader.c:1204
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "���件"
@@ -9305,604 +8135,708 @@ 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:1225
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1579
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "�件"
 msgstr[1] "�件"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?件è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?件è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "檢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "篩é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
-msgstr "è¤?製è?³è³?æ??夾(_C)..."
+msgstr "è¤?製è?³è³?æ??夾(_C)â?¦"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "è¤?製已é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "���件(_D)"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1518
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
-msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)..."
+msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1883
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
-msgstr "æ?¶ä»¶è??é??濾å?¨(_R)..."
+msgstr "æ?¶ä»¶è??é??濾å?¨(_R)â?¦"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
-msgstr "å¯?件è??é??濾å?¨(_N)..."
+msgstr "å¯?件è??é??濾å?¨(_N)â?¦"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
-msgstr "主æ?¨é??濾å?¨(_S)..."
+msgstr "主æ?¨é??濾å?¨(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??濾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??濾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
-msgstr "��件���(_F)..."
+msgstr "��件���(_F)�"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1918
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?顯示ç??é?µä»¶æ?¬æ??中ç??æ??å­?"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "����(_C)"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1925
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1932
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?設ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
-msgstr "è·?é?¨(_U)..."
+msgstr "è·?é?¨(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1583 ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??件形å¼?è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:1588
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "以é??件è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1597 ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??中"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "以����(_I)"
 
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1611 ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "以å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1623
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1644
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?示æ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1651
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "已��(_R)"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1665
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "���(_U)"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1672
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
-msgstr "編輯���件(_E)..."
+msgstr "編輯���件(_E)�"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:2037
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1679
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "�寫��件(_N)"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?以便æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1686
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "使ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1693
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
-msgstr "移è?³è³?æ??夾(_M)..."
+msgstr "移è?³è³?æ??夾(_M)â?¦"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1700
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "å??æ??è?³è³?æ??夾(_S)"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "顯示ä¸?層è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1707
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:1714
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:1721
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "é??é??ç?®å??ç??å??é ?(_O)"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "é??é??ç?®å??ç??å??é ?"
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "����件(_N)"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1735
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1742
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1749
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1756
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "����件(_P)"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1763
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1770
+#: ../mail/e-mail-reader.c:2133
+msgid "Previous T_hread"
+msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_H)"
+
+#: ../mail/e-mail-reader.c:2135
+msgid "Display the previous thread"
+msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??給æ??人"
 
-#: ../mail/e-mail-reader.c:1798 ../mail/mail.error.xml.h:91
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:151
+#: ../mail/e-mail-reader.c:2168
+msgid "Remo_ve Attachments"
+msgstr "移é?¤é??件(_V)"
+
+#: ../mail/e-mail-reader.c:2170
+msgid "Remove attachments"
+msgstr "移é?¤é??件"
+
+#: ../mail/e-mail-reader.c:2175
+msgid "Remove Du_plicate Messages"
+msgstr "移é?¤é??è¤?ç??é?µä»¶(_P)"
+
+#: ../mail/e-mail-reader.c:2177
+msgid "Checks selected messages for duplicates"
+msgstr "檢æ?¥é?¸å??ç??é?µä»¶æ?¯å?¦æ??é??è¤?"
+
+#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:2184
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1805 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:2191
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1812
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:2198
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?件è??"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
-msgstr "å?²å­?æ?? mbox(_S)..."
+msgstr "å?²å­?æ?? mbox(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å­?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
-msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)..."
+msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
-msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)..."
+msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)â?¦"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
-msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)..."
+msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)â?¦"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
-msgstr "主æ?¨æ??å°?è³?æ??夾(_U)..."
+msgstr "主æ?¨æ??å°?è³?æ??夾(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "�件��(_M)"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "顯示é?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "復å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "正常大�(_N)"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "é??設æ??å­?ç?ºå??å§?大å°?"
 
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "å°?æ??å­?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "å°?æ??å­?縮å°?"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "建ç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "�符編碼(_A)"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "���(_O)"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "ç¾£çµ?å??è¦?(_G)"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "移�(_G)"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "æ¨?示æ??(_K)"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "�件(_M)"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "縮�(_Z)"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
-msgstr "�示���(_W)..."
+msgstr "�示���(_W)�"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "æ¨?示æ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "æ¨?示æ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "æ¨?示æ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "æ¨?示æ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?示æ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "æ¨?示æ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "��模�(_C)"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2430
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??中顯示é??ç??游æ¨?"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é ­(_H)"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "顯示é?µä»¶å??詳細æª?é ­"
 
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "�����件"
 
-#: ../mail/e-mail-reader.c:2327 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, 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:2887 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:538
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:3056
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3524
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:3057
+#: ../mail/e-mail-reader.c:3525
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#. 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:3075
+#: ../mail/e-mail-reader.c:3544
 msgid "Group Reply"
 msgstr "ç¾£çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3076
+#: ../mail/e-mail-reader.c:3545
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3121 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:3153
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3167 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:3782
+#: ../mail/e-mail-reader.c:4274
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??夾ã??%sã??"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:644
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
+
+#: ../mail/e-mail-session.c:646
+msgid "Enter Passphrase"
+msgstr "輸���"
+
+#: ../mail/e-mail-session.c:649
+#, c-format
+msgid "Enter Password for %s"
+msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
+
+#: ../mail/e-mail-session.c:651
+msgid "Enter Password"
+msgstr "輸��碼"
+
+#: ../mail/e-mail-session.c:696
+#, c-format
+msgid "User canceled operation."
+msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
+
+#: ../mail/e-mail-session.c:864
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:873
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "é??å??è³?æ??夾ã??%sã??"
+
+#: ../mail/e-mail-session.c:1278
+#, c-format
+msgid "Invalid folder: %s"
+msgstr "ç?¡æ??ç??è³?æ??夾ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"ç?¡æ³?é??å? è?³ %sï¼?%s\n"
+"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
+
+#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/mail-ops.c:866
+msgid "Sending message"
+msgstr "æ­£å?¨å?³é??é?µä»¶"
+
+#: ../mail/e-mail-session-utils.c:832
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
+
+#: ../mail/e-mail-tag-editor.c:295
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -9910,7 +8844,7 @@ msgstr "æ²?æ??å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:124
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS ��"
@@ -9918,58 +8852,40 @@ 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:516 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:575 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:603
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s æ??æ¬?å??ç´?"
-
-#: ../mail/em-account-editor.c:610
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"è«?ä»?ç´°é?±è®?以ä¸?顯示ç??\n"
-" %s æ??æ¬?å??ç´?\n"
-"並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:981
+#: ../mail/em-account-editor.c:924
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:982
+#: ../mail/em-account-editor.c:925
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:983
+#: ../mail/em-account-editor.c:926
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2092
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2093
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9979,37 +8895,36 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2096
 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:2101 ../mail/em-account-editor.c:2258
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2260
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2099
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2102
 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:2107
+#: ../mail/em-account-editor.c:2104
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10017,11 +8932,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2112
+#: ../mail/em-account-editor.c:2109
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2110
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10035,70 +8950,70 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2554
+#: ../mail/em-account-editor.c:2573
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2562
+#: ../mail/em-account-editor.c:2581
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2838
+#: ../mail/em-account-editor.c:2863
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
 msgid "Security"
 msgstr "���"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
+#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see mail/em-composer-utils.c:attribvars array
+#: ../mail/em-composer-utils.c:1136
+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:1146
+msgid "-----Original Message-----"
+msgstr "-----å??å§?é?µä»¶-----"
+
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1695
+#: ../mail/em-composer-utils.c:1804
 #, 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:1743
+#: ../mail/em-composer-utils.c:1854
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2272
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?件è??"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2199
-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:2343
-msgid "-----Original Message-----"
-msgstr "-----å??å§?é?µä»¶-----"
-
-#: ../mail/em-composer-utils.c:2555
+#: ../mail/em-composer-utils.c:2696
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2556
+#: ../mail/em-composer-utils.c:2697
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??夾"
 
@@ -10215,7 +9130,7 @@ msgstr "�設�"
 msgid "is set"
 msgstr "設�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10264,7 +9179,7 @@ msgid "Play Sound"
 msgstr "æ?­æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "已�"
 
@@ -10345,16 +9260,16 @@ msgid "Unset Status"
 msgstr "å??æ¶?設å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:539
 msgid "Then"
 msgstr "æ?¥ç??æ ¹æ??"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:570
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:124
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "���件:"
@@ -10362,36 +9277,35 @@ 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:130
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "æ??æ??é?µä»¶:"
 msgstr[1] "æ??æ??é?µä»¶:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¡?使ç?¨é?? (%s):"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "è³?æ??夾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
 msgstr "<æ??é??è£?é?¸æ??è³?æ??夾>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "è³?æ??夾å??稱(_N):"
 
@@ -10399,7 +9313,7 @@ msgstr "è³?æ??夾å??稱(_N):"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??夾"
 
@@ -10408,286 +9322,263 @@ msgstr "æ??å°?è³?æ??夾"
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
-msgstr "��中..."
+msgstr "��中�"
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??夾å??稱ä¸?è?½å??å?«æ??ç·?ã??"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??夾樹"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ­£å?¨ç§»å??è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ­£å?¨è¤?製è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ­£å?¨å°?é?µä»¶ç§»è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ­£å?¨è¤?製é?µä»¶è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1824
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?層ç??å?²å­?å??"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "移å??è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "è¤?製è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:571
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "æ­£å?¨å»ºç«?è³?æ??夾ã??%sã??"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:746
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?建ç«?è³?æ??夾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "�簽署"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æ­¤é?µä»¶æ?ªç°½ç½²ã??ä¸?ä¿?è­?æ­¤é?µä»¶å·²é©?è­?ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "æ??æ??ç??簽署"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "æ­¤é?µä»¶å·²ç°½ç½²è??ä¸?æ??æ??ï¼?表示å®?é??常æ??å?¯è?½æ?¯é©?è­?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??簽署"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "é?µä»¶ç??簽署ç?¡æ³?檢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??被æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "簽署æ??æ??ï¼?ä½?æ?¯ç?¡æ³?檢é©?å¯?件è??"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??簽署ï¼?ä½?æ?¯é?µä»¶ç??å¯?件è??ç?¡æ³?檢é©?ã??"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "簽署å­?å?¨ï¼?ä½?é??è¦?å?¬é??å¯?碼å??"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??簽署ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??å¯?碼å??ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "���"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ­¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??äº?è?¯ç¶²å?³é??å?¯è?½æ??被檢é?±ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "已������"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr "æ­¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??人å¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??æ?¥ï¼?並ä¸?æ?¯ç?¡æ³?檢è¦?æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "已��"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "æ­¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??人é?£ä»¥æª¢è¦?æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "已�����"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr "æ­¤é?µä»¶å·²å? å¯?ï¼?使ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??縱使ç¶?é??ä¸?段æ??é??ï¼?å¤?é?¢ç??人å¾?é?£æª¢é?±æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "檢���(_V)"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "此����檢�"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr "Evolution ç?¡æ³?顯示此å°?é?»å­?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??大å°?ã??ä½ å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹å¼?æ??使ç?¨å¤?é?¨æ??å­?編輯å?¨ä¾?é?±è®?å®?ã??"
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:757
 msgid "Overdue:"
 msgstr "å?°æ??æ?¥:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
-msgstr "以...é??å??(_O)"
+msgstr "以â?¦é??å??(_O)"
 
 #: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
-msgstr "æ ¼å¼?å??é?µä»¶..."
+msgstr "æ ¼å¼?å??é?µä»¶â?¦"
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2028
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2062
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??示 (ã??%sã??é¡?å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
@@ -10698,56 +9589,94 @@ msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
 msgid "No HTML stream available"
 msgstr "æ²?æ?? HTML 串æµ?å?¯ç?¨"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "æ­¤å?²å­?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
+#: ../mail/em-subscription-editor.c:1107
+msgid "Folder Subscriptions"
+msgstr "è³?æ??夾è¨?é?±"
+
+#: ../mail/em-subscription-editor.c:1146
+msgid "_Account:"
+msgstr "帳è??(_A):"
+
+#: ../mail/em-subscription-editor.c:1161
+msgid "Clear Search"
+msgstr "æ¸?é?¤æ??å°?"
+
+#: ../mail/em-subscription-editor.c:1179
+msgid "Sho_w items that contain:"
+msgstr "顯示é ?ç?®å??å?«(_W):"
+
+#: ../mail/em-subscription-editor.c:1218
+msgid "Subscribe to the selected folder"
+msgstr "è¨?é?±é?¸å??ç??è³?æ??夾"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "已��"
+#: ../mail/em-subscription-editor.c:1219
+msgid "Su_bscribe"
+msgstr "��(_B)"
+
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Unsubscribe from the selected folder"
+msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
+
+#: ../mail/em-subscription-editor.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "_Unsubscribe"
+msgstr "å??æ¶?è¨?é?±(_U)"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "è³?æ??夾"
+#: ../mail/em-subscription-editor.c:1242
+msgid "Collapse all folders"
+msgstr "æ?¶æ?ºæ??æ??ç??è³?æ??夾"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "è«?é?¸æ??ä¸?å??伺æ??å?¨ã??"
+#: ../mail/em-subscription-editor.c:1243
+msgid "C_ollapse All"
+msgstr "����(_O)"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "å°?æ?ªé?¸æ??伺æ??å?¨"
+#: ../mail/em-subscription-editor.c:1253
+msgid "Expand all folders"
+msgstr "å±?é??æ??æ??ç??è³?æ??夾"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-subscription-editor.c:1254
+msgid "E_xpand All"
+msgstr "å?¨é?¨å±?é??(_X)"
+
+#: ../mail/em-subscription-editor.c:1264
+msgid "Refresh the folder list"
+msgstr "é??æ?°æ?´ç??è³?æ??夾æ¸?å?®"
+
+#: ../mail/em-subscription-editor.c:1276
+msgid "Stop the current operation"
+msgstr "å??æ­¢ç?®å??ç??æ??ä½?"
+
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:101
 #, c-format
-msgid "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "你確å®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
 msgstr[1] "你確å®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
 
-#: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??夾"
 
@@ -10764,158 +9693,187 @@ msgid "\"Filter Editor\" window width"
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?é??度"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?é«?度"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?æ??大å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?é??度"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?æ??大å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?æ??大å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr "ç?¶ä½¿ç?¨è??è½?å¯?æ??å??è¦?è¦?çª?中顯示ç??é?µä»¶æ??è©¢å??æ?¯å?¦è¦?é??é??é?µä»¶è¦?çª?"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+#, fuzzy
+#| msgid "Attached message"
+msgid "Attribute message."
+msgstr "����"
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??表æ??辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "檢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "å??å??æ??檢æ?¥æ?°é?µä»¶"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "�寫���設�度"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "æ?°å¯«è¦?çª?é ?設é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "編輯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?縮å?¨ TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "å°? TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?å£?縮ç?º address_count 中æ??å®?ç??é?·åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶æ?¬å?°ç«¯æ?´æ?¹è??é? ç«¯é?µä»¶ä¼ºæ??å?¨å??æ­¥ç??é »ç??ã??é??é??å¿?é ?è?³å°?æ?? 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªé?¸æ¨?é ­ã??æ­¤æ¸?å?®ä¸­ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?符é??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?符é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "é ?設è½?é??樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "è¨?é?±å°?話ç??ç??é ?設é«?度ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??æ??大å??ç??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "é ?設å??è¦?樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?設æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "è¨?é?±å°?話ç??ç??é ?設é??度ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å­?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10923,128 +9881,128 @@ msgid ""
 "autocompletion."
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??ã??å¦?æ??æ?¾å¾?å?°ï¼?å°±ä¸?å?¤æ?·ç?ºå??å?¾é?µä»¶ã??å®?æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??é??度å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決å®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr "決å®?æ?¯å?¦ä½¿ç?¨è?ªé?¸æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?並ä¸?æ??ä¾?æ¨?é ­ï¼?å°?æ??æ??å??å??å?¾é?µä»¶æª¢æ?¥ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "決å®?æ?¯å?¦å?¨å??ç?´æª¢è¦?ç??ã??é?µä»¶ã??è£?ç??ã??å¯?件人ã??å??ã??主æ?¨ã??中使ç?¨å??樣ç??å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for loading/attaching files to composer."
 msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??件ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å­?é?µä»¶å??件æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Display only message texts not exceeding certain size"
 msgstr "å?ªé¡¯ç¤ºä¸?è¶?é??æ??å??大å°?ç??é?µä»¶æ??å­?"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Do not add signature delimiter"
 msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??符è??"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ç?¶ä½ è¼¸å?¥å?§å®¹æ??å?¨æ??å­?ä¸?顯示æ?¼å­?é?¯èª¤æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Junk folders on exit"
 msgstr "é?¢é??æ??æ¸?空å??å?¾é?µä»¶è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Trash folders on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é?¢é?? Evolution æ??æ¸?空æ??æ??å??å?¾é?µä»¶è³?æ??夾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?空æ??æ??å??å?¾è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr "å??ç?¨ HTML é?µä»¶ä¸­ç??å??ç?«å??ç??ã??許å¤?使ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??好以é??æ??å??ç??代æ?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å??ç?¨æ??å?¥è??模å¼?ï¼?å¦?此你å?¯ä»¥å?¨é?±è®?é?µä»¶æ??ç??å?°æ¸¸æ¨?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é­?è¡?空ç?½é?µ"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??夾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??許äº?å??å¼?æ??å°?è³?æ??夾å??稱ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å??ç?¨æ­¤é?¸é ?å?¯å?¨é?µä»¶é ?覽ã??é?µä»¶æ¸?å?®å??è³?æ??夾中使ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr "å??ç?¨å??å?ªæ??顯示ä¸?è¶?é??ã??message_text_part_limitã??設å®?é?µä¸­æ??å®?義ç??大å°?ç??é?µä»¶æ??å­?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "å??ç?¨ä»¥å?¨æ??æ??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å??ç?¨æ­¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??模å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??稱編碼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11052,62 +10010,72 @@ msgid ""
 "standard."
 msgstr "å°?é?µä»¶æ¨?頭中ç??æª?æ¡?å??稱編碼ç?º Outlook æ?? GMail ç??å½¢å¼?ï¼?好è®?å®?å??è?½æ­£ç¢ºé¡¯ç¤ºç?± Evolution å¯?å?ºç?? UTF-8 å­?符æª?æ¡?å??稱ï¼?å? ç?ºå®?å??並æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?正確ç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "é??濾å¾?æ¸?空å¯?件å?£"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Forward message."
+msgstr "è½?å¯?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "ç¾£çµ?å??è¦?å??ä¿¡å?°é??ä¿¡è«?å£?"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "�件���格�度"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??夾é ?覽並移é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??使ç?¨è??å??試ä¸?次é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??使ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??麼å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
 "in GNOME's MIME type database may be used for displaying content."
 msgstr "å¦?æ??æ²?æ??å?§ç½®æª¢è¦?å?¨å?¯ç?¨æ?¼ Evolution è£?é?¢ç?¹æ®?ç?? MIME é¡?å??ï¼?ä»»ä½?顯示å?¨æ­¤æ¸?å?®ç??  MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??庫ä¹? Bonobo å??件檢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§å®¹ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "忽ç?¥é??ä¿¡è«?å£? Reply-To:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11115,7 +10083,15 @@ msgid ""
 "maximized. This key exists only as an implementation detail."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??è³?æ??夾è¨?é?±ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11123,7 +10099,7 @@ msgid ""
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11132,25 +10108,31 @@ msgid ""
 "detail."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?é??度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?é??度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?é??度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é??度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11158,381 +10140,396 @@ msgid ""
 "replying."
 msgstr "æ??å?¥æ?¼ä¸?è?¬ç??ã??å??è¦?å?¨é?¨ã??è¡?ç?ºï¼?é??å??é?¸é ?æ??è®?ã??ç¾£çµ?å??è¦?ã??å·¥å?·å??æ??é??å??試å?ªå??ä¿¡å?°é??ä¿¡è«?å£?ï¼?ä¹?å°±æ?¯ä½ æ?¶å?°è¦?å??è¦?ç??é??å°?ä¿¡ç??ä¾?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??示以警å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??中移é?¤ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??示警å??ä½ æ­£å??試å??è¦?ç§?人信件給é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "å®?æ??å??ç?¨/å??ç?¨è­¦å??ä½ ã??ä½ æ­£å??è¦?給å¾?å¤?人ã??ç??é??è¦?æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??示警å??ä½ æ­£å??試å??è¦?ç§?人信件給é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??è??é??ä¿¡è«?å£?設å®?ç?? Reply-To: æ¨?é ­æ??å°?ä½ ç??å??ä¿¡é??æ?°å°?å??è?³é??ä¿¡è«?å£?ä¸?ç??æ??æ??æ??å?¡"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Last time Empty Junk was run"
 msgstr "ä¸?次æ¸?空å??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Trash was run"
 msgstr "ä¸?次æ¸?空å??æ?¶ç­?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Layout style"
 msgstr "é??置樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:104
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Level beyond which the message should be logged."
+msgstr "æ??è¨?é??ç??é?µä»¶ç­?ç´?ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?籤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?檢æ?¥ Bonobo å??件檢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accounts"
 msgstr "帳è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 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:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªé?¸æª?頭以å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å­?檢æ?¥ç??å­?å?¸èª?è¨?碼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 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:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 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:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Log filter actions"
 msgstr "è¨?é??é??濾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??濾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mail browser height"
 msgstr "é?µä»¶ç??覽å?¨é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser maximized"
 msgstr "é?µä»¶ç??覽å?¨æ??大å??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser width"
 msgstr "é?µä»¶ç??覽å?¨é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Message text limit for display"
 msgstr "顯示é?µä»¶æ??å­?é??å?¶"
 
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ­]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示æ?¼ TO/CC/BCC 中ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Original message."
+msgstr "å??å§?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr "å?¯è?½ç??æ?¸å?¼æ??ï¼?never - æ°¸ä¸?é??é??ç??覽å?¨è¦?çª? always - 總æ?¯é??é??ç??覽å?¨è¦?çª? ask - (æ??ä»»ä½?å?¶ä»?æ?¸å?¼) æ??è©¢å??使ç?¨è??"
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??主æ?¨æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??試æ¸?空è³?æ??夾æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??夾中ç??é?µä»¶æ??顯示æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ç?¶é??ä¿¡è«?å£?å?«æ??ç§?人å??è¦?æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when replying privately to list messages"
 msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when replying to many recipients"
 msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when user expunges"
 msgstr "使ç?¨è??æ¸?空æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?件å?¯æ?¬æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??試ä¸?次é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é?? HTML é?µä»¶å?°ä¸?æ?³æ?¥å?? HTML é?µä»¶ç??æ?¶ä»¶è??æ??ï¼?顯示æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??人å??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?端"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?游æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "辨èª?æ??å­?中ç??表æ??符è??並å??代æ??å??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Recognize links in text and replace them."
 msgstr "辨èª?æ??å­?中ç??é?£çµ?並å°?ä¹?å??代ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Save directory"
 msgstr "å?²å­?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?件è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Send HTML mail by default"
 msgstr "é ?設å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Send HTML mail by default."
 msgstr "é ?設å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?件è??é?»å­?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Server synchronization interval"
 msgstr "伺æ??å?¨å??æ­¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
 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:151
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??ç¾£çµ?æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??ç¾£çµ?æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show Animations"
 msgstr "顯示å??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show all message headers"
 msgstr "顯示æ??æ??é?µä»¶æª?é ­"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show all the headers when viewing a messages."
 msgstr "檢è¦?é?µä»¶æ??顯示æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show animated images as animations."
 msgstr "æ?­æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show image animations"
 msgstr "顯示å??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show original \"Date\" header value."
 msgstr "顯示å??å§?ç??ã??æ?¥æ??ã??æ¨?é ­æ?¸å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show photo of the sender"
 msgstr "顯示å¯?件è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:177
 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:167
+#: ../mail/evolution-mail.schemas.in.h:178
 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:168
+#: ../mail/evolution-mail.schemas.in.h:179
 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:169
+#: ../mail/evolution-mail.schemas.in.h:180
 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:170
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??中以å??é?¢ç??æ¬?ä½?顯示å¯?件è??ç??é?»å­?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:182
 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:172
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?格中顯示å¯?件è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 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. "
@@ -11543,45 +10540,37 @@ msgid ""
 "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
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Spell check inline"
 msgstr "����檢�"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Spell checking color"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "è¨?é?±å°?話ç??é ?設é«?度"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "è¨?é?±å°?話ç??é ?設é??度"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Terminal font"
 msgstr "çµ?端æ©?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?設å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:192
 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 "
@@ -11589,41 +10578,59 @@ msgid ""
 "message list."
 msgstr "é??ç½®æ?¹å¼?決å®?äº?å?¨é?µä»¶æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?端æ©?å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr "å?¨è½?å¯?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?說æ??æ?¥ä¸?ä¾?æ?¯è½?å¯?ç??é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?ç½®é ?張貼ï¼?ï¼?說æ??æ?¥ä¸?ä¾?æ?¯å??å§?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?說æ??é?µä»¶ç??å??ä½?è??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??é??度å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "é??è£?å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ï¼?ã??1ã??ç?ºè­¦å??ï¼?ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
 "is used only when 'force_message_limit' key is activated."
 msgstr "é??è£?決å®?äº?é?µä»¶å?§æ??å?¨ Evolution 中å?¯é¡¯ç¤ºç??æ??大容é??ï¼?以 KB ç?ºå?®ä½?æ??å®?ã??é ?設å?¼ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??設å®?é?µæ??æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:200
 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:189
+#: ../mail/evolution-mail.schemas.in.h:201
 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:190
+#: ../mail/evolution-mail.schemas.in.h:202
 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;"
@@ -11631,219 +10638,230 @@ msgid ""
 "mail view."
 msgstr "æ­¤å¯?碼å??æ??該å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªé?¸æª?é ­ï¼?以å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é ­æ??顯示å?¨é?µä»¶æª¢è¦?ï¼?å??設å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:203
 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:192
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
-msgstr "é??æ??設å®?å?¨é ?設é?µä»¶æ¸?å?®æª¢è¦?中顯示ä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??顯示ã??...ã??ã??"
+msgstr "é??æ??設å®?å?¨é ?設é?µä»¶æ¸?å?®æª¢è¦?中顯示ä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??顯示ã??â?¦ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?設ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:207
 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:196
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Thread the message-list based on Subject"
 msgstr "以主����串��件��"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "UID string of the default account."
 msgstr "é ?設帳è??ç?? UID å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "使ç?¨è¡?å?§æ?¼å­?檢æ?¥æ??å°?æ?¼é?¯å­?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Use SpamAssassin daemon and client"
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Use custom fonts"
 msgstr "使ç?¨è?ªé?¸å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Use custom fonts for displaying mail."
 msgstr "使ç?¨è?ªé?¸å­?å??ä¾?顯示é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??游æ¨?å??å?¨ä½?è??ã??é??æ??決å®?游æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??決å®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Variable width font"
 msgstr "è®?å??é??度å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?設å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶è??ä¸?管ã??檢æ?¥æ?°é?µä»¶æ?¼æ¯? X å??é??ã??é?¸é ?ã??é??å??é?¸é ?å?ªè?½å??ã??send_recv_on_startã??é?¸é ?ä¸?起使ç?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ?°é?µä»¶ã??é??ä¹?å??å?«å¯?å?ºå¯?件å?£ä¸­ç??é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "ç?¶é?µä»¶ä¸?å??å?« In-Reply-To æ?? References æª?é ­æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾£çµ?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦æ ¹æ??é?µä»¶ç¾£çµ?中æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:228
 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
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Width of the message-list pane"
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼é??度"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é??度ã??"
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "輸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "�件"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸��"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "ç?®ç??端è³?æ??夾(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??夾"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??夾ä¾?輸å?¥"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "主�"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "å¯?件è??"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley �件信箱 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??夾"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "正���信箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:587
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ­£å?¨å?¯å?¥ã??%sã??"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "Evolution 管é??輸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
@@ -11867,102 +10885,106 @@ msgstr "主�� %s"
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??表"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??濾å?¨è¦?å??"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
+#. 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:480
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?ä¿®æ?¹ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 msgstr[1] ""
 "ä¸?å??é??濾å?¨è¦?å??\n"
-"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\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 "(Not Recommended)"
-msgstr "(�建議)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
-msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
+msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)â?¦"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使ç?¨æ­¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½ç½²(_W)"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "å??許ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?(_M)"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) 給:"
+msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (cc) 給(_S):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (_Bcc) 給:"
+msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (bcc) 給(_B):"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??å¯?碼å??å??è£?ç??å¯?碼å??(_T)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "é©?è­?"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??符è??(_E)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å­?符é??(_H):"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "檢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "以è?ªé?¸æ¨?頭檢æ?¥å??å?¾é?µä»¶(_S)"
 
+#: ../mail/mail-config.ui.h:19
+msgid "Check for new _messages on start"
+msgstr "å??å??æ??檢æ?¥æ?°é?µä»¶(_M)"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new messa_ges in all active accounts"
+msgstr "檢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶(_G)"
+
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "檢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
@@ -11972,33 +10994,40 @@ msgid "Check spelling while I _type"
 msgstr "ç?¶æ??輸å?¥æ??檢æ?¥æ?¼å­?(_T)"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
-
-#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "��(_A)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "��(_R)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å­?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "正�編輯�件"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "çµ?æ??"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??夾æ??確èª?(_W)"
 
+#: ../mail/mail-config.ui.h:29
+msgid "Confirmations"
+msgstr "確�"
+
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
+
 #: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "�設��"
@@ -12007,377 +11036,331 @@ msgstr "�設��"
 msgid "Default character e_ncoding:"
 msgstr "�設�符編碼(_N):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "���件"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½² [é ?設å?¼] (_U)"
+msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ç¢¼ç°½ç½² [é ?設å?¼](_U)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Displayed Message Headers"
 msgstr "顯示ç??é?µä»¶æª?é ­"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "ä¸?顯示é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?件è??å?¨æ??ç??é??è¨?é??中就ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "ä¸?使ç?¨å¼?æ??"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "è??稿å?£(_F):"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "é?»å­?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?空å??æ?¶ç­?è³?æ??夾(_X)"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "å??ç?¨é­?è¡?空ç?½é?µ(_P)"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "å??ç?¨æ??å°?è³?æ??夾(_R)"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:45
 msgid "Encry_ption certificate:"
 msgstr "����(_P):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:46
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?設å?¼)(_E)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "å?ºå®?é??度(_X):"
+#: ../mail/mail-config.ui.h:47
+msgid "F_all back to threading messages by subject"
+msgstr "é??å??å?°æ ¹æ??主æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:48
+msgid "Fix_ed Width Font:"
 msgstr "å?ºå®?é??度å­?å??(_E):"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "å­?å??å?§å®¹"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:49
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:50
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:52
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "å¦?æ??å?¯è?½ï¼?ç¾£çµ?å??è¦?å?ªç?¨æ?¼é??ä¿¡è«?å£?"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:53
 msgid "HTML Messages"
 msgstr "HTML �件"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:54
 msgid "H_TTP Proxy:"
 msgstr "H_TTP 代ç??伺æ??å?¨:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:55
 msgid "Headers"
 msgstr "�頭"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:56
 msgid "Highlight _quotations with"
 msgstr "強調å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:57
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "忽ç?¥é??ä¿¡è«?å£?ç?? Reply-To:"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:58
 msgid "Inline"
 msgstr "è¡?å?§"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:59
 msgid "Inline (Outlook style)"
 msgstr "���Outlook 風格�"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "�籤"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "Languages Table"
 msgstr "��表"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "Loading Images"
 msgstr "æ­£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
 msgid "Mail Headers Table"
 msgstr "�件�頭表"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Mailbox location"
 msgstr "信箱�置"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Message Display"
 msgstr "�件顯示"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "é?µä»¶å­?å??"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:67
 msgid "Message Receipts"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:68
 msgid "No _Proxy for:"
 msgstr "æ²?æ??代ç??伺æ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr "注æ??ï¼?å?¨é¦?次é?£ç·?ä¹?å??å°?ä¸?æ??æ??示你輸å?¥å¯?碼"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:70
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªé?¸å??å?¾é?µä»¶æ¨?é ­é??å??é?¸é ?å°±æ??被忽ç?¥ã??"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "é?¸æ??æ?§ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:73
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:74
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG å¯?碼å?? ID:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:75
 msgid "Pass_word:"
 msgstr "�碼(_W):"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "æ??é?¸é¡?è?²"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Port:"
 msgstr "���:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??æ??顯示æ??示(_O)"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:78
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "����� (PGP/GPG)"
 
-# zh_HK: msgstr "å??å?°å??å¿?é??"
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "å??å?°å??å¿?é??"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?æ??å??æ??é??"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示(_L)"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示(_M)"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:80
 msgid "Proxy Settings"
 msgstr "代ç??伺æ??å?¨è¨­å®?å?¼"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:81
 msgid "Quoted"
 msgstr "å¼?æ??"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:82
 msgid "Re_member password"
 msgstr "���碼(_M)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:83
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:84
 msgid "Remember _password"
 msgstr "���碼(_P)"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:85
+msgid "Replies and Forwards"
+msgstr "å??è¦?å??è½?å¯?"
+
+#: ../mail/mail-config.ui.h:86
 msgid "Required Information"
 msgstr "å¿?è¦?ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:87
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:88
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:89
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:90
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:92
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ­¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:93
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??中ç??å¯?件è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:94
 msgid "S_elect..."
-msgstr "é?¸å??(_E)..."
+msgstr "é?¸å??(_E)â?¦"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:95
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å­?å??(_T):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "��� MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "é?¸æ??è??稿è³?æ??夾"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:99
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?ºå®?é??度å­?å??"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:100
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?é??度å­?å??"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "é?¸æ??ç?¨æ?¼æ??å?°ç?? HTML å?¯è®?é??度å­?å??"
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "å¯?件è??ç?¸ç??"
 
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "é?¸æ??å??å?¾é?µä»¶è³?æ??夾"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+msgid "Sending a _private reply to a mailing list message"
+msgstr "å?³é??ç§?人å??è¦?å?°é??ä¿¡è«?å£?(_P)"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "é?¸æ??å¯?件è³?æ??夾"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+msgid "Sending a message with an _empty subject line"
+msgstr "å?³é??æ²?æ??主æ?¨ç??é?µä»¶(_E)"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "é?¸æ??å??æ?¶ç­?è³?æ??夾"
-
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "å¯?件è??ç?¸ç??"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "å?³é??å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶(_B)"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "å?³é??é?µä»¶"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:109
+msgid "Sending a reply to a large _number of recipients"
+msgstr "å?³é??æ??大é??æ?¶ä»¶è??ç??é?µä»¶(_N)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??夾(_M):"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "å¯?件è??è??稿é?µä»¶"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "伺æ??å?¨è¦?æ±?é©?è­?(_V)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:112
 msgid "Server Configuration"
 msgstr "伺æ??å?¨çµ?æ??"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "伺æ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:114
 msgid "Si_gning algorithm:"
 msgstr "簽署���(_G):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "ç°½å??æª?(_N)"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "簽署��(_N):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:119
 msgid "Signing _algorithm:"
 msgstr "簽署���(_A):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:120
+msgid "Special Folders"
+msgstr "ç?¹æ®?è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:122
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?輸å?¥(_T)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:123
+msgid "Start up"
+msgstr "å??å??"
+
+#: ../mail/mail-config.ui.h:125
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12387,12 +11370,13 @@ msgstr ""
 "ç°½å??æª?ã??ä½ æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "置�張貼��"
+#: ../mail/mail-config.ui.h:130
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr "è¦?é?¿å??é?»å­?é?µä»¶å?ºç?¾æ??å¤?æ??令人é?£å ªç??æ??æ³?ï¼?å?¨é?²è¡?ä¸?å??已核å??å??ä½?æ??è©¢å??使ç?¨è??以å??å¾?確èª?ï¼?"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12400,166 +11384,141 @@ msgstr ""
 "輸å?¥æ?³ç?¨ä¾?代表é??å??帳è??ç??å??稱ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??人ã??"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:133
 msgid "Us_ername:"
 msgstr "使ç?¨è??å??稱(_E):"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:134
 msgid "Use Authe_ntication"
 msgstr "使���(_N)"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:135
+msgid "User _Name:"
 msgstr "使ç?¨è??å??稱(_N):"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "å?¯è®?é??度(_A):"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:136
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:137
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:138
 msgid "_Authentication Type"
 msgstr "é©?è­?é¡?å??(_A)"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:139
 msgid "_Default junk plugin:"
 msgstr "é ?設å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:140
 msgid "_Direct connection to the Internet"
 msgstr "�������網(_D)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?簽署æ??è­°é??è«? (å?¼å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:142
 msgid "_Forward style:"
 msgstr "����(_F):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:143
 msgid "_Junk Folder:"
 msgstr "å??å?¾é?µä»¶è³?æ??夾(_J):"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:144
+msgid "_Keep signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??簽署(_K)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:145
 msgid "_Languages"
 msgstr "��(_L)"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "è¼?å?¥ç?±è?¯çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
+#: ../mail/mail-config.ui.h:146
+msgid "_Load images only in messages from contacts"
+msgstr "å?ªè¼?å?¥ç?±è?¯çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:147
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:148
 msgid "_Make this my default account"
 msgstr "設ç?ºæ??ç??é ?設帳è??(_M)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:149
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??代ç??伺æ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "�示�件�已���(_M)"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:151
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²çµ¡ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:152
 msgid "_Path:"
 msgstr "路�(_P):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??è?¯çµ¡äººæ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "ç?¶å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??顯示æ??示(_P)"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "�令稿(_S):"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "伺æ??å?¨(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "顯示å??ç?«å??ç??(_S)"
+#: ../mail/mail-config.ui.h:160
+msgid "_Show animated images"
+msgstr "æ?­æ?¾å??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?覽顯示å¯?件è??ç?¸ç??(_S)"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "縮� _To / Cc / Bcc �頭�"
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:162
 msgid "_Trash Folder:"
 msgstr "å??æ?¶ç­?è³?æ??夾(_T):"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:163
 msgid "_Use Secure Connection:"
 msgstr "使�����(_U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:164
 msgid "_Use system defaults"
 msgstr "使�系統�設�(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "使ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å­?å??(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "å?°å??"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:168
 msgid "color"
 msgstr "�彩"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:169
 msgid "description"
 msgstr "æ??è¿°"
 
@@ -12584,78 +11543,58 @@ msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "���起(_A)"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "�碼簽署"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "����"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "å?¨é?¨å±?é??(_X)"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "è³?æ??夾è¨?é?±"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "給你ç??è³?è¨?"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "å??è¦?å?¨é?¨"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "檢�"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "伺æ??å?¨(_E):"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "å?ªé¡¯ç¤ºé ?ç?®å?«æ??(_S):"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "æ??å°?è³?æ??夾ä¾?æº?"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "�����"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12663,334 +11602,251 @@ msgstr ""
 "ä½ é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸­é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "��(_F):"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "é??濾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "���件"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"ç?¡æ³?é??å? è?³ %sï¼?%s\n"
-"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
-
-#: ../mail/mail-ops.c:654
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "æ­£å?¨å?³é??é?µä»¶"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "é??å??è³?æ??夾ã??%sã??"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2123
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2216
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "å?²å­?é??件"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2387
 #, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"��建�輸����%s�\n"
-" %s"
+msgid "Preparing account '%s' for offline"
+msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
+#: ../mail/mail-ops.c:2478
+msgid "Checking Service"
+msgstr "檢æ?¥æ??å??"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2558
 #, c-format
-msgid "Disconnecting from '%s'"
-msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
+msgid "Disconnecting %s"
+msgstr "正�中� %s"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2615
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
+msgid "Removing attachments"
+msgstr "æ­£å?¨ç§»é?¤é??件"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2662
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
-
-#: ../mail/mail-ops.c:2636
-msgid "Checking Service"
-msgstr "檢æ?¥æ??å??"
+msgid "File \"%s\" has been removed."
+msgstr "æª?æ¡?ã??%sã??å·²ç¶?被移é?¤ã??"
 
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
-msgstr "æ­£å?¨å??æ¶?..."
+msgstr "æ­£å?¨å??æ¶?â?¦"
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:435
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
-msgstr "��中..."
+msgstr "��中�"
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
 msgid "Waiting..."
-msgstr "正���..."
+msgstr "正����"
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "輸���"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "輸��碼"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
-
-#: ../mail/mail-session.c:724
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/mail-session.c:733
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é??ã??%sã??ï¼?%s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº?ã??%sã??ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "ç?¡æ??ç??è³?æ??夾ï¼?ã??%sã??"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設å®?æ??å°?è³?æ??夾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??夾"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:709
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?ä¿®æ?¹ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 msgstr[1] ""
 "ä¸?å??æ??å°?è³?æ??夾\n"
-"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1273
 msgid "Edit Search Folder"
 msgstr "編輯æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1380
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??夾"
 
@@ -13178,86 +12034,112 @@ msgid ""
 msgstr "è«?檢æ?¥å¯?碼æ?¼å­?æ?¯å?¦æ­£ç¢ºã??è«?注æ??ï¼?å¾?å¤?å¯?碼å??å??大å°?寫ï¼?ä½ å?¯è?½æ??äº? Caps Lockã??"
 
 #: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "é??é??é?µä»¶è¦?çª?ã??"
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "ç?¡æ³?å?²å­?簽署æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
+msgid ""
+"Default local store has been changed from mbox to maildir format. Do you "
+"want to migrate now ?\n"
+"\n"
+"A mbox account will be created to preserve the old mbox folders. You can "
+"delete it after ensuring the data is safely migrated. Please make sure there "
+"is enough space if you choose to migrate."
+msgstr ""
+"é ?設ç??æ?¬å?°ç«¯å?²å­?å??å·²ç¶?å¾? mbox æ?¹è®?ç?º maildir æ ¼å¼?ã??ä½ ç?¾å?¨æ?¯å?¦è¦?è½?æ??ï¼?\n"
+"\n"
+"ç¨?å¼?æ??建ç«?ä¸?å?? mbox 帳è??ä¾?ä¿?ç??è??ç?? mbox è³?æ??夾ã??ä½ å?¯ä»¥å?¨ç¢ºèª?è³?æ??é?½å®?å?¨è½?æ??å¾?å??å°?å®?å?ªé?¤ã??å¦?æ??ä½ é?¸æ??è½?æ??ï¼?è«?確å®?æ??足夠ç??空é??ã??"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??夾ã??{0}ã??中ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 msgid "Do _Not Disable"
 msgstr "ä¸?è¦?å??ç?¨(_N)"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Do _Not Send"
 msgstr "ä¸?è¦?å?³é??(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 msgid "Do _Not Synchronize"
 msgstr "ä¸?è¦?å??æ­¥(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ­¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??æ?´æ?¹ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "輸å?¥å¯?碼ã??"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??濾å?¨å®?義æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?業æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to unsubscribe from folder."
+msgstr "ç?¡æ³?å??æ¶?è¨?é?±è³?æ??夾ã??"
+
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å­?å?¨ä½?ç?¡æ³?è¦?寫ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å­?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:61
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:67
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "è³?æ??夾ã??{0}ã??並æ?ªå??å?«ä»»ä½?é??è¤?ç??é?µä»¶ã??"
+
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??ä½ é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?復å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "å¦?æ??ä½ å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??ä½ é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?失ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:71
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??代ç??伺æ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13265,33 +12147,33 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?該帳è??ç??è³?è¨?以å??\n"
 "å®?æ??æ??ç??代ç??伺æ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:74
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?帳è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??ä½ é?¸æ??çµ?æ??ï¼?å??次å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è­?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??濾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
 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 "
@@ -13299,33 +12181,45 @@ msgid ""
 "recipient."
 msgstr "å¾?å¤?é?»å­?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é ­è?³å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??å? å?¥äº?æ­¤æª?é ­ï¼?æ??æ°¸é? å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:81
+msgid "Migrate local mbox folders to maildir"
+msgstr "å°?æ?¬å?°ç«¯ mbox è³?æ??夾è½?æ??ç?º maildir"
+
+#: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
+msgid "N_ever"
+msgstr "永�(_E)"
+
+#: ../mail/mail.error.xml.h:85
+msgid "No duplicate messages found."
+msgstr "æ?¾ä¸?å?°é??è¤?ç??é?µä»¶ã??"
+
+#: ../mail/mail.error.xml.h:86
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:87
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?次é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:88
 msgid "Please check your account settings and try again."
 msgstr "è«?檢æ?¥å¸³è??設å®?並å??試ä¸?次ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:89
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??使ç?¨å?¶ä»?帳è??å?³é??ã??"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?輸å?¥ä¸?å??æ??æ??ç??é?»å­?é?µä»¶å?°å??ã??ä½ å?¯ä»¥æ??ä¸?ä¸?輸å?¥æ?¹å¡?æ??é??ç??ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å­?é?µä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13334,65 +12228,69 @@ msgstr ""
 "è«?確å®?以ä¸?æ?¶ä»¶è??å¸?æ??並ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å­?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:93
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?輸å?¥å?¯ä¾?辨è­?é??å??ç°½å??æª?ç??ç?¨ç?¹å??稱ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:94
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:95
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?移è??é?µä»¶è³?æ??夾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:96
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??伺æ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è­?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:97
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:98
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??以å??å®?æ??æ??ç??å­?è³?æ??夾?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\"?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??ï¼?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:100
+msgid "Remove duplicate messages?"
+msgstr "æ?¯å?¦ç§»é?¤é??è¤?ç??é?µä»¶ï¼?"
+
+#: ../mail/mail.error.xml.h:101
 msgid "Reply _Privately"
 msgstr "ç§?人å??è¦?(_P)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:104
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??夾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:105
 msgid "Send private reply?"
 msgstr "æ?¯å?¦å?³é??ç§?人å??è¦?ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:106
 msgid "Send reply to all recipients?"
 msgstr "æ?¯å?¦å??è¦?給æ??æ??ç??æ?¶ä»¶è??ï¼?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:107
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å­?å?¨"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:108
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ­¥è³?æ??夾以ä¾?é?¢ç·?使ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "Evolution é??è¦?系統è³?æ??夾æ??è?½æ­£å¸¸ä½?業ï¼?è??ä¸?該è³?æ??夾ä¸?å?¯ä»¥é??æ?°å?½å??ã??移å??æ??å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13405,7 +12303,7 @@ msgstr ""
 "\n"
 "å¾?å¤?é?»å­?é?µä»¶ç³»çµ±æ??æ?°å¢? Apparently-To æª?é ­è?³å?ªæ??å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶ã??å¦?æ??æ?°å¢?æ­¤æª?é ­ï¼?æ??å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?ä½ æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13413,7 +12311,7 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?»å­?é?µä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13421,11 +12319,11 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?»å­?é?µä»¶å?°å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:118
 msgid "The script file must exist and be executable."
 msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å­?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13433,60 +12331,60 @@ msgstr ""
 "æ­¤è³?æ??夾å?¯è?½å·²ç¶?è?ªå??æ?°å¢?ã??\n"
 "é??è¦?æ??ï¼?è«?移è?³æ??å°?è³?æ??夾編輯å?¨ï¼?以æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å? ç?ºä½ æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??帳è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºä½ æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´æ­¤é©?è­?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è­?ã??"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:124
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽署已ç¶?æ?´æ?¹ï¼?ä½?å°?æ?ªå?²å­?ã??"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "é??æ??å°?æ¨?示é?¸å®?ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:126
 msgid "This will mark all messages as read in the selected folder."
 msgstr "é??æ??å°?æ¨?示é?¸å??ç??è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:127
 msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "ç?¡æ³?é??å??此帳è??ç??è??稿è³?æ??夾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??稿è³?æ??夾代æ?¿ï¼?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to read license file."
 msgstr "ç?¡æ³?è®?å??æ??æ¬?æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:130
 msgid "Use _Default"
 msgstr "使��設�(_D)"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:131
 msgid "Use default drafts folder?"
 msgstr "使ç?¨é ?設ç??è??稿è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13495,51 +12393,55 @@ msgstr ""
 "è­¦å??ï¼?å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶å°?æ??è?ªä½ ç??æ?¬å?°æ??é? ç«¯è³?æ??夾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??麼å??ï¼?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:134
+msgid "Would you like to close the message window?"
+msgstr "ä½ æ?³è¦?é??é??é?µä»¶è¦?çª?å??ï¼?"
+
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr "你正以ç§?人å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯é??å??é??ä¿¡è«?å£?å??試å°?ä½ ç??å??ä¿¡å°?å??è«?å£?ã??你確å®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr "ä½ æ­£å?¨å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯ä½ ä»¥ç§?人å??è¦?æ?¹å¼?å¯?給å??å¯?件è??ï¼?è??é??å¯?å??é??ä¿¡è«?å£?ã??你確å®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "ä½ æ­£å?¨å??è¦?ç??信件æ??å?³é??給許å¤?æ?¶ä»¶è??ã??你確å®?å??信給ä»?å??å?¨é?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:138
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ä½ æ²?æ??足夠ç??æ¬?é??å?ªé?¤æ­¤å°?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:139
 msgid "You have not filled in all of the required information."
 msgstr "ä½ æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:140
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ä½ æ??æ?ªå¯?å?ºç??é?µä»¶ï¼?ä½ ç?¡è«?å¦?ä½?é?½è¦?é?¢é??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:141
 msgid "You may not create two accounts with the same name."
 msgstr "ä½ ä¸?è?½ç?¨ç?¸å??ç??å??稱建ç«?å?©å??帳è??ã??"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:142
 msgid "You must name this Search Folder."
 msgstr "ä½ å¿?é ?å?½å??æ­¤æ??å°?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:143
 msgid "You must specify a folder."
 msgstr "ä½ å¿?é ?æ??å®?ä¸?å??è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13548,127 +12450,143 @@ msgstr ""
 "ä½ å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??夾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??夾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??夾ã??æ??æ??é? ç«¯è³?æ??夾æ??äº?è??ç??é?¸ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:146
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ä½ ç?»å?¥ä¼ºæ??å?¨ã??{0}ã??ç??帳è??ç?ºã??{0}ã??ï¼?ä½?失æ??äº?ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:147
+msgid "_Always"
+msgstr "總�(_A)"
+
+#: ../mail/mail.error.xml.h:148
 msgid "_Append"
 msgstr "添�(_A)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:149
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:150
 msgid "_Discard changes"
 msgstr "����(_D)"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../mail/mail.error.xml.h:151
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_E)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:152
 msgid "_Expunge"
 msgstr "��(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:153
+msgid "_No"
+msgstr "å?¦(_N)"
+
+#: ../mail/mail.error.xml.h:154
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:157
 msgid "_Send Receipt"
 msgstr "å?³é??å??æ¢?(_S)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:158
 msgid "_Synchronize"
 msgstr "å??æ­¥å??(_S)"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:159
+msgid "_Yes"
+msgstr "æ?¯(_Y)"
+
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "���"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "已��"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "��"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
+#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "�件"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "æ²?æ??é?µä»¶ç¬¦å??ä½ ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??夾中æ²?æ??é?µä»¶ã??"
 
@@ -13697,7 +12615,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:576
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "大�"
 
@@ -13706,27 +12624,27 @@ msgid "Subject - Trimmed"
 msgstr "主� - 已��"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Sender contains"
 msgstr "å¯?件è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Subject contains"
 msgstr "主æ?¨å??å?«"
 
@@ -13734,48 +12652,48 @@ msgstr "主æ?¨å??å?«"
 msgid "Subject or Addresses contains"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP 伺æ??å?¨ (å¦?æ??ä½ ç?? LDAP 伺æ??å?¨æ?¯æ?´ SSL)ã??"
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°ä½ ç?? LDAP 伺æ??å?¨ (å¦?æ??ä½ ç?? LDAP 伺æ??å?¨æ?¯æ?´ TLS)ã??"
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:213
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
 msgstr "é?¸å??æ­¤é?¸é ?表示ï¼?ä½ ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示你ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?ä½ ç??å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:756
 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:820
+#: ../modules/addressbook/addressbook-config.c:830
 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:895
+#: ../modules/addressbook/addressbook-config.c:905
 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 "
@@ -13783,29 +12701,29 @@ msgid ""
 "one level beneath your base."
 msgstr "æ??å°?ç¯?å??æ??å®?義你æ?³å¾?網絡ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -13842,14 +12760,24 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??è?¯çµ¡äººé ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "主é??è¨?é??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "顯示è?ªå??è£?é½?ç??å§?å??è??ä½?å??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "顯示�覽�格"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr "ã??è?¯çµ¡äººã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13857,89 +12785,89 @@ msgid ""
 "contact list."
 msgstr "é??ç½®æ?¹å¼?決å®?äº?å?¨è?¯çµ¡äººæ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨è?¯çµ¡äººæ¸?å?®æ??é??ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "å?¨ Evolution å??試è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?輸å?¥ç??å­?符æ?¸ç?®ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ä¸?次ç?¨æ?¼é?¸å??å??稱å°?話ç??ç??è³?æ??夾 URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ä¸?次ç?¨æ?¼é?¸å??å??稱å°?話ç??ç??è³?æ??夾 URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸­è?ªå??è£?é½?ç??è?¯çµ¡äººå§?å??è??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦é¡¯ç¤ºé ?覽çª?æ ¼ã??"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:162
-#: ../modules/mail/em-mailer-prefs.c:1165
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "_Table column:"
 msgstr "表格�(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "è?ªå??å®?æ??"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??è?¯çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:281
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "�絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:282
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "建ç«?æ?°ç??è?¯çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "�絡人��(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:290
+#: ../modules/addressbook/e-book-shell-backend.c:289
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "建ç«?æ?°ç??è?¯çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:298
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:300
+#: ../modules/addressbook/e-book-shell-backend.c:299
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "建ç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:317
+#: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "�絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "è­?æ?¸"
 
@@ -13951,7 +12879,7 @@ msgstr "��� vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
-msgstr "è¤?製æ??æ??ç??è?¯çµ¡äººå?°(_P)..."
+msgstr "è¤?製æ??æ??ç??è?¯çµ¡äººå?°(_P)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
@@ -13967,7 +12895,7 @@ msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
-msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)..."
+msgstr "å°?æ??æ??ç??è?¯çµ¡äººç§»å?°(_V)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
@@ -13986,12 +12914,12 @@ msgid "Show properties of the selected address book"
 msgstr "顯示é?¸å??é??è¨?é??ç??屬æ?§"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "_Rename..."
-msgstr "é??æ?°å?½å??(_R)..."
+msgstr "é??æ?°å?½å??(_R)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
@@ -14011,7 +12939,7 @@ msgstr "å??æ­¢è¼?å?¥"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
-msgstr "�製�絡人�(_C)..."
+msgstr "�製�絡人�(_C)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
@@ -14023,7 +12951,7 @@ msgstr "���絡人(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
-msgstr "��絡人���(_F)..."
+msgstr "��絡人���(_F)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
@@ -14031,7 +12959,7 @@ msgstr "æ??å°?顯示ç??è?¯çµ¡äººä¸­ç??æ??å­?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
-msgstr "���絡人(_F)..."
+msgstr "���絡人(_F)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
@@ -14039,7 +12967,7 @@ msgstr "å?³é??é?¸å??è?¯çµ¡äººçµ¦å?¶ä»?使ç?¨è??ã??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
-msgstr "��絡人移�(_M)..."
+msgstr "��絡人移�(_M)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
@@ -14047,11 +12975,11 @@ msgstr "å°?é?¸å??ç??è?¯çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
-msgstr "���絡人(_N)..."
+msgstr "���絡人(_N)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
-msgstr "���絡人��(_L)..."
+msgstr "���絡人��(_L)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
@@ -14063,29 +12991,29 @@ msgstr "檢è¦?ç?®å??ç??è?¯çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
-msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)..."
+msgstr "å?³é??é?µä»¶çµ¦è?¯çµ¡äºº(_S)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??è?¯çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "_Preview"
 msgstr "�覽(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "��(_D)"
 
@@ -14097,7 +13025,7 @@ msgstr "屬�(_P)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:830
 #: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
-msgstr "å?²å­?æ?? _vCard..."
+msgstr "å?²å­?æ?? _vCardâ?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
@@ -14108,9 +13036,9 @@ msgid "Show contact preview window"
 msgstr "顯示�絡人�覽��"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "_Classic View"
 msgstr "�統檢�(_C)"
 
@@ -14119,9 +13047,9 @@ msgid "Show contact preview below the contact list"
 msgstr "��絡人����顯示�絡人�覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
@@ -14130,25 +13058,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "å?¨è?¯çµ¡äººæ¸?å?®æ??é??顯示è?¯çµ¡äººé ?覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1684
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../shell/e-shell-content.c:613
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
@@ -14306,115 +13234,851 @@ msgstr "使�����(_U):"
 msgid "cards"
 msgstr "å?¡ç??"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u è?? %d æ??被æ?¿æ??ç?ºé?»å­?é?µä»¶ä½?å??中ç??使ç?¨è??è??網å??å??稱ã??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(顯示��檢�)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "警示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "天"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "é ?設ç??空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "顯示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "å°?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "å??é??"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "��(_U)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "以é?±æ?²å??æ??檢è¦?(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "第äº?æ??å??(_C):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "顯示æ??é??(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "å?¨å·¦ä¸?è¡?äº?æ??中å°?é?±æ??æ?§äº?件以æ??é«?顯示(_E)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "顯示��(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "é?±å??(_H)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "樣�:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:606
+msgid "Time"
+msgstr "æ??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "æ??å?»æ ¼å¼?:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "使ç?¨ç³»çµ±æ??å??(_Y)"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Wee_k starts on:"
+msgstr "ä¸?é?±é??å§?æ?¼(_K):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+msgid "Work Week"
+msgstr "工��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "工��:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_12 å°?æ?? (AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_24 å°?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "��(_F)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "��(_M)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "é??æ??ç??å·¥ä½?(_O):"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "��(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "æ??é??é??é??(_T):"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "��(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "��(_W)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "鬧���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "ä»?天å?°æ??ç??å·¥ä½?è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "é??æ??å·¥ä½?ç??è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder units"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Birthday and anniversary reminder value"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "å?¨æ??å?»å??中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©(ç??空表示使ç?¨é ?設å?¼)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "æ¸?空æ??確èª?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "é ?設ç??ç´?æ??æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "é ?設æ??é??ç??å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "é ?設æ??é??ç??æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "ç?¨ä¾?å­?æ?¾é¬§é?´é?³æ??æª?ç??ç?®é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "é?±è??å·¥ä½?å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "é?±è??å·¥ä½?æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "水平�格�置"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥çµ?æ??æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥é??å§?æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示工ä½?é ?覽çª?æ ¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "ä¸?次鬧é?´æ??å?»"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼å¸?ç??伺æ??å?¨ URL æ¸?å?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains ç·?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸­è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "決å®?ç??æ?¥æ??é?±å¹´ç´?念æ?¥æ??é??ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "決å®?é ?設æ??é??ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "é??æ??ç??å·¥ä½?è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?覽è¡?äº?æ??ä¹?é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "主è¦?è¡?äº?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "主è¦?å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "主�工���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Recurrent Events in Italic"
+msgstr "é?±æ??æ?§äº?件以æ??é«?顯示"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "以é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "å?¨äº?件/æ??è­°/å·¥ä½?編輯å?¨ä¸­é¡¯ç¤º å??é¡? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr "å?¨å·¦ä¸?è¡?äº?æ??中å°?é?±æ??æ?§äº?件é?£å¹¾å¤©ä»¥æ??é«?顯示ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "顯示工��覽�格"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?覽顯示é?±æ?¸"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr "å¦?æ??設å®?å??æ??å?¨æ?¥æª¢è¦?中顯示第äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??設å®?é?µç??ç?¨æ³?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "工��覽�格�置�水平�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr "ã??è¡?äº?æ??ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr "ã??å??å¿?é??ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr "ã??å·¥ä½?ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr "ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??網å??ç¯?æ?¬ï¼?%u è¦?以é?»å­?é?µä»¶ä½?å??ç??使ç?¨è??å??稱é?¨å??ä¾?å??代ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??稱ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr "ç?¨æ?¼è¡?äº?æ??中æ?¥æ??è??æ??å?»ç??é ?設æ??å??ï¼?æ?ªç¿»è­¯ç?? Olsen æ??å??è³?æ??庫ä½?置就å?? \"America/New York\"ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr "é??ç½®æ?¹å¼?決å®?äº?å?¨å??å¿?é??æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr "é??ç½®æ?¹å¼?決å®?äº?å?¨å·¥ä½?æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "é??è£?å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè­¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "æ??é??å??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "ä¸?次鬧é?´å?·è¡?ç??æ??é??(_T)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "24 å°?æ??å?¶æ ¼å¼?"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "é ?設æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "使ç?¨ç³»çµ±æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "使ç?¨ç³»çµ±æ??å??å??代å?¨ Evolution 中é?¸å??ç??æ??å??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "ä¸?é?±é??å§?æ?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å?­ (6)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr "æ?¯å?¦å£?縮æ??檢è¦?中ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸­ç??é?±å?­è??é?±æ?¥ç½®æ?¼ä¸?å??空ä½?中ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "æ?¯å?¦å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??中繪å?º Marcus Bains ç·?ï¼?代表ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?ï¼?è??é??以æ??ç?ºå?®ä½?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "æ?¯å?¦è¨­å®?ç??æ?¥å??é?±å¹´ç´?念æ?¥ç??æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "工��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "å·¥ä½?æ?¥é??å§?å??é??"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "��(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "é?¸æ??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "���工�(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:192
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:158
 msgid "On The Web"
 msgstr "�網��"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "天氣"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new appointment"
 msgstr "建ç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "建ç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è­°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "建ç«?æ?°æ??è­°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../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"
-"%s"
-msgstr ""
-"%s ç?¼ç??é?¯èª¤\n"
-"%s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:217
 msgid "Loading calendars"
 msgstr "æ­£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#: ../modules/calendar/e-cal-shell-sidebar.c:641
 msgid "_New Calendar..."
-msgstr "æ?°å¢?è¡?äº?æ??(_N)..."
+msgstr "æ?°å¢?è¡?äº?æ??(_N)â?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:658
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1001
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14448,294 +14112,294 @@ 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:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "�件"
 
-#: ../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:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "��� iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
-msgstr "�製(_C)..."
+msgstr "�製(_C)�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "��(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è­°"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Cop_y to Calendar..."
-msgstr "è¤?製è?³è¡?äº?æ??(_Y)..."
+msgstr "è¤?製è?³è¡?äº?æ??(_Y)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "_Delegate Meeting..."
-msgstr "å§?æ´¾æ??è­°(_D)..."
+msgstr "å§?æ´¾æ??è­°(_D)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Delete This _Occurrence"
 msgstr "å?ªé?¤é??次ç?¼ç??ç??äº?件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ­¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete All Occ_urrences"
 msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "New All Day _Event..."
-msgstr "���天�件(_E)..."
+msgstr "���天�件(_E)�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Create a new all day event"
 msgstr "建ç«?æ?°ç??å?¨å¤©äº?件"
 
-#: ../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:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
-msgstr "以 iCale_ndar ��..."
+msgstr "以 iCale_ndar ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New _Meeting..."
-msgstr "æ?°å¢?æ??è­°(_M)..."
+msgstr "æ?°å¢?æ??è­°(_M)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new meeting"
 msgstr "建ç«?æ?°ç??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Mo_ve to Calendar..."
-msgstr "移è?³è¡?äº?æ??(_V)..."
+msgstr "移è?³è¡?äº?æ??(_V)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Appointment..."
-msgstr "æ?°å¢?ç´?æ??(_A)..."
+msgstr "æ?°å¢?ç´?æ??(_A)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?件æ¨?示æ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "View the current appointment"
 msgstr "檢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
-msgstr "��� iCalendar..."
+msgstr "��� iCalendar�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "_Schedule Meeting..."
-msgstr "æ??è­°æ??ç¨?(_S)..."
+msgstr "æ??è­°æ??ç¨?(_S)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Conv_ert to Appointment..."
-msgstr "è½?æ??ç?ºç´?æ??(_E)..."
+msgstr "è½?æ??ç?ºç´?æ??(_E)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è­°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Quit"
 msgstr "çµ?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Show one day"
 msgstr "顯示�天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "List"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Show as list"
 msgstr "顯示æ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Show one month"
 msgstr "顯示ä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Show one week"
 msgstr "顯示��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Show one work week"
 msgstr "顯示ä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Active Appointments"
 msgstr "é?²è¡?中ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 天ç??ç´?æ??(_P)"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "主æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Preview the calendar to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 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:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "建ç«?æ?°ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "檢è¦?é?¸å??ç??å??å¿?é??"
 
-#: ../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:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "é??å??網é ?(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14743,101 +14407,113 @@ msgstr "æ??å?°é?¸å??ç??å??å¿?é??"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. 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:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "工�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "æ??派工ä½?(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "_Mark as Complete"
 msgstr "æ¨?示ç?ºå®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??å®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 msgid "_Mark as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??æ?ªå®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "��工�(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "建ç«?ä¸?å??æ?°ç??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "View the selected task"
 msgstr "檢è¦?é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
-msgstr "��� iCalendar[_S]..."
+msgstr "��� iCalendar[_S]�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "æ??å?°é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "æ??å?»å??æ?¥æ??(_M):"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "å?ªæ??æ?¥æ??(_D):"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "建ç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "建ç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:225
 msgid "Loading memos"
 msgstr "æ­£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:594
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:899
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -14848,77 +14524,77 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
-msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
+msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)â?¦"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?顯示ç??å??å¿?é??中ç??æ??å­?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ­¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??顯示å??å¿?é??é ?覽"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr "å·²é?¸æ?? %d å??"
@@ -14931,40 +14607,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "工�(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "建ç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工���(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "建��工���"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:225
 msgid "Loading tasks"
 msgstr "正���工�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:594
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:899
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -14974,7 +14650,7 @@ msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 msgid "Print Tasks"
 msgstr "æ??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -14985,578 +14661,613 @@ msgstr ""
 "\n"
 "確å®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "��工�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
-msgstr "�工����(_F)..."
+msgstr "�工����(_F)�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?顯示ç??å·¥ä½?中ç??æ??å­?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
-msgstr "�製..."
+msgstr "�製�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "��工���(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "��工���(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "�顯示此工���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "工��覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Show task preview below the task list"
 msgstr "�工�����顯示工��覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??顯示工ä½?é ?覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "é?²è¡?中ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 天ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "æ??é??件ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "��中"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d �工�"
 msgstr[1] "%d �工�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "��工�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "��工�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, 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:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "�件��(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "編輯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "建ç«?æ?°é?µä»¶è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:513
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "網絡å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??è³?æ??夾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:834
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "C_reate Search Folder From Search..."
-msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)..."
+msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?使ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:843
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??帳è??è??è³?æ??夾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:848
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?件å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Copy Folder To..."
-msgstr "è¤?製è³?æ??夾å?°(_C)..."
+msgstr "è¤?製è³?æ??夾å?°(_C)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?製已é?¸å®?ç??è³?æ??夾å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?移é?¤é??å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "E_xpunge"
 msgstr "��(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?移é?¤å?¨é??å??è³?æ??夾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?示æ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Move Folder To..."
-msgstr "移å??è³?æ??夾å?°(_M)..."
+msgstr "移å??è³?æ??夾å?°(_M)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??夾移è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New..."
-msgstr "��(_N)..."
+msgstr "��(_N)�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Create a new folder for storing mail"
 msgstr "建ç«?ä¸?å??æ?°è³?æ??夾以å?²å­?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Change the properties of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??夾ç??屬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Change the name of this folder"
 msgstr "æ?´æ?¹é??å??è³?æ??夾ç??å??稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å­?ç¾£çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
-msgid "_Unsubscribe"
-msgstr "å??æ¶?è¨?é?±(_U)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:934
-msgid "Unsubscribe from the selected folder"
-msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Empty _Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??帳è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_New Label"
 msgstr "���籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "_Manage Subscriptions"
+msgstr "管ç??è¨?é?±(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??夾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "Send / _Receive"
+msgstr "å?³é??/æ?¥æ?¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid "Send queued items and retrieve new items"
+msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "R_eceive all"
+msgstr "����(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Receive new items from all accounts"
+msgstr "æ?¥æ?¶å?¨æ??æ??帳è??å?§ç??æ?°é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+msgid "_Send all"
+msgstr "å?¨é?¨å?³é??(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "Send queued items in all accounts"
+msgstr "å?³é??å?¨æ??æ??帳è??å?§å¾?é??ç??é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../widgets/misc/e-activity-proxy.c:314
+msgid "Cancel"
+msgstr "å??æ¶?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??編輯é??濾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Create or edit search folder definitions"
 msgstr "建ç«?æ??編輯æ??å°?è³?æ??夾ç??å®?義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Subscriptions..."
-msgstr "��(_S)..."
+msgstr "��(_S)�"
 
-#: ../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:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "F_older"
 msgstr "è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_Label"
 msgstr "�籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_New Folder..."
-msgstr "æ?°å¢?è³?æ??夾(_N)..."
+msgstr "æ?°å¢?è³?æ??夾(_N)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Show Message _Preview"
 msgstr "顯示�件�覽(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Show message preview pane"
 msgstr "顯示�件�覽�格"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Show _Deleted Messages"
 msgstr "顯示已���件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已å?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤ç·?)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "_Group By Threads"
 msgstr "æ ¹æ??ç?¸é??é?µä»¶ç?ºç¾£çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Show message preview below the message list"
 msgstr "��件����顯示�件�覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1410
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??顯示é?µä»¶é ?覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 天ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Messages with Attachments"
 msgstr "æ??é??件ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "No Label"
 msgstr "��籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Read Messages"
 msgstr "已��件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Unread Messages"
 msgstr "���件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Subject or Addresses contain"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "All Accounts"
 msgstr "æ??æ??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Current Account"
 msgstr "ç?®å??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已��"
 msgstr[1] "%d �已��"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??稿"
 msgstr[1] "%d å??è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view-private.c:1107
+msgid "Trash"
+msgstr "å??æ?¶ç­?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1461
+msgid "Send / Receive"
+msgstr "å?³é??/æ?¥æ?¶"
+
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:675
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:868
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
-#: ../modules/mail/em-account-prefs.c:130
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
-#: ../modules/mail/em-account-prefs.c:179
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "帳è??編輯å?¨"
 
-#: ../modules/mail/em-composer-prefs.c:530
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../modules/mail/em-composer-prefs.c:534
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "�次"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "�天�次"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "���次"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?次"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªé?¸å??å?¾é?µä»¶æª?é ­"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "æ¨?é ­å??稱:"
 
-#: ../modules/mail/em-mailer-prefs.c:234
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "æ¨?é ­æ?¸å?¼å??å?«:"
 
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
 #, 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:739 ../modules/mail/em-mailer-prefs.c:811
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?使ç?¨ã??è«?檢æ?¥æ?¯å?¦æ??å®?è£?該å¥?件ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:737
 msgid "No junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1167
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Date header:"
 msgstr "æ?¥æ??æ¨?é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Show _original header value"
 msgstr "顯示å??å§?æ¨?é ­æ?¸å?¼(_O)"
 
@@ -15569,10 +15280,59 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æ?¯å?¦è¦?å°? Evolution 設ç?ºä½ ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ï¼?"
 
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "é»?é?¸ã??網ä¸?å·¥ä½?ã??以å??å?°ç¶²ä¸?模å¼?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?å·¥ä½?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "ä½?è??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "注æ??ï¼?æ??äº?æ?´æ?¹å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "�覽"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "å¤?æ??ç¨?å¼?"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15589,39 +15349,39 @@ 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:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 msgid "Please select the information that you would like to import:"
 msgstr "è«?é?¸æ??ä½ æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:302
-#: ../widgets/misc/e-import-assistant.c:549
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
-#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "正�����"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "å?¯å?¥å·²å??æ¶?ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "å?¯å?¥å·²å®?æ??ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設å®?å?©ç??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "歡�使�"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15646,8 +15406,13 @@ msgid ""
 "body"
 msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "é??é?µå­?"
 
@@ -15663,7 +15428,7 @@ msgstr "é?µä»¶æ²?æ??é??件"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
-msgstr "æ?°å¢?é??件(_A)..."
+msgstr "æ?°å¢?é??件(_A)â?¦"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -15685,170 +15450,169 @@ msgstr "è¡?å?§é?³æ??"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥æ?­æ?¾é?µä»¶ä¸­ç??é?³æ??é??件ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "Select name of the Evolution back up file"
 msgstr "é?¸æ?? Evolution å??份æª?æ¡?ç??å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
-msgstr "å??份å¾?é??æ?°å??å?? Evolution(_R)"
+#: ../plugins/backup-restore/backup-restore.c:216
+msgid "_Restart Evolution after back up"
+msgstr "å??份å¾?é??æ?°å??å?? Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
+msgid "Select name of the Evolution back up file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??份æª?æ¡?å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr "ä½ å?¯ä»¥å¾?å??份中é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??è?¯çµ¡äººã??å®?ä¹?å?¯ä»¥é??å??ä½ æ??æ??ç??å??人設å®?ã??é?µä»¶é??濾å?¨ç­?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
-msgstr "å¾?å??份æª?æ¡?é??å?? Evol_ution"
+#: ../plugins/backup-restore/backup-restore.c:330
+msgid "_Restore Evolution from the back up file"
+msgstr "å¾?å??份æª?æ¡?é??å?? Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?庫ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
-msgstr "å¾?å??份é??å??"
+#: ../plugins/backup-restore/backup-restore.c:348
+msgid "Restore from back up"
+msgstr "å¾?å??份æª?æ¡?é??å??"
 
-#: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "æ­£å?¨å??份 Evolution ç??設å®?å?¼(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:386
+msgid "_Back up Evolution Data..."
+msgstr "å??份 Evolution è³?æ??(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "å°? Evolution ç??è³?æ??è??設å®?å?¼å??份ç?ºæª?æ¡?庫"
 
-#: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
+#: ../plugins/backup-restore/backup-restore.c:393
+msgid "R_estore Evolution Data..."
+msgstr "é??å?? Evolution è³?æ??(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
-msgstr "å??份 Evolution ç?®é??"
+#: ../plugins/backup-restore/backup.c:79
+msgid "Back up Evolution directory"
+msgstr "å??份 Evolution è³?æ??夾"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "é??å?? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
+msgid "Check Evolution Back up"
 msgstr "檢æ?¥ Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "使ç?¨å??形使ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "æ­£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr "å??份 Evolution ç??帳è??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ­£å?¨å??份 Evolution è³?æ?? (é?µä»¶ã??è?¯çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
+msgid "Back up complete"
 msgstr "å??份å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:403
 msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:409
+msgid "Extracting files from back up"
 msgstr "å¾?å??份解é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "æ­£å?¨è®?å?? Evolution ç??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
+msgid "Removing temporary back up files"
 msgstr "移é?¤æ?«å­?ç??å??份æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "正�確���端��"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ­£å??份è?³è³?æ??夾 %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
+msgid "Evolution Back up"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份你ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??ä½ ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:768
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼ä½ ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "å??份è??é??å??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "å??份è??é??å?? Evolution ç??è³?æ??è??設å®?å?¼ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -15857,11 +15621,11 @@ msgstr "確å®?è¦?é??é?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "確å®?è¦?å¾?é?¸å®?ç??å??份æª?æ¡?é??å?? Evolutionï¼?"
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr "確å®?è¦?å¾?é?¸å??ç??å??份æª?æ¡?é??å?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "é??é??並å??份 Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -15873,11 +15637,11 @@ msgid "Insufficient Permissions"
 msgstr "æ¬?é??ä¸?足"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "ç?¡æ??ç?? Evolution å??份æª?æ¡?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "è«?é?¸æ??æ??æ??ç??å??份æª?æ¡?ä¾?é??å??ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -15886,7 +15650,7 @@ msgstr "é?¸å??ç??è³?æ??夾ç?¡æ³?寫å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr "è¦?å??份你ç??è³?æ??å??設å®?å?¼ï¼?ä½ å¿?é ?å??é??é?? Evolutionã??è«?確å®?ä½ å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å­?ä»»ä½?å°?æ?ªå?²å­?ç??è³?æ??ã??"
 
@@ -15894,8 +15658,8 @@ msgstr "è¦?å??份你ç??è³?æ??å??設å®?å?¼ï¼?ä½ å¿?é ?å??é??é?? Evolutionã??è«?
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr "è¦?é??å??ä½ ç??è³?æ??å??設å®?å?¼ï¼?ä½ å¿?é ?å??é??é?? Evolutionã??è«?確å®?ä½ å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å­?ä»»ä½?å°?æ?ªå?²å­?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤ä½ ç?®å?? Evolution æ??æ??ç??è³?æ??å??設å®?å?¼ï¼?並å¾?ä½ ç??å??份é??å??å®?å??ã??"
 
 #: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
@@ -15946,33 +15710,33 @@ msgstr ""
 "\n"
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??中填å?¥å§?å??è??é?»å­?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸­å¡«å?¥ IM è?¯çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter å°?æ?ªå??妥ã??è«?å??å®?è£?å®?ã??"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
+msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?â?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "�� Bogofilter ���中�����..."
+msgstr "�� Bogofilter ���中������"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?管è?³ Bogofilter 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å­?è½?æ??ç?º _Unicode"
 
@@ -15998,15 +15762,15 @@ msgstr "Bogofilter ��"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使ç?¨ Bogofilter é??濾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Authentication failed. Server requires correct login."
 msgstr "é©?è­?失æ??ã??伺æ??å?¨è¦?æ±?正確ç??ç?»å?¥ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:207
 msgid "Given URL cannot be found."
 msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:211
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16015,101 +15779,120 @@ msgstr ""
 "伺æ??å?¨å?³å??äº?æ?ªé ?æ??ç??è³?æ??ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:341
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Failed to parse server response."
 msgstr "ç?¡æ³?å??æ??伺æ??å?¨ç??å??æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Events"
 msgstr "�件"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "User's calendars"
 msgstr "使ç?¨è??ç??è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:566
+#: ../plugins/caldav/caldav-browse-server.c:734
 msgid "Failed to get server URL."
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:773
+#: ../plugins/caldav/caldav-browse-server.c:1432
 msgid "Searching for user's calendars..."
-msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??..."
+msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??â?¦"
 
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:771
 msgid "Could not find any user calendar."
 msgstr "æ?¾ä¸?å?°ä»»ä½?使ç?¨è??è¡?äº?æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "å??ä¸?次ç??å??試失æ??ï¼?%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:905
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "å??ä¸?次ç??å??試失æ??代碼ç?º %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:910
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:969
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1095
+#: ../plugins/caldav/caldav-browse-server.c:1215
 msgid "Searching folder content..."
-msgstr "æ??å°?è³?æ??夾å?§å®¹..."
+msgstr "æ??å°?è³?æ??夾å?§å®¹â?¦"
+
+#: ../plugins/caldav/caldav-browse-server.c:1264
+#: ../plugins/caldav/caldav-source.c:255
+msgid "Server _handles meeting invitations"
+msgstr ""
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1309
 msgid "Supports"
 msgstr "��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1336
+#: ../plugins/caldav/caldav-source.c:254
+#, fuzzy
+#| msgid "User _Name:"
+msgid "User e-_mail:"
+msgstr "使ç?¨è??å??稱(_N):"
+
+#: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "��建�����%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1517
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "伺æ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1368
+#: ../plugins/caldav/caldav-browse-server.c:1523
 msgid "Browse for a CalDAV calendar"
 msgstr "ç??覽 CalDAV è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/caldav/caldav-source.c:235
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "網å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/caldav/caldav-source.c:242
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "使� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+msgid "User_name:"
+msgstr "使ç?¨è??å??稱(_N):"
+
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Brows_e server for a calendar"
 msgstr "ç??覽伺æ??å?¨ç??è¡?äº?æ??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/caldav/caldav-source.c:275
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -16121,31 +15904,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV ��"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "����(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "æª?æ¡?å??稱(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "æ?¼æ?´æ?¹ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "強���(_O)"
 
@@ -16173,62 +15956,62 @@ msgstr "å°?網絡è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Web Calendars"
 msgstr "網絡è¡?äº?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "天氣�起�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "天氣ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "天氣ï¼?æ?´æ??ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "��(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å??ç±³ç­?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç­?)"
 
@@ -16257,11 +16040,11 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?顯示è?¯çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "è?¯çµ¡äººç??å?°å??"
 
-#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/dbx-import/dbx-importer.c:233
 msgid "Select folder to import OE folder into"
 msgstr "é?¸å??å?¯å?¥ OE è³?æ??夾ç?¨ç??è³?æ??夾"
 
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "æ­£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
@@ -16316,40 +16099,52 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr "é??å??é?µå?¼æ??å®?ç??æ?¯ä½ å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªé?¸æ¨?é ­æ¸?å?®ã??æ??å®?æ¨?é ­è??æ¨?é ­æ?¸å?¼ç??æ ¼å¼?ç?ºï¼?è?ªé?¸æ¨?é ­å??稱å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??以ã??;ã??é??é??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
+msgctxt "email-custom-header-Security"
 msgid "Security:"
-msgstr "���:"
+msgstr "����"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "å??人"
+
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "�歸�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "已�護"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "��"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "極��"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:394
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:586
 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:830
+#: ../plugins/email-custom-header/email-custom-header.c:845
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16357,12 +16152,12 @@ msgstr ""
 "æ??å®?è?ªé?¸æ¨?é ­é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªé?¸æ¨?é ­é?µå?¼ç??å??稱è«?以ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:899
 msgid "Key"
 msgstr "設��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "��"
 
@@ -16384,7 +16179,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸­æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?編輯å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16396,11 +16191,11 @@ msgstr "�設��編輯�"
 msgid "The default command that must be used as the editor."
 msgstr "é ?設ç??æ??令å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:117
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??編輯å?¨ç??æ??令: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16408,8 +16203,8 @@ msgstr ""
 "Emacs 使ç?¨ã??xemacsã??\n"
 "VI 使ç?¨ã??gvim -fã??"
 
-#: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "���編輯�中�寫"
 
@@ -16509,17 +16304,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:274
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#: ../plugins/google-account-setup/google-contacts-source.c:314
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸å?¥ä½¿ç?¨è?? %s ç??å¯?碼以å­?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16528,17 +16323,17 @@ msgstr ""
 "ä¸?è?½å¾? Google 伺æ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "å??å??æ¸?å?®(_L)"
 
@@ -16556,38 +16351,46 @@ msgstr "檢���"
 
 #: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
-msgstr "æ?°å¢?å??享è³?æ??夾(_S)..."
+msgstr "æ?°å¢?å??享è³?æ??夾(_S)â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
-msgstr "代ç??伺æ??å?¨ç?»å?¥(_P)..."
+msgstr "代ç??伺æ??å?¨ç?»å?¥(_P)â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
-msgstr "å??å?¾é?µä»¶è¨­å®?å?¼..."
+msgstr "å??å?¾é?µä»¶è¨­å®?å?¼â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:177
 msgid "Track Message Status..."
-msgstr "追蹤é?µä»¶ç??æ??..."
+msgstr "追蹤é?µä»¶ç??æ??â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:183
 msgid "Retract Mail"
 msgstr "æ?¶å??é?µä»¶"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "æ?¥å??"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "æ?«æ??å¥?ç?¨"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "æ??çµ?"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
-msgstr "é??å¯?æ??è­°(_N)..."
+msgstr "é??å¯?æ??è­°(_N)â?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16612,11 +16415,11 @@ msgstr ""
 "æ??ã??å¥?ç?¨ã??以å®?è£?å??享è³?æ??夾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "å®?è£?å??享è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "å??享è³?æ??夾å®?è£?"
 
@@ -16646,7 +16449,7 @@ msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "移�(_R)"
@@ -16669,6 +16472,11 @@ msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "å°? å?³é?? é?¸é ?å? å?¥ GroupWise è¨?æ?¯"
@@ -16783,31 +16591,23 @@ msgstr "è?ªé?¸é??ç?¥è¨?æ?¯(_U)"
 
 #: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
-msgstr "�絡人(_T)..."
+msgstr "�絡人(_T)�"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "å??享è³?æ??夾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "使ç?¨è??ï¼?"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "æ?ªå??享(_N)"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
-msgstr "å??享給(_S)..."
-
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "å??享(_S)"
+msgstr "å??享給(_S)â?¦"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
@@ -16854,7 +16654,7 @@ msgid "Proxy"
 msgstr "代ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "帳è??å??稱"
 
@@ -16864,104 +16664,108 @@ msgstr "ç?»å?¥ä»£ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?輸å?¥ %s æ??é??ç??å¯?碼(使ç?¨è?? %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:704
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å??ç?¨æ­¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "代ç??"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "輸å?¥ä½¿ç?¨è??並設å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "å??享"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "è?ªé?¸é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "��"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/share-folder.c:738
+msgid "Modify"
+msgstr "修�"
+
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "主�:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "å¯?件è??:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "建ç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "已��:"
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
@@ -16973,12 +16777,12 @@ msgstr "è¡?å?§å??ç??"
 msgid "View image attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤ºå??ç??ã??"
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "���頭"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP �頭"
@@ -17031,189 +16835,202 @@ msgstr "IMAP å??è?½"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??ã??%sã??(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' 中ç??ç´?æ??å??é??å??æ??è­°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??中ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??中æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
-msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
+msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??â?¦"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å­?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºä¸?確å®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??並設ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è­°å?¬é??人已移é?¤ä»£ç??人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "æ??è­°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "工�����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è­°è³?è¨?ï¼?該æ??議並ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "����工����該�工����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?該å??å¿?é??並ä¸?å­?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "å?²å­?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "é??帶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æ­¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??並é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??中ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "æ­¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?該å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?件ã??å·¥ä½?æ??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "æ?«æ??æ?¥å??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
-msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
+msgstr "é??å??æ??è­°ç??é?±æ??è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
-msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
+msgstr "é??é ?å·¥ä½?ç??é?±æ??è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 msgid "This memo recurs"
-msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
+msgstr "é??å??å??å¿?é??ç??é?±æ??è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
@@ -17349,6 +17166,14 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
+#: ../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 "ä¸?æ??人士"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -17366,12 +17191,12 @@ msgstr "代表 %s ��"
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "%s through %s has published the following meeting information:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s has published the following meeting information:"
-msgstr "%s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
@@ -17453,12 +17278,12 @@ msgstr "%s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°æ?´æ?¹ã??"
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "%s through %s has published the following task:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s has published the following task:"
-msgstr "%s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?äº?ä¸?å??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
@@ -17541,12 +17366,12 @@ msgstr "%s å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 #: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s through %s has published the following memo:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?äº?ä¸?å??å??å¿?é??ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s has published the following memo:"
-msgstr "%s å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?äº?å??å¿?é??ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
@@ -17578,7 +17403,7 @@ msgstr "é??å§?æ?¥ï¼?"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
@@ -17588,7 +17413,7 @@ msgstr "çµ?æ??æ?¥ï¼?"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
@@ -17647,41 +17472,41 @@ msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??實é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "顯示æ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "工�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -17711,84 +17536,68 @@ msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?­æ?¾è?²é?³æª?æ¡?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "è®?é??ç?¥å??ç??å??示é??ç??ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "å??ç?¨ D-Bus è¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "å??ç?¨é??ç?¥å??ç??å??示ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??ç?¢ç?? D-BUS è¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??ç?¶æ?°é?µä»¶æ?µé??æ??ç?¼å?ºå?¶è?²å?¦å??å°±æ?­æ?¾è?²é?³æª?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ï¼?å?¨æ?°é?µä»¶é??å?°æ??æ?­æ?¾ä¸»é¡?ç??é?³æ??ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "å?¨å??示ä¸?å½?å?ºæ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??å?¨é??ç?¥å??顯示æ?°é?µä»¶å??示ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "è¦?æ?­æ?¾ç??è?²é?³æª?æ¡?å??稱ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æ?°é?µä»¶é??å?°æ??è¦?æ?­æ?¾ç??é?³æ??æª?æ¡?ï¼?å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "使ç?¨é?³æ??主é¡?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?¯å?¦æ?­æ?¾è?²é?³æª?æ¡?æ??ç?¼å?ºå?¶è?²ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??示ä¸?å½?å?ºè¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "å??示æ?¯å?¦è¦?é??ç??ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:369
-msgid "Evolution's Mail Notification"
-msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
-
-#: ../plugins/mail-notification/mail-notification.c:391
-msgid "Mail Notification Properties"
-msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
-
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17805,67 +17614,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "å¯?件è??ï¼?%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:425
 #, 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:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "��件"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??中顯示å??示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "è®?é??ç?¥å??å??示é??ç??(_L)"
-
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??示ä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "��(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "使ç?¨é?³æ??主é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "����(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:846
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -17878,7 +17684,7 @@ 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:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å¾? %s ç??é?µä»¶æ??建ç«?"
@@ -18006,40 +17812,40 @@ msgid ""
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??è£?建ç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "建��件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new event from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "建ç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 msgid "Create a new memo from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "建�工�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 msgid "Create a new task from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "建ç«?æ??è­°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 
@@ -18047,55 +17853,55 @@ msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 msgid "Convert a mail message to a task."
 msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "Get an archive of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??æª?æ¡?庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??使ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "è?¯çµ¡æ­¤é?µä»¶æ??屬é??ä¿¡è«?å£?ç??管ç??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æ?°å¯«é?µä»¶çµ¦æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "����(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "å??æ¶?è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
@@ -18190,15 +17996,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "ä½ è¦?å°?ç?®å??ç??è³?æ??夾中ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "�示�件�已�(_S)"
 
@@ -18210,40 +18016,6 @@ msgstr "å?¨é?¨æ¨?示æ??å·²è®?"
 msgid "Mark all messages in a folder as read."
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "管ç??ä½ ç?? Evolution å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "ä½?è??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "注æ??ï¼?æ??äº?æ?´æ?¹å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "�覽"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "å¤?æ??ç¨?å¼?"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "å¤?æ??ç¨?å¼?(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18257,39 +18029,39 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18313,43 +18085,44 @@ msgstr "Outlook PST ��"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??人è³?æ??夾 (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "�件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??夾:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "工�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "����(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
-msgstr "è¡?äº?æ??ç?¼ä½?"
+msgstr "è¡?äº?æ??ç?¼å¸?"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
@@ -18357,53 +18130,53 @@ msgstr "ä½?ç½®"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
-msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
+msgstr "å°?è¡?äº?æ??ç?¼å¸?ç?ºç¶²é ?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "ç?¡æ³?é??å?? %sï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
+msgstr "ç?¼å¸?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
+msgstr "ç?¼å¸?å?° %s å·²æ??å??çµ?æ??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "æ??è¼? %s 失æ??ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "å??ç?¨(_E)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 msgstr "確å®?è¦?移é?¤é??å??ä½?ç½®ï¼?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
-msgstr "ç?¡æ³?建ç«?ç?¼ä½?å?·è¡?ç·?ã??"
+msgstr "ç?¡æ³?建ç«?ç?¼å¸?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
-msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
+msgstr "ç?¼å¸?è¡?äº?æ??è³?è¨?(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Custom Location"
@@ -18431,11 +18204,11 @@ msgstr "�� FTP"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
-msgstr "���置"
+msgstr "���置"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
-msgstr "ç?¼ä½?é »ç??(_F):"
+msgstr "ç?¼å¸?é »ç??(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
@@ -18479,7 +18252,7 @@ msgstr "�碼(_P):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
-msgstr "���(_P):"
+msgstr "���(_P):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
@@ -18497,57 +18270,57 @@ msgstr "iCal"
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
+msgstr "ç?¡æ³?ç?¼å¸?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "編輯�置"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "��� SpamAssassin�代碼�%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "建ç«?å°?管失æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
+msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?â?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "�� SpamAssassin ���中�����..."
+msgstr "�� SpamAssassin ���中������"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?管è?³ SpamAssassin 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ç?¡æ³?使ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??度è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18599,6 +18372,10 @@ msgstr "é??å§?"
 msgid "End"
 msgstr "çµ?æ??"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "�止"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
@@ -18684,23 +18461,6 @@ msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å­?è?³ç£?ç¢?"
 msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "以主æ?¨ç?ºå?ºç¤?串æ?¥é?µä»¶ã??"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "主æ?¨æ??å??"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "以主����串��件"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "é??å??å?°æ ¹æ??主æ?¨ç??ç?¸é??é?µä»¶(_A)"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -18711,15 +18471,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:620
+#: ../plugins/templates/templates.c:631
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:693
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "�����"
 
@@ -18739,27 +18499,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:195
+#: ../plugins/vcard-inline/vcard-inline.c:280
 msgid "Show Full vCard"
 msgstr "顯示å®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:198
 msgid "Show Compact vCard"
 msgstr "顯示精簡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:259
 msgid "There is one other contact."
 msgstr "é??æ??è?¯çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:268
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:289
 msgid "Save in Address Book"
 msgstr "å­?å?¥é??è¨?é??"
 
@@ -18775,11 +18535,11 @@ msgstr "WebDAV �絡人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
 msgid "URL:"
 msgstr "網å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??使ç?¨ Apache < 2.2.8)"
 
@@ -18797,7 +18557,7 @@ msgstr "çµ?æ??ç??æ?¬"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "é ?設è³?è¨?æ?¹å¡?å??é??度"
+msgstr "é ?設å?´é??æ¬?é??度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
@@ -18931,7 +18691,7 @@ msgstr "顯示å?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "忽ç?¥é??ç?¼è­¦å??å°?話ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "以é?¢ç·?模å¼?å??å??"
 
@@ -19071,11 +18831,11 @@ msgstr "è¦?çª?æ??é??風格"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:717
 msgid "Save Search"
 msgstr "å?²å­?æ??å°?çµ?æ??"
 
@@ -19083,38 +18843,42 @@ msgstr "å?²å­?æ??å°?çµ?æ??"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:921
+#: ../shell/e-shell-searchbar.c:941
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:974
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1037
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr "å?²å­?使ç?¨è??ä»?é?¢ç??æ??"
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -19125,307 +18889,299 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution 網�"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1216
 msgid "Bug Buddy is not installed."
 msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Bug Buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1399
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution ç?¸é??è³?è¨?"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1404
+#: ../shell/e-shell-window-actions.c:1418
 msgid "_Close Window"
 msgstr "é??é??è¦?çª?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1425
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1427
 msgid "Open the Evolution User Guide"
 msgstr "é??å?? Evolution 使ç?¨è??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "é??å??常è¦?å??é¡?(FAQ)網é ?"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Forget Passwords"
 msgstr "���碼(_F)"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Forget all remembered passwords"
 msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?碼"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1467
 msgid "I_mport..."
-msgstr "��(_M)..."
+msgstr "��(_M)�"
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Import data from other programs"
 msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1474
 msgid "New _Window"
 msgstr "é??æ?°è¦?çª?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Create a new window displaying this view"
 msgstr "建ç«?ä¸?å??æ?°ç??è¦?çª?ä¾?顯示é??å??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Configure Evolution"
 msgstr "設� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1495
 msgid "_Quick Reference"
 msgstr "å¿«é??å??好設å®?(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution ç??æ?·å¾?é?µ"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Exit the program"
 msgstr "é?¢é??é??å??ç¨?å¼?"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Advanced Search..."
-msgstr "é?²é??æ??å°?(_A)..."
+msgstr "é?²é??æ??å°?(_A)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Construct a more advanced search"
 msgstr "建ç«?æ?´é?²é??ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Clear the current search parameters"
 msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1523
 msgid "_Edit Saved Searches..."
-msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)..."
+msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Manage your saved searches"
 msgstr "管ç??ä½ å·²å?²å­?ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Click here to change the search type"
 msgstr "æ??é??è£?以æ?¹è®?æ??å°?é¡?å??"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1537
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Execute the current search parameters"
 msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Save Search..."
-msgstr "å?²å­?æ??å°?çµ?æ??(_S)..."
+msgstr "å?²å­?æ??å°?çµ?æ??(_S)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Save the current search parameters"
 msgstr "å?²å­?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Send / _Receive"
-msgstr "å?³é??/æ?¥æ?¶(_R)"
-
-#: ../shell/e-shell-window-actions.c:1580
-msgid "Send queued items and retrieve new items"
-msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
-
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Submit _Bug Report..."
-msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
+msgstr "å?³é??é?¯èª¤å ±å??(_B)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Work Offline"
 msgstr "��工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Put Evolution into offline mode"
 msgstr "� Evolution ����模�"
 
 # zh_HK: msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Work Online"
 msgstr "��工�(_W)"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Put Evolution into online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Lay_out"
 msgstr "ä½?å±?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_New"
 msgstr "��(_N)"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_Switcher Appearance"
 msgstr "å??æ??å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Window"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1666
 msgid "Show Side _Bar"
 msgstr "顯示å?´é??æ¬?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show the side bar"
 msgstr "顯示å?´é??å??"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1674
 msgid "Show _Buttons"
 msgstr "顯示æ??é??(_B)"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show the switcher buttons"
 msgstr "顯示å??æ??ç¨?å¼?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1682
 msgid "Show _Status Bar"
 msgstr "顯示ç??æ??å??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show the status bar"
 msgstr "顯示ç??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show _Tool Bar"
 msgstr "顯示工å?·å??(_T)"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the tool bar"
 msgstr "顯示工å?·å??"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1714
 msgid "_Icons Only"
 msgstr "å?ªæ??å??示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Display window buttons with icons only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??示"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Display window buttons with text only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Icons _and Text"
 msgstr "å??示å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Display window buttons with icons and text"
 msgstr "顯示è¦?çª?æ??é??ç??å??示å??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Tool_bar Style"
 msgstr "å·¥å?·å??風格(_B)"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·å??設å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1745
 msgid "Define Views..."
-msgstr "�義檢�..."
+msgstr "�義檢��"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Create or edit views"
 msgstr "建ç«?æ??編輯檢è¦?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Save Custom View..."
-msgstr "����檢�..."
+msgstr "����檢��"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save current custom view"
 msgstr "å?²å­?ç?®å??ç??è?ªé?¸æª¢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1761
 msgid "C_urrent View"
 msgstr "ç?®å??檢è¦?(_U)"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Custom View"
 msgstr "��檢�"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??檢è¦?æ?¹å¼?æ?¯è?ªé?¸ç??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1783
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ?¹ç?®å??æ??å?°æ©?ç??é ?é?¢æ??å?°è¨­å®?"
 
-#: ../shell/e-shell-window-actions.c:2183
+#: ../shell/e-shell-window-actions.c:2168
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2381
 msgid "Execute these search parameters"
 msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:434
 msgid "New"
 msgstr "��"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
-msgstr "æº?å??é?²å?¥é?¢ç·?..."
+msgstr "æº?å??é?²å?¥é?¢ç·?â?¦"
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
-msgstr "æº?å??é?²å?¥ä¸?ç·?..."
+msgstr "æº?å??é?²å?¥ä¸?ç·?â?¦"
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
-msgstr "æº?å??çµ?æ??..."
+msgstr "æº?å??çµ?æ??â?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19460,7 +19216,7 @@ msgstr ""
 "æ??å??å¸?æ??你享å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??ä½ æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19468,63 +19224,79 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
-#: ../shell/main.c:327
-msgid "Start Evolution activating the specified component"
-msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
+#. Translators: Do NOT translate the five component names, they MUST remain in English!
+#: ../shell/main.c:367
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
 
-#: ../shell/main.c:329
+#: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??尺寸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/main.c:333
+#: ../shell/main.c:373
 msgid "Start in online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:375
+msgid "Ignore network availability"
+msgstr "忽���網����"
+
+#: ../shell/main.c:377
 msgid "Start in \"express\" mode"
 msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:380
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:383
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:385
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:345
+#: ../shell/main.c:387
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??è?¯çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:391
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:393
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:557 ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:627
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%sï¼? --online å?? --offline ä¸?è?½ä¸?起使ç?¨ã??\n"
-"  使ç?¨ %s --help å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
+"  使ç?¨ '%s --help' å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
+
+#: ../shell/main.c:633
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%sï¼? --force-online å?? --offline ä¸?è?½ä¸?起使ç?¨ã??\n"
+"  使ç?¨ '%s --help' å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -19602,27 +19374,27 @@ msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "ç?¡æ³?辨è­?ç??æ¡?é?¢æª?æ¡?ç??æ?¬ã??%sã??"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "æº?å??å??å?? %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "æ??ç?¨ç¨?å¼?ä¸?æ?¥å??以å?½ä»¤å??é??å??æ??件"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "ç?¡æ³?辨è­?ç??å??å??é?¸é ?ï¼?%d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "ä¸?è?½å?³é??æ??件 URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
@@ -19684,7 +19456,7 @@ msgstr "å? ç?ºä½ ä¸?ä¿¡ä»»ç?¼å?ºæ­¤è­?æ?¸ç??è­?æ?¸å?®ä½?ï¼?æ??以é?¤é??å?¨æ­¤æ??
 #: ../smime/gui/certificate-manager.c:460
 #: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
-msgstr "é?¸å??è¦?å?¯å?¥ç??è­?æ?¸..."
+msgstr "é?¸å??è¦?å?¯å?¥ç??è­?æ?¸â?¦"
 
 #: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
@@ -19778,7 +19550,7 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  主��%s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
 msgstr "é?¸å??è­?æ?¸"
 
@@ -19922,7 +19694,7 @@ msgstr "æ??æ??æ?§"
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr "ä½ å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥ä½ ç??身份:"
+msgstr "ä½ å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥ä½ ç??身å??:"
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
@@ -19937,13 +19709,14 @@ msgstr "ä½ å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??è­?æ?¸ï¼?å?¯ä»¥è­?å?¥é??äº?人å?¡:"
 msgid "Your Certificates"
 msgstr "ä½ ç??è­?æ?¸"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
 msgstr "å??份(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
-msgstr "編輯核è­?æ©?é?? (_CA) 信任度"
+msgstr "編輯核è­?æ©?é?? (CA) 信任度(_E)"
 
 #: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
@@ -20268,7 +20041,7 @@ msgstr "å®?義ã??%sã??ç??檢è¦?"
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "å?²å­?ç?®å??檢è¦?"
 
@@ -20296,122 +20069,122 @@ msgstr "檢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "檢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "�設�(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "æª?æ¡?å??稱(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:533
 msgid "_Suggest automatic display of attachment"
 msgstr "建議è?ªå??顯示é??件(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "ç?¡æ³?設ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "設ç?ºè??æ?¯(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "ç?¡æ³?é??å?ºé??件ã??"
 msgstr[1] "ç?¡æ³?é??å?ºé??件ã??"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
-msgstr "å?³é??è?³(_S)..."
+msgstr "å?³é??è?³(_S)â?¦"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??件å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:511
-#: ../widgets/misc/e-attachment-tree-view.c:551
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-icon-view.c:523
-#: ../widgets/misc/e-attachment-tree-view.c:563
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-paned.c:88
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:90
-#: ../widgets/misc/e-attachment-paned.c:637
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:640
 msgid "Show Attachment _Bar"
 msgstr "顯示é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "Add Attachment"
 msgstr "å? å?¥é??件"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:524
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:587
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å­?é??件"
 msgstr[1] "å?²å­?é??件"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:616
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:346
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:372
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
-msgstr "å? å?¥é??件(_A)..."
+msgstr "å? å?¥é??件(_A)â?¦"
 
-#: ../widgets/misc/e-attachment-view.c:396
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:403
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "å?¨é?¨é?±è??(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:410
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "檢���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:417
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "��以��檢�(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:734
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "以ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:737
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s 中é??å??é??å??é??件"
@@ -20420,160 +20193,160 @@ 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:1021
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?中"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "å?²å­?æ??ä½?å·²å?¨é?²è¡?中"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??件"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??件"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å­?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-é»?é?¸ä»¥é??å??é?£çµ?"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1255
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "�符編碼"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "輸å?¥è¦?使ç?¨ç??å­?符é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
-msgstr "��..."
+msgstr "���"
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?輸å?¥æ?¥æ??ç??æ??å­?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "æ??æ­¤æ??é??以顯示è¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:605
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:677
 msgid "No_w"
 msgstr "��(_W)"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:683
 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:677
+#: ../widgets/misc/e-dateedit.c:691
 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:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1825
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1869
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:246
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?並ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:263
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??稱(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:287
-#: ../widgets/misc/e-import-assistant.c:462
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:330
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??此輸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?輸å?¥è³?æ??å??設å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:371
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "������(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:523
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20581,37 +20354,37 @@ msgid ""
 msgstr "Evolution å·²ç¶?檢æ?¥å¾?以ä¸?æ??ç?¨ç¨?å¼?輸å?¥ç??設å®?å?¼ï¼?Pineã??Netscapeã??Elmã??iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??設å®?å?¼ã??å¦?æ??ä½ æ?³å??試ä¸?次ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:770
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "å??æ¶?å?¯å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "é ?覽é??è¦?å?¯å?¥ç??è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1347
-#: ../widgets/misc/e-import-assistant.c:1356
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "å?¯å?¥è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:925
 msgid "Select what type of file you want to import from the list."
 msgstr "é?¸æ??ä½ æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:1271
-#: ../widgets/misc/e-import-assistant.c:1305
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1288
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "輸��置"
 
-#: ../widgets/misc/e-import-assistant.c:1299
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20620,27 +20393,27 @@ msgstr ""
 "æ­¡è¿?使ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?ä½ å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1313
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "輸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1328
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20661,56 +20434,56 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
 
-#: ../widgets/misc/e-preferences-window.c:276
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution å??好設å®?"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "符å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ­¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "å??å??大å°?寫(_C)"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?端繼çº?"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?端ï¼?å¾?åº?é?¨ç¹¼çº?"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
@@ -20731,132 +20504,152 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "ç?´å?°(_U)"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "æ??æ?¼(_A)"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "��(_T)"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "æ??é«?æ©?å¯?"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "����(_R)"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "å°?å?©"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "è¿?å??é??ç?¥"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "�"
+
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??追蹤(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "��"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ç??æ??追蹤"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "æ??é«?æ©?å¯?"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "��(_T)"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_After"
-msgstr "æ??æ?¼(_A)"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "歸�(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "延é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "設å®?é?¾æ??æ?¥æ??(_S)"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "_Until"
-msgstr "ç?´å?°(_U)"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "ç?¶æ??空æ??(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:563
+#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "å?²å­?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "編輯簽å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??稱(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "��簽署�令稿"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "編輯簽署�令稿"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "���令稿(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20866,53 +20659,53 @@ msgstr ""
 "ç°½å??æª?ã??ä½ æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "�令稿(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "æ??é??è£?以移è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "è¤?製é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??覽å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??覽å?¨ä¸­é??å??æ­¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å­?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?­è??給 %s"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??è£?é?±è??/解é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -20931,7 +20724,7 @@ msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "evolution è¡?äº?æ??é ?ç?®"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "�����"
 
@@ -20964,28 +20757,28 @@ msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å­?"
 msgid "click to add"
 msgstr "è«?æ??é??è£?å? å?¥"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??ç¾£çµ?"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "顯示��"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -20994,7 +20787,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21007,7 +20800,7 @@ msgid "Clear _All"
 msgstr "����(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21049,11 +20842,11 @@ msgstr "æ?¥ç??æ ¹æ??"
 
 #: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
-msgstr "��顯示(_F)..."
+msgstr "��顯示(_F)�"
 
 #: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
-msgstr "ç¾£çµ?æ ¹æ??(_G)..."
+msgstr "ç¾£çµ?æ ¹æ??(_G)â?¦"
 
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
@@ -21065,7 +20858,7 @@ msgstr "æ ¹æ??åº?顯示é??äº?æ¬?ä½?(_S):"
 
 #: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
-msgstr "æ??åº?(_S)..."
+msgstr "æ??åº?(_S)â?¦"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
@@ -21086,7 +20879,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21099,80 +20892,75 @@ msgstr[1] "%sï¼?%s (%d å??é ?ç?®)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "è?ªé?¸ç?®å??ç??檢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "æ ¹æ??æ­¤æ¬?ä½?å??ç¾£çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "æ ¹æ??æ?¹å¡?ç?ºç¾£çµ?(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "移�此�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
-msgstr "����(_O)..."
+msgstr "����(_O)�"
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
-msgstr "æ ¼å¼?å??æ¬?(_S)..."
+msgstr "æ ¼å¼?å??æ¬?(_S)â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
-msgstr "è?ªé?¸ç?®å??ç??檢è¦?(_M)..."
+msgstr "è?ªé?¸ç?®å??ç??檢è¦?(_M)â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "��(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "�����"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "é??å§?編輯此å?²å­?æ ¼"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -21200,1213 +20988,295 @@ msgstr "é»?é?¸"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2289
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2301
 msgid "Input Methods"
 msgstr "輸��"
 
-#~ msgid ""
-#~ "Evolution backup can start only when Evolution is not running. Please "
-#~ "make sure that you save and close all your unsaved windows before "
-#~ "proceeding.  If you want Evolution to restart automatically after backup, "
-#~ "please enable the toggle button."
-#~ msgstr ""
-#~ "Evolution å??份å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å?¨é?²è¡?ä¹?å??è«?確å®?æ?¨å·²å?²å­?並"
-#~ "é??é??æ??æ??æ?ªå?²å­?ç??è¦?çª?ã??å¦?æ??å¸?æ?? Evolution å?¨å??份å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??"
-#~ "æ??é??ã??"
-
-#~ msgid ""
-#~ "This will delete all your current Evolution data and settings and restore "
-#~ "them from your backup. Evolution restore can start only when Evolution is "
-#~ "not running. Please make sure that you close all your unsaved windows "
-#~ "before you proceed. If you want Evolution to restart automatically "
-#~ "restart after restore, please enable the toggle button."
-#~ msgstr ""
-#~ "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??設å®?å?¼ä¸¦å¾?å??份中é??å??å®?å??ã??Evolution "
-#~ "é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??"
-#~ "å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
-
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
-#~ 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 "Start Evolution activating the specified component"
+#~ msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
 
-#~ msgid "The item could not be deleted due to a corba error"
-#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "æ?°äº?件ç??é ?設é?±æ??æ?§æ¬¡æ?¸ã?? -1 代表永é? ã??"
 
-#~ msgid "Appoint_ment"
-#~ msgstr "ç´?æ??(_M)"
+#~ msgid "Default recurrence count"
+#~ msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
 
-#~ msgid "Attendee_s..."
-#~ msgstr "å?°æ??è??(_S)..."
+#~ msgid "Event Gradient"
+#~ msgstr "äº?件漸層æ??æ??"
 
-#~ msgid "_Task"
-#~ msgstr "工�(_T)"
+#~ msgid "Event Transparency"
+#~ msgstr "äº?件é??æ??æ??æ??"
 
-#~ 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 "Gradient of the events in calendar views."
+#~ msgstr "è¡?äº?æ??檢è¦?中ç??äº?件漸層æ??æ??ã??"
 
 #~ msgid ""
-#~ "Unable to read settings from previous Evolution install, `evolution/"
-#~ "config.xmldb' does not exist or is corrupt."
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
 #~ msgstr ""
-#~ "ç?¡æ³?å¾?以å??ç?? Evolution è®?å??設å®?å?¼ï¼?`evolution/config.xmldb' ä¸?å­?å?¨æ??æ??æ¯?ã??"
+#~ "è¡?äº?æ??檢è¦?中ç??äº?件é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#~ msgid "Allows Evolution to display text part of limited size"
-#~ msgstr "å??許 evolution 顯示å?§æ??é?¨ä»½ç??é??å?¶å¤§å°?"
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#~ msgid "Enable to render message text part of limited size."
-#~ msgstr "å??ç?¨ä»¥é¡¯ç¤ºé??å?¶å¤§å°?ç??é?µä»¶æ??å­?ã??"
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#~ msgid "Show \"From\" field when sending a mail message"
-#~ msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
-#~ 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 "Recurring:"
+#~ msgstr "循�模��"
 
-#~ msgid "Do not d_elete"
-#~ msgstr "����(_E)"
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "æ?¯ã??(è¤?é??循ç?°)"
 
-#~ 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 "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "�天"
+#~ msgstr[1] "� %d 天"
 
-#~ 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 "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "��"
+#~ msgstr[1] "� %d �"
 
-#~ msgid "Shell Backend"
-#~ msgstr "Shell �端��"
-
-#~ msgid ""
-#~ "There are only hidden messages in this folder. Use View->Show Hidden "
-#~ "Messages to show them."
-#~ msgstr ""
-#~ "å?¨é??å??è³?æ??夾中å?ªæ??é?±è??ç??é?µä»¶ã??使ç?¨ 檢è¦?->顯示é?±è??ç??é?µä»¶ ä¾?顯示å®?å??ã??"
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "���"
+#~ msgstr[1] "� %d ��"
 
-#~ msgid "Table column:"
-#~ msgstr "表格��"
+#~ msgid " and "
+#~ msgstr " å?? "
 
-#~ msgid "Source List"
-#~ msgstr "����"
+#~ msgid "The %s day of "
+#~ msgstr "%s �� "
 
-#~ msgid "The registry of address books"
-#~ msgstr "é??è¨?é??ç??註å??表"
+#~ msgid "The %s %s of "
+#~ msgstr "%s %s �� "
 
-#~ msgid "Current View"
-#~ msgstr "ç?®å??檢è¦?"
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "æ¯?æ??"
+#~ msgstr[1] "æ¯? %d æ??"
 
-#~ msgid "The currently selected address book view"
-#~ msgstr "ç?®å??é?¸å??ç??é??è¨?é??檢è¦?"
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "�年"
+#~ msgstr[1] "� %d 年"
 
-#~ msgid "Previewed Contact"
-#~ msgstr "é ?覽ç??é?£çµ¡äºº"
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "總� %d 次"
+#~ msgstr[1] "總� %d 次"
 
-#~ msgid "The contact being shown in the preview pane"
-#~ msgstr "è¦?顯示å?¨é ?覽çª?æ ¼ç??é?£çµ¡äºº"
+#~ msgid ", ending on "
+#~ msgstr "ï¼?çµ?æ??æ?¼ "
 
-#~ msgid "Preview is Visible"
-#~ msgstr "é ?覽ç?ºé¡¯ç¤ºç??æ??"
+#~ msgid "Starts"
+#~ msgstr "é??å§?"
 
-#~ msgid "Whether the preview pane is visible"
-#~ msgstr "�覽�格�����"
+#~ msgid "Ends"
+#~ msgstr "çµ?æ??"
 
-#~ msgid "LDAP Servers"
-#~ msgstr "LDAP 伺æ??å?¨"
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar ��"
 
-#~ msgid "Autocompletion Settings"
-#~ msgstr "è?ªå??å®?æ??設å®?"
+#~ msgid "iCalendar Error"
+#~ msgstr "iCalendar �誤"
 
 #~ 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)"
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
 
 #~ msgid ""
-#~ "Hide deleted messages rather than displaying them with a line through them"
-#~ msgstr "é?±è??å·²å?ªé?¤ç??é?µä»¶è??é??å°?å®?å??以å?ªé?¤ç·?ç??å½¢å¼?顯示"
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ 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 ç??æ?¯æ?´ã??"
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
 
-#~ msgid "Hula Support"
-#~ msgstr "Hula ��"
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?æ??è­°è³?è¨?ã??"
 
-#~ msgid "_Accept"
-#~ msgstr "æ?¥å??(_A)"
+#~ msgid "Meeting Information"
+#~ msgstr "æ??è­°è³?è¨?"
 
-#~ msgid "Guides you through your initial account setup."
-#~ msgstr "æ??å¼?æ?¨å®?æ??å??å§?帳è??設å®?ã??"
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#~ msgid "Setup Assistant"
-#~ msgstr "設å®?å?©ç??"
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s é??è«?æ?¨å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#~ msgid "Importing data."
-#~ msgstr "å?¯å?¥è³?æ??ã??"
+#~ msgid "Meeting Proposal"
+#~ msgstr "æ??è­°æ??æ¡?"
 
-#~ msgid "Please wait"
-#~ msgstr "è«?ç¨?å??"
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
 
-#~ msgid "%ld KB"
-#~ msgstr "%ld KB"
+#~ msgid "Meeting Update"
+#~ msgstr "æ??è­°æ?´æ?°"
 
-#~ msgid "Toolbar Style"
-#~ msgstr "å·¥å?·å??樣å¼?"
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
 
-#~ msgid "The switcher's toolbar style"
-#~ msgstr "å??æ??ç¨?å¼?å·¥å?·å??樣å¼?"
+#~ msgid "Meeting Update Request"
+#~ msgstr "æ??è­°æ?´æ?°è«?æ±?"
 
-#~ msgid "Toolbar Visible"
-#~ msgstr "å·¥å?·å??å?¯è¦?æ?§"
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
 
-#~ msgid "Whether the switcher is visible"
-#~ msgstr "å??æ??ç¨?å¼?æ?¯å?¦ç?ºå?¯è¦?"
+#~ msgid "Meeting Reply"
+#~ msgstr "æ??è­°ç­?è¦?"
 
-#~ msgid "Switcher Action"
-#~ msgstr "å??æ??ç¨?å¼?å??ä½?"
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
 
-#~ msgid "The switcher action for this shell view"
-#~ msgstr "é??å?? shell 檢è¦?ç??å??æ??ç¨?å¼?å??ä½?"
+#~ msgid "Meeting Cancelation"
+#~ msgstr "æ??è­°å??æ¶?"
 
-#~ msgid "Page Number"
-#~ msgstr "�碼"
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
 
-#~ msgid "The notebook page number of the shell view"
-#~ msgstr "é??å?? shell 檢è¦?ç??ç­?è¨?æ?¬é ?æ?¸"
+#~ msgid "Bad Meeting Message"
+#~ msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
 
-#~ msgid "Search Rule"
-#~ msgstr "æ??å°?è¦?å??"
+#~ msgid "%s has published task information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?äº?å·¥ä½?è³?è¨?ã??"
 
-#~ msgid "Criteria for the current search results"
-#~ msgstr "ç?®å??ç??æ??å°?çµ?æ??ç??æ¢?件"
+#~ msgid "Task Information"
+#~ msgstr "工���"
 
-#~ msgid "The EShellBackend for this shell view"
-#~ msgstr "é??å?? shell 檢è¦?ç?? EShell å¾?端ç¨?å¼?"
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#~ msgid "Shell Content Widget"
-#~ msgstr "Shell å?§å®¹å??件"
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
 
-#~ msgid "The content widget appears in a shell window's right pane"
-#~ msgstr "å?§å®¹å??件顯示æ?¼ shell è¦?çª?ç??å?³çª?æ ¼"
+#~ msgid "Task Proposal"
+#~ msgstr "å·¥ä½?è¨?å??"
 
-#~ 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 "%s wishes to be added to an existing task."
+#~ msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
 
-#~ msgid "ETree table adapter"
-#~ msgstr "ETree 表格���"
+#~ msgid "Task Update"
+#~ msgstr "工���"
 
-#~ msgid "Retro Look"
-#~ msgstr "æ?·è??å¤?è§?"
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#~ msgid "Draw lines and +/- expanders."
-#~ msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
+#~ msgid "Task Update Request"
+#~ msgstr "工�����"
 
-#~ msgid "Expander Size"
-#~ msgstr "å±?é??å?¨å¤§å°?"
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#~ msgid "Size of the expander arrow"
-#~ msgstr "å±?é??å?¨ç®­è??ç??大å°?"
+#~ msgid "Task Reply"
+#~ msgstr "å·¥ä½?å??è¦?"
 
-#~ msgid "popup"
-#~ msgstr "å½?å?º"
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#~ msgid "edit"
-#~ msgstr "編輯"
+#~ msgid "Task Cancelation"
+#~ msgstr "å·¥ä½?å??æ¶?"
 
-#~ msgid "toggle"
-#~ msgstr "å??æ??"
+#~ msgid "Bad Task Message"
+#~ msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
 
-#~ msgid "expand"
-#~ msgstr "å±?é??"
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?空é??/å¿?ç¢?è³?è¨?ã??"
 
-#~ msgid "Event Processor"
-#~ msgstr "äº?件è??ç??å?¨"
+#~ msgid "Free/Busy Information"
+#~ msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#~ msgid "Text"
-#~ msgstr "æ??å­?"
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s è«?æ±?æ?¨ç??空é??/å¿?ç¢?è³?è¨?ã??"
 
-#~ msgid "Bold"
-#~ msgstr "ç²?é«?"
+#~ msgid "Free/Busy Request"
+#~ msgstr "空é??/å¿?ç¢?è«?æ±?"
 
-#~ msgid "Strikeout"
-#~ msgstr "���"
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
 
-#~ msgid "Anchor"
-#~ msgstr "��"
+#~ msgid "Free/Busy Reply"
+#~ msgstr "空é??/å¿?ç¢?å??è¦?"
 
-#~ msgid "Justification"
-#~ msgstr "左���"
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
 
-#~ msgid "Clip Width"
-#~ msgstr "�輯寬度"
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
 
-#~ msgid "Clip Height"
-#~ msgstr "�輯�度"
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#~ msgid "Clip"
-#~ msgstr "�輯"
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#~ msgid "Fill clip rectangle"
-#~ msgstr "填滿�輯��"
+#~ msgid "Update complete\n"
+#~ msgstr "æ?´æ?°å®?æ??\n"
 
-#~ msgid "X Offset"
-#~ msgstr "X �移"
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#~ msgid "Y Offset"
-#~ msgstr "Y �移"
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#~ msgid "Text width"
-#~ msgstr "æ??å­?寬度"
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#~ msgid "Text height"
-#~ msgstr "æ??å­?é«?度"
+#~ msgid "Attendee status updated\n"
+#~ msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#~ msgid "Use ellipsis"
-#~ msgstr "使ç?¨ç??ç?¥è??"
+#~ msgid "Item sent!\n"
+#~ msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#~ msgid "Ellipsis"
-#~ msgstr "æ©¢å??"
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#~ msgid "Line wrap"
-#~ msgstr "æ??è¡?"
+#~ msgid "Choose an action:"
+#~ msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
-#~ msgid "Break characters"
-#~ msgstr "中æ?·å­?å??"
+#~ msgid "Update"
+#~ msgstr "æ?´æ?°"
 
-#~ msgid "Max lines"
-#~ msgstr "æ??大è¡?æ?¸"
+#~ msgid "Tentatively accept"
+#~ msgstr "æ?«æ??æ?¥å??"
 
-#~ msgid "Draw borders"
-#~ msgstr "繪製��"
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#~ msgid "Allow newlines"
-#~ msgstr "å??許æ?°è¡?"
+#~ msgid "Update respondent status"
+#~ msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#~ msgid "Draw background"
-#~ msgstr "繪製è??æ?¯"
+#~ msgid "Send Latest Information"
+#~ msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#~ msgid "Draw button"
-#~ msgstr "繪製æ??é??"
+#~ msgid "--to--"
+#~ msgstr "--å?°--"
 
-#~ msgid "Cursor position"
-#~ msgstr "游��置"
+#~ msgid "Calendar Message"
+#~ msgstr "è¡?äº?æ??è¨?æ?¯"
 
-#~ msgid "IM Context"
-#~ msgstr "IM 快顯��"
+#~ msgid "Date:"
+#~ msgstr "æ?¥æ??:"
 
-#~ msgid "Handle Popup"
-#~ msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+#~ msgid "Loading Calendar"
+#~ msgstr "è¼?å?¥è¡?äº?æ??"
 
-#~ msgid "Loading appointments at %s"
-#~ msgstr "è¼?å?¥ %s ç??ç´?æ??"
+#~ msgid "Loading calendar..."
+#~ msgstr "è¼?å?¥è¡?äº?æ??â?¦"
 
-#~ msgid "_Security"
-#~ msgstr "���(_S)"
+#~ msgid "Organizer:"
+#~ msgstr "æ??è­°å?¬é??人:"
 
-#~ msgid "Copying `%s' to `%s'"
-#~ msgstr "å°?ã??%sã??è¤?製å?°ã??%sã??"
+#~ msgid "Server Message:"
+#~ msgstr "伺æ??å?¨è¨?æ?¯:"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 23c627e..efc5a77 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,22 +2,24 @@
 # Copyright (C) 2001, 03, 04, 05, 06 Free Software Foundation, Inc.
 # Joe Man <trmetal yahoo com hk>, 2001.
 # Chao-Hsiung Liao <pesder liao msa hinet net>, 2003.
-# Craig Jeffares <cjeffares novell com>,2004.
+# 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:533
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
+#
+#: ../shell/main.c:615
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.31.91\n"
+"Project-Id-Version: evolution 2.91.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 20:09+0800\n"
-"PO-Revision-Date: 2010-08-20 08:47+0800\n"
+"POT-Creation-Date: 2010-12-09 20:14+0800\n"
+"PO-Revision-Date: 2010-12-09 15:59+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -83,7 +85,7 @@ msgid "Delete address book '{0}'?"
 msgstr "å?ªé?¤é??è¨?é??ã??{0}ã??ï¼?"
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:49
 msgid "Do _Not Delete"
 msgstr "����(_N)"
 
@@ -97,7 +99,7 @@ msgstr "ç?¡æ³?é©?è­? LDAP 伺æ??å?¨ã??"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Failed to delete contact"
 msgstr "å?ªé?¤é?£çµ¡äººå¤±æ??"
 
@@ -196,37 +198,38 @@ msgid ""
 "changes?"
 msgstr "æ?¨å·²ç¶?ä¿®æ?¹æ­¤é?£çµ¡äººã??è¦?å?²å­?é??äº?è®?æ?´ï¼?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#. Translators: {0} is replaced with an address book name which will not be available
+#: ../addressbook/addressbook.error.xml.h:37
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨ {0} ç??é?£çµ¡äººã??"
 
-#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:603
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
-#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../plugins/groupwise-features/properties.ui.h:9
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "å? å?¥(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Discard"
 msgstr "��(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Do not save"
 msgstr "����(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Resize"
 msgstr "調�大�(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "_Use as it is"
 msgstr "����(_U)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:2022
+#: ../calendar/gui/e-calendar-view.c:2084
 msgid "Anniversary"
 msgstr "�年�念�"
 
@@ -237,8 +240,8 @@ msgstr "�年�念�"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:123
+#: ../calendar/gui/e-calendar-view.c:2083 ../capplet/anjal-settings-main.c:123
+#: ../shell/main.c:133
 msgid "Birthday"
 msgstr "ç??æ?¥"
 
@@ -248,34 +251,34 @@ msgid "Blog:"
 msgstr "��格�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
-msgstr "å??é¡?(_T)..."
+msgstr "å??é¡?(_T)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "è¡?äº?æ??ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:934
+#: ../addressbook/importers/evolution-vcard-importer.c:957
 msgid "Contact"
 msgstr "�絡人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:589
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:604
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2583
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2607
 msgid "Contact Editor"
 msgstr "�絡人編輯�"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:295
+#: ../addressbook/gui/merging/eab-contact-merging.c:298
 #: ../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:832
+#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "���件"
 
@@ -285,10 +288,10 @@ msgstr "空é??/å¿?ç¢?ï¼?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
-msgstr "å?¨å??(_N)..."
+msgstr "å?¨å??(_N)â?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "�家"
@@ -323,7 +326,7 @@ msgid "Nic_kname:"
 msgstr "�稱(_K):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../modules/calendar/e-memo-shell-migrate.c:260
 #: ../plugins/groupwise-features/camel-gw-listener.c:423
 #: ../plugins/groupwise-features/camel-gw-listener.c:448
 #: ../plugins/groupwise-features/camel-gw-listener.c:563
@@ -331,10 +334,10 @@ msgid "Notes"
 msgstr "å??註"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1725
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "Other"
 msgstr "��"
 
@@ -359,7 +362,7 @@ msgid "Web addresses"
 msgstr "網å??"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
 msgid "Work"
@@ -386,9 +389,9 @@ 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
+#: ../calendar/gui/dialogs/event-page.c:887
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../plugins/itip-formatter/itip-view.c:1922
 msgid "_Calendar:"
 msgstr "è¡?äº?æ??(_C):"
 
@@ -467,74 +470,74 @@ msgstr "é??è¨?é??(_W):"
 msgid "_Zip/Postal Code:"
 msgstr "é?µé??å??è??(_Z):"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:368
 msgid "Error adding contact"
 msgstr "æ?°å¢?é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "ä¿®æ?¹é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
 msgid "Error removing contact"
 msgstr "移é?¤é?£çµ¡äººæ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:599
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2578
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2602
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "�絡人編輯� - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3001
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3025
 msgid "Please select an image for this contact"
 msgstr "è«?é?¸å??代表此é?£çµ¡äººç??å??ç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3002
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3026
 msgid "_No image"
 msgstr "æ²?æ??å??ç??(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -542,23 +545,23 @@ msgstr ""
 "é?£çµ¡äººè³?æ??ç?¡æ??ï¼?\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "ã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3310
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sã??%sã??å?«æ??ç?¡æ??ç??æ ¼å¼?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3301
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3336
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sã??%sã??æ?¯ç©ºç??"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3350
 msgid "Invalid contact."
 msgstr "ç?¡æ??ç??é?£çµ¡äººã??"
 
@@ -648,7 +651,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:657
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:659
 msgid "Contact List Editor"
 msgstr "�絡人��編輯�"
 
@@ -665,32 +668,32 @@ msgid "_List name:"
 msgstr "å??å?ºå??稱(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:157
 msgid "_Select..."
-msgstr "é?¸å??(_S)..."
+msgstr "é?¸å??(_S)â?¦"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸å?¥é?»å­?é?µä»¶å?°å??æ??æ??æ?³é?£çµ¡äººå?°ä»¥ä¸?æ¸?å?®(_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:751
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
 msgid "Contact List Members"
 msgstr "é?£çµ¡äººæ¸?å?®æ??å?¡"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:905
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1320
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:907
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1322
 msgid "_Members"
 msgstr "æ??å?¡(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1160
 msgid "Error adding list"
 msgstr "æ?°å¢?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1172
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1174
 msgid "Error modifying list"
 msgstr "編輯æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1186
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
 msgid "Error removing list"
 msgstr "移é?¤æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
@@ -730,17 +733,17 @@ msgstr ""
 "æ?¼æ­¤è³?æ??夾ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?æ?°å¢?å®?å??ï¼?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:241
+#: ../addressbook/gui/merging/eab-contact-merging.c:244
 msgid "_Merge"
 msgstr "å??ä½µ(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/gui/merging/eab-contact-merging.c:169
 #: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
 #, c-format
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:224
+#: ../addressbook/gui/merging/eab-contact-merging.c:227
 msgid "Merge Contact"
 msgstr "å??ä½µé?£çµ¡äºº"
 
@@ -748,9 +751,9 @@ msgstr "å??ä½µé?£çµ¡äºº"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:920
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Any field contains"
 msgstr "ä»»ä½?æ¬?ä½?å??å?«"
 
@@ -764,22 +767,22 @@ msgstr "é?»å­?é?µä»¶é??å§?æ?¼"
 msgid "Name contains"
 msgstr "å??稱å??å?«"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:149
 msgid "No contacts"
 msgstr "æ²?æ??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d å??é?£çµ¡äºº"
 msgstr[1] "%d å??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-model.c:327
 msgid "Error getting book view"
 msgstr "å??å¾?æ?¸æ?¬æª¢è¦?æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:716
+#: ../addressbook/gui/widgets/e-addressbook-model.c:740
 msgid "Search Interrupted"
 msgstr "æ??å°?被中æ?·"
 
@@ -787,67 +790,74 @@ msgstr "æ??å°?被中æ?·"
 msgid "Error modifying card"
 msgstr "編輯å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:626
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
 msgid "Cut selected contacts to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:632
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
 msgid "Copy selected contacts to the clipboard"
 msgstr "è¤?製é?¸å??ç??é?£çµ¡äººè?³å?ªè²¼ç°¿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:638
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 msgid "Paste contacts from the clipboard"
 msgstr "��貼簿貼��絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 #: ../modules/addressbook/e-book-shell-view-actions.c:745
 msgid "Delete selected contacts"
 msgstr "å?ªé?¤é?¸å®?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Select all visible contacts"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?£çµ¡äºº"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?®ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººæ¸?å?® (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??äº?é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "æ?¨ç¢ºå®?è¦?å?ªé?¤é??å??é?£çµ¡äºº (%s)ï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
+#. Translators: This is shown for more than 5 contacts.
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr ""
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+"é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
+"確å®?è¦?顯示é??裡æ??æ??ç??é?£çµ¡äººï¼?"
+msgstr[1] ""
 "é??å?? %d å??é?£çµ¡äººæ??å??æ??é??å?? %d å??æ?°è¦?çª?ã??\n"
 "確å®?è¦?顯示é??裡æ??æ??ç??é?£çµ¡äººï¼?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "��顯示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "顯示æ??æ??ç??é?£çµ¡äºº(_A)"
 
@@ -881,7 +891,7 @@ msgid "Car Phone"
 msgstr "汽��話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -982,7 +992,7 @@ msgid "Radio"
 msgstr "����話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:569
+#: ../calendar/gui/e-meeting-list-view.c:571
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "��"
@@ -1018,7 +1028,7 @@ msgstr "��"
 msgid "Web Site"
 msgstr "網å??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:183
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1028,7 +1038,7 @@ msgstr ""
 "\n"
 "æ??å°?é?£çµ¡äºº..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:186
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1042,7 +1052,7 @@ msgstr ""
 "\n"
 "é??æ??é??裡以建ç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
 "\n"
 "\n"
@@ -1056,7 +1066,7 @@ msgstr ""
 "\n"
 "é??æ??é??裡以建ç«?æ?°ç??é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1066,7 +1076,7 @@ msgstr ""
 "\n"
 "å°?æ?¾é?£çµ¡äººã??"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1076,16 +1086,16 @@ msgstr ""
 "\n"
 "æ²?æ??é ?ç?®å?¯ä¾?é??種檢è¦?æ?¹å¼?顯示ã??"
 
-#: ../addressbook/gui/widgets/e-minicard.c:99
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "工����件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "�家���件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:808
 msgid "Other Email"
 msgstr "�����件"
 
@@ -1131,17 +1141,17 @@ msgid "Copy _Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:391
+#: ../widgets/misc/e-web-view.c:395
 msgid "Copy the email address to the clipboard"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??å?°å?ªè²¼ç°¿"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:396
+#: ../widgets/misc/e-web-view.c:400
 msgid "_Send New Message To..."
 msgstr "å?³é??æ?°é?µä»¶è?³(_S)â?¦"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:398
+#: ../widgets/misc/e-web-view.c:402
 msgid "Send a mail message to this address"
 msgstr "å?³é??é?µä»¶å?°é??å??ä½?å??"
 
@@ -1177,22 +1187,22 @@ msgid "Video Chat"
 msgstr "��交�"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/dialogs/calendar-setup.c:376
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../modules/calendar/e-cal-shell-view.c:497
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
 #: ../plugins/groupwise-features/camel-gw-listener.c:446
 #: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:498
+#: ../widgets/misc/e-send-options.c:499
 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:128
-#: ../calendar/gui/dialogs/event-editor.c:355
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "空é??/å¿?ç¢?"
@@ -1224,16 +1234,15 @@ msgstr "網�"
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../capplet/settings/mail-capplet-shell.c:366
 #: ../modules/addressbook/e-book-shell-backend.c:116
-#: ../modules/addressbook/e-book-shell-migrate.c:138
-#: ../modules/calendar/e-cal-shell-backend.c:127
-#: ../modules/calendar/e-cal-shell-migrate.c:151
-#: ../modules/calendar/e-memo-shell-backend.c:112
-#: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../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
+#: ../modules/addressbook/e-book-shell-migrate.c:143
+#: ../modules/calendar/e-cal-shell-backend.c:132
+#: ../modules/calendar/e-cal-shell-migrate.c:159
+#: ../modules/calendar/e-memo-shell-backend.c:116
+#: ../modules/calendar/e-memo-shell-migrate.c:117
+#: ../modules/calendar/e-task-shell-backend.c:116
+#: ../modules/calendar/e-task-shell-migrate.c:126
 msgid "Personal"
 msgstr "å??人"
 
@@ -1250,7 +1259,7 @@ msgid "Blog"
 msgstr "��格"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1011
-#: ../widgets/misc/e-web-view.c:848
+#: ../widgets/misc/e-web-view.c:852
 #, c-format
 msgid "Click to mail %s"
 msgstr "æ??ä¸?ä¸?ä¾?å?³é??é?µä»¶ %s"
@@ -1264,7 +1273,7 @@ msgstr ""
 "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??å?¯è?½è¡¨ç¤ºæ­¤ç?®é??æ??å??æ?ªæ¨?è¨?ç?ºé?¢ç·?ç?¨é??æ??è??å°?æ?ªä¸?è¼?以"
 "ä¾?é?¢ç·?使ç?¨ã??è«?æ?¼ä¸?ç·?模å¼?å??次è®?å??ç?®é??æ??å??以ä¸?è¼?å®?ç??å?§å®¹ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:98
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1272,7 +1281,7 @@ msgid ""
 msgstr ""
 "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??è«?檢æ?¥è·¯å¾? %s æ?¯å?¦å­?å?¨è??ä¸?æ¬?é??已設å®?å?¯ä»¥å­?å??å®?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:92
+#: ../addressbook/gui/widgets/eab-gui-util.c:111
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1280,17 +1289,17 @@ msgstr ""
 "æ­¤ Evolution ç??æ?¬æ?ªå°? LDAP æ?¯æ?´ç·¨è­¯é?²å?»ã??å¦?æ??æ?¨æ?³å?¨ Evolution 使ç?¨ LDAPï¼?å¿?é ?"
 "å®?è£?å??ç?¨ LDAP ç?? Evolution å¥?件ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:101
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr "æ??å??ç?¡æ³?é??å??é??å??ç?®é??æ??å??ã??é??表示æ?¨è¼¸å?¥é?¯èª¤ç??URIï¼?æ??伺æ??å?¨ç?¡æ³?é?£ç·?ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:109
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid "Detailed error message:"
 msgstr "詳細ç??é?¯èª¤è¨?æ?¯ï¼?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:133
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1302,7 +1311,7 @@ msgstr ""
 "è«?使ç?¨æ?´å? æ??確ç??æ?¥è©¢æ??æ?¯æ??é«?æ­¤ç?®é??æ??å??ç??ç?®é??\n"
 "伺æ??å?¨å??好設å®?中ç??çµ?æ??é??å?¶ã??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1315,49 +1324,49 @@ msgstr ""
 "æ??é??ä¸?é??ã??"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?ç?¡æ³?解æ??é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "æ­¤ç?®é??æ??å??ç??å¾?端ç¨?å¼?æ??çµ?å?·è¡?é??次ç??æ?¥è©¢ã??%s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:158
+#: ../addressbook/gui/widgets/eab-gui-util.c:177
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "é??次ç??æ?¥è©¢ä¸¦æ?ªå®?å?¨æ??å??ã??%s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:202
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:223
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
 msgid "Select Address Book"
 msgstr "é?¸æ??é??è¨?é??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:286
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "��"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:425
+#: ../addressbook/gui/widgets/eab-gui-util.c:441
 msgid "Move contact to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "Copy contact to"
 msgstr "�製�絡人�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:446
 msgid "Move contacts to"
 msgstr "��絡人移�"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:448
 msgid "Copy contacts to"
 msgstr "�製�絡人�"
 
@@ -1365,51 +1374,51 @@ msgstr "�製�絡人�"
 msgid "Card View"
 msgstr "å??ç??檢è¦?模å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:720
-#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../addressbook/importers/evolution-csv-importer.c:721
+#: ../addressbook/importers/evolution-ldif-importer.c:519
+#: ../addressbook/importers/evolution-vcard-importer.c:278
 #: ../calendar/importers/icalendar-importer.c:325
 #: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "��..."
+msgstr "���"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1008
+#: ../addressbook/importers/evolution-csv-importer.c:1021
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1009
+#: ../addressbook/importers/evolution-csv-importer.c:1022
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1017
+#: ../addressbook/importers/evolution-csv-importer.c:1030
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1018
+#: ../addressbook/importers/evolution-csv-importer.c:1031
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1026
+#: ../addressbook/importers/evolution-csv-importer.c:1039
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV æ?? Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1027
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV è?? Tab å?¯å?¥ç¨?å¼?"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:742
+#: ../addressbook/importers/evolution-ldif-importer.c:757
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP è³?æ??交æ??æ ¼å¼? (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:743
+#: ../addressbook/importers/evolution-ldif-importer.c:758
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸��"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:623
+#: ../addressbook/importers/evolution-vcard-importer.c:646
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcfã??.gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:624
+#: ../addressbook/importers/evolution-vcard-importer.c:647
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard ����"
 
@@ -1434,58 +1443,58 @@ msgstr "ç?¡æ³?å??å¾?é??è¨?é??æ¸?å?®"
 msgid "failed to open book"
 msgstr "ç?¡æ³?é??å??é??è¨?é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:45
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "æ??å®?輸å?ºæª?æ¡?è??ä¸?æ?¯æ¨?æº?輸å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:46
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "輸���"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "å??å?ºæ?¬å?°é??è¨?é??è³?æ??夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "å°?å??ç??顯示æ?? vcard æ?? csv æª?æ¡?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:53
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:70
 msgid "Export in asynchronous mode"
 msgstr "å?¨é??å??步模å¼?å?¯å?º"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:73
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "é??å??步模å¼?ä¸?ï¼?ä¸?å??輸å?ºæª?æ¡?中ç??å??ç??æ?¸ç?®ï¼?é ?設大å°?æ?¯ 100ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:75
 msgid "NUMBER"
 msgstr "æ?¸é??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:137
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "æ??令å??å¼?æ?¸é?¯èª¤ï¼?è«?使ç?¨ --help é?¸é ?ä¾?æ?¥ç??ç?¨æ³?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:151
 msgid "Only support csv or vcard format."
 msgstr "å??æ?¯æ?´ csv æ?? vcard æ ¼å¼?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:160
 msgid "In async mode, output must be file."
 msgstr "å?¨é??å??步模å¼?ä¸?ï¼?輸å?ºå¿?é ?æ?¯æª?æ¡?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:168
 msgid "In normal mode, there is no need for the size option."
 msgstr "å?¨ä¸?è?¬æ¨¡å¼?ä¸?ï¼?ä¸?é??è¦?大å°?é?¸é ?ã??"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:199
 msgid "Unhandled error"
 msgstr "æ?ªè??ç??ç??é?¯èª¤"
 
@@ -1505,10 +1514,11 @@ msgid "Enter password for %s (user %s)"
 msgstr "輸å?¥ %s (使ç?¨è?? %s) ç??å¯?碼 "
 
 #: ../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
+#: ../calendar/common/authentication.c:53
+#: ../calendar/gui/e-meeting-store.c:1770
+#: ../plugins/caldav/caldav-browse-server.c:922
+#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "輸��碼"
@@ -1610,19 +1620,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤ç´?æ??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:187
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤æ??è­°ï¼?"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "確å®?è¦?å?ªé?¤æ­¤å??å¿?é??ï¼?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確����此工��"
@@ -1698,133 +1708,139 @@ msgstr "è¼?å?¥å??å¿?é??æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 msgid "Error loading task list"
 msgstr "è¼?å?¥å·¥ä½?æ¸?å?®æ??ç?¼ç??é?¯èª¤"
 
-#: ../calendar/calendar.error.xml.h:44
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:46
+msgid "Error on {0}: {1}"
+msgstr "{0} ç?¼ç??é?¯èª¤ï¼?{1}"
+
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "å¦?æ??ä¸?å?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??æ??è­°å·²ç¶?å??æ¶?ã??"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??該å??å¿?é??å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "å¦?æ??æ?ªå?³é??å??æ¶?é??ç?¥ï¼?å?¶ä»?å??è??è??å?¯è?½ä¸?ç?¥é??å·¥ä½?å·²ç¶?å?ªé?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?å??許å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "å?³é??æ?´æ?°ç??è³?è¨?è®?å?¶ä»?å??è??è??ä¿?æ??æ??æ?°ç??å·¥ä½?æ¸?å?®ã??"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "é??裡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?æ­¤ç´?æ??å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "é??裡æ??ä¸?äº?é??è¦?ä¸?è¼?ç??é??件ã??å?²å­?此工ä½?å°?æ??失å?»é??äº?é??件ã??"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "æ??äº?å??è?½å?¯è?½ç?¡æ³?å?¨æ?¨ç?®å??ç??伺æ??å?¨ç??æ?¬ä¸?正常é??ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution è¡?äº?æ??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution å??å¿?é??å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution å·¥ä½?å·²ç¶?æ??å¤?çµ?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "æ­¤è¡?äº?æ??å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "æ­¤å??å¿?é??æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "此工ä½?æ¸?å?®å°?æ?ªæ¨?è¨?ç?ºé?¢ç·?使ç?¨ã??"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "é??å??è¡?äº?æ??å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "é??å??å??å¿?é??æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "é??é ?å·¥ä½?æ¸?å?®å°?æ??被永é? ç§»é?¤ã??"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
 msgstr "è¦?å?²å­?å°?æ­¤ç´?æ??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
 msgstr "è¦?å?²å­?å°?æ­¤æ??è­°æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
 msgstr "è¦?å?²å­?å°?æ­¤å??å¿?é??æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
 msgstr "è¦?å?²å­?å°?此工ä½?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "æ?¯å?¦è¦?å?³é??æ­¤å??å¿?é??ç??å??æ¶?é??ç?¥ï¼?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "è¦?å?³é??å??æ¶?é??ç?¥çµ¦æ??æ??ç??å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "è¦?å?³é??æ??è­°é??è«?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
 msgstr "è¦?å?³é??此工ä½?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "è¦?å?³é??æ??è­°æ?´æ?°è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
 msgstr "è¦?å?³é??æ?´æ?°ç??å·¥ä½?è³?è¨?給å??è??è??ï¼?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1833,70 +1849,70 @@ msgstr ""
 "æ?¨æ­£é?£ç·?å?°ä¸?æ?¯æ?´ç?? GroupWise 伺æ??å?¨è??ä¸?å?¯è?½é??å?°ä½¿ç?¨ Evolution ç??å??é¡?ã??æ??好ç??"
 "解決æ?¹æ¡?æ?¯å°?該伺æ??å?¨å??ç´?è?³æ?¯æ?´ç??ç??æ?¬ã??"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤ç´?æ??ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤æ??è­°ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤å·¥ä½?ï¼?ä½?å°?æ?ªå?²å­?å®?ã??"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "æ?¨å·²ç¶?è®?æ?´æ­¤å??å¿?é??ï¼?ä½?å°?æ?ªå?²å­?å®?å??ã??"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??è¡?äº?æ??ã??"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??å??å¿?é??ã??"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "é??æ?°å??å?? Evolution ä¹?å??ï¼?ç?¡æ³?使ç?¨æ?¨ç??å·¥ä½?ã??"
 
-#: ../calendar/calendar.error.xml.h:80
-#: ../composer/mail-composer.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "����(_D)"
 
-#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:271
+#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:271
 msgid "_Save"
 msgstr "��(_S)"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
 msgstr "����(_S)"
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:86
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:156
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:87
 msgid "_Send Notice"
 msgstr "å?³é??é??ç?¥(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:101
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "å??é??"
 msgstr[1] "å??é??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "å°?æ??"
 msgstr[1] "å°?æ??"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:286
 msgid "Start time"
 msgstr "é??å§?æ??å?»"
 
@@ -1911,10 +1927,9 @@ msgstr "��解�(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
-#: ../calendar/gui/e-itip-control.c:1175
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "Location:"
 msgstr "ä½?ç½®:"
 
@@ -1922,7 +1937,8 @@ msgstr "ä½?ç½®:"
 msgid "Snooze _time:"
 msgstr "忽ç?¥æ??é??(_T):"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:882
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "解�(_D)"
 
@@ -1932,9 +1948,9 @@ msgstr "延æ??(_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
+#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:427
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:335
+#: ../plugins/google-account-setup/google-contacts-source.c:375
 msgid "hours"
 msgstr "å°?æ??"
 
@@ -1945,14 +1961,14 @@ msgstr "ç´?æ??ç??å?°é»?"
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:426
 #: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../plugins/google-account-setup/google-contacts-source.c:374
 msgid "minutes"
 msgstr "å??é??"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
 msgid "No summary available."
 msgstr "æ²?æ??å?¯ç?¨ç??æ??è¦?ã??"
 
@@ -1967,16 +1983,17 @@ msgstr "æ²?æ??å?¯ç?¨ç??å?°é»?è³?è¨?ã??"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
-msgid "You have %d alarms"
-msgstr "æ?¨æ?? %d å??鬧é?´"
+msgid "You have %d alarm"
+msgid_plural "You have %d alarms"
+msgstr[0] "æ?¨æ?? %d å??鬧é?´"
+msgstr[1] "æ?¨æ?? %d å??鬧é?´"
 
-#: ../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
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1988,7 +2005,7 @@ msgstr ""
 "é??å?ºé?»å­?é?µä»¶ã??  Evolution æ??顯示\n"
 "æ?®é??ç??æ??é??å°?話ç??ä¾?代æ?¿ã??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2005,7 +2022,7 @@ msgstr ""
 "\n"
 "æ?¨ç¢ºå®?è¦?å?·è¡?é??å??ç¨?å¼?ï¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1752
 msgid "Do not ask me about this program again."
 msgstr "ä¸?è¦?å??è©¢å??æ??é??æ?¼é??å??ç¨?å¼?ã??"
 
@@ -2042,556 +2059,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d �"
 msgstr[1] "%d �"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "鬧���"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:11
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
-msgid "Ask for confirmation when deleting items"
-msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ä»?天å?°æ??ç??å·¥ä½?è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "é??æ??å·¥ä½?ç??è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Calendars to run alarms for"
-msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-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:8
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
-msgid "Compress weekends in month view"
-msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
-msgid "Confirm expunge"
-msgstr "æ¸?空æ??確èª?"
-
-#: ../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:12
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
-msgid "Default appointment reminder"
-msgstr "é ?設ç??ç´?æ??æ??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
-msgid "Default recurrence count"
-msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "é ?設æ??é??ç??å?®ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "é ?設æ??é??ç??æ?¸å?¼"
-
-#: ../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:18
-msgid "Event Gradient"
-msgstr "äº?件漸層æ??æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
-msgid "Event Transparency"
-msgstr "äº?件é??æ??æ??æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
-msgid "Free/busy server URLs"
-msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
-msgid "Free/busy template URL"
-msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
-
-#: ../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:23
-msgid "Hide completed tasks"
-msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
-msgid "Hide task units"
-msgstr "é?±è??å·¥ä½?å?®ä½?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
-msgid "Hide task value"
-msgstr "é?±è??å·¥ä½?æ?¸å?¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
-msgid "Horizontal pane position"
-msgstr "水平�格�置"
-
-#: ../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: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:29
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
-
-#: ../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:31
-msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
-msgid "Last alarm time"
-msgstr "ä¸?次鬧é?´æ??å?»"
-
-#: ../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:34
-msgid "List of recently used second time zones in a Day View."
-msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
-
-#: ../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:36
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains ç·?"
-
-#: ../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:38
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
-
-#: ../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:40
-msgid "Maximum number of recently used timezones to remember."
-msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
-msgid "Memo layout style"
-msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
-msgid "Memo preview pane position (horizontal)"
-msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
-msgid "Memo preview pane position (vertical)"
-msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
-
-#: ../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:45
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
-msgid "Month view horizontal pane position"
-msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid "Month view vertical pane position"
-msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../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:49
-msgid "Number of units for determining when to hide tasks."
-msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
-msgid "Overdue tasks color"
-msgstr "é??æ??ç??å·¥ä½?è?²å½©"
-
-#: ../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: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:53
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
-
-#: ../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:55
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
-
-#: ../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: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: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:59
-msgid "Primary calendar"
-msgstr "主è¦?è¡?äº?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-msgid "Primary memo list"
-msgstr "主è¦?å??å¿?é??æ¸?å?®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
-msgid "Primary task list"
-msgstr "主�工���"
-
-#: ../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:63
-msgid "Recently used second time zones in a Day View"
-msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
-
-#: ../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:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
-
-#: ../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:68
-msgid "Show appointment end times in week and month views"
-msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
-
-#: ../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:70
-msgid "Show display alarms in notification tray"
-msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
-
-#: ../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:72
-msgid "Show the memo preview pane"
-msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the task preview pane"
-msgstr "顯示工��覽�格"
-
-#: ../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:75
-msgid "Show type field in the event/task/meeting editor"
-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: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:78
-msgid "Task layout style"
-msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Task preview pane position (horizontal)"
-msgstr "工��覽�格�置�水平�"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (vertical)"
-msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-msgid "Tasks due today color"
-msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
-
-#: ../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: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: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: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:87
-msgid "The second timezone for a Day View"
-msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
-
-#: ../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:89
-msgid "Time divisions"
-msgstr "æ??é??å??é??"
-
-#: ../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:91
-msgid "Timezone"
-msgstr "æ??å??"
-
-#: ../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:93
-msgid "Twenty four hour time format"
-msgstr "24 å°?æ??å?¶æ ¼å¼?"
-
-#: ../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:95
-msgid "URI of the highlighted (\"primary\") memo list"
-msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
-
-#: ../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: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: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:99
-msgid "Use system timezone"
-msgstr "使ç?¨ç³»çµ±æ??å??"
-
-#: ../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:101
-msgid "Vertical pane position"
-msgstr "å??ç?´çª?æ ¼ä½?ç½®"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
-msgid "Week start"
-msgstr "ä¸?é?±é??å§?æ?¼"
-
-#: ../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:104
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
-
-#: ../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:106
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
-
-#: ../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: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: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:110
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
-
-#: ../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:112
-msgid "Whether to set a default reminder for appointments."
-msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
-
-#: ../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:114
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
-
-#: ../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:116
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
-
-#: ../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:118
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
-
-#: ../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:120
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Work days"
-msgstr "工��"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Workday end hour"
-msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Workday end minute"
-msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday start hour"
-msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday start minute"
-msgstr "å·¥ä½?æ?¥é??å§?å??é??"
-
 #: ../calendar/gui/cal-editor-utils.c:105
 msgid "Invalid object"
 msgstr "ç?¡æ??ç??ç?©ä»¶"
@@ -2637,18 +2104,16 @@ msgstr "å??é¡?"
 msgid "Classification"
 msgstr "歸�"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
-#: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:323
-#: ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
+#: ../calendar/gui/e-cal-model.c:780 ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "��"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:530
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../widgets/misc/e-attachment-tree-view.c:524
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "æ??è¿°:"
@@ -2670,7 +2135,7 @@ msgstr "å­?å?¨"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../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.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
@@ -2681,21 +2146,21 @@ msgstr "ä½?ç½®"
 msgid "Organizer"
 msgstr "æ??è­°å?¬é??人"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
+#: ../calendar/gui/e-cal-model.c:778 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "�人"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
-#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
+#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-cal-model.c:776
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "å?¬é??"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:322
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "é?±æ??æ?§"
@@ -2763,7 +2228,7 @@ msgid "Add Alarm"
 msgstr "��鬧�"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
+#: ../calendar/gui/dialogs/event-editor.c:364
 msgid "Alarm"
 msgstr "鬧�"
 
@@ -2779,7 +2244,7 @@ msgstr "��鬧���"
 msgid "Mes_sage:"
 msgstr "��(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:72
 msgid "Options"
 msgstr "��"
 
@@ -2819,20 +2284,16 @@ msgstr "æ??æ?¼"
 msgid "before"
 msgstr "æ?©æ?¼"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
 #: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:376
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "天"
 
@@ -2866,382 +2327,86 @@ msgid "A_dd"
 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:7
+#: ../calendar/gui/dialogs/event-page.ui.h:1
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Alarms"
 msgstr "鬧�"
 
-#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
-#: ../calendar/gui/e-day-view-time-item.c:797
-msgctxt "cal-second-zone"
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
-#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:319
-msgid "Select..."
-msgstr "é?¸æ??..."
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
-msgid "Selected Calendars for Alarms"
-msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
-msgid "Ti_me and date:"
-msgstr "æ??å?»å??æ?¥æ??(_M):"
-
-#: ../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
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u è?? %d æ??被æ?¿æ??ç?ºé?»å­?é?µä»¶ä½?å??中ç??使ç?¨è??è??網å??å??稱ã??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(顯示��檢�)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
-msgid "05 minutes"
-msgstr "05 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
-msgid "10 minutes"
-msgstr "10 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
-msgid "15 minutes"
-msgstr "15 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
-msgid "30 minutes"
-msgstr "30 å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
-msgid "60 minutes"
-msgstr "60 å??é??"
-
-#: ../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:30
-#: ../modules/addressbook/autocompletion-config.c:156
-msgid "Date/Time Format"
-msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
-msgid "Day _ends:"
-msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
-msgid "Days"
-msgstr "天"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
-msgid "Default Free/Busy Server"
-msgstr "é ?設ç??空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
-msgid "Display"
-msgstr "顯示"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:738
-msgid "Friday"
-msgstr "æ??æ??äº?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-#: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
-#: ../modules/addressbook/addressbook-config.c:1005
-#: ../plugins/itip-formatter/itip-formatter.c:2676
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:21
-msgid "General"
-msgstr "��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
-msgid "Hours"
-msgstr "å°?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
-msgid "Minutes"
-msgstr "å??é??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:734
-msgid "Monday"
-msgstr "æ??æ??ä¸?"
-
-#. Translators: "None" for not including threads;
-#. * part of "Include threads: None"
-#. Translators: Used in send options dialog
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:85
-msgid "Pick a color"
-msgstr "æ??é?¸é¡?è?²"
-
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-msgid "S_un"
-msgstr "��(_U)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:739
-msgid "Saturday"
-msgstr "æ??æ??å?­"
-
-#: ../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:29
-msgid "Se_cond zone:"
-msgstr "第äº?æ??å??(_C):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
-msgid "Select the calendars for alarm notification"
-msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Sh_ow a reminder"
-msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-msgid "Show a _reminder"
-msgstr "顯示æ??é??(_R)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
-msgid "Show week _numbers"
-msgstr "顯示��(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:733
-msgid "Sunday"
-msgstr "æ??æ??æ?¥"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-msgid "T_asks due today:"
-msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
-
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-msgid "T_hu"
-msgstr "é?±å??(_H)"
-
-#: ../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:41
-msgid "Template:"
-msgstr "樣�:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:737
-msgid "Thursday"
-msgstr "æ??æ??å??"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "æ??é??"
-
-#: ../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:45
-msgid "Time format:"
-msgstr "æ??å?»æ ¼å¼?:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:735
-msgid "Tuesday"
-msgstr "æ??æ??äº?"
-
-#: ../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:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:736
-msgid "Wednesday"
-msgstr "æ??æ??ä¸?"
-
-#. 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:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
-msgid "Work Week"
-msgstr "工��"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
-msgid "Work days:"
-msgstr "工��:"
-
-#: ../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:54
-msgid "_24 hour"
-msgstr "_24 å°?æ??"
-
-#: ../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:56
-msgid "_Compress weekends in month view"
-msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
-msgid "_Day begins:"
-msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
-
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
-msgid "_Fri"
-msgstr "��(_F)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
-msgid "_Hide completed tasks after"
-msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
-
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
-msgid "_Mon"
-msgstr "��(_M)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
-msgid "_Overdue tasks:"
-msgstr "é??æ??ç??å·¥ä½?(_O):"
-
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
-msgid "_Sat"
-msgstr "��(_S)"
-
-#: ../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:67
-msgid "_Time divisions:"
-msgstr "æ??é??é??é??(_T):"
-
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
-msgid "_Tue"
-msgstr "��(_T)"
-
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
-msgid "_Wed"
-msgstr "��(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
-msgid "before every anniversary/birthday"
-msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
-msgid "before every appointment"
-msgstr "å??"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:153
+#: ../calendar/gui/dialogs/calendar-setup.c:159
 msgid "Type:"
 msgstr "é¡?å??:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:510
+#: ../calendar/gui/dialogs/calendar-setup.c:175
+#: ../modules/addressbook/addressbook-config.c:513
 msgid "_Type:"
 msgstr "é¡?å??(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:150
 #: ../modules/addressbook/ldap-config.ui.h:26
-#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:282
+#: ../widgets/misc/e-signature-script-dialog.c:285
 msgid "_Name:"
 msgstr "å??稱(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "è¤?製è¡?äº?æ??å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:278
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "�製工����容���以便���業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:274
+#: ../calendar/gui/dialogs/calendar-setup.c:280
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "è¤?製å??å¿?é??æ¸?å?®å?§å®¹è?³æ?¬å?°ä»¥ä¾¿é?¢ç·?ä½?業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:346
+#: ../calendar/gui/dialogs/calendar-setup.c:352
 msgid "Colo_r:"
 msgstr "é¡?è?²(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:392
+#: ../calendar/gui/dialogs/calendar-setup.c:375
+#: ../calendar/gui/dialogs/calendar-setup.c:386
+#: ../calendar/gui/dialogs/calendar-setup.c:397
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:51
+#: ../modules/addressbook/addressbook-config.c:1015
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../plugins/itip-formatter/itip-formatter.c:2818
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:21
+msgid "General"
+msgstr "��"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Task List"
+msgstr "工���"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:398
 msgid "Memo List"
 msgstr "å??å¿?é??æ¸?å?®"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "Calendar Properties"
 msgstr "iCalendar �誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:483
 msgid "New Calendar"
 msgstr "æ?°è¡?äº?æ??"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "Task List Properties"
 msgstr "工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:533
+#: ../calendar/gui/dialogs/calendar-setup.c:539
 msgid "New Task List"
 msgstr "��工���"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "Memo List Properties"
 msgstr "å??å¿?é??æ¸?å?®å±¬æ?§"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:589
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 msgid "New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®"
 
@@ -3294,237 +2459,237 @@ msgstr "%s  æ?¨æ²?æ??å??ä»»ä½?è®?æ?´ï¼?æ?´æ?°é??å??編輯å?¨ï¼?"
 msgid "Validation error: %s"
 msgstr "確èª?ä¸?ç??é?¯èª¤ï¼? %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:246
+#: ../calendar/gui/dialogs/comp-editor.c:267
 msgid "Could not save attachments"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:522
+#: ../calendar/gui/dialogs/comp-editor.c:543
 msgid "Could not update object"
 msgstr "�����件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:658
 msgid "Edit Appointment"
 msgstr "編輯ç´?æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:644
+#: ../calendar/gui/dialogs/comp-editor.c:665
 #, c-format
 msgid "Meeting - %s"
 msgstr "æ??è­° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:646
+#: ../calendar/gui/dialogs/comp-editor.c:667
 #, c-format
 msgid "Appointment - %s"
 msgstr "ç´?æ?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:673
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "æ??æ´¾ç??å·¥ä½? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:654
+#: ../calendar/gui/dialogs/comp-editor.c:675
 #, c-format
 msgid "Task - %s"
 msgstr "工� - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:659
+#: ../calendar/gui/dialogs/comp-editor.c:680
 #, c-format
 msgid "Memo - %s"
 msgstr "å??å¿?é?? - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:675
+#: ../calendar/gui/dialogs/comp-editor.c:696
 msgid "No Summary"
 msgstr "æ²?æ??æ??è¦?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:786
+#: ../calendar/gui/dialogs/comp-editor.c:817
 msgid "Keep original item?"
 msgstr "æ?¯å?¦ä¿?æ??å??å§?é ?ç?®ï¼?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Click here to close the current window"
 msgstr "æ??é??裡以é??é??ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1454
-#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
+#: ../calendar/gui/dialogs/comp-editor.c:1020 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1434
+#: ../widgets/misc/e-focus-tracker.c:118 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:412 ../widgets/misc/e-web-view.c:1065
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å??ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1461
-#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:1055
+#: ../calendar/gui/dialogs/comp-editor.c:1027 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1441
+#: ../widgets/misc/e-focus-tracker.c:111 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:1059
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1004
-#: ../shell/e-shell-window-actions.c:1468
-#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1034
+#: ../shell/e-shell-window-actions.c:1448
+#: ../widgets/misc/e-focus-tracker.c:132 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "å?ªé?¤é?¸å??ç¯?å??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1011
+#: ../calendar/gui/dialogs/comp-editor.c:1041
 msgid "Click here to view help available"
 msgstr "æ??é??裡以檢è¦?å?¯ç?¨ç??說æ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1503
-#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:1067
+#: ../calendar/gui/dialogs/comp-editor.c:1048 ../mail/e-mail-browser.c:153
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:125 ../widgets/misc/e-focus-tracker.c:560
+#: ../widgets/misc/e-web-view.c:1071
 msgid "Paste the clipboard"
 msgstr "è²¼ä¸?å?ªè²¼ç°¿ç??å?§å®¹"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1039
+#: ../calendar/gui/dialogs/comp-editor.c:1069
 msgid "Click here to save the current window"
 msgstr "æ??é??裡以å?²å­?ç?®å??è¦?çª?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1573
-#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1076 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1553
+#: ../widgets/misc/e-focus-tracker.c:139 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "é?¸å??æ??æ??æ??å­?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1053
+#: ../calendar/gui/dialogs/comp-editor.c:1083
 msgid "_Classification"
 msgstr "歸�(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1608
+#: ../shell/e-shell-window-actions.c:1581
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1615
-#: ../widgets/misc/e-signature-editor.c:217
+#: ../calendar/gui/dialogs/comp-editor.c:1097 ../mail/e-mail-browser.c:167
+#: ../shell/e-shell-window-actions.c:1588
+#: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "��(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1074
-#: ../shell/e-shell-window-actions.c:1622
+#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../shell/e-shell-window-actions.c:1595
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1111
 msgid "_Insert"
 msgstr "æ??å?¥(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../composer/e-composer-actions.c:315
+#: ../calendar/gui/dialogs/comp-editor.c:1118
+#: ../composer/e-composer-actions.c:301
 msgid "_Options"
 msgstr "��(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
+#: ../calendar/gui/dialogs/comp-editor.c:1125 ../mail/e-mail-browser.c:181
+#: ../shell/e-shell-window-actions.c:1630 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
-#: ../composer/e-composer-actions.c:243
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../composer/e-composer-actions.c:257
 msgid "_Attachment..."
-msgstr "é??件(_A)..."
+msgstr "é??件(_A)â?¦"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1107
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Click here to attach a file"
 msgstr "æ??é??裡以é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1145
 msgid "_Categories"
 msgstr "å??é¡?(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1147
 msgid "Toggles whether to display categories"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å??é¡?ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "Time _Zone"
 msgstr "æ??å??(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Toggles whether the time zone is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??æ??å??ã??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1164
 msgid "Pu_blic"
 msgstr "å?¬é??(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "Classify as public"
 msgstr "å??é¡?ç?ºå?¬é??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_Private"
 msgstr "�人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Classify as private"
 msgstr "歸���人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1178
 msgid "_Confidential"
 msgstr "��(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../calendar/gui/dialogs/comp-editor.c:1180
 msgid "Classify as confidential"
 msgstr "歸����"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1158
+#: ../calendar/gui/dialogs/comp-editor.c:1188
 msgid "R_ole Field"
 msgstr "����(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "Toggles whether the Role field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??è§?è?²ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1166
+#: ../calendar/gui/dialogs/comp-editor.c:1196
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1198
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??RSVPã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 msgid "_Status Field"
 msgstr "ç??æ??æ¬?ä½?(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1206
 msgid "Toggles whether the Status field is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??ç??æ??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182
+#: ../calendar/gui/dialogs/comp-editor.c:1212
 msgid "_Type Field"
 msgstr "é¡?å??æ¬?ä½?(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1184
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "å??æ??æ?¯å?¦é¡¯ç¤ºã??å?°æ??è??é¡?å??ã??æ¬?ä½?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1208
+#: ../calendar/gui/dialogs/comp-editor.c:1238
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "æ??è¿?使ç?¨æ??件(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1743
-#: ../composer/e-composer-actions.c:431
+#: ../calendar/gui/dialogs/comp-editor.c:1923
+#: ../composer/e-composer-actions.c:461
 msgid "Attach"
 msgstr "é??å? "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2072
-#: ../calendar/gui/dialogs/comp-editor.c:2121
-#: ../calendar/gui/dialogs/comp-editor.c:3086
+#: ../calendar/gui/dialogs/comp-editor.c:2252
+#: ../calendar/gui/dialogs/comp-editor.c:2415
+#: ../calendar/gui/dialogs/comp-editor.c:3382
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "å¦?æ??æ??æ?°ç??æ?´æ?°ï¼?å??æ??æ?¾æ£?å°?æ­¤é ?ç?®æ??å??ç??è®?æ?´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../calendar/gui/dialogs/comp-editor.c:3346
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "é??件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3118
+#: ../calendar/gui/dialogs/comp-editor.c:3414
 msgid "Unable to use current version!"
 msgstr "ç?¡æ³?使ç?¨ç?®å??ç??ç??æ?¬ï¼?"
 
@@ -3540,11 +2705,11 @@ msgstr "ç?¡æ³?é??å??ç?®ç??å?°"
 msgid "Destination is read only"
 msgstr "ç?®ç??å?°æ?¯å?¯è®?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "æ?¯å?¦å?ªé?¤å?¶ä»?æ??æ??æ?¶ä»¶è??信箱中ç??é??å??é ?ç?®(_D)ï¼?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
 msgstr "æ?¶å??註解(_R)"
 
@@ -3614,7 +2779,7 @@ msgstr "ç?±æ?¼ç?¼ç??é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ï¼?%s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
-msgstr "�絡人..."
+msgstr "�絡人�"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
@@ -3624,147 +2789,147 @@ msgstr "��給�"
 msgid "Enter Delegate"
 msgstr "輸�代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Alarms"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:219
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Click here to set or unset alarms for this event"
 msgstr "æ??é??裡以設å®?æ??å??æ¶?é??å??äº?件ç??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "顯示æ??é??ç?ºå¿?ç¢?(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:229
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "å??æ??æ?¯å?¦å°?æ??é??顯示ç?ºå¿?ç¢?"
 
-#: ../calendar/gui/dialogs/event-editor.c:238
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "é?±æ??æ?§(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
-msgstr "�此�設�循��件"
+msgstr "å°?æ­¤é ?設ç?ºé?±æ??æ?§äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:210
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../plugins/groupwise-features/send-options.c:212
+#: ../widgets/misc/e-send-options.ui.h:22
 msgid "Send Options"
 msgstr "å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
-#: ../calendar/gui/dialogs/task-editor.c:129
+#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "æ??å?¥é?²é??å?³é??é?¸é ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "�天�件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:257
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "å??æ??æ?¯å?¦è¦?æ??å?¨å¤©äº?件"
 
-#: ../calendar/gui/dialogs/event-editor.c:266
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "空é??/å¿?ç¢?(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:268
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "æ?¥è©¢æ­¤å?°æ??è??ç??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3140
 msgid "Appointment"
 msgstr "ç´?æ??"
 
-#: ../calendar/gui/dialogs/event-editor.c:385
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/e-meeting-list-view.c:148
 msgid "Attendees"
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/dialogs/event-editor.c:578
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "å??å?°é??å??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:766
+#: ../calendar/gui/dialogs/event-page.c:771
 msgid "Event's start time is in the past"
 msgstr "äº?件ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:812
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "ä¸?è?½ç·¨è¼¯äº?件ï¼?å? ç?ºé?¸å??ç??è¡?äº?æ??æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/event-page.c:811
+#: ../calendar/gui/dialogs/event-page.c:816
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯äº?件ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.c:2775
+#: ../calendar/gui/dialogs/event-page.c:828
+#: ../calendar/gui/dialogs/event-page.c:2784
 msgid "This event has alarms"
 msgstr "é??å??äº?件å?·æ??鬧é?´"
 
-#: ../calendar/gui/dialogs/event-page.c:890
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.c:895
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æ??è­°å?¬é??人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:937
+#: ../calendar/gui/dialogs/event-page.c:942
 msgid "_Delegatees"
 msgstr "代ç??è??(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "Atte_ndees"
 msgstr "å?°æ??è??(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1154
+#: ../calendar/gui/dialogs/event-page.c:1159
 msgid "Event with no start date"
 msgstr "ç?¡é??å§?æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1157
+#: ../calendar/gui/dialogs/event-page.c:1162
 msgid "Event with no end date"
 msgstr "ç?¡çµ?æ??æ?¥æ??ç??äº?件"
 
-#: ../calendar/gui/dialogs/event-page.c:1328
-#: ../calendar/gui/dialogs/memo-page.c:686
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1333
+#: ../calendar/gui/dialogs/memo-page.c:689
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "Start date is wrong"
 msgstr "é??å§?æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1338
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End date is wrong"
 msgstr "çµ?æ??æ?¥æ??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1361
+#: ../calendar/gui/dialogs/event-page.c:1366
 msgid "Start time is wrong"
 msgstr "é??å§?æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1368
+#: ../calendar/gui/dialogs/event-page.c:1373
 msgid "End time is wrong"
 msgstr "çµ?æ??æ??é??é?¯èª¤"
 
-#: ../calendar/gui/dialogs/event-page.c:1530
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:967
+#: ../calendar/gui/dialogs/event-page.c:1537
+#: ../calendar/gui/dialogs/memo-page.c:730
+#: ../calendar/gui/dialogs/task-page.c:971
 msgid "The organizer selected no longer has an account."
 msgstr "é?¸å??ç??å?¬é??人已ç¶?æ²?æ??帳è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1536
-#: ../calendar/gui/dialogs/memo-page.c:733
-#: ../calendar/gui/dialogs/task-page.c:973
+#: ../calendar/gui/dialogs/event-page.c:1543
+#: ../calendar/gui/dialogs/memo-page.c:736
+#: ../calendar/gui/dialogs/task-page.c:977
 msgid "An organizer is required."
 msgstr "é??è¦?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:1561
-#: ../calendar/gui/dialogs/task-page.c:997
+#: ../calendar/gui/dialogs/event-page.c:1568
+#: ../calendar/gui/dialogs/task-page.c:1001
 msgid "At least one attendee is required."
 msgstr "æ??å°?é??è¦?ä¸?å??å?°æ??è??ã??"
 
-#: ../calendar/gui/dialogs/event-page.c:2649
+#: ../calendar/gui/dialogs/event-page.c:2658
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
@@ -3775,140 +2940,146 @@ msgstr "ç?¡æ³?é??å??è¡?äº?æ?? '%s'ã??"
 #. on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2693
-#: ../calendar/gui/dialogs/memo-page.c:946
-#: ../calendar/gui/dialogs/task-page.c:1787
+#: ../calendar/gui/dialogs/event-page.c:2702
+#: ../calendar/gui/dialogs/memo-page.c:949
+#: ../calendar/gui/dialogs/task-page.c:1791
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æ?¨æ­£æ??ä»» %s ç??代ç??人"
 
-#: ../calendar/gui/dialogs/event-page.c:2994
+#: ../calendar/gui/dialogs/event-page.c:3013
 #, 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:3000
+#: ../calendar/gui/dialogs/event-page.c:3019
 #, 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:3006
+#: ../calendar/gui/dialogs/event-page.c:3025
 #, 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:3019
+#: ../calendar/gui/dialogs/event-page.c:3044
 msgid "Customize"
 msgstr "��"
 
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:3021
+#: ../calendar/gui/dialogs/event-page.c:3050
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "æ²?æ??"
 
-#. TRANSLATORS: Predefined alarm's description
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-msgid "1 day before appointment"
-msgstr "ç´?æ??å?? 1 天"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgid "1 hour before appointment"
-msgstr "ç´?æ??å?? 1 å°?æ??"
-
-#. TRANSLATORS: Predefined alarm's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "15 minutes before appointment"
-msgstr "ç´?æ??å?? 15 å??é??"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "Atte_ndees..."
-msgstr "å?°æ??è??(_N)..."
+msgstr "å?°æ??è??(_N)â?¦"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Custom Alarm:"
 msgstr "��鬧�:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Event Description"
 msgstr "äº?件æ??è¿°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Time _zone:"
+msgstr "æ??å??(_Z):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "_Alarm"
 msgstr "鬧�(_A)"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:345
+#: ../widgets/misc/e-attachment-dialog.c:349
 msgid "_Description:"
 msgstr "æ??è¿°(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../plugins/calendar-weather/calendar-weather.c:358
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../plugins/calendar-weather/calendar-weather.c:361
 msgid "_Location:"
 msgstr "ä½?ç½®(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "æ??è¦?(_S):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "æ??å?»(_T):"
 
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "ç´?æ??å?? 1 天"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "ç´?æ??å?? 1 å°?æ??"
+
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:21
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "ç´?æ??å?? 15 å??é??"
+
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "eventpage"
 msgid "for"
 msgstr "å?±"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+msgctxt "eventpage"
 msgid "until"
 msgstr "ç?´å?°"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3144
 msgid "Memo"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "å??å?°é??å??å??å¿?é??"
 
-#: ../calendar/gui/dialogs/memo-page.c:338
+#: ../calendar/gui/dialogs/memo-page.c:341
 msgid "Memo's start date is in the past"
 msgstr "å??å¿?é??ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/memo-page.c:376
+#: ../calendar/gui/dialogs/memo-page.c:379
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å??å¿?é??ï¼?å? ç?ºé?¸å??ç??å??å¿?é??æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/memo-page.c:380
+#: ../calendar/gui/dialogs/memo-page.c:383
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯å??å¿?é??ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/memo-page.c:907
+#: ../calendar/gui/dialogs/memo-page.c:910
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "ç?¡æ³?å?¨ã??%sã??é??å??å??å¿?é??ã??"
 
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:270
-#: ../em-format/em-format.c:1030 ../mail/em-format-html.c:2289
-#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
+#: ../calendar/gui/dialogs/memo-page.c:1081 ../em-format/em-format-quote.c:282
+#: ../em-format/em-format.c:1052 ../mail/em-format-html.c:2401
+#: ../mail/em-format-html.c:2460 ../mail/em-format-html.c:2484
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:75
 msgid "To"
 msgstr "æ?¶ä»¶è??"
 
@@ -3927,7 +3098,7 @@ msgid "T_o:"
 msgstr "æ?¶ä»¶è??(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.c:428
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "群�(_G):"
@@ -3968,21 +3139,21 @@ msgstr "æ­¤ä¾?é ?å??以å¾?ç??ä¾?é ?"
 msgid "All Instances"
 msgstr "æ??æ??ä¾?é ?"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:560
+#: ../calendar/gui/dialogs/recurrence-page.c:569
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution ç?¡æ³?編輯é??å??é?±æ??æ?§ç´?æ??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:901
 msgid "Recurrence date is invalid"
 msgstr "é?±æ??æ?§æ?¥æ??ç?¡æ??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:941
 msgid "End time of the recurrence was before event's start"
 msgstr "é?±æ??æ?§äº?件ç??çµ?æ??æ??å?»æ?©æ?¼é??å§?æ??å?»"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "on"
 msgstr "ç??"
 
@@ -3990,7 +3161,7 @@ msgstr "ç??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "first"
 msgstr "�"
 
@@ -3999,7 +3170,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1024
+#: ../calendar/gui/dialogs/recurrence-page.c:1035
 msgid "second"
 msgstr "�"
 
@@ -4007,7 +3178,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1029
+#: ../calendar/gui/dialogs/recurrence-page.c:1040
 msgid "third"
 msgstr "�"
 
@@ -4015,7 +3186,7 @@ msgstr "�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "fourth"
 msgstr "å??"
 
@@ -4023,7 +3194,7 @@ msgstr "å??"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "fifth"
 msgstr "第�"
 
@@ -4031,13 +3202,13 @@ msgstr "第�"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1055
 msgid "last"
 msgstr "æ??å¾?"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1068
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "Other Date"
 msgstr "å?¶ä»?æ?¥æ??"
 
@@ -4045,7 +3216,7 @@ msgstr "å?¶ä»?æ?¥æ??"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 msgid "1st to 10th"
 msgstr "1��10�"
 
@@ -4053,7 +3224,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:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 msgid "11th to 20th"
 msgstr "11��20�"
 
@@ -4061,45 +3232,80 @@ 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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
 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
+#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "day"
 msgstr "天"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Monday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1124
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "Tuesday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "Wednesday"
+msgstr "æ??æ??ä¸?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
+msgid "Thursday"
+msgstr "æ??æ??å??"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+msgid "Friday"
+msgstr "æ??æ??äº?"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
+msgid "Saturday"
+msgstr "æ??æ??å?­"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
+msgid "Sunday"
+msgstr "æ??æ??æ?¥"
+
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 msgid "on the"
 msgstr "�第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1425
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2119
+#: ../calendar/gui/dialogs/recurrence-page.c:2132
 msgid "Add exception"
 msgstr "����"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2160
+#: ../calendar/gui/dialogs/recurrence-page.c:2173
 msgid "Could not get a selection to modify."
 msgstr "ç?¡æ³?å??å¾?è¦?編輯ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2166
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Modify exception"
 msgstr "編輯��"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2210
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Could not get a selection to delete."
 msgstr "ç?¡æ³?å??å¾?è¦?å?ªé?¤ç??é?¸å??å??ã??"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2337
+#: ../calendar/gui/dialogs/recurrence-page.c:2357
 msgid "Date/Time"
 msgstr "æ?¥æ??/æ??é??"
 
@@ -4111,119 +3317,140 @@ msgstr "�"
 msgid "Exceptions"
 msgstr "��"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:79
 msgid "Preview"
 msgstr "�覽"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
-msgstr "é??å??ç´?æ??ç??循ç?°è¦?å??ç?º(_U)"
+msgstr "é??å??ç´?æ??ç??é?±æ??æ?§è¦?å??ç?º(_U)"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "天"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+msgctxt "recurrpage"
+msgid "for"
+msgstr "å?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+msgctxt "recurrpage"
 msgid "forever"
 msgstr "永�"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
+msgctxt "recurrpage"
 msgid "month(s)"
-msgstr "æ??"
+msgstr "å??æ??"
+
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
+msgctxt "recurrpage"
+msgid "until"
+msgstr "ç?´å?°"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "é?±"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "å¹´"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:193
 msgid "Send my alarms with this event"
 msgstr "å°?æ??ç??鬧é?´è??é??å??äº?件ä¸?èµ·é??å?º"
 
-#: ../calendar/gui/dialogs/send-comp.c:164
+#: ../calendar/gui/dialogs/send-comp.c:195
 msgid "Notify new attendees _only"
 msgstr "å?ªé??ç?¥æ?°ç??å?°æ??è??(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:350
-#: ../calendar/gui/dialogs/task-details-page.c:372
+#: ../calendar/gui/dialogs/task-details-page.c:356
+#: ../calendar/gui/dialogs/task-details-page.c:378
 msgid "Completed date is wrong"
 msgstr "å®?æ??æ?¥æ??é?¯èª¤ "
 
-#: ../calendar/gui/dialogs/task-details-page.c:483
+#: ../calendar/gui/dialogs/task-details-page.c:489
 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
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-model-tasks.c:442
+#: ../calendar/gui/e-cal-model-tasks.c:716 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:593
+#: ../calendar/gui/print.c:3230 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
 msgstr "å·²å??æ¶?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:441
-#: ../calendar/gui/e-cal-model-tasks.c:715
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
-#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:714
+#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
+#: ../calendar/gui/e-task-table.c:212 ../calendar/gui/e-task-table.c:227
+#: ../calendar/gui/e-task-table.c:592 ../calendar/gui/print.c:3227
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "å·²å®?æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1226 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "é«?"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
-#: ../calendar/gui/print.c:2669
+#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:712
+#: ../calendar/gui/e-cal-model-tasks.c:789 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:591
+#: ../calendar/gui/print.c:3224
 msgid "In Progress"
 msgstr "��中"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-task-table.c:518 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "ä½?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-cal-model.c:1524 ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1225
+#: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "��"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
-#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:710 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:590
+#: ../calendar/gui/print.c:3221 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æ?ªé??å§?"
 
@@ -4239,8 +3466,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:1773
-#: ../calendar/gui/e-meeting-list-view.c:594
+#: ../calendar/gui/e-calendar-view.c:1837
+#: ../calendar/gui/e-meeting-list-view.c:596
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
@@ -4249,8 +3476,8 @@ msgstr "ç??æ??"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
@@ -4259,7 +3486,7 @@ msgid "_Date completed:"
 msgstr "å®?æ??æ?¥æ??(_D):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Priority:"
 msgstr "å?ªå??é ?åº?(_P):"
 
@@ -4267,65 +3494,65 @@ msgstr "å?ªå??é ?åº?(_P):"
 msgid "_Web Page:"
 msgstr "網�(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:117
+#: ../calendar/gui/dialogs/task-editor.c:116
 msgid "_Status Details"
 msgstr "ç??æ??詳細è³?æ??(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:119
+#: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
 msgstr "æ??é??裡æ?¹è®?/檢è¦?該工ä½?ç??ç??æ??詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:127
+#: ../calendar/gui/dialogs/task-editor.c:126
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "å?³é??é?¸é ?(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
-#: ../widgets/misc/e-send-options.c:502
+#: ../calendar/gui/dialogs/task-editor.c:331 ../calendar/gui/print.c:3142
+#: ../widgets/misc/e-send-options.c:503
 msgid "Task"
 msgstr "工�"
 
-#: ../calendar/gui/dialogs/task-editor.c:331
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "Task Details"
 msgstr "å·¥ä½?詳細è³?æ??"
 
-#: ../calendar/gui/dialogs/task-editor.c:373
+#: ../calendar/gui/dialogs/task-editor.c:376
 msgid "Print this task"
 msgstr "å??å?°é??é ?å·¥ä½?"
 
-#: ../calendar/gui/dialogs/task-page.c:343
+#: ../calendar/gui/dialogs/task-page.c:345
 msgid "Task's start date is in the past"
 msgstr "å·¥ä½?ç??é??å§?æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:344
+#: ../calendar/gui/dialogs/task-page.c:346
 msgid "Task's due date is in the past"
 msgstr "å·¥ä½?ç??çµ?æ??æ??å?»å?¨é??å?»"
 
-#: ../calendar/gui/dialogs/task-page.c:379
+#: ../calendar/gui/dialogs/task-page.c:381
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "ä¸?è?½ç·¨è¼¯å·¥ä½?ï¼?å? ç?ºé?¸å??ç??å·¥ä½?æ¸?å?®æ?¯å?¯è®?ç??"
 
-#: ../calendar/gui/dialogs/task-page.c:383
+#: ../calendar/gui/dialogs/task-page.c:385
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "ä¸?è?½å®?æ?´ç??編輯工ä½?ï¼?å? ç?ºæ?¨ä¸?æ?¯å?¬é??人"
 
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:436
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "æ??è­°å?¬é??人(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:880
+#: ../calendar/gui/dialogs/task-page.c:882
 msgid "Due date is wrong"
 msgstr "å?°æ??æ?¥é?¯èª¤"
 
-#: ../calendar/gui/dialogs/task-page.c:1744
+#: ../calendar/gui/dialogs/task-page.c:1748
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "ç?¡æ³?å?¨ '%s' é??å??å·¥ä½?ã??"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
-msgstr "å??é¡?(_I)..."
+msgstr "å??é¡?(_I)â?¦"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
@@ -4411,7 +3638,7 @@ msgstr "%s å?¨ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s ç?ºæ?ªç?¥ç??觸ç?¼é¡?å??"
 
-#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:674
 msgid "Untitled"
 msgstr "���"
 
@@ -4420,37 +3647,33 @@ msgid "Categories:"
 msgstr "å??é¡?ï¼?"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "æ??è¦?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
-#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-cal-component-preview.c:247
+#: ../calendar/gui/e-cal-component-preview.c:261
 msgid "Start Date:"
 msgstr "é??å§?æ?¥æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "Due Date:"
 msgstr "æ?ªæ­¢æ?¥æ??ï¼?"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1189
-#: ../plugins/itip-formatter/itip-view.c:1074
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1075
 msgid "Status:"
 msgstr "ç??æ??ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-component-preview.c:315
 msgid "Priority:"
 msgstr "å?ªå??ç­?ç´?ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:36
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../calendar/gui/e-cal-component-preview.c:368
+#: ../calendar/gui/e-cal-component-preview.c:371
 msgid "Web Page:"
 msgstr "網��"
 
@@ -4477,16 +3700,16 @@ msgid "Start Date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:563
+#: ../calendar/gui/e-task-table.c:568
 msgid "Free"
 msgstr "空é??"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:549 ../calendar/gui/e-task-table.c:569
 msgid "Busy"
 msgstr "��"
 
-#: ../calendar/gui/e-cal-model-tasks.c:659
+#: ../calendar/gui/e-cal-model-tasks.c:658
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4497,47 +3720,44 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:709
+#: ../calendar/gui/e-cal-model-tasks.c:708
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:856
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:1029
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
+#: ../calendar/gui/e-cal-model-tasks.c:1064 ../calendar/gui/e-cal-model.c:1530
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-meeting-store.c:193
 msgid "No"
 msgstr "å?¦"
 
-#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
-#: ../calendar/gui/e-itip-control.c:1349
-#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-cal-model.c:782 ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1073
+#: ../calendar/gui/print.c:1090 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:98
 #: ../plugins/itip-formatter/itip-formatter.c:457
-#: ../plugins/itip-formatter/itip-formatter.c:2343
-#: ../plugins/plugin-manager/plugin-manager.c:89
+#: ../plugins/itip-formatter/itip-formatter.c:2485
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../calendar/gui/e-cal-model.c:1271
+#: ../calendar/gui/e-cal-model.c:1526
 msgid "Recurring"
-msgstr "循�模�"
+msgstr "é?±æ??æ?§æ¨¡å¼?"
 
-#: ../calendar/gui/e-cal-model.c:1273
+#: ../calendar/gui/e-cal-model.c:1528
 msgid "Assigned"
 msgstr "å·²æ??å®?"
 
-#: ../calendar/gui/e-cal-model.c:2175
+#: ../calendar/gui/e-cal-model.c:2608
 #, c-format
 msgid "Opening %s"
 msgstr "æ­£å?¨é??å?? %s"
@@ -4574,97 +3794,95 @@ msgid "Start date"
 msgstr "é??å§?æ?¥æ??"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:557
+#: ../calendar/gui/e-meeting-list-view.c:559
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:588
+#: ../widgets/misc/e-attachment-tree-view.c:582
 msgid "Type"
 msgstr "é¡?å??"
 
-#: ../calendar/gui/e-calendar-view.c:407
+#: ../calendar/gui/e-calendar-view.c:430
 msgid "Cut selected events to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:413
+#: ../calendar/gui/e-calendar-view.c:436
 msgid "Copy selected events to the clipboard"
 msgstr "è¤?製é?¸å??ç??äº?件è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-calendar-view.c:419
+#: ../calendar/gui/e-calendar-view.c:442
 msgid "Paste events from the clipboard"
 msgstr "��貼簿貼��件"
 
-#: ../calendar/gui/e-calendar-view.c:425
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Delete selected events"
 msgstr "å?ªé?¤é?¸å??ç??äº?件"
 
-#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
-#: ../calendar/gui/e-task-table.c:266
+#: ../calendar/gui/e-calendar-view.c:467 ../calendar/gui/e-memo-table.c:187
+#: ../calendar/gui/e-task-table.c:265
 msgid "Deleting selected objects"
 msgstr "å?ªé?¤é?¸å®?ç??ç?©ä»¶"
 
-#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
-#: ../calendar/gui/e-task-table.c:1068
+#: ../calendar/gui/e-calendar-view.c:661 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1078
 msgid "Updating objects"
 msgstr "���件"
 
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-calendar-view.c:1784
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
-#: ../plugins/itip-formatter/itip-formatter.c:2331
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../plugins/itip-formatter/itip-formatter.c:2473
 msgid "Accepted"
 msgstr "æ?¥å??"
 
-#: ../calendar/gui/e-calendar-view.c:1721
-#: ../calendar/gui/e-itip-control.c:1205
+#: ../calendar/gui/e-calendar-view.c:1785
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
-#: ../plugins/itip-formatter/itip-formatter.c:2337
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../plugins/itip-formatter/itip-formatter.c:2479
 msgid "Declined"
 msgstr "å©?æ??"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1786
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Tentative"
 msgstr "��"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1787
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../plugins/itip-formatter/itip-formatter.c:2340
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../plugins/itip-formatter/itip-formatter.c:2482
 msgid "Delegated"
 msgstr "已�派"
 
-#: ../calendar/gui/e-calendar-view.c:1724
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "Needs action"
 msgstr "é??è¦?å??ä½?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
-#: ../calendar/gui/e-task-table.c:743
+#: ../calendar/gui/e-calendar-view.c:1932 ../calendar/gui/e-memo-table.c:538
+#: ../calendar/gui/e-task-table.c:753
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "å?¬é??人: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
-#: ../calendar/gui/e-task-table.c:746
+#: ../calendar/gui/e-calendar-view.c:1936 ../calendar/gui/e-memo-table.c:543
+#: ../calendar/gui/e-task-table.c:756
 #, c-format
 msgid "Organizer: %s"
 msgstr "æ??è­°å?¬é??人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
+#: ../calendar/gui/e-calendar-view.c:1952 ../calendar/gui/print.c:3176
 #, c-format
 msgid "Location: %s"
 msgstr "�置�%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1920
+#: ../calendar/gui/e-calendar-view.c:1983
 #, c-format
 msgid "Time: %s %s"
 msgstr "æ??å?»: %s %s"
@@ -4692,23 +3910,38 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:759
+#: ../calendar/gui/e-day-view-time-item.c:761
 #, c-format
 msgid "%02i minute divisions"
 msgstr "é??é?? %02i å??é??"
 
-#: ../calendar/gui/e-day-view-time-item.c:780
+#: ../calendar/gui/e-day-view-time-item.c:782
 msgid "Show the second time zone"
 msgstr "顯示第äº?æ??å??"
 
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/e-day-view-time-item.c:799
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.c:175
+#: ../modules/calendar/e-calendar-preferences.c:224
+msgctxt "cal-second-zone"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-timezone-entry.c:319
+#: ../modules/calendar/e-calendar-preferences.c:251
+msgid "Select..."
+msgstr "é?¸æ??â?¦"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %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-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
+#: ../calendar/gui/e-day-view-top-item.c:877 ../calendar/gui/e-day-view.c:1802
+#: ../calendar/gui/e-week-view-main-item.c:214 ../calendar/gui/print.c:1847
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -4718,10 +3951,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: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
+#: ../calendar/gui/e-day-view-top-item.c:881 ../calendar/gui/e-day-view.c:1819
+#: ../calendar/gui/e-week-view-main-item.c:223
+#: ../calendar/gui/ea-gnome-calendar.c:203
+#: ../modules/calendar/e-cal-shell-view-private.c:1005
 msgid "%a %d %b"
 msgstr "%-m æ?? %-d æ?¥ (%a)"
 
@@ -4730,453 +3963,33 @@ msgstr "%-m æ?? %-d æ?¥ (%a)"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
-#: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../calendar/gui/e-day-view-top-item.c:885 ../calendar/gui/e-day-view.c:1835
+#: ../calendar/gui/e-week-view-main-item.c:237
+#: ../calendar/gui/ea-gnome-calendar.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 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:1077 ../calendar/gui/e-week-view.c:749
-#: ../calendar/gui/print.c:819
+#: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:904 ../calendar/gui/print.c:920
+#: ../calendar/gui/print.c:2341 ../calendar/gui/print.c:2358
 msgid "am"
 msgstr "ä¸?å??"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
-#: ../calendar/gui/print.c:821
+#: ../calendar/gui/e-day-view.c:1008 ../calendar/gui/e-week-view.c:763
+#: ../calendar/gui/print.c:906 ../calendar/gui/print.c:922
+#: ../calendar/gui/print.c:2343 ../calendar/gui/print.c:2360
 msgid "pm"
 msgstr "ä¸?å??"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2645
+#: ../calendar/gui/e-day-view.c:2609
 #, 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 "æ?¯ã??(è¤?é??循ç?°)"
-
-#: ../calendar/gui/e-itip-control.c:782
-#, c-format
-msgid "Every day"
-msgid_plural "Every %d days"
-msgstr[0] "�天"
-msgstr[1] "� %d 天"
-
-#: ../calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] "��"
-msgstr[1] "� %d �"
-
-#: ../calendar/gui/e-itip-control.c:802
-#, c-format
-msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] "���"
-msgstr[1] "� %d ��"
-
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:813
-msgid " and "
-msgstr " å?? "
-
-#: ../calendar/gui/e-itip-control.c:822
-#, c-format
-msgid "The %s day of "
-msgstr "%s �� "
-
-#: ../calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "The %s %s of "
-msgstr "%s %s �� "
-
-#: ../calendar/gui/e-itip-control.c:849
-#, c-format
-msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] "æ¯?æ??"
-msgstr[1] "æ¯? %d æ??"
-
-#: ../calendar/gui/e-itip-control.c:861
-#, c-format
-msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] "�年"
-msgstr[1] "� %d 年"
-
-#: ../calendar/gui/e-itip-control.c:874
-#, c-format
-msgid "a total of %d time"
-msgid_plural "a total of %d times"
-msgstr[0] "總� %d 次"
-msgstr[1] "總� %d 次"
-
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:885
-msgid ", ending on "
-msgstr "ï¼?çµ?æ??æ?¼ "
-
-#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
-#: ../calendar/gui/e-itip-control.c:906
-msgid "Starts"
-msgstr "é??å§?"
-
-#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
-#: ../calendar/gui/e-itip-control.c:916
-msgid "Ends"
-msgstr "çµ?æ??"
-
-#: ../calendar/gui/e-itip-control.c:943
-#: ../plugins/save-calendar/csv-format.c:372
-msgid "Due"
-msgstr "�止"
-
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
-msgid "iCalendar Information"
-msgstr "iCalendar ��"
-
-#. Title
-#: ../calendar/gui/e-itip-control.c:1008
-msgid "iCalendar Error"
-msgstr "iCalendar �誤"
-
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
-#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
-#: ../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:1145
-msgid ""
-"Please review the following information, and then select an action from the "
-"menu below."
-msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
-
-#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1160
-#: ../plugins/itip-formatter/itip-formatter.c:2318
-msgctxt "cal-itip"
-msgid "None"
-msgstr "æ²?æ??"
-
-#: ../calendar/gui/e-itip-control.c:1200
-#: ../plugins/itip-formatter/itip-formatter.c:2334
-msgid "Tentatively Accepted"
-msgstr "æ?«æ??æ?¥å??"
-
-#: ../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:1292
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
-
-#: ../calendar/gui/e-itip-control.c:1369
-#, c-format
-msgid "%s has published meeting information."
-msgstr "%s å·²ç¶?ç?¼ä½?æ??è­°è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1370
-msgid "Meeting Information"
-msgstr "æ??è­°è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:1376
-#, c-format
-msgid "%s requests the presence of %s at a meeting."
-msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1378
-#, c-format
-msgid "%s requests your presence at a meeting."
-msgstr "%s é??è«?æ?¨å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1379
-msgid "Meeting Proposal"
-msgstr "æ??è­°æ??æ¡?"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "%s wishes to be added to an existing meeting."
-msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1386
-msgid "Meeting Update"
-msgstr "æ??è­°æ?´æ?°"
-
-#: ../calendar/gui/e-itip-control.c:1390
-#, c-format
-msgid "%s wishes to receive the latest meeting information."
-msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1391
-msgid "Meeting Update Request"
-msgstr "æ??è­°æ?´æ?°è«?æ±?"
-
-#: ../calendar/gui/e-itip-control.c:1398
-#, c-format
-msgid "%s has replied to a meeting request."
-msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1399
-msgid "Meeting Reply"
-msgstr "æ??è­°ç­?è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1406
-#, c-format
-msgid "%s has canceled a meeting."
-msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
-
-#: ../calendar/gui/e-itip-control.c:1407
-msgid "Meeting Cancelation"
-msgstr "æ??è­°å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
-#: ../calendar/gui/e-itip-control.c:1534
-#, c-format
-msgid "%s has sent an unintelligible message."
-msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
-
-#: ../calendar/gui/e-itip-control.c:1418
-msgid "Bad Meeting Message"
-msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1445
-#, c-format
-msgid "%s has published task information."
-msgstr "%s å·²ç¶?ç?¼ä½?äº?å·¥ä½?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1446
-msgid "Task Information"
-msgstr "工���"
-
-#: ../calendar/gui/e-itip-control.c:1453
-#, c-format
-msgid "%s requests %s to perform a task."
-msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1455
-#, c-format
-msgid "%s requests you perform a task."
-msgstr "%s è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1456
-msgid "Task Proposal"
-msgstr "å·¥ä½?è¨?å??"
-
-#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "%s wishes to be added to an existing task."
-msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1463
-msgid "Task Update"
-msgstr "工���"
-
-#: ../calendar/gui/e-itip-control.c:1467
-#, c-format
-msgid "%s wishes to receive the latest task information."
-msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1468
-msgid "Task Update Request"
-msgstr "工�����"
-
-#: ../calendar/gui/e-itip-control.c:1475
-#, c-format
-msgid "%s has replied to a task assignment."
-msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1476
-msgid "Task Reply"
-msgstr "å·¥ä½?å??è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1483
-#, c-format
-msgid "%s has canceled a task."
-msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1484
-msgid "Task Cancelation"
-msgstr "å·¥ä½?å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.c:1495
-msgid "Bad Task Message"
-msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1519
-#, c-format
-msgid "%s has published free/busy information."
-msgstr "%s å·²ç¶?ç?¼ä½?空é??/å¿?ç¢?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1520
-msgid "Free/Busy Information"
-msgstr "空é??/å¿?ç¢?è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:1524
-#, c-format
-msgid "%s requests your free/busy information."
-msgstr "%s è«?æ±?æ?¨ç??空é??/å¿?ç¢?è³?è¨?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1525
-msgid "Free/Busy Request"
-msgstr "空é??/å¿?ç¢?è«?æ±?"
-
-#: ../calendar/gui/e-itip-control.c:1529
-#, c-format
-msgid "%s has replied to a free/busy request."
-msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1530
-msgid "Free/Busy Reply"
-msgstr "空é??/å¿?ç¢?å??è¦?"
-
-#: ../calendar/gui/e-itip-control.c:1535
-msgid "Bad Free/Busy Message"
-msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1611
-msgid "The message does not appear to be properly formed"
-msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
-
-#: ../calendar/gui/e-itip-control.c:1670
-msgid "The message contains only unsupported requests."
-msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
-
-#: ../calendar/gui/e-itip-control.c:1703
-msgid "The attachment does not contain a valid calendar message"
-msgstr "é??件並æ?ªå??å?«å??æ³?ç??è¡?äº?æ??è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.c:1741
-msgid "The attachment has no viewable calendar items"
-msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
-
-#: ../calendar/gui/e-itip-control.c:1983
-msgid "Update complete\n"
-msgstr "æ?´æ?°å®?æ??\n"
-
-#: ../calendar/gui/e-itip-control.c:2017
-msgid "Object is invalid and cannot be updated\n"
-msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
-
-#: ../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:2053
-msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
-
-#: ../calendar/gui/e-itip-control.c:2077
-msgid "Attendee status updated\n"
-msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
-
-#: ../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:2115 ../calendar/gui/e-itip-control.c:2172
-msgid "Item sent!\n"
-msgstr "é ?ç?®å?³é??ï¼?\n"
-
-#: ../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:2273
-msgid "Choose an action:"
-msgstr "é?¸æ??ä¸?å??å??ä½?:"
-
-#. To translators: RSVP means "please reply"
-#: ../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:2342
-msgid "Update"
-msgstr "æ?´æ?°"
-
-#: ../calendar/gui/e-itip-control.c:2366
-#: ../plugins/groupwise-features/gw-ui.c:331
-msgid "Accept"
-msgstr "æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2367
-msgid "Tentatively accept"
-msgstr "æ?«æ??æ?¥å??"
-
-#: ../calendar/gui/e-itip-control.c:2368
-#: ../plugins/groupwise-features/gw-ui.c:345
-msgid "Decline"
-msgstr "æ??çµ?"
-
-#: ../calendar/gui/e-itip-control.c:2393
-msgid "Send Free/Busy Information"
-msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
-
-#: ../calendar/gui/e-itip-control.c:2417
-msgid "Update respondent status"
-msgstr "æ?´æ?°å??æ??ç??æ??"
-
-#: ../calendar/gui/e-itip-control.c:2441
-msgid "Send Latest Information"
-msgstr "é??å?ºæ??æ?°è³?è¨?"
-
-#: ../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 "å??æ¶?"
-
-#: ../calendar/gui/e-itip-control.ui.h:1
-msgid "--to--"
-msgstr "--å?°--"
-
-#: ../calendar/gui/e-itip-control.ui.h:2
-msgid "Calendar Message"
-msgstr "è¡?äº?æ??è¨?æ?¯"
-
-#: ../calendar/gui/e-itip-control.ui.h:3
-msgid "Date:"
-msgstr "æ?¥æ??:"
-
-#: ../calendar/gui/e-itip-control.ui.h:5
-msgid "Loading Calendar"
-msgstr "è¼?å?¥è¡?äº?æ??"
-
-#: ../calendar/gui/e-itip-control.ui.h:6
-msgid "Loading calendar..."
-msgstr "è¼?å?¥è¡?äº?æ??..."
-
-#: ../calendar/gui/e-itip-control.ui.h:7
-msgid "Organizer:"
-msgstr "æ??è­°å?¬é??人:"
-
-#: ../calendar/gui/e-itip-control.ui.h:8
-msgid "Server Message:"
-msgstr "伺æ??å?¨è¨?æ?¯:"
-
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席"
@@ -5194,72 +4007,90 @@ msgid "Resources"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/e-meeting-store.c:1023 ../calendar/gui/print.c:1069
 msgid "Individual"
 msgstr "å??å?¥"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
-#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1070 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "群�"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
-#: ../calendar/gui/print.c:970
+#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/print.c:1071
 msgid "Resource"
 msgstr "��"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/print.c:1072
 msgid "Room"
 msgstr "æ??議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/print.c:985
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1086
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/e-meeting-store.c:1026 ../calendar/gui/print.c:1087
 msgid "Required Participant"
 msgstr "å?ºå¸­è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
-#: ../calendar/gui/print.c:987
+#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/print.c:1088
 msgid "Optional Participant"
 msgstr "å??席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/print.c:1089
 msgid "Non-Participant"
 msgstr "缺席è??"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:863
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:1036
 msgid "Needs Action"
 msgstr "é??è¦?å??ä½?"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:537
+#: ../calendar/gui/e-meeting-list-view.c:539
 msgid "Attendee                          "
 msgstr "å?°æ??è??"
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:584
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
 msgid "In Process"
 msgstr "��中"
 
+#: ../calendar/gui/e-meeting-store.c:1760
+#, fuzzy, c-format
+#| msgid "Enter password for user %s on server %s"
+msgid "Enter password to access free/busy information on server %s as user %s"
+msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
+
+#: ../calendar/gui/e-meeting-store.c:1767
+#, fuzzy, c-format
+#| msgid "Failed to create thread: %s"
+msgid "Failure reason: %s"
+msgstr "��建�����%s"
+
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2376
+#: ../calendar/gui/e-meeting-time-sel-item.c:434
+#: ../calendar/gui/e-meeting-time-sel.c:2397
 msgid "%A, %B %d, %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 
@@ -5267,74 +4098,74 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A)"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2407
+#: ../calendar/gui/e-meeting-time-sel-item.c:438
+#: ../calendar/gui/e-meeting-time-sel.c:2428
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:466
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:550
 msgid "Out of Office"
 msgstr "��辦�室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "No Information"
 msgstr "æ²?æ??è³?è¨?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:587
 msgid "O_ptions"
 msgstr "��(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:605
 msgid "Show _only working hours"
 msgstr "å?ªé¡¯ç¤ºå·¥ä½?æ??é??(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:628
+#: ../calendar/gui/e-meeting-time-sel.c:616
 msgid "Show _zoomed out"
 msgstr "顯示縮�(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "_Update free/busy"
 msgstr "æ?´æ?°ç©ºé??/å¿?ç¢?(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:659
+#: ../calendar/gui/e-meeting-time-sel.c:647
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_Autopick"
 msgstr "è?ªå??é?¸æ??(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:710
+#: ../calendar/gui/e-meeting-time-sel.c:698
 msgid "_All people and resources"
 msgstr "æ??æ??人å?¡å??è³?æº?(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:720
+#: ../calendar/gui/e-meeting-time-sel.c:708
 msgid "All _people and one resource"
 msgstr "æ??æ??人å?¡å??ä¸?å??è³?æº?(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "å¿?è¦?ç??人å?¡(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:739
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid "Required people and _one resource"
 msgstr "å¿?è¦?人å?¡å??ä¸?å??è³?æº?(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:785
+#: ../calendar/gui/e-meeting-time-sel.c:776
 msgid "_Start time:"
 msgstr "é??å§?æ??å?»(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:822
+#: ../calendar/gui/e-meeting-time-sel.c:816
 msgid "_End time:"
 msgstr "çµ?æ??æ??å?»(_E):"
 
@@ -5362,47 +4193,47 @@ msgstr "��"
 msgid "Member"
 msgstr "æ??å?¡"
 
-#: ../calendar/gui/e-memo-table.c:412
+#: ../calendar/gui/e-memo-table.c:419
 #: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:431
+#: ../plugins/caldav/caldav-browse-server.c:439
 msgid "Memos"
 msgstr "å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
+#: ../calendar/gui/e-memo-table.c:500 ../calendar/gui/e-task-table.c:717
 msgid "* No Summary *"
 msgstr "* æ²?æ??æ??è¦? *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:585 ../calendar/gui/e-task-table.c:797
 msgid "Start: "
 msgstr "é??å§?:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:815
 msgid "Due: "
 msgstr "å?°æ??:"
 
-#: ../calendar/gui/e-memo-table.c:710
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:716
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "è¤?製é?¸å??ç??å??å¿?é??è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-memo-table.c:722
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿è²¼ä¸?å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:728
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "å?ªé?¤é?¸å®?ç??å??å¿?é??"
 
-#: ../calendar/gui/e-memo-table.c:734
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å??å¿?é??"
 
@@ -5414,43 +4245,43 @@ msgstr "è«?æ??é??裡å¢?å? æ?°ç??å??å¿?é??"
 #. %d is the actual value, %% is replaced with a percent sign.
 #. Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:539
+#: ../calendar/gui/e-task-table.c:544
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/gui/e-task-table.c:636 ../calendar/gui/print.c:2140
 #: ../calendar/importers/icalendar-importer.c:81
 #: ../calendar/importers/icalendar-importer.c:828
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../modules/calendar/e-task-shell-view.c:444
+#: ../plugins/caldav/caldav-browse-server.c:437
 #: ../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:933
+#: ../calendar/gui/e-task-table.c:943
 msgid "Cut selected tasks to the clipboard"
 msgstr "å?ªä¸?é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:939
+#: ../calendar/gui/e-task-table.c:949
 msgid "Copy selected tasks to the clipboard"
 msgstr "è¤?製é?¸å??ç??å·¥ä½?è?³å?ªè²¼ç°¿"
 
-#: ../calendar/gui/e-task-table.c:945
+#: ../calendar/gui/e-task-table.c:955
 msgid "Paste tasks from the clipboard"
 msgstr "��貼簿貼�工�"
 
-#: ../calendar/gui/e-task-table.c:951
-#: ../modules/calendar/e-task-shell-view-actions.c:690
+#: ../calendar/gui/e-task-table.c:961
+#: ../modules/calendar/e-task-shell-view-actions.c:696
 msgid "Delete selected tasks"
 msgstr "å?ªé?¤é?¸å®?ç??å·¥ä½?"
 
-#: ../calendar/gui/e-task-table.c:957
+#: ../calendar/gui/e-task-table.c:967
 msgid "Select all visible tasks"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??å·¥ä½?"
 
@@ -5461,7 +4292,7 @@ msgstr "é?¸æ??ä¸?å??æ??å??"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
+#: ../calendar/gui/e-week-view-main-item.c:231 ../calendar/gui/print.c:1828
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -5494,23 +4325,23 @@ msgstr "è¡?äº?æ??檢è¦?äº?件"
 msgid "Grab Focus"
 msgstr "����"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New Appointment"
 msgstr "æ?°å¢?ç´?æ??"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New All Day Event"
 msgstr "���天�件"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "New Meeting"
 msgstr "æ?°å¢?æ??è­°"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Today"
 msgstr "移���"
 
-#: ../calendar/gui/ea-cal-view.c:308
+#: ../calendar/gui/ea-cal-view.c:309
 msgid "Go to Date"
 msgstr "移è?³æ?¥æ??"
 
@@ -5519,7 +4350,7 @@ msgstr "移è?³æ?¥æ??"
 msgid "a table to view and select the current time range"
 msgstr "ç?¨ä¾?檢è¦?è??é?¸æ??æ??å?»ç¯?å??ç??表格"
 
-#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5528,14 +4359,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:155 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:153
 msgid "It has no events."
 msgstr "å®?æ²?æ??äº?件ã??"
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:162
+#: ../calendar/gui/ea-day-view.c:163
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
@@ -5543,47 +4374,47 @@ msgstr "å·¥ä½?é?±æª¢è¦?ï¼?%sã??%s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "æ?¥æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-day-view.c:202
+#: ../calendar/gui/ea-day-view.c:203
 msgid "calendar view for a work week"
 msgstr "å·¥ä½?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-day-view.c:204
+#: ../calendar/gui/ea-day-view.c:205
 msgid "calendar view for one or more days"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?æ?¥ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/gui/ea-gnome-calendar.c:49
+#: ../calendar/gui/ea-gnome-calendar.c:57
 #: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnome è¡?äº?æ??"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1010
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:1001
 msgid "%A %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:205
+#: ../calendar/gui/ea-gnome-calendar.c:210
+#: ../calendar/gui/ea-gnome-calendar.c:212
+#: ../modules/calendar/e-cal-shell-view-private.c:1008
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 #: ../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:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1043
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-#: ../modules/calendar/e-cal-shell-view-private.c:1061
-#: ../modules/calendar/e-cal-shell-view-private.c:1064
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../calendar/gui/ea-gnome-calendar.c:235
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:243
+#: ../modules/calendar/e-cal-shell-view-private.c:1034
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
+#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1055
 msgid "%d %b %Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
@@ -5595,25 +4426,25 @@ msgstr "è·³èº?æ??é??"
 msgid "Click here, you can find more events."
 msgstr "æ??é??裡ï¼?æ?¨å?¯ä»¥æ?¾å?°æ?´å¤?äº?件ã??"
 
-#: ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "æ??檢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:161
+#: ../calendar/gui/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "é?±æª¢è¦?ï¼?%sã??%s"
 
-#: ../calendar/gui/ea-week-view.c:195
+#: ../calendar/gui/ea-week-view.c:196
 msgid "calendar view for a month"
 msgstr "ç?¨æ?¼æ??ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:198
 msgid "calendar view for one or more weeks"
 msgstr "ç?¨æ?¼ä¸?æ??å¤?é?±ç??è¡?äº?æ??檢è¦?"
 
-#: ../calendar/gui/gnome-cal.c:2287
+#: ../calendar/gui/gnome-cal.c:2201
 msgid "Purging"
 msgstr "��"
 
@@ -5666,7 +4497,7 @@ msgid "Select Date"
 msgstr "é?¸æ??æ?¥æ??"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1316
 msgid "Select _Today"
 msgstr "é?¸æ??ä»?天(_T)"
 
@@ -5674,32 +4505,32 @@ msgstr "é?¸æ??ä»?天(_T)"
 msgid "September"
 msgstr "ä¹?æ??"
 
-#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
-#: ../calendar/gui/itip-utils.c:551
+#: ../calendar/gui/itip-utils.c:407 ../calendar/gui/itip-utils.c:458
+#: ../calendar/gui/itip-utils.c:550
 msgid "An organizer must be set."
 msgstr "å¿?é ?æ??å®?ä¸?å??å?¬é??人ã??"
 
-#: ../calendar/gui/itip-utils.c:451
+#: ../calendar/gui/itip-utils.c:450
 msgid "At least one attendee is necessary"
 msgstr "è?³å°?é??è¦?ä¸?å??å?°æ??è??"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "�件��"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "工���"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "å??å¿?é??è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#: ../calendar/gui/itip-utils.c:644
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "è¡?äº?æ??è³?è¨?"
 
@@ -5707,7 +4538,7 @@ msgstr "è¡?äº?æ??è³?è¨?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:678
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "å·²æ?¥å??"
@@ -5716,7 +4547,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:685
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "æ?«æ??æ?¥å??"
@@ -5728,7 +4559,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:692 ../calendar/gui/itip-utils.c:740
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "å·²æ??çµ?"
@@ -5737,7 +4568,7 @@ msgstr "å·²æ??çµ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:699
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "已�派"
@@ -5745,7 +4576,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:712
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "已��"
@@ -5753,7 +4584,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:719
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "å??æ¶?"
@@ -5761,7 +4592,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:726
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "é??æ?°æ?´ç??"
@@ -5769,7 +4600,7 @@ 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:733
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "æ??票表å?³"
@@ -5795,225 +4626,213 @@ msgstr "ç?¡æ³?å??å¾?è³?æº?ï¼?é?¯èª¤ç?ºï¼?"
 msgid "You must be an attendee of the event."
 msgstr "æ?¨å¿?é ?æ?¯æ­¤äº?件ç??å?°æ??è??ã??"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "1st"
 msgstr "1æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "2nd"
 msgstr "2æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "3rd"
 msgstr "3æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "4th"
 msgstr "4æ?¥"
 
-#: ../calendar/gui/print.c:508
+#: ../calendar/gui/print.c:542
 msgid "5th"
 msgstr "5æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "6th"
 msgstr "6æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "7th"
 msgstr "7æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "8th"
 msgstr "8æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "9th"
 msgstr "9æ?¥"
 
-#: ../calendar/gui/print.c:509
+#: ../calendar/gui/print.c:543
 msgid "10th"
 msgstr "10æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "11th"
 msgstr "11æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "12th"
 msgstr "12æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "13th"
 msgstr "13æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "14th"
 msgstr "14æ?¥"
 
-#: ../calendar/gui/print.c:510
+#: ../calendar/gui/print.c:544
 msgid "15th"
 msgstr "15æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "16th"
 msgstr "16æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "17th"
 msgstr "17æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "18th"
 msgstr "18æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "19th"
 msgstr "19æ?¥"
 
-#: ../calendar/gui/print.c:511
+#: ../calendar/gui/print.c:545
 msgid "20th"
 msgstr "20æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "21st"
 msgstr "21æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "22nd"
 msgstr "22æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "23rd"
 msgstr "23æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "24th"
 msgstr "24æ?¥"
 
-#: ../calendar/gui/print.c:512
+#: ../calendar/gui/print.c:546
 msgid "25th"
 msgstr "25æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "26th"
 msgstr "26æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "27th"
 msgstr "27æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "28th"
 msgstr "28æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "29th"
 msgstr "29æ?¥"
 
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:547
 msgid "30th"
 msgstr "30æ?¥"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:548
 msgid "31st"
 msgstr "31æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Su"
 msgstr "æ?¥"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Mo"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "Tu"
 msgstr "�"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:605
 msgid "We"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Th"
 msgstr "å??"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Fr"
 msgstr "�"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:606
 msgid "Sa"
 msgstr "å?­"
 
-#. Translators: This is part of "START to END" text,
-#. * where START and END are date/times.
-#: ../calendar/gui/print.c:2429
+#: ../calendar/gui/print.c:2969
 msgid " to "
 msgstr " å?° "
 
-#. Translators: This is part of "START to END
-#. * (Completed COMPLETED)", where COMPLETED is a
-#. * completed date/time.
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2979
 msgid " (Completed "
 msgstr " (å·²å®?æ??) "
 
-#. Translators: This is part of "Completed COMPLETED",
-#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:2441
+#: ../calendar/gui/print.c:2985
 msgid "Completed "
 msgstr "å·²å®?æ?? "
 
-#. Translators: This is part of "START (Due DUE)",
-#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2995
 msgid " (Due "
 msgstr "(æ??é??)"
 
-#. Translators: This is part of "Due DUE",
-#. * where DUE is a date/time due the event
-#. * should be finished.
-#: ../calendar/gui/print.c:2454
+#: ../calendar/gui/print.c:3002
 msgid "Due "
 msgstr "æ??é?? "
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:3167
 #, c-format
 msgid "Summary: %s"
 msgstr "æ??è¦?ï¼?%s"
 
-#: ../calendar/gui/print.c:2639
+#: ../calendar/gui/print.c:3194
 msgid "Attendees: "
 msgstr "å?°æ??è??:"
 
-#: ../calendar/gui/print.c:2682
+#: ../calendar/gui/print.c:3237
 #, c-format
 msgid "Status: %s"
 msgstr "ç??æ??(_S): %s"
 
-#: ../calendar/gui/print.c:2697
+#: ../calendar/gui/print.c:3252
 #, c-format
 msgid "Priority: %s"
 msgstr "å?ªå??é ?åº?(_P): %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:3270
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "å®?æ??ç?¾å??æ¯?: %i"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "URL: %s"
 msgstr "網å??: %s"
 
-#: ../calendar/gui/print.c:2739
+#: ../calendar/gui/print.c:3294
 #, c-format
 msgid "Categories: %s"
 msgstr "å??é¡?: %s"
 
-#: ../calendar/gui/print.c:2750
+#: ../calendar/gui/print.c:3305
 msgid "Contacts: "
 msgstr "�絡人: "
 
@@ -6040,7 +4859,7 @@ msgstr "ç´?æ??å??æ??è­°"
 
 #: ../calendar/importers/icalendar-importer.c:350
 #: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:1833
+#: ../plugins/itip-formatter/itip-formatter.c:1958
 msgid "Opening calendar"
 msgstr "é??å??è¡?äº?æ??"
 
@@ -7212,7 +6031,7 @@ msgstr "äº?æ´²/æ??馬ç?¾ç½?"
 
 #: ../calendar/zones.h:268
 msgid "Asia/Seoul"
-msgstr "äº?æ´²/æ¼¢å??"
+msgstr "�洲/��"
 
 #: ../calendar/zones.h:269
 msgid "Asia/Shanghai"
@@ -7768,253 +6587,243 @@ msgstr "太平æ´?/é??浦島"
 
 #: ../composer/e-composer-actions.c:163
 msgid "Save as..."
-msgstr "����..."
+msgstr "�����"
 
-#: ../composer/e-composer-actions.c:245
-#: ../widgets/misc/e-attachment-view.c:374
+#: ../composer/e-composer-actions.c:259
+#: ../widgets/misc/e-attachment-view.c:380
 msgid "Attach a file"
 msgstr "é??å? æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:250
-#: ../widgets/misc/e-signature-editor.c:203
+#: ../composer/e-composer-actions.c:264
+#: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "é??é??(_C)"
 
-#: ../composer/e-composer-actions.c:252
+#: ../composer/e-composer-actions.c:266
 msgid "Close the current file"
 msgstr "é??é??ç?®å??ç??æª?æ¡?"
 
-#: ../composer/e-composer-actions.c:257
-msgid "_Print..."
-msgstr "å??å?°(_P)..."
-
-#: ../composer/e-composer-actions.c:264
-msgid "Print Pre_view"
-msgstr "é ?覽å??å?°(_V)"
-
 #: ../composer/e-composer-actions.c:273
 msgid "Save the current file"
 msgstr "å?²å­?ç?®å??ç??æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:278
 msgid "Save _As..."
-msgstr "����(_A)..."
+msgstr "����(_A)�"
 
 #: ../composer/e-composer-actions.c:280
 msgid "Save the current file with a different name"
 msgstr "以å?¦ä¸?å??å??稱å?²å­?ç?®å??ç??æª?æ¡?"
 
 #: ../composer/e-composer-actions.c:285
+msgid "New _Message"
+msgstr "�寫��件(_M)"
+
+#: ../composer/e-composer-actions.c:287
+msgid "Open New Message window"
+msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
+
+#: ../composer/e-composer-actions.c:294
+msgid "Character _Encoding"
+msgstr "å­?å??編碼(_E)"
+
+#: ../composer/e-composer-actions.c:311
+msgid "_Print..."
+msgstr "å??å?°(_P)â?¦"
+
+#: ../composer/e-composer-actions.c:318
+msgid "Print Pre_view"
+msgstr "é ?覽å??å?°(_V)"
+
+#: ../composer/e-composer-actions.c:325
 msgid "Save as _Draft"
 msgstr "å?²å­?ç?ºè??稿(_D)"
 
-#: ../composer/e-composer-actions.c:287
+#: ../composer/e-composer-actions.c:327
 msgid "Save as draft"
 msgstr "å?²å­?ç?ºè??稿"
 
-#: ../composer/e-composer-actions.c:292 ../composer/e-composer-private.c:297
+#: ../composer/e-composer-actions.c:332 ../composer/e-composer-private.c:318
 msgid "S_end"
 msgstr "å?³é??(_E)"
 
-#: ../composer/e-composer-actions.c:294
+#: ../composer/e-composer-actions.c:334
 msgid "Send this message"
 msgstr "å?³é??é??å??é?µä»¶"
 
-#: ../composer/e-composer-actions.c:299
-msgid "New _Message"
-msgstr "�寫��件(_M)"
-
-#: ../composer/e-composer-actions.c:301
-msgid "Open New Message window"
-msgstr "é??å??æ?°ç??é?µä»¶è¦?çª?"
-
-#: ../composer/e-composer-actions.c:308
-msgid "Character _Encoding"
-msgstr "å­?å??編碼(_E)"
-
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:342
 msgid "PGP _Encrypt"
 msgstr "PG_P ��"
 
-#: ../composer/e-composer-actions.c:327
+#: ../composer/e-composer-actions.c:344
 msgid "Encrypt this message with PGP"
 msgstr "使ç?¨ PGP å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:350
 msgid "PGP _Sign"
 msgstr "P_GP å? ç°½"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:352
 msgid "Sign this message with your PGP key"
 msgstr "ç?¨æ?¨ç?? PGP é??é?°ç?ºé?µä»¶å? ä¸?æ?¸ä½?簽章"
 
-#: ../composer/e-composer-actions.c:341
+#: ../composer/e-composer-actions.c:358
 msgid "_Prioritize Message"
 msgstr "é?µä»¶å?ªå??æ¬?(_P)"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:360
 msgid "Set the message priority to high"
 msgstr "å°?é?µä»¶å?ªå??æ¬?設ç?ºã??é«?ã??"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:366
 msgid "Re_quest Read Receipt"
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?(_Q)"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:368
 msgid "Get delivery notification when your message is read"
 msgstr "å?¨æ?¨ç??é?µä»¶è¢«é?±è®?æ??å??å¾?é??ä¿¡é??ç?¥"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:374
 msgid "S/MIME En_crypt"
 msgstr "_S/MIME ��"
 
-#: ../composer/e-composer-actions.c:359
+#: ../composer/e-composer-actions.c:376
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使ç?¨æ?¨ç?? S/MIME å? å¯?æ??è­?å°?é??å°?é?µä»¶å? å¯?"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:382
 msgid "S/MIME Sig_n"
 msgstr "S/MI_ME å? ç°½"
 
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:384
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "ç?¨æ?¨ç?? S/MIME ç°½å??æ??è­?ç?ºé?µä»¶å? ä¸?æ?¸ä½?簽章"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:390
 msgid "_Bcc Field"
 msgstr "�件����(_B)"
 
-#: ../composer/e-composer-actions.c:375
+#: ../composer/e-composer-actions.c:392
 msgid "Toggles whether the BCC field is displayed"
 msgstr "å??æ??å¯?件å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:398
 msgid "_Cc Field"
 msgstr "����(_C)"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:400
 msgid "Toggles whether the CC field is displayed"
 msgstr "å??æ??å?¯æ?¬æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:406
 msgid "_Reply-To Field"
 msgstr "å??è¦?æ¬?ä½?(_R)"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:408
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "å??æ??å??è¦?æ¬?ä½?ç??顯示ç??æ??"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:464
 msgid "Save Draft"
 msgstr "å?²å­?è??稿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the recipients of the message"
 msgstr "輸å?¥é?µä»¶ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸å?¥é?µä»¶å?¯æ?¬ç??æ?¶ä»¶è??"
 
-#: ../composer/e-composer-header-table.c:46
+#: ../composer/e-composer-header-table.c:45
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr ""
 "輸å?¥é?µä»¶å¯?件å?¯æ?¬ç??æ?¶ä»¶è??ï¼?ä»?å??æ??æ?¶å?°é??å°?é?µä»¶ä½?ä¸?æ??å?ºç?¾å?¨é?µä»¶ç??æ?¶ä»¶è??æ¸?å?®"
 
-#: ../composer/e-composer-header-table.c:1002
+#: ../composer/e-composer-header-table.c:1006
 msgid "Fr_om:"
 msgstr "å¯?件è??(_O):"
 
-#: ../composer/e-composer-header-table.c:1011
+#: ../composer/e-composer-header-table.c:1015
 msgid "_Reply-To:"
 msgstr "å??è¦?(_R):"
 
-#: ../composer/e-composer-header-table.c:1015
+#: ../composer/e-composer-header-table.c:1019
 msgid "_To:"
 msgstr "æ?¶ä»¶è??(_T):"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1024
 msgid "_Cc:"
 msgstr "��(_C):"
 
-#: ../composer/e-composer-header-table.c:1025
+#: ../composer/e-composer-header-table.c:1029
 msgid "_Bcc:"
 msgstr "�件��(_B):"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1034
 msgid "_Post To:"
 msgstr "張貼�(_P):"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1038
 msgid "S_ubject:"
 msgstr "主�(_U):"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1047
 msgid "Si_gnature:"
 msgstr "ç°½å??æª?(_G):"
 
-#: ../composer/e-composer-name-header.c:137
+#: ../composer/e-composer-name-header.c:141
 msgid "Click here for the address book"
 msgstr "æ??é??裡æ?°å¢?ç?®é??æ??å??"
 
-#: ../composer/e-composer-post-header.c:126
+#: ../composer/e-composer-post-header.c:131
 msgid "Click here to select folders to post to"
 msgstr "æ??ä¸?ä¸?é??裡ï¼?é?¸å??è¦?張貼ç??è³?æ??夾"
 
-#: ../composer/e-composer-private.c:215
+#: ../composer/e-composer-private.c:217
 msgid "Undo the last action"
 msgstr "復å??ä¸?ä¸?次ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:219
+#: ../composer/e-composer-private.c:221
 msgid "Redo the last undone action"
 msgstr "å??æ¶?ä¸?ä¸?次復å??ç??å??ä½?"
 
-#: ../composer/e-composer-private.c:223
+#: ../composer/e-composer-private.c:225
 msgid "Search for text"
 msgstr "æ??å°?æ??å­?"
 
-#: ../composer/e-composer-private.c:227
+#: ../composer/e-composer-private.c:229
 msgid "Search for and replace text"
 msgstr "æ??å°?å??å??代æ??å­?"
 
-#: ../composer/e-composer-private.c:317
+#: ../composer/e-composer-private.c:338
 msgid "Save draft"
 msgstr "å?²å­?è??稿"
 
-#. Check buttons
-#: ../composer/e-msg-composer.c:192
-#: ../plugins/attachment-reminder/attachment-reminder.c:117
-msgid "_Do not show this message again."
-msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
-
-#: ../composer/e-msg-composer.c:1024
+#: ../composer/e-msg-composer.c:784
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "ç?¡æ³?簽署é??å?ºç??é?µä»¶ï¼?此帳è??æ²?æ??設å®?簽章æ??è­?"
 
-#: ../composer/e-msg-composer.c:1036
+#: ../composer/e-msg-composer.c:793
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "ç?¡æ³?å? å¯?é??å?ºç??é?µä»¶ï¼?æ²?æ??設å®?å? å¯?æ??è­?(此帳è??)"
 
-#: ../composer/e-msg-composer.c:1461
-msgid "Unable to reconstruct message from autosave file"
-msgstr "ç?¡æ³?å¾?è?ªå??å?²å­?ç??æª?æ¡?é??建é?µä»¶"
-
-#: ../composer/e-msg-composer.c:1531 ../composer/e-msg-composer.c:1877
+#: ../composer/e-msg-composer.c:1675 ../composer/e-msg-composer.c:2014
 msgid "Compose Message"
 msgstr "編輯�件"
 
-#: ../composer/e-msg-composer.c:3562
+#: ../composer/e-msg-composer.c:4085
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??å?«ä¸?è?½ç·¨è¼¯ç??é??æ??å­?ç??é?µä»¶å?§æ??ã??"
 
-#: ../composer/e-msg-composer.c:4174
+#: ../composer/e-msg-composer.c:4790
 msgid "Untitled Message"
 msgstr "æ?ªå?½å??ç??é?µä»¶"
 
@@ -8029,20 +6838,41 @@ msgid "All accounts have been removed."
 msgstr "æ??æ??帳è??å·²ç¶?移é?¤ã??"
 
 #: ../composer/mail-composer.error.xml.h:3
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "ç?¶å?²å­?å?°æ?¨ç??è??稿è³?æ??夾æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../composer/mail-composer.error.xml.h:4
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "ç?¶å?²å­?å?°æ?¨ç??å¯?件è³?æ??夾æ??ç?¼ç??é?¯èª¤ã??"
+
+#: ../composer/mail-composer.error.xml.h:5
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "å?¨å¯?ä¿¡æ??ç?¼ç??é?¯èª¤ã??æ?¨è¦?å¦?ä½?ç¹¼çº?ï¼?"
+
+#: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "確å®?è¦?æ?¾æ£?æ­£å?¨æ?°å¯«ï¼?æ¨?é¡?ç?º â??{0}â?? ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:4
+#: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "å? ç?ºã??{0}ã??ï¼?æ??以æ?¨å?¯è?½é??è¦?é?¸å??ä¸?å??ç??é?µä»¶é?¸é ?ã??"
 
-#: ../composer/mail-composer.error.xml.h:5
+#: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
 msgstr "å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:6
+#: ../composer/mail-composer.error.xml.h:9
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"å? ç?ºæ?¨å?¨é?¢ç·?å·¥ä½?ï¼?é??å??é?µä»¶æ??å?²å­?å?¨æ?¨æ?¬å?°ç«¯ç??å¯?件è³?æ??夾裡ã??ç?¶æ?¨å??å?°ç·?ä¸?å·¥ä½?ï¼?"
+"æ?¨å?¯ä»¥é»?é?¸ Evolution å·¥å?·å??ç??å?³é??/æ?¥æ?¶æ??é??ä¾?å¯?å?ºé?µä»¶ã??"
+
+#: ../composer/mail-composer.error.xml.h:10
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -8051,182 +6881,190 @@ msgstr ""
 "é?¤é??æ?¨é?¸æ??å?²å­?é?µä»¶è?³ã??è??稿ã??è³?æ??夾ï¼?å?¦å??é??é??æ­¤æ?°å¯«è¦?çª?æ??æ°¸ä¹?æ?¾æ£?é?µä»¶ã??å?²å­?è??"
 "稿å?¯ä»¥è®?æ?¨ä»¥å¾?å??ç¹¼çº?æ?°å¯«é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:7
-msgid "Could not create composer window."
-msgstr "ç?¡æ³?建ç«?æ?°å¯«è¦?çª?ã??"
-
-#: ../composer/mail-composer.error.xml.h:8
+#: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
 msgstr "ç?¡æ³?建ç«?é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:9
+#: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "ç?¡æ³?è®?å??ç°½å??æª?ã??{0}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:10
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "ç?¡æ³?æ?·å??é?µä»¶ä¾?é??å?  (å¾? {0})ã??"
 
-#: ../composer/mail-composer.error.xml.h:11
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "ç?¡æ³?å?²å­?è?³è?ªå??å?²å­?æª?æ¡?ã??{0}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
 msgstr "è¦?復å??æ?ªå®?æ??ç??é?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:13
+#: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "ä¸?è¼?å°?å?¨é?²è¡?中ã??æ?¯å?¦å¯?å?ºé?µä»¶ï¼?"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "å?²å­?è?³è?ªå??å?²å­?æ??ç?¼ç??é?¯èª¤ï¼?å? ç?ºã??{1}ã??ã??"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 "ç?¶æ?¨æ?°å¯«æ?°é?µä»¶æ??ï¼?Evolution æ??å¤?çµ?æ??ã??復å??é?µä»¶å?¯ä»¥è®?æ?¨å¾?å??ä¾?中æ?·ç??å?°æ?¹ç¹¼çº?ã??"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:19
+msgid "Saving message to Outbox."
+msgstr "å?²å­?é?µä»¶å?°å¯?件å?£ã??"
+
+#: ../composer/mail-composer.error.xml.h:20
 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
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:117
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??"
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid ""
-"Unable to activate the HTML editor control.\n"
-"\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
-"installed."
-msgstr ""
-"ç?¡æ³?å??å?? HTML 編輯å?¨æ?§å?¶ã??\n"
-"\n"
-"è«?確å®?æ?¨å®?è£?ç??æ?¯æ­£ç¢ºç??gtkhtml å?? libgtkhtml ç??æ?¬ã??"
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å¾?å?¯è?½æ²?æ??å?²å­?ã??"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "Unable to activate the address selector control."
-msgstr "ç?¡æ³?å??å??å?°å??é?¸æ??å?¨æ?§å?¶ã??"
+#: ../composer/mail-composer.error.xml.h:23
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "å??å ±ç??é?¯èª¤ç?º &quot;{0}&quot;ã??é?µä»¶å°?æ?ªå¯?å?ºã??"
 
-#: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file n{0}' to this message."
-msgstr "æ?¨ç?¡æ³?å°?æª?æ¡?ã??{0}ã??é??å? å?°æ­¤é?µä»¶ã??"
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "æ?¨ç?¡æ³?å°?æª?æ¡? &quot;{0}&quot; é??å? å?°é??å°?é?µä»¶ã??"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "æ?°å¯«é?µä»¶å??ï¼?æ?¨é??è¦?å??設å®?帳è??ã??"
 
-#: ../composer/mail-composer.error.xml.h:23
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "繼�編輯(_C)"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "ä¸?è¦?復å??(_D)"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "復å??(_R)"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "å?²å­?è??稿(_S)"
 
-#: ../capplet/anjal-settings-main.c:199
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Save to Outbox"
+msgstr "����件�(_S)"
+
+#: ../composer/mail-composer.error.xml.h:34
+msgid "_Try Again"
+msgstr "å??試ä¸?次(_T)"
+
+#: ../capplet/anjal-settings-main.c:223
 msgid "Run Anjal in a window"
 msgstr "以å??å?¥è¦?çª?å?·è¡? Anjal"
 
-#: ../capplet/anjal-settings-main.c:200
+#: ../capplet/anjal-settings-main.c:224
 msgid "Make Anjal the default email client"
 msgstr "以 Anjal å??ç?ºé ?設é?µä»¶å®¢æ?¶ç«¯"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:207
+#: ../capplet/anjal-settings-main.c:231
 msgid "ID of the socket to embed in"
 msgstr "socket ç?? IDï¼?å?§åµ?æ?¼"
 
-#: ../capplet/anjal-settings-main.c:208
+#: ../capplet/anjal-settings-main.c:232
 msgid "socket"
 msgstr "socket"
 
-#: ../capplet/anjal-settings-main.c:221
+#: ../capplet/anjal-settings-main.c:245
 msgid "Anjal email client"
 msgstr "Anjal ���件客�端"
 
-#: ../capplet/settings/mail-account-view.c:74
+#: ../capplet/settings/mail-account-view.c:73
 msgid "Please enter your full name."
 msgstr "è«?輸å?¥æ?¨ç??å?¨å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:75
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your email address."
 msgstr "è«?輸å?¥æ?¨ç??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:76
+#: ../capplet/settings/mail-account-view.c:75
 msgid "The email address you have entered is invalid."
 msgstr "æ?¨è¼¸å?¥ç??é?»å­?é?µä»¶ä½?å??æ?¯ç?¡æ??ç??ã??"
 
-#: ../capplet/settings/mail-account-view.c:77
+#: ../capplet/settings/mail-account-view.c:76
 msgid "Please enter your password."
 msgstr "è«?輸å?¥æ?¨ç??å¯?碼ã??"
 
-#: ../capplet/settings/mail-account-view.c:256
+#: ../capplet/settings/mail-account-view.c:255
 #: ../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
+#: ../capplet/settings/mail-account-view.c:359
+#: ../plugins/google-account-setup/google-contacts-source.c:56
 #: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../capplet/settings/mail-account-view.c:464
+#: ../capplet/settings/mail-account-view.c:463
 msgid "Personal details:"
 msgstr "å??人詳細è³?æ??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:471
+#: ../capplet/settings/mail-account-view.c:470
 msgid "Name:"
 msgstr "å§?å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:480
+#: ../capplet/settings/mail-account-view.c:479
 msgid "Email address:"
 msgstr "Email ä½?å??ï¼?"
 
-#: ../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:489
+msgid "Details:"
+msgstr "詳細è³?æ??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
-msgstr "<span size=\"large\" weight=\"bold\">正���</span>"
+#: ../capplet/settings/mail-account-view.c:497
+msgid "Receiving"
+msgstr "��中"
 
-#: ../capplet/settings/mail-account-view.c:501
+#: ../capplet/settings/mail-account-view.c:504
 msgid "Server type:"
 msgstr "伺æ??å?¨é¡?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:510
+#: ../capplet/settings/mail-account-view.c:513
 msgid "Server address:"
 msgstr "伺æ??å?¨ä½?å??ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:519
+#: ../capplet/settings/mail-account-view.c:522
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:528
+#: ../capplet/settings/mail-account-view.c:531
 msgid "Use encryption:"
 msgstr "使����"
 
-#: ../capplet/settings/mail-account-view.c:533
-#: ../capplet/settings/mail-account-view.c:566
+#: ../capplet/settings/mail-account-view.c:536
+#: ../capplet/settings/mail-account-view.c:571
 msgid "never"
 msgstr "永�"
 
-#: ../capplet/settings/mail-account-view.c:545
-msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
-msgstr "<span size=\"large\" weight=\"bold\">æ­£å?¨å?³é??</span>"
+#: ../capplet/settings/mail-account-view.c:548
+msgid "Sending"
+msgstr "å?³é??中"
 
-#: ../capplet/settings/mail-account-view.c:585
+#: ../capplet/settings/mail-account-view.c:590
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
 "address and password in below and we'll try and work out all the settings. "
@@ -8236,7 +7074,7 @@ msgstr ""
 "碼ï¼?æ??å??æ??å??試並æ?¾å?ºæ??æ??ç??設å®?å?¼ã??å¦?æ??æ??å??ç?¡æ³?è?ªå??å®?æ??é??å??æ­¥é©?ï¼?æ?¨å°±é??è¦?使ç?¨"
 "è?ªå·±å¸³è??ç??伺æ??å?¨è©³ç´°è³?æ??ã??"
 
-#: ../capplet/settings/mail-account-view.c:587
+#: ../capplet/settings/mail-account-view.c:592
 msgid ""
 "Sorry, we can't work out the settings to get your mail automatically. Please "
 "enter them below. We've tried to make a start with the details you just "
@@ -8245,11 +7083,11 @@ msgstr ""
 "æ?±æ­?ï¼?æ??å??ç?¡æ³?è?ªå??æ?¾å?ºæ?¨ç??é?µä»¶è¨­å®?å?¼ã??è«?å?¨ä¸?é?¢è¼¸å?¥å®?å??ã??æ??å??æ??以æ?¨å??å??輸å?¥ç??"
 "詳細è³?æ??試è??é??å§?ï¼?ä½?æ?¯æ?¨ä¹?æ??å?¯è?½é??è¦?æ?¹è®?å®?å??ã??"
 
-#: ../capplet/settings/mail-account-view.c:589
+#: ../capplet/settings/mail-account-view.c:594
 msgid "You can specify more options to configure the account."
 msgstr "æ?¨å?¯ä»¥æ??å®?æ?´å¤?ç?¨ä¾?設å®?é??å??帳è??ç??é?¸é ?ã??"
 
-#: ../capplet/settings/mail-account-view.c:591
+#: ../capplet/settings/mail-account-view.c:596
 msgid ""
 "Now we need your settings for sending mail. We've tried to make some guesses "
 "but you should check them over to make sure."
@@ -8257,111 +7095,110 @@ msgstr ""
 "ç?¾å?¨æ??å??é??è¦?æ?¨ç??設å®?å?¼æ??è?½å?³é??é?µä»¶ã??æ??å??å·²ç¶?試è??ç??測é?¨å??設å®?ï¼?ä½?æ?¯æ?¨æ??該檢æ?¥"
 "å®?å??以é?²è¡?確èª?ã??"
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:597
 msgid "You can specify your default settings for your account."
 msgstr "æ?¨å?¯ä»¥æ??å®?è?ªå·±å¸³è??ç??é ?設設å®?å?¼ã??"
 
-#: ../capplet/settings/mail-account-view.c:593
+#: ../capplet/settings/mail-account-view.c:598
 msgid ""
 "Time to check things over before we try and connect to the server and fetch "
 "your mail."
 msgstr "å?¨æ??å??å??試並é?£ç·?å?°ä¼ºæ??å?¨å??å??é?µä»¶å??檢æ?¥äº?é ?ç??æ??é??ã??"
 
-#: ../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
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2095 ../mail/em-account-editor.c:2216
 msgid "Identity"
 msgstr "身å??"
 
-#: ../capplet/settings/mail-account-view.c:608
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Receiving mail"
-msgstr "��步 - 正����件"
+msgstr "��步 - ���件"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Receiving mail"
-msgstr "正����件"
+msgstr "���件"
 
-#: ../capplet/settings/mail-account-view.c:609
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Next - Sending mail"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Back - Identity"
-msgstr "ä¸?ä¸?æ­¥ - 身å??è­?å?¥"
+msgstr "ä¸?ä¸?æ­¥ - 身å??"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:614
 msgid "Next - Receiving options"
-msgstr "��步 - 正�����"
+msgstr "��步 - ����"
 
-#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Receiving options"
-msgstr "正�����"
+msgstr "����"
 
-#: ../capplet/settings/mail-account-view.c:610
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving mail"
-msgstr "��步 - 正����件"
+msgstr "��步 - ���件"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Sending mail"
-msgstr "æ­£å?¨å?³é??é?µä»¶"
+msgstr "å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:612
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Next - Review account"
 msgstr "ä¸?ä¸?æ­¥ - 檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Next - Defaults"
 msgstr "ä¸?ä¸?æ­¥ - 詳細è³?æ??"
 
-#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:617
 msgid "Back - Receiving options"
-msgstr "��步 - 正�����"
+msgstr "��步 - ����"
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
+#: ../capplet/settings/mail-account-view.c:618
+#: ../mail/em-account-editor.c:3044
 msgid "Defaults"
 msgstr "�設�"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:618
 msgid "Back - Sending mail"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??é?µä»¶"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??é?µä»¶"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Review account"
 msgstr "檢é?±å¸³è??"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Finish"
 msgstr "å®?æ??"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:620
 msgid "Back - Sending"
-msgstr "ä¸?ä¸?æ­¥ - æ­£å?¨å?³é??"
+msgstr "ä¸?ä¸?æ­¥ - å?³é??"
 
-#: ../capplet/settings/mail-account-view.c:719
+#: ../capplet/settings/mail-account-view.c:725
 msgid "Setup Google contacts with Evolution"
 msgstr "� Google �絡人�� Evolution"
 
-#: ../capplet/settings/mail-account-view.c:720
+#: ../capplet/settings/mail-account-view.c:726
 msgid "Setup Google calendar with Evolution"
 msgstr "å°? Google æ?¥æ??å? å?¥ Evolution"
 
-#: ../capplet/settings/mail-account-view.c:725
+#: ../capplet/settings/mail-account-view.c:731
 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:739
+msgid "Google account settings:"
+msgstr "Google 帳è??設å®?å?¼ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:766
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "å°? Yahoo è¡?äº?æ??å? å?¥ Evolution"
 
-#: ../capplet/settings/mail-account-view.c:761
+#: ../capplet/settings/mail-account-view.c:770
 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 "
@@ -8370,63 +7207,63 @@ 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:777
+msgid "Yahoo account settings:"
+msgstr "Yahoo 帳è??設å®?å?¼ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:780
+#: ../capplet/settings/mail-account-view.c:791
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo è¡?äº?æ??å??稱ï¼?"
 
-#: ../capplet/settings/mail-account-view.c:1023
+#: ../capplet/settings/mail-account-view.c:1063
 msgid "Password:"
 msgstr "�碼�"
 
-#: ../capplet/settings/mail-account-view.c:1091
-#: ../capplet/settings/mail-settings-view.c:267
+#: ../capplet/settings/mail-account-view.c:1132
+#: ../capplet/settings/mail-settings-view.c:266
 msgid "Close Tab"
 msgstr "é??é??å??é ?"
 
-#: ../capplet/settings/mail-account-view.c:1101
+#: ../capplet/settings/mail-account-view.c:1142
 msgid "Account Wizard"
 msgstr "帳è??ç²¾é??"
 
-#: ../capplet/settings/mail-capplet-shell.c:208
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
-#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../capplet/settings/mail-capplet-shell.c:358 ../mail/e-mail-migrate.c:677
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:148
 #: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
 #: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
-#: ../mail/message-list.c:1666
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:218
+#: ../mail/message-list.c:1709
 #: ../modules/addressbook/e-book-shell-backend.c:96
-#: ../modules/addressbook/e-book-shell-migrate.c:130
-#: ../modules/calendar/e-cal-shell-backend.c:102
-#: ../modules/calendar/e-cal-shell-migrate.c:141
-#: ../modules/calendar/e-memo-shell-backend.c:92
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:92
-#: ../modules/calendar/e-task-shell-migrate.c:111
+#: ../modules/addressbook/e-book-shell-migrate.c:135
+#: ../modules/calendar/e-cal-shell-backend.c:107
+#: ../modules/calendar/e-cal-shell-migrate.c:148
+#: ../modules/calendar/e-memo-shell-backend.c:96
+#: ../modules/calendar/e-memo-shell-migrate.c:106
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-migrate.c:115
 msgid "On This Computer"
 msgstr "æ??ç??é?»è?¦"
 
-#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:737
-msgid "Modify"
-msgstr "修�"
+#: ../capplet/settings/mail-settings-view.c:145
+#, c-format
+msgid "Modify %s..."
+msgstr "修� %s�"
 
-#: ../capplet/settings/mail-settings-view.c:148
+#: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
 msgstr "å? å?¥æ?°ç??帳è??"
 
-#: ../capplet/settings/mail-settings-view.c:184
+#: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
 msgstr "帳è??管ç??"
 
-#: ../capplet/settings/mail-settings-view.c:277
+#: ../capplet/settings/mail-settings-view.c:276
 msgid "Settings"
 msgstr "設��"
 
@@ -8438,7 +7275,8 @@ msgstr "è¡?äº?æ??äº?件é??ç?¥"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 鬧é?´é??ç?¥"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:959
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolution"
@@ -8447,7 +7285,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution é?µä»¶è??è¡?äº?æ??"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupware ����"
 
@@ -8464,45 +7302,43 @@ msgid "Email Settings"
 msgstr "���件設��"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:224
+#: ../e-util/e-activity.c:226
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s ï¼?å·²å??æ¶?ï¼?"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:229
 #, c-format
 msgid "%s (completed)"
 msgstr "%s ï¼?å·²å®?æ??ï¼? "
 
-#. Translators: This is an activity whose percent
-#. * complete is unknown.
-#: ../e-util/e-activity.c:231
+#. Translators: This is an activity waiting to run.
+#: ../e-util/e-activity.c:232
 #, c-format
-msgid "%s..."
-msgstr "%s..."
+msgid "%s (waiting)"
+msgstr "%s (正���)"
 
+#. Translators: This is a running activity which
+#. *              the user has requested to cancel.
 #: ../e-util/e-activity.c:236
 #, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% å®?æ??)"
-
-#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
-msgid "Evolution Error"
-msgstr "Evolution �誤"
+msgid "%s (cancelling)"
+msgstr "%s (æ­£å?¨å??æ¶?)"
 
-#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
-msgid "Evolution Warning"
-msgstr "Evolution è­¦å??"
+#: ../e-util/e-activity.c:238
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../e-util/e-alert.c:649
+#: ../e-util/e-activity.c:243
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "å?§é?¨é?¯èª¤ï¼?è¦?æ±?ç??ä¸?æ??é?¯èª¤ '%s'>"
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% å®?æ??)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
-msgstr "é?¿æ??伯æ??"
+msgstr "é?¿æ??伯èª?"
 
 #: ../e-util/e-charset.c:54
 msgid "Baltic"
@@ -8522,27 +7358,27 @@ msgstr "æ?¯æ??夫èª?ç³»"
 
 #: ../e-util/e-charset.c:58
 msgid "Greek"
-msgstr "å¸?è??æ??"
+msgstr "å¸?è??èª?"
 
 #: ../e-util/e-charset.c:59
 msgid "Hebrew"
-msgstr "å¸?伯ä¾?æ??"
+msgstr "�伯��"
 
 #: ../e-util/e-charset.c:60
 msgid "Japanese"
-msgstr "æ?¥æ??"
+msgstr "��"
 
 #: ../e-util/e-charset.c:61
 msgid "Korean"
-msgstr "é??æ??"
+msgstr "é??èª?"
 
 #: ../e-util/e-charset.c:62
 msgid "Thai"
-msgstr "æ³°æ??"
+msgstr "泰�"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "å??è?³å?¶æ??"
+msgstr "å??è?³å?¶èª?"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -8554,7 +7390,7 @@ msgstr "西��系"
 
 #: ../e-util/e-charset.c:66
 msgid "Western European, New"
-msgstr "西��系��"
+msgstr "�代西��系"
 
 #. Translators: Character set "Chinese, Traditional"
 #: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
@@ -8578,138 +7414,78 @@ msgid "Visual"
 msgstr "�覺"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../e-util/e-datetime-format.c:199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
 #: ../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:205 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:210 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "æ??天"
 
-#: ../e-util/e-datetime-format.c:207
+#: ../e-util/e-datetime-format.c:212
 msgid "Yesterday"
 msgstr "�天"
 
-#. Translators: %d is replaced with a number of days. It's always greater than 1
-#: ../e-util/e-datetime-format.c:211
+#. Translators: %a is a strftime modifier, the abbreviated week day name, for example "Next Tue".
+#. ngettext is used to be able to define different translations for different days of week, where
+#. necessary. Index is between 1 and 7 inclusive, meaning 1 .. Monday, 2 .. Tuesday, ..., 7 .. Sunday
+#: ../e-util/e-datetime-format.c:218
 #, c-format
-msgid "%d day from now"
-msgid_plural "%d days from now"
-msgstr[0] "���起 %d 天"
-msgstr[1] "���起 %d 天"
+msgid "Next %a"
+msgid_plural "Next %a"
+msgstr[0] "�%a"
+msgstr[1] "�%a"
 
-#. 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 day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天å??"
-msgstr[1] "%d 天å??"
-
-#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
-#: ../e-util/e-datetime-format.c:308
+#: ../e-util/e-datetime-format.c:295 ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:314
 msgid "Use locale default"
 msgstr "使ç?¨å?°å??設å®?é ?設å?¼"
 
-#: ../e-util/e-datetime-format.c:502
+#: ../e-util/e-datetime-format.c:510
 msgid "Format:"
 msgstr "格��"
 
-#: ../e-util/e-file-utils.c:136
+#: ../e-util/e-file-utils.c:152
 msgid "(Unknown Filename)"
 msgstr "ï¼?ä¸?æ??ç??æª?æ¡?å??稱ï¼?"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:140
+#: ../e-util/e-file-utils.c:156
 #, c-format
 msgid "Writing \"%s\""
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:145
+#: ../e-util/e-file-utils.c:161
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "æ­£å?¨å¯«å?¥ã??%sã??è?³ %s"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:194
-msgid "Debug Logs"
-msgstr "é?¤é?¯ç´?é??æª?"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:208
-msgid "Show _errors in the status bar for"
-msgstr "å?¨ç??æ??å??顯示此é?¯èª¤(_E)"
-
-#. Translators: This is the second part of the sentence
-#. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:226
-msgid "second(s)."
-msgstr "ç§?ã??"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:232
-msgid "Log Messages:"
-msgstr "ç´?é??æª?è¨?æ?¯:"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:279
-msgid "Log Level"
-msgstr "ç´?é??ç­?ç´?"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
-#: ../mail/message-list.etspec.h:10
-msgid "Messages"
-msgstr "�件"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1426
-#: ../shell/e-shell-window-actions.c:1433
-#: ../shell/e-shell-window-actions.c:1440
-msgid "Close this window"
-msgstr "é??é??æ?¬è¦?çª?"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Error"
-msgstr "�誤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:38
-msgid "Errors"
-msgstr "�誤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:39
-msgid "Warnings and Errors"
-msgstr "è­¦å??è??é?¯èª¤"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Debug"
-msgstr "��"
-
-#: ../e-util/e-non-intrusive-error-dialog.h:40
-msgid "Error, Warnings and Debug messages"
-msgstr "é?¯èª¤ã??è­¦å??è??é?¤é?¯è¨?æ?¯"
-
-#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:377
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "é?±"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:157
 msgid "An error occurred while printing"
 msgstr "å??å?°æ??ç?¼ç??é?¯èª¤"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:164
 msgid "The printing system reported the following details about the error:"
 msgstr "å??å?°ç³»çµ±å??å ±ä¸?å??é??æ?¼æ­¤é?¯èª¤ç??詳細è³?è¨?ï¼?"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:170
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "å??å?°ç³»çµ±æ²?æ??å??報任ä½?é??æ?¼æ­¤é?¯èª¤ç??é¡?å¤?è³?è¨?ã??"
 
-#: ../e-util/e-signature.c:731
+#: ../e-util/e-signature.c:707
 msgid "Autogenerated"
 msgstr "è?ªå??ç?¢ç??ç??"
 
@@ -8733,15 +7509,15 @@ msgstr "��寫�?"
 msgid "File exists \"{0}\"."
 msgstr "æª?æ¡?å·²å­?å?¨ã??{0}ã??ã??"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:155
 msgid "_Overwrite"
 msgstr "�寫(_O)"
 
-#: ../e-util/e-util.c:146
+#: ../e-util/e-util.c:154
 msgid "Could not open the link."
 msgstr "ç?¡æ³?é??å??該é?£çµ?ã??"
 
-#: ../e-util/e-util.c:193
+#: ../e-util/e-util.c:201
 msgid "Could not display help for Evolution."
 msgstr "ç?¡æ³?顯示 Evolution ç??æ±?å?©æ??件ã??"
 
@@ -8754,152 +7530,156 @@ msgstr "GConf �誤�%s"
 msgid "All further errors shown only on terminal."
 msgstr "æ??æ??é?²ä¸?æ­¥ç??é?¯èª¤è¨?æ?¯å?ªæ??å?¨çµ?端æ©?中顯示ã??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1028
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1050
+#: ../mail/e-mail-tag-editor.c:329 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "From"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1029
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1051
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Reply-To"
 msgstr "å??è¦?"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1031
-#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
-#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1053
+#: ../mail/em-format-html.c:2402 ../mail/em-format-html.c:2464
+#: ../mail/em-format-html.c:2487 ../modules/mail/em-mailer-prefs.c:76
 msgid "Cc"
 msgstr "��"
 
-#: ../em-format/em-format-quote.c:270 ../em-format/em-format.c:1032
-#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
-#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
+#: ../em-format/em-format-quote.c:282 ../em-format/em-format.c:1054
+#: ../mail/em-format-html.c:2403 ../mail/em-format-html.c:2468
+#: ../mail/em-format-html.c:2490 ../modules/mail/em-mailer-prefs.c:77
 msgid "Bcc"
 msgstr "�件��"
 
-#: ../em-format/em-format-quote.c:410 ../em-format/em-format.c:1033
-#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
-#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
+#: ../em-format/em-format-quote.c:426 ../em-format/em-format.c:1055
+#: ../mail/e-mail-tag-editor.c:334 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/groupwise-features/notification.ui.h:2
+#: ../plugins/groupwise-features/properties.ui.h:5 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "主�"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:421 ../mail/em-format-html.c:2472
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/em-format-quote.c:437 ../mail/em-format-html.c:2584
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "å¯?件è??"
 
-#: ../em-format/em-format-quote.c:500 ../mail/em-composer-utils.c:1262
+#: ../em-format/em-format-quote.c:518 ../mail/em-composer-utils.c:1141
 msgid "-------- Forwarded Message --------"
 msgstr "-------- è½?é??ç??é?µä»¶ --------"
 
-#: ../em-format/em-format.c:1034 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
-#: ../widgets/misc/e-dateedit.c:546
+#: ../em-format/em-format.c:1056 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:79 ../widgets/misc/e-dateedit.c:529
+#: ../widgets/misc/e-dateedit.c:551
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../em-format/em-format.c:1035 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1057 ../modules/mail/em-mailer-prefs.c:80
 msgid "Newsgroups"
 msgstr "æ?°è??群çµ?"
 
-#: ../em-format/em-format.c:1036 ../modules/mail/em-mailer-prefs.c:86
+#: ../em-format/em-format.c:1058 ../modules/mail/em-mailer-prefs.c:81
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "��"
 
-#: ../em-format/em-format.c:1416
+#: ../em-format/em-format.c:1455
 #, c-format
 msgid "%s attachment"
 msgstr "%s é??件"
 
-#: ../em-format/em-format.c:1481
+#: ../em-format/em-format.c:1547
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? S/MIME é?µä»¶:æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1639 ../em-format/em-format.c:1823
+#: ../em-format/em-format.c:1729 ../em-format/em-format.c:1926
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "ç?¡æ³?解æ?? MIME æ ¼å¼?ç??é?µä»¶ã??å?ªå¥½é¡¯ç¤ºå??å§?æª?ã??"
 
-#: ../em-format/em-format.c:1649
+#: ../em-format/em-format.c:1739
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "å¤?é?¨ä»½/å·²å? å¯?ä¸?æ?¯æ?´ç??å? å¯?é¡?å??"
 
-#: ../em-format/em-format.c:1665
+#: ../em-format/em-format.c:1759
 msgid "Could not parse PGP/MIME message"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶"
 
-#: ../em-format/em-format.c:1666
+#: ../em-format/em-format.c:1760
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "ç?¡æ³?å??æ?? PGP/MIME é?µä»¶ï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1951
 msgid "Unsupported signature format"
 msgstr "ä¸?æ?¯æ?´ç??ç°½å??æ ¼å¼?"
 
-#: ../em-format/em-format.c:1858 ../em-format/em-format.c:2018
+#: ../em-format/em-format.c:1964 ../em-format/em-format.c:2137
 msgid "Error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??é?¯èª¤"
 
-#: ../em-format/em-format.c:1859 ../em-format/em-format.c:2006
-#: ../em-format/em-format.c:2019
+#: ../em-format/em-format.c:1965 ../em-format/em-format.c:2124
+#: ../em-format/em-format.c:2138
 msgid "Unknown error verifying signature"
 msgstr "檢é©?ç°½å??ç?¼ç??ä¸?æ??é?¯èª¤"
 
-#: ../em-format/em-format.c:2106
+#: ../em-format/em-format.c:2229
 msgid "Could not parse PGP message: "
 msgstr "ç?¡æ³?解æ?? PGP é?µä»¶ï¼?"
 
-#: ../em-format/em-format.c:2112 ../plugins/caldav/caldav-browse-server.c:203
-#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../em-format/em-format.c:2235 ../mail/mail-ops.c:624
+#: ../plugins/caldav/caldav-browse-server.c:211
+#: ../plugins/caldav/caldav-browse-server.c:1408 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:100
 msgid "Unknown error"
 msgstr "ä¸?æ??ç??é?¯èª¤"
 
-#: ../filter/e-filter-datespec.c:74
+#. Don't delete this code, since it is needed so that xgettext can extract the translations.
+#. * Please, keep these strings in sync with the strings in the timespans array
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 ç§?å??"
 msgstr[1] "%d ç§?å??"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:71
 #, 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:75
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 å??é??å??"
 msgstr[1] "%d å??é??å??"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:73
 #, 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:76
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 å°?æ??å??"
 msgstr[1] "%d å°?æ??å??"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:75
 #, 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:77
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -8920,121 +7700,127 @@ msgid_plural "%d weeks ago"
 msgstr[0] "1 é?±å??"
 msgstr[1] "%d é?±å??"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:79
 #, 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:79
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 æ??å??"
 msgstr[1] "%d æ??å??"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:81
 #, 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:80
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 å¹´å??"
 msgstr[1] "%d å¹´å??"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../filter/e-filter-datespec.c:83
 #, 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:119
+#: ../filter/e-filter-datespec.c:133
 msgid "<click here to select a date>"
-msgstr "<æ??é??è£?é?¸æ??æ?¥æ??>"
+msgstr "<æ??é??裡é?¸æ??æ?¥æ??>"
 
-#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
-#: ../filter/e-filter-datespec.c:144
+#: ../filter/e-filter-datespec.c:136 ../filter/e-filter-datespec.c:147
+#: ../filter/e-filter-datespec.c:158
 msgid "now"
 msgstr "��"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:143
 msgid "%d-%b-%Y"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥"
 
-#: ../filter/e-filter-datespec.c:272
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "é?¸æ??è¦?æ¯?å°?ç??æ??é??"
 
-#: ../filter/e-filter-file.c:184
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "é?¸æ??æª?æ¡?"
 
-#: ../filter/e-filter-rule.c:659
+#: ../filter/e-filter-rule.c:669
 msgid "R_ule name:"
 msgstr "è¦?å??å??稱(_U):"
 
-#: ../filter/e-filter-rule.c:689
+#: ../filter/e-filter-rule.c:699
 msgid "Find items that meet the following conditions"
 msgstr "å°?æ?¾ç¬¦å??ä¸?å??æ¢?件ç??é ?ç?®"
 
-#: ../filter/e-filter-rule.c:723
-msgid "A_dd Condition"
-msgstr "���件(_D)"
-
-#: ../filter/e-filter-rule.c:732
+#: ../filter/e-filter-rule.c:724
 msgid "If all conditions are met"
 msgstr "å¦?æ??å?¨é?¨æ¢?件符å??"
 
-#: ../filter/e-filter-rule.c:733
+#: ../filter/e-filter-rule.c:725
 msgid "If any conditions are met"
 msgstr "å¦?æ??ä»»ä½?æ¢?件符å??"
 
-#: ../filter/e-filter-rule.c:736
+#: ../filter/e-filter-rule.c:728
 msgid "_Find items:"
 msgstr "����(_F):"
 
-#: ../filter/e-filter-rule.c:760
+#. Translators: "None" for not including threads;
+#. * part of "Include threads: None"
+#: ../filter/e-filter-rule.c:757
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../filter/e-filter-rule.c:758
 msgid "All related"
 msgstr "æ??æ??ç?¸é??ç??"
 
-#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "å??è¦?"
 
-#: ../filter/e-filter-rule.c:762
+#: ../filter/e-filter-rule.c:760
 msgid "Replies and parents"
 msgstr "å??è¦?å??ç?¶ä»£"
 
-#: ../filter/e-filter-rule.c:763
+#: ../filter/e-filter-rule.c:761
 msgid "No reply or parent"
 msgstr "æ²?æ??å??復æ??å??å§?é?µä»¶"
 
-#: ../filter/e-filter-rule.c:766
+#: ../filter/e-filter-rule.c:764
 msgid "I_nclude threads"
 msgstr "å??æ?¬é?µä»¶ç¾¤çµ?(_N)"
 
-#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:304
+#: ../filter/e-filter-rule.c:789
+msgid "A_dd Condition"
+msgstr "���件(_D)"
+
+#: ../filter/e-filter-rule.c:1136 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:317
 msgid "Incoming"
 msgstr "å?§é??"
 
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
+#: ../filter/e-filter-rule.c:1136 ../mail/em-utils.c:318
 msgid "Outgoing"
 msgstr "��"
 
-#: ../filter/e-rule-editor.c:265
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "æ?°å¢?è¦?å??"
 
-#: ../filter/e-rule-editor.c:352
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "編輯è¦?å??"
 
@@ -9058,7 +7844,7 @@ msgstr "缺å°?æ?¥æ??ã??"
 msgid "Missing file name."
 msgstr "缺å°?æª?æ¡?å??稱ã??"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:83
 msgid "Missing name."
 msgstr "缺å°?å??稱ã??"
 
@@ -9114,7 +7900,7 @@ msgstr ""
 "é?µä»¶æ?¥æ??å°?æ??è??é??濾å?¨å?·è¡?æ??ç??\n"
 "æ??é??ä½?æ¯?è¼?ã??"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:193
 msgid "_Filter Rules"
 msgstr "é??濾å?¨è¦?å??(_F)"
 
@@ -9135,7 +7921,7 @@ msgstr "å¾?"
 msgid "months"
 msgstr "å??æ??"
 
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
+#: ../filter/filter.ui.h:19
 msgid "seconds"
 msgstr "�"
 
@@ -9151,32 +7937,38 @@ msgstr "æ?¨æ??å®?ç??æ??å?»"
 msgid "years"
 msgstr "å¹´"
 
-#: ../mail/e-mail-attachment-bar.c:91 ../mail/e-mail-attachment-bar.c:96
-#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:119
-#: ../widgets/misc/e-attachment-paned.c:124
+#: ../mail/e-mail-attachment-bar.c:93 ../mail/e-mail-attachment-bar.c:98
+#: ../mail/em-format-html-display.c:1053 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:131
+#: ../widgets/misc/e-attachment-paned.c:136
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "é??件"
 msgstr[1] "é??件"
 
-#: ../mail/e-mail-attachment-bar.c:611
-#: ../widgets/misc/e-attachment-paned.c:605
+#: ../mail/e-mail-attachment-bar.c:633
+#: ../widgets/misc/e-attachment-paned.c:624
 msgid "Icon View"
 msgstr "å??示檢è¦?"
 
-#: ../mail/e-mail-attachment-bar.c:612
-#: ../widgets/misc/e-attachment-paned.c:606
+#: ../mail/e-mail-attachment-bar.c:635
+#: ../widgets/misc/e-attachment-paned.c:626
 msgid "List View"
 msgstr "��檢�"
 
-#: ../mail/e-mail-browser.c:265
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1406
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1420
+msgid "Close this window"
+msgstr "é??é??æ?¬è¦?çª?"
+
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(æ²?æ??主æ?¨)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
-msgstr "å? å?¥å?°é??è¨?é??(_A)..."
+msgstr "å? å?¥å?°é??è¨?é??(_A)â?¦"
 
 #: ../mail/e-mail-display.c:73
 msgid "_To This Address"
@@ -9190,7 +7982,12 @@ msgstr "å¾?é??å??ä½?å??(_F)"
 msgid "Create Search _Folder"
 msgstr "建ç«?æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/e-mail-label-dialog.c:220
+#: ../mail/e-mail-folder-utils.c:88
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
+
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "æ¨?籤å??稱(_L):"
 
@@ -9219,7 +8016,7 @@ msgid "_Later"
 msgstr "��(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:478
+#: ../modules/mail/e-mail-shell-view-actions.c:616
 msgid "Add Label"
 msgstr "���籤"
 
@@ -9240,41 +8037,48 @@ msgid "Color"
 msgstr "é¡?è?²"
 
 #: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
+#: ../plugins/caldav/caldav-browse-server.c:1297
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
 #: ../widgets/menus/gal-define-views-dialog.c:334
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
 msgid "Name"
 msgstr "å??稱"
 
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
-#: ../mail/em-folder-tree-model.c:696 ../mail/em-folder-tree.c:2759
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../mail/e-mail-local.c:35 ../mail/em-folder-properties.c:285
+#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree.c:2986
+#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../modules/mail/e-mail-shell-view-private.c:1110
 msgid "Inbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:688
+#: ../mail/e-mail-local.c:36 ../mail/e-mail-migrate.c:1007
+#: ../mail/em-folder-tree-model.c:758
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Drafts"
 msgstr "è??稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:700
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-tree-model.c:770
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 msgid "Outbox"
 msgstr "�件�"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:702
+#: ../mail/e-mail-local.c:38 ../mail/e-mail-migrate.c:1000
+#: ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Sent"
 msgstr "å·²å?³é??"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:691
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:761
+#: ../modules/mail/e-mail-shell-view-private.c:1105
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:577
+#: ../plugins/templates/templates.c:581
 msgid "Templates"
 msgstr "��"
 
 #: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
-msgstr "正�移�..."
+msgstr "正�移��"
 
 #: ../mail/e-mail-migrate.c:164
 msgid "Migration"
@@ -9285,11 +8089,11 @@ msgstr "移�"
 msgid "Migrating '%s':"
 msgstr "æ­£å?¨ç§»è½?ã??%sã??ï¼?"
 
-#: ../mail/e-mail-migrate.c:649
+#: ../mail/e-mail-migrate.c:657
 msgid "Migrating Folders"
 msgstr "æ­£å?¨è½?移è³?æ??夾"
 
-#: ../mail/e-mail-migrate.c:650
+#: ../mail/e-mail-migrate.c:658
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -9300,50 +8104,63 @@ msgstr ""
 "\n"
 "ç?¶ Evolution 移è½?æ?¨ç??è³?æ??夾æ??ï¼?è«?è??å¿?ç­?å??..."
 
-#: ../mail/e-mail-migrate.c:739
+#: ../mail/e-mail-migrate.c:1147
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ç?¡æ³?å?¨ã??%sã??建ç«?æ?¬å?°é?µä»¶è³?æ??夾ï¼?%s"
 
-#: ../mail/e-mail-notebook-view.c:563
+#: ../mail/e-mail-notebook-view.c:565
 msgid "Please select a folder"
 msgstr "è«?é?¸æ??è³?æ??夾"
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:109
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../mail/e-mail-reader-utils.c:111
+#: ../modules/calendar/e-task-shell-view-actions.c:576
 msgid "Do not ask me again"
 msgstr "ä¸?è¦?å??è©¢å??æ??"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:309 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "è¤?製è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:309 ../mail/em-folder-utils.c:421
 msgid "C_opy"
 msgstr "�製(_O)"
 
-#: ../mail/e-mail-reader.c:687 ../mail/em-filter-i18n.h:51
+#. Translators: %s is replaced with a folder name
+#. %d with count of duplicate messages.
+#: ../mail/e-mail-reader.c:510
+#, c-format
+msgid ""
+"Folder '%s' contains %d duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %d duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] "è³?æ??夾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??æ?¨ç¢ºå®?è¦?å?ªé?¤å®?ï¼?"
+msgstr[1] "è³?æ??夾ã??%sã??å??å?« %d å°?é??è¤?ç??é?µä»¶ã??æ?¨ç¢ºå®?è¦?å?ªé?¤å®?å??ï¼?"
+
+#: ../mail/e-mail-reader.c:969 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移è?³è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:687 ../mail/em-folder-utils.c:402
+#: ../mail/e-mail-reader.c:969 ../mail/em-folder-utils.c:421
 msgid "_Move"
 msgstr "移å??(_M)"
 
 #. Check buttons
-#: ../mail/e-mail-reader.c:952 ../mail/e-mail-reader.c:1068
-#: ../mail/e-mail-reader.c:1109
+#: ../mail/e-mail-reader.c:1248 ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1446
 msgid "_Do not ask me again."
 msgstr "ä¸?è¦?å??è©¢å??æ??(_D)ã??"
 
-#: ../mail/e-mail-reader.c:1114
+#: ../mail/e-mail-reader.c:1451
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æ°¸é? å¿½ç?¥é??ä¿¡è«?å£?ç??å??è¦?æ¬?ä½?(_A)"
 
-#: ../mail/e-mail-reader.c:1204
+#: ../mail/e-mail-reader.c:1558
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "���件"
@@ -9355,604 +8172,708 @@ 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:1225
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/e-mail-reader.c:1579
+#: ../plugins/groupwise-features/notification.ui.h:1
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "�件"
 msgstr[1] "�件"
 
-#: ../mail/e-mail-reader.c:1490
+#: ../mail/e-mail-reader.c:1853
 msgid "A_dd Sender to Address Book"
 msgstr "å? å?¥å¯?件è??å?°ç?®é??æ??å??(_D)"
 
-#: ../mail/e-mail-reader.c:1492
+#: ../mail/e-mail-reader.c:1855
 msgid "Add sender to address book"
 msgstr "æ?°å¢?å¯?件è??è?³é??è¨?é??"
 
-#: ../mail/e-mail-reader.c:1497
+#: ../mail/e-mail-reader.c:1860
 msgid "Check for _Junk"
 msgstr "檢æ?¥å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1499
+#: ../mail/e-mail-reader.c:1862
 msgid "Filter the selected messages for junk status"
 msgstr "篩é?¸æ??é?¸ä¿¡ä»¶ç??å??å?¾é?µä»¶ç??æ??"
 
-#: ../mail/e-mail-reader.c:1504
+#: ../mail/e-mail-reader.c:1867
 msgid "_Copy to Folder..."
-msgstr "è¤?製è?³è³?æ??夾(_C)..."
+msgstr "è¤?製è?³è³?æ??夾(_C)â?¦"
 
-#: ../mail/e-mail-reader.c:1506
+#: ../mail/e-mail-reader.c:1869
 msgid "Copy selected messages to another folder"
 msgstr "è¤?製已é?¸å®?ç??é?µä»¶å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1874
 msgid "_Delete Message"
 msgstr "���件(_D)"
 
-#: ../mail/e-mail-reader.c:1513
+#: ../mail/e-mail-reader.c:1876
 msgid "Mark the selected messages for deletion"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??è¦?å?ªé?¤"
 
-#: ../mail/e-mail-reader.c:1518
+#: ../mail/e-mail-reader.c:1881
 msgid "Filter on Mailing _List..."
-msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)..."
+msgstr "é??ä¿¡è«?å£?é??濾å?¨(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1883
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1525
+#: ../mail/e-mail-reader.c:1888
 msgid "Filter on _Recipients..."
-msgstr "æ?¶ä»¶è??é??濾å?¨(_R)..."
+msgstr "æ?¶ä»¶è??é??濾å?¨(_R)â?¦"
 
-#: ../mail/e-mail-reader.c:1527
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1532
+#: ../mail/e-mail-reader.c:1895
 msgid "Filter on Se_nder..."
-msgstr "å¯?件è??é??濾å?¨(_N)..."
+msgstr "å¯?件è??é??濾å?¨(_N)â?¦"
 
-#: ../mail/e-mail-reader.c:1534
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a rule to filter messages from this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1539
+#: ../mail/e-mail-reader.c:1902
 msgid "Filter on _Subject..."
-msgstr "主æ?¨é??濾å?¨(_S)..."
+msgstr "主æ?¨é??濾å?¨(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a rule to filter messages with this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?é??濾å?¨è¦?å??"
 
-#: ../mail/e-mail-reader.c:1546
+#: ../mail/e-mail-reader.c:1909
 msgid "A_pply Filters"
 msgstr "å¥?ç?¨é??濾å?¨(_P)"
 
-#: ../mail/e-mail-reader.c:1548
+#: ../mail/e-mail-reader.c:1911
 msgid "Apply filter rules to the selected messages"
 msgstr "å¥?ç?¨é??濾å?¨è¦?å??æ?¼æ??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1553
+#: ../mail/e-mail-reader.c:1916
 msgid "_Find in Message..."
-msgstr "��件���(_F)..."
+msgstr "��件���(_F)�"
 
-#: ../mail/e-mail-reader.c:1555
+#: ../mail/e-mail-reader.c:1918
 msgid "Search for text in the body of the displayed message"
 msgstr "æ??å°?顯示ç??é?µä»¶æ?¬æ??中ç??æ??å­?"
 
-#: ../mail/e-mail-reader.c:1560
+#: ../mail/e-mail-reader.c:1923
 msgid "_Clear Flag"
 msgstr "����(_C)"
 
-#: ../mail/e-mail-reader.c:1562
+#: ../mail/e-mail-reader.c:1925
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "移é?¤é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1567
+#: ../mail/e-mail-reader.c:1930
 msgid "_Flag Completed"
 msgstr "æ¨?è¨?ç?ºå·²å®?æ??(_F)"
 
-#: ../mail/e-mail-reader.c:1569
+#: ../mail/e-mail-reader.c:1932
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "å°?å·²é?¸å??é?µä»¶ç??è·?é?¨æ??æ¨?設ç?ºå·²å®?æ??"
 
-#: ../mail/e-mail-reader.c:1574
+#: ../mail/e-mail-reader.c:1937
 msgid "Follow _Up..."
-msgstr "è·?é?¨(_U)..."
+msgstr "è·?é?¨(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1576
+#: ../mail/e-mail-reader.c:1939
 msgid "Flag the selected messages for follow-up"
 msgstr "å°?é?¸å®?ç??é?µä»¶å? ä¸?è·?é?¨æ??æ¨?"
 
-#: ../mail/e-mail-reader.c:1581
+#: ../mail/e-mail-reader.c:1944
 msgid "_Attached"
 msgstr "é??件(_A)"
 
-#: ../mail/e-mail-reader.c:1583 ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1946 ../mail/e-mail-reader.c:1953
 msgid "Forward the selected message to someone as an attachment"
 msgstr "å°?é?¸å®?ç??é?µä»¶ä»¥é??件形å¼?è½?å¯?給æ??人"
 
-#: ../mail/e-mail-reader.c:1588
+#: ../mail/e-mail-reader.c:1951
 msgid "Forward As _Attached"
 msgstr "以é??件è½?å¯?(_A)"
 
-#: ../mail/e-mail-reader.c:1595
+#: ../mail/e-mail-reader.c:1958
 msgid "_Inline"
 msgstr "è¡?å?§(_I)"
 
-#: ../mail/e-mail-reader.c:1597 ../mail/e-mail-reader.c:1604
+#: ../mail/e-mail-reader.c:1960 ../mail/e-mail-reader.c:1967
 msgid "Forward the selected message in the body of a new message"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶å¤¾é??æ?¼æ?°é?µä»¶ç??å?§æ??中"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1965
 msgid "Forward As _Inline"
 msgstr "以����(_I)"
 
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1972
 msgid "_Quoted"
 msgstr "å¼?æ??(_Q)"
 
-#: ../mail/e-mail-reader.c:1611 ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1974 ../mail/e-mail-reader.c:1981
 msgid "Forward the selected message quoted like a reply"
 msgstr "å°?é??è¦?è½?å¯?ç??é?µä»¶ä»¥å??è¦?é?µä»¶æ?¹å¼?å¯?å?º"
 
-#: ../mail/e-mail-reader.c:1616
+#: ../mail/e-mail-reader.c:1979
 msgid "Forward As _Quoted"
 msgstr "以å¼?æ??è½?å¯?(_Q)"
 
-#: ../mail/e-mail-reader.c:1623
+#: ../mail/e-mail-reader.c:1986
 msgid "_Load Images"
 msgstr "è¼?å?¥å??ç??(_L)"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1988
 msgid "Force images in HTML mail to be loaded"
 msgstr "é?±è®? HTML æ ¼å¼?ç??é?µä»¶æ??å¼·è¿«è¼?å?¥å??ç??"
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1993
 msgid "_Important"
 msgstr "é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages as important"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??é??è¦?"
 
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:2000
 msgid "_Junk"
 msgstr "å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1639
+#: ../mail/e-mail-reader.c:2002
 msgid "Mark the selected messages as junk"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1644
+#: ../mail/e-mail-reader.c:2007
 msgid "_Not Junk"
 msgstr "ä¸?æ?¯å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1646
+#: ../mail/e-mail-reader.c:2009
 msgid "Mark the selected messages as not being junk"
 msgstr "å°?é?¸å??ç??é?µä»¶æ¨?示æ??ä¸?æ?¯å??å?¾é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1651
+#: ../mail/e-mail-reader.c:2014
 msgid "_Read"
 msgstr "已��(_R)"
 
-#: ../mail/e-mail-reader.c:1653
+#: ../mail/e-mail-reader.c:2016
 msgid "Mark the selected messages as having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??å·²ç¶?é?±è®?"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:2021
 msgid "Uni_mportant"
 msgstr "ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:2023
 msgid "Mark the selected messages as unimportant"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??ä¸?é??è¦?"
 
-#: ../mail/e-mail-reader.c:1665
+#: ../mail/e-mail-reader.c:2028
 msgid "_Unread"
 msgstr "���(_U)"
 
-#: ../mail/e-mail-reader.c:1667
+#: ../mail/e-mail-reader.c:2030
 msgid "Mark the selected messages as not having been read"
 msgstr "å°?é?¸å®?ç??é?µä»¶æ¨?示æ??æ?ªé?±è®?"
 
-#: ../mail/e-mail-reader.c:1672
+#: ../mail/e-mail-reader.c:2035
 msgid "_Edit as New Message..."
-msgstr "編輯���件(_E)..."
+msgstr "編輯���件(_E)�"
 
-#: ../mail/e-mail-reader.c:1674
+#: ../mail/e-mail-reader.c:2037
 msgid "Open the selected messages in the composer for editing"
 msgstr "å?¨æ?°å¯«è¦?çª?é??å??é?¸å??ç??é?µä»¶ä»¥ä¾¿ç·¨è¼¯"
 
-#: ../mail/e-mail-reader.c:1679
+#: ../mail/e-mail-reader.c:2042
 msgid "Compose _New Message"
 msgstr "�寫��件(_N)"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:2044
 msgid "Open a window for composing a mail message"
 msgstr "é??å??è¦?çª?以便æ?°å¯«é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1686
+#: ../mail/e-mail-reader.c:2049
 msgid "_Open in New Window"
 msgstr "å?¨æ?°è¦?çª?é??å??(_O)"
 
-#: ../mail/e-mail-reader.c:1688
+#: ../mail/e-mail-reader.c:2051
 msgid "Open the selected messages in a new window"
 msgstr "使ç?¨æ?°è¦?çª?é??å??é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1693
+#: ../mail/e-mail-reader.c:2056
 msgid "_Move to Folder..."
-msgstr "移è?³è³?æ??夾(_M)..."
+msgstr "移è?³è³?æ??夾(_M)â?¦"
 
-#: ../mail/e-mail-reader.c:1695
+#: ../mail/e-mail-reader.c:2058
 msgid "Move selected messages to another folder"
 msgstr "å°?é?¸å®?ç??é?µä»¶ç§»è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1700
+#: ../mail/e-mail-reader.c:2063
 msgid "_Switch to Folder"
 msgstr "å??æ??è?³è³?æ??夾(_S)"
 
-#: ../mail/e-mail-reader.c:1702
+#: ../mail/e-mail-reader.c:2065
 msgid "Display the parent folder"
 msgstr "顯示ä¸?層è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1707
+#: ../mail/e-mail-reader.c:2070
 msgid "Switch to _next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_N)"
 
-#: ../mail/e-mail-reader.c:1709
+#: ../mail/e-mail-reader.c:2072
 msgid "Switch to the next tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:1714
+#: ../mail/e-mail-reader.c:2077
 msgid "Switch to _previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?(_P)"
 
-#: ../mail/e-mail-reader.c:1716
+#: ../mail/e-mail-reader.c:2079
 msgid "Switch to the previous tab"
 msgstr "å??æ??è?³ä¸?ä¸?å??å??é ?"
 
-#: ../mail/e-mail-reader.c:1721
+#: ../mail/e-mail-reader.c:2084
 msgid "Cl_ose current tab"
 msgstr "é??é??ç?®å??ç??å??é ?(_O)"
 
-#: ../mail/e-mail-reader.c:1723
+#: ../mail/e-mail-reader.c:2086
 msgid "Close current tab"
 msgstr "é??é??ç?®å??ç??å??é ?"
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:2091
 msgid "_Next Message"
 msgstr "����件(_N)"
 
-#: ../mail/e-mail-reader.c:1730
+#: ../mail/e-mail-reader.c:2093
 msgid "Display the next message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1735
+#: ../mail/e-mail-reader.c:2098
 msgid "Next _Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_I)"
 
-#: ../mail/e-mail-reader.c:1737
+#: ../mail/e-mail-reader.c:2100
 msgid "Display the next important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1742
+#: ../mail/e-mail-reader.c:2105
 msgid "Next _Thread"
 msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_T)"
 
-#: ../mail/e-mail-reader.c:1744
+#: ../mail/e-mail-reader.c:2107
 msgid "Display the next thread"
 msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1749
+#: ../mail/e-mail-reader.c:2112
 msgid "Next _Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1751
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the next unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1756
+#: ../mail/e-mail-reader.c:2119
 msgid "_Previous Message"
 msgstr "����件(_P)"
 
-#: ../mail/e-mail-reader.c:1758
+#: ../mail/e-mail-reader.c:2121
 msgid "Display the previous message"
 msgstr "顯示����件"
 
-#: ../mail/e-mail-reader.c:1763
+#: ../mail/e-mail-reader.c:2126
 msgid "Pr_evious Important Message"
 msgstr "ä¸?ä¸?å°?é??è¦?é?µä»¶(_E)"
 
-#: ../mail/e-mail-reader.c:1765
+#: ../mail/e-mail-reader.c:2128
 msgid "Display the previous important message"
 msgstr "顯示ä¸?ä¸?å°?é??è¦?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1770
+#: ../mail/e-mail-reader.c:2133
+msgid "Previous T_hread"
+msgstr "ä¸?ä¸?å°?ç?¸é??é?µä»¶(_H)"
+
+#: ../mail/e-mail-reader.c:2135
+msgid "Display the previous thread"
+msgstr "顯示ä¸?ä¸?å°?ç?¸é??é?µä»¶"
+
+#: ../mail/e-mail-reader.c:2140
 msgid "P_revious Unread Message"
 msgstr "ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶(_R)"
 
-#: ../mail/e-mail-reader.c:1772
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the previous unread message"
 msgstr "顯示ä¸?ä¸?å°?æ?ªé?±è®?ç??é?µä»¶"
 
 # zh_HK: msgstr "å??å?°é?µä»¶"
-#: ../mail/e-mail-reader.c:1779
+#: ../mail/e-mail-reader.c:2149
 msgid "Print this message"
 msgstr "å??å?°é?µä»¶"
 
 # zh_HK: msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
-#: ../mail/e-mail-reader.c:1786
+#: ../mail/e-mail-reader.c:2156
 msgid "Preview the message to be printed"
 msgstr "é ?覽é??è¦?å??å?°ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:2161
 msgid "Re_direct"
 msgstr "é??æ?°å°?å??(_D)"
 
-#: ../mail/e-mail-reader.c:1793
+#: ../mail/e-mail-reader.c:2163
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶é??æ?°å°?å??給æ??人"
 
-#: ../mail/e-mail-reader.c:1798 ../mail/mail.error.xml.h:91
-#: ../modules/calendar/e-cal-shell-view-actions.c:1459
-#: ../modules/mail/e-mail-attachment-handler.c:151
+#: ../mail/e-mail-reader.c:2168
+msgid "Remo_ve Attachments"
+msgstr "移é?¤é??件(_V)"
+
+#: ../mail/e-mail-reader.c:2170
+msgid "Remove attachments"
+msgstr "移é?¤é??件"
+
+#: ../mail/e-mail-reader.c:2175
+msgid "Remove Du_plicate Messages"
+msgstr "移é?¤é??è¤?ç??é?µä»¶(_P)"
+
+#: ../mail/e-mail-reader.c:2177
+msgid "Checks selected messages for duplicates"
+msgstr "檢æ?¥é?¸å??ç??é?µä»¶æ?¯å?¦æ??é??è¤?"
+
+#: ../mail/e-mail-reader.c:2182 ../mail/mail.error.xml.h:102
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "å??è¦?æ??æ??人(_A)"
 
-#: ../mail/e-mail-reader.c:1800
+#: ../mail/e-mail-reader.c:2184
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦å·²é?¸å??é?µä»¶ç??å?¨é?¨æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:1805 ../mail/mail.error.xml.h:92
+#: ../mail/e-mail-reader.c:2189 ../mail/mail.error.xml.h:103
 msgid "Reply to _List"
 msgstr "å??è¦?è?³æ¸?å?®(_L)"
 
-#: ../mail/e-mail-reader.c:1807
+#: ../mail/e-mail-reader.c:2191
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?é?µä»¶ç??é??ä¿¡è«?å£?"
 
-#: ../mail/e-mail-reader.c:1812
-#: ../modules/mail/e-mail-attachment-handler.c:158
+#: ../mail/e-mail-reader.c:2196
+#: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../mail/e-mail-reader.c:1814
+#: ../mail/e-mail-reader.c:2198
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æ?°å¯«å??é?µçµ¦æ??é?¸å®?ç??é?µä»¶ç??å¯?件è??"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:2203
 msgid "_Save as mbox..."
-msgstr "å?²å­?æ?? mbox(_S)..."
+msgstr "å?²å­?æ?? mbox(_S)â?¦"
 
-#: ../mail/e-mail-reader.c:1821
+#: ../mail/e-mail-reader.c:2205
 msgid "Save selected messages as an mbox file"
 msgstr "å°?é?¸å®?ç??é?µä»¶å?¦å­?æ?? mbox æª?æ¡?"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:2210
 msgid "Search Folder from Mailing _List..."
-msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)..."
+msgstr "é??ä¿¡è«?å£?æ??å°?è³?æ??夾(_L)â?¦"
 
-#: ../mail/e-mail-reader.c:1828
+#: ../mail/e-mail-reader.c:2212
 msgid "Create a search folder for this mailing list"
 msgstr "ç?ºé??å??é??ä¿¡è«?å£?建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:2217
 msgid "Search Folder from Recipien_ts..."
-msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)..."
+msgstr "å¾?æ?¶ä»¶è??æ??å°?è³?æ??夾(_T)â?¦"
 
-#: ../mail/e-mail-reader.c:1835
+#: ../mail/e-mail-reader.c:2219
 msgid "Create a search folder for these recipients"
 msgstr "ç?ºé??äº?æ?¶ä»¶è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:2224
 msgid "Search Folder from Sen_der..."
-msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)..."
+msgstr "å¯?件è??æ??å°?è³?æ??夾(_D)â?¦"
 
-#: ../mail/e-mail-reader.c:1842
+#: ../mail/e-mail-reader.c:2226
 msgid "Create a search folder for this sender"
 msgstr "ç?ºé??å??å¯?件è??建ç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:2231
 msgid "Search Folder from S_ubject..."
-msgstr "主æ?¨æ??å°?è³?æ??夾(_U)..."
+msgstr "主æ?¨æ??å°?è³?æ??夾(_U)â?¦"
 
-#: ../mail/e-mail-reader.c:1849
+#: ../mail/e-mail-reader.c:2233
 msgid "Create a search folder for this subject"
 msgstr "ç?ºé??å??主æ?¨å»ºç«?ä¸?å??æ??å°?è³?æ??夾"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message Source"
 msgstr "�件��(_M)"
 
-#: ../mail/e-mail-reader.c:1856
+#: ../mail/e-mail-reader.c:2240
 msgid "Show the raw email source of the message"
 msgstr "顯示é?µä»¶å??å§?æª?"
 
-#: ../mail/e-mail-reader.c:1868
+#: ../mail/e-mail-reader.c:2252
 msgid "_Undelete Message"
 msgstr "復å??å?ªé?¤é?µä»¶(_U)"
 
-#: ../mail/e-mail-reader.c:1870
+#: ../mail/e-mail-reader.c:2254
 msgid "Undelete the selected messages"
 msgstr "å??æ¶?å?ªé?¤é?¸å®?ç??é?µä»¶"
 
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:2259
 msgid "_Normal Size"
 msgstr "正常大�(_N)"
 
-#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:2261
 msgid "Reset the text to its original size"
 msgstr "é??設æ??å­?ç?ºå??å§?大å°?"
 
-#: ../mail/e-mail-reader.c:1882
+#: ../mail/e-mail-reader.c:2266
 msgid "_Zoom In"
 msgstr "æ??è¿?(_Z)"
 
-#: ../mail/e-mail-reader.c:1884
+#: ../mail/e-mail-reader.c:2268
 msgid "Increase the text size"
 msgstr "å°?æ??å­?æ?¾å¤§"
 
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:2273
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:2275
 msgid "Decrease the text size"
 msgstr "å°?æ??å­?縮å°?"
 
-#: ../mail/e-mail-reader.c:1898
+#: ../mail/e-mail-reader.c:2282
 msgid "Create R_ule"
 msgstr "建ç«?è¦?å??(_U)"
 
-#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:2289
 msgid "Ch_aracter Encoding"
 msgstr "å­?å??編碼(_A)"
 
-#: ../mail/e-mail-reader.c:1912
+#: ../mail/e-mail-reader.c:2296
 msgid "F_orward As"
 msgstr "���(_O)"
 
-#: ../mail/e-mail-reader.c:1919
+#: ../mail/e-mail-reader.c:2303
 msgid "_Group Reply"
 msgstr "群çµ?å??è¦?(_G)"
 
-#: ../mail/e-mail-reader.c:1926
+#: ../mail/e-mail-reader.c:2310
 msgid "_Go To"
 msgstr "移�(_G)"
 
-#: ../mail/e-mail-reader.c:1933
+#: ../mail/e-mail-reader.c:2317
 msgid "Mar_k As"
 msgstr "æ¨?示æ??(_K)"
 
-#: ../mail/e-mail-reader.c:1940
+#: ../mail/e-mail-reader.c:2324
 msgid "_Message"
 msgstr "�件(_M)"
 
-#: ../mail/e-mail-reader.c:1947
+#: ../mail/e-mail-reader.c:2331
 msgid "_Zoom"
 msgstr "縮�(_Z)"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark for Follo_w Up..."
-msgstr "�示���(_W)..."
+msgstr "�示���(_W)�"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Important"
 msgstr "æ¨?示æ??é??è¦?(_I)"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Junk"
 msgstr "æ¨?示æ??å??å?¾é?µä»¶(_J)"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2372
 msgid "Mark as _Not Junk"
 msgstr "æ¨?示æ??é??å??å?¾é?µä»¶(_N)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2376
 msgid "Mar_k as Read"
 msgstr "æ¨?示æ??å·²é?±è®?(_K)"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:2380
 msgid "Mark as Uni_mportant"
 msgstr "æ¨?示æ??ä¸?é??è¦?(_M)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2384
 msgid "Mark as _Unread"
 msgstr "æ¨?示æ??æ?ªé?±è®?(_U)"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2428
 msgid "_Caret Mode"
 msgstr "��模�(_C)"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2430
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "å?¨é¡¯ç¤ºç??é?µä»¶å?§æ??中顯示é??ç??游æ¨?"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2436
 msgid "All Message _Headers"
 msgstr "æ??æ??é?µä»¶æª?é ­(_H)"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2438
 msgid "Show messages with all email headers"
 msgstr "顯示é?µä»¶å??詳細æª?é ­"
 
-#: ../mail/e-mail-reader.c:2267
+#: ../mail/e-mail-reader.c:2670
 msgid "Unable to retrieve message"
 msgstr "�����件"
 
-#: ../mail/e-mail-reader.c:2327 ../mail/mail-ops.c:1891
+#: ../mail/e-mail-reader.c:2731 ../mail/mail-ops.c:2044
 #, 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:2887 ../mail/mail-config.ui.h:31
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:537
-#: ../plugins/google-account-setup/google-source.c:659
-#: ../widgets/misc/e-account-tree-view.c:234
+#: ../mail/e-mail-reader.c:3344 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:538
+#: ../plugins/google-account-setup/google-source.c:674
+#: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "�設�"
 
-#: ../mail/e-mail-reader.c:3056
-#: ../modules/mail/e-mail-attachment-handler.c:144
+#: ../mail/e-mail-reader.c:3524
+#: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "��(_F)"
 
-#: ../mail/e-mail-reader.c:3057
+#: ../mail/e-mail-reader.c:3525
 msgid "Forward the selected message to someone"
 msgstr "å°?é?¸å®?ç??é?µä»¶è½?å¯?給æ??人"
 
-#. 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:3075
+#: ../mail/e-mail-reader.c:3544
 msgid "Group Reply"
 msgstr "群çµ?å??è¦?"
 
-#: ../mail/e-mail-reader.c:3076
+#: ../mail/e-mail-reader.c:3545
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "å??è¦?給é??ä¿¡è«?å£?ï¼?æ??æ?¯çµ¦æ??æ??ç??æ?¶ä»¶è??"
 
-#: ../mail/e-mail-reader.c:3121 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:743
+#: ../mail/e-mail-reader.c:3590 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:744
 msgid "Delete"
 msgstr "��"
 
-#: ../mail/e-mail-reader.c:3153
-#: ../modules/calendar/e-cal-shell-view-actions.c:1305
-#: ../widgets/misc/e-calendar.c:193
+#: ../mail/e-mail-reader.c:3623
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../widgets/misc/e-calendar.c:196
 msgid "Next"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1298
-#: ../widgets/misc/e-calendar.c:169
+#: ../mail/e-mail-reader.c:3627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../widgets/misc/e-calendar.c:172
 msgid "Previous"
 msgstr "ä¸?ä¸?å??"
 
-#: ../mail/e-mail-reader.c:3167 ../mail/mail-dialogs.ui.h:19
+#: ../mail/e-mail-reader.c:3637 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "å??è¦?"
 
-#: ../mail/e-mail-reader.c:3782
+#: ../mail/e-mail-reader.c:4274
 #, c-format
 msgid "Folder '%s'"
 msgstr "è³?æ??夾ã??%sã??"
 
-#: ../mail/e-mail-tag-editor.c:292
+#: ../mail/e-mail-session.c:644
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
+
+#: ../mail/e-mail-session.c:646
+msgid "Enter Passphrase"
+msgstr "輸���"
+
+#: ../mail/e-mail-session.c:649
+#, c-format
+msgid "Enter Password for %s"
+msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
+
+#: ../mail/e-mail-session.c:651
+msgid "Enter Password"
+msgstr "輸��碼"
+
+#: ../mail/e-mail-session.c:696
+#, c-format
+msgid "User canceled operation."
+msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
+
+#: ../mail/e-mail-session.c:864
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:873
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
+
+#: ../mail/e-mail-session.c:1262 ../mail/mail-ops.c:1220
+#, c-format
+msgid "Opening folder '%s'"
+msgstr "é??å??è³?æ??夾ã??%sã??"
+
+#: ../mail/e-mail-session.c:1278
+#, c-format
+msgid "Invalid folder: %s"
+msgstr "ç?¡æ??ç??è³?æ??夾ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:477 ../mail/mail-ops.c:605
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:501 ../mail/e-mail-session-utils.c:535
+#: ../mail/mail-ops.c:622 ../mail/mail-ops.c:653
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"ç?¡æ³?é??å? è?³ %sï¼?%s\n"
+"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
+
+#: ../mail/e-mail-session-utils.c:555 ../mail/mail-ops.c:673
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
+
+#: ../mail/e-mail-session-utils.c:761 ../mail/mail-ops.c:774
+#: ../mail/mail-ops.c:866
+msgid "Sending message"
+msgstr "æ­£å?¨å?³é??é?µä»¶"
+
+#: ../mail/e-mail-session-utils.c:832
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
+
+#: ../mail/e-mail-store-utils.c:39
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
+
+#: ../mail/e-mail-store-utils.c:130
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
+
+#: ../mail/e-mail-tag-editor.c:295
 msgid "Flag to Follow Up"
 msgstr "è¦?è·?é?¨ç??æ¨?å¹?"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../mail/em-account-editor.c:567 ../mail/mail-config.ui.h:69
 #: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "æ²?æ??å? å¯?"
@@ -9960,7 +8881,7 @@ msgstr "æ²?æ??å? å¯?"
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
-#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../mail/em-account-editor.c:571 ../mail/mail-config.ui.h:124
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS ��"
@@ -9968,58 +8889,40 @@ 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:516 ../mail/mail-config.ui.h:105
+#: ../mail/em-account-editor.c:575 ../mail/mail-config.ui.h:91
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL ��"
 
-#: ../mail/em-account-editor.c:603
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s æ??æ¬?å??ç´?"
-
-#: ../mail/em-account-editor.c:610
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"è«?ä»?ç´°é?±è®?以ä¸?顯示ç??\n"
-" %s æ??æ¬?å??ç´?\n"
-"並é?¸å??æ ¸å??æ?¹å¡?ä¾?æ?¥å??å®?\n"
-
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:843 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:981
+#: ../mail/em-account-editor.c:924
 msgid "Never"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:982
+#: ../mail/em-account-editor.c:925
 msgid "Always"
 msgstr "永�"
 
-#: ../mail/em-account-editor.c:983
+#: ../mail/em-account-editor.c:926
 msgid "Ask for each message"
 msgstr "æ¯?å°?é?µä»¶ç??è©¢å??"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1708 ../widgets/misc/e-account-tree-view.c:131
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../mail/em-account-editor.c:2095
+#: ../mail/em-account-editor.c:2092
 msgid "Mail Configuration"
 msgstr "é?µä»¶çµ?æ??"
 
-#: ../mail/em-account-editor.c:2096
+#: ../mail/em-account-editor.c:2093
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10029,7 +8932,7 @@ msgstr ""
 "\n"
 "æ??ä¸?ä¸?ã??å??å??ã??é??å§?ã?? "
 
-#: ../mail/em-account-editor.c:2099
+#: ../mail/em-account-editor.c:2096
 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 "
@@ -10038,20 +8941,19 @@ msgstr ""
 "è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??å??稱å??é?»é?µå?°å??ã??ã??é?¸æ??æ?§ã??ç??æ¬?ä½?ä¸?ä¸?å®?è¦?å¡«ï¼?é?¤é??æ?¨å¸?æ??å?¨é??å?º"
 "ç??é?µä»¶å?§å??å?«é??äº?è³?è¨?ã??"
 
-#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
-#: ../mail/mail-config.ui.h:98
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2260
 msgid "Receiving Email"
 msgstr "�����件"
 
-#: ../mail/em-account-editor.c:2102
+#: ../mail/em-account-editor.c:2099
 msgid "Please configure the following account settings."
 msgstr "è«?å?¨è¨­å®?ä¸?å??帳è??ç??設å®?å?¼ã??"
 
-#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2759
 msgid "Sending Email"
 msgstr "å?³é??é?»å­?é?µä»¶"
 
-#: ../mail/em-account-editor.c:2105
+#: ../mail/em-account-editor.c:2102
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -10059,11 +8961,11 @@ msgstr ""
 "è«?輸å?¥ä»¥ä¸?é??æ?¼å¯?é??é?µä»¶æ?¹å¼?ç??è³?è¨?ã??å¦?æ??æ?¨ä¸?æ¸?æ¥?ï¼?è«?è?¯çµ¡ç³»çµ±ç®¡ç??å?¡æ??網路æ??å??ä¾?"
 "æ??å??ã??"
 
-#: ../mail/em-account-editor.c:2107
+#: ../mail/em-account-editor.c:2104
 msgid "Account Management"
 msgstr "帳è??總管"
 
-#: ../mail/em-account-editor.c:2108
+#: ../mail/em-account-editor.c:2105
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10071,11 +8973,11 @@ msgstr ""
 "è«?å?¨ä¸?é?¢ç??空é??輸å?¥æ??è¿°é??å??帳è??ç??å??稱ã??\n"
 "é??å??å??稱å°?å?ªå??ç?ºé¡¯ç¤ºä¹?ç?¨ã??"
 
-#: ../mail/em-account-editor.c:2112
+#: ../mail/em-account-editor.c:2109
 msgid "Done"
 msgstr "å®?æ??"
 
-#: ../mail/em-account-editor.c:2113
+#: ../mail/em-account-editor.c:2110
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10089,72 +8991,72 @@ msgstr ""
 "\n"
 "è«?æ??ä¸?ä¸?ã??å¥?ç?¨ã??å?²å­?設å®?ã??"
 
-#: ../mail/em-account-editor.c:2554
+#: ../mail/em-account-editor.c:2573
 msgid "Check for _new messages every"
 msgstr "è?ªå??檢æ?¥æ?°é?µä»¶æ¯?(_N)"
 
-#: ../mail/em-account-editor.c:2562
+#: ../mail/em-account-editor.c:2581
 msgid "minu_tes"
 msgstr "å??é??(_T)"
 
-#: ../mail/em-account-editor.c:2838
+#: ../mail/em-account-editor.c:2863
 msgid "Please select a folder from the current account."
 msgstr "è«?é?¸æ??ç?®å??帳è??ç??è³?æ??夾ã??"
 
-#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
+#: ../mail/em-account-editor.c:3172 ../mail/mail-config.ui.h:98
 msgid "Security"
 msgstr "���"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
+#: ../mail/em-account-editor.c:3217 ../mail/em-account-editor.c:3285
 msgid "Receiving Options"
 msgstr "����"
 
-#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
+#: ../mail/em-account-editor.c:3218 ../mail/em-account-editor.c:3286
 msgid "Checking for New Messages"
 msgstr "檢���件"
 
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see mail/em-composer-utils.c:attribvars array
+#: ../mail/em-composer-utils.c:1136
+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:1146
+msgid "-----Original Message-----"
+msgstr "-----å??å§?é?µä»¶-----"
+
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1695
+#: ../mail/em-composer-utils.c:1804
 #, 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:1743
+#: ../mail/em-composer-utils.c:1854
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "é??é??é??ç?¥ï¼?ã??%sã??"
 
-#: ../mail/em-composer-utils.c:2152
+#: ../mail/em-composer-utils.c:2272
 msgid "an unknown sender"
 msgstr "ä¸?æ??ç??å¯?件è??"
 
-#. Note to translators: this is the attribution string used when quoting messages.
-#. * each ${Variable} gets replaced with a value. To see a full list of available
-#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2199
-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:2343
-msgid "-----Original Message-----"
-msgstr "-----å??å§?é?µä»¶-----"
-
-#: ../mail/em-composer-utils.c:2555
+#: ../mail/em-composer-utils.c:2696
 msgid "Posting destination"
 msgstr "張貼ç??ç?®ç??端"
 
-#: ../mail/em-composer-utils.c:2556
+#: ../mail/em-composer-utils.c:2697
 msgid "Choose folders to post the message to."
 msgstr "é?¸å??è³?æ??夾ä¾?張貼é?µä»¶ã??"
 
-#: ../mail/em-filter-folder-element.c:260
+#: ../mail/em-filter-folder-element.c:337
 msgid "Select Folder"
 msgstr "é?¸æ??è³?æ??夾"
 
@@ -10271,7 +9173,7 @@ msgstr "�設�"
 msgid "is set"
 msgstr "設�"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:60
 msgid "Junk"
 msgstr "å??å?¾é?µä»¶"
 
@@ -10320,7 +9222,7 @@ msgid "Play Sound"
 msgstr "æ?­æ?¾é?³æ??"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "已�"
 
@@ -10401,16 +9303,16 @@ msgid "Unset Status"
 msgstr "å??æ¶?設å®?ç??æ??"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:533
+#: ../mail/em-filter-rule.c:539
 msgid "Then"
 msgstr "æ?¥è??ä¾?"
 
-#: ../mail/em-filter-rule.c:564
+#: ../mail/em-filter-rule.c:570
 msgid "Add Ac_tion"
 msgstr "å? å?¥å??ä½?(_T)"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:126
+#: ../mail/em-folder-properties.c:124
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "���件:"
@@ -10418,36 +9320,35 @@ 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:130
+#: ../mail/em-folder-properties.c:128
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "æ??æ??é?µä»¶:"
 msgstr[1] "æ??æ??é?µä»¶:"
 
-#: ../mail/em-folder-properties.c:148
+#: ../mail/em-folder-properties.c:146
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "é??é¡?使ç?¨é?? (%s):"
 
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage"
 msgstr "é??å?¶ç?¨é??"
 
-#: ../mail/em-folder-properties.c:288
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../mail/em-folder-properties.c:290
 msgid "Folder Properties"
 msgstr "è³?æ??夾å?§å®¹"
 
-#: ../mail/em-folder-selection-button.c:75
+#: ../mail/em-folder-selection-button.c:81
 msgid "<click here to select a folder>"
-msgstr "<æ??é??è£?é?¸æ??è³?æ??夾>"
+msgstr "<æ??é??裡é?¸æ??è³?æ??夾>"
 
-#: ../mail/em-folder-selector.c:264
+#: ../mail/em-folder-selector.c:262
 msgid "C_reate"
 msgstr "建�(_R)"
 
-#: ../mail/em-folder-selector.c:268
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "è³?æ??夾å??稱(_N):"
 
@@ -10455,7 +9356,7 @@ msgstr "è³?æ??夾å??稱(_N):"
 #: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
 #: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 #: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
-#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
+#: ../mail/mail-vfolder.c:1140 ../mail/mail-vfolder.c:1216
 msgid "Search Folders"
 msgstr "æ??å°?è³?æ??夾"
 
@@ -10464,166 +9365,143 @@ msgstr "æ??å°?è³?æ??夾"
 msgid "UNMATCHED"
 msgstr "ä¸?符å??"
 
-#: ../mail/em-folder-tree-model.c:766 ../mail/em-folder-tree-model.c:1113
+#: ../mail/em-folder-tree-model.c:836 ../mail/em-folder-tree-model.c:1113
 msgid "Loading..."
-msgstr "��中..."
+msgstr "��中�"
 
-#: ../mail/em-folder-tree.c:184
+#: ../mail/em-folder-tree.c:201
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/em-folder-tree.c:601
+#: ../mail/em-folder-tree.c:629
 msgid "Folder names cannot contain '/'"
 msgstr "è³?æ??夾å??稱ä¸?è?½å??å?«æ??ç·?ã??"
 
-#. Translators: This is the string used for displaying the
-#. * folder names in folder trees. The first "%s" will be
-#. * replaced by the folder's name and "%u" will be replaced
-#. * with the number of unread messages in the folder. The
-#. * second %s will be replaced with a "+" letter for collapsed
-#. * folders with unread messages in some subfolder too,
-#. * or with an empty string for other cases.
-#. *
-#. * Most languages should translate this as "%s (%u%s)". The
-#. * languages that use localized digits (like Persian) may
-#. * need to replace "%u" with "%Iu". Right-to-left languages
-#. * (like Arabic and Hebrew) may need to add bidirectional
-#. * formatting codes to take care of the cases the folder
-#. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
-#.
-#: ../mail/em-folder-tree.c:1084
+#: ../mail/em-folder-tree.c:1191
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1318
+#: ../mail/em-folder-tree.c:1427
 msgid "Mail Folder Tree"
 msgstr "é?µä»¶è³?æ??夾樹"
 
-#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
+#: ../mail/em-folder-tree.c:1788 ../mail/em-folder-utils.c:90
 #, c-format
 msgid "Moving folder %s"
 msgstr "æ­£å?¨ç§»å??è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
+#: ../mail/em-folder-tree.c:1792 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Copying folder %s"
 msgstr "æ­£å?¨è¤?製è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
+#: ../mail/em-folder-tree.c:1801 ../mail/message-list.c:2214
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æ­£å?¨å°?é?µä»¶ç§»è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
+#: ../mail/em-folder-tree.c:1805 ../mail/message-list.c:2216
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æ­£å?¨è¤?製é?µä»¶è?³è³?æ??夾 %s"
 
-#: ../mail/em-folder-tree.c:1650
+#: ../mail/em-folder-tree.c:1824
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ç?¡æ³?å°?é?µä»¶æ??æ?¾å?°æ??ä¸?層ç??å?²å­?å??"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Move Folder To"
 msgstr "移å??è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:403
+#: ../mail/em-folder-utils.c:422
 msgid "Copy Folder To"
 msgstr "è¤?製è³?æ??夾å?°"
 
-#: ../mail/em-folder-utils.c:533
-#: ../plugins/groupwise-features/share-folder-common.c:136
+#: ../mail/em-folder-utils.c:571
+#: ../plugins/groupwise-features/share-folder-common.c:138
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "æ­£å?¨å»ºç«?è³?æ??夾ã??%sã??"
 
-#: ../mail/em-folder-utils.c:693
+#: ../mail/em-folder-utils.c:745
 msgid "Create Folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../mail/em-folder-utils.c:694
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../mail/em-folder-utils.c:746
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Specify where to create the folder:"
 msgstr "æ??å®?è¦?建ç«?è³?æ??夾ç??ä½?ç½®ï¼?"
 
-#: ../mail/em-folder-utils.c:714
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "å??æ¶?è¨?é?±è³?æ??夾 ã??%sã??"
-
-#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
+#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1604
 msgid "Unsigned"
 msgstr "æ?ªç°½å??"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:88
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æ­¤é?µä»¶æ?ªç°½å??ã??ä¸?ä¿?è­?æ­¤é?µä»¶å·²é©?è­?ã??"
 
-#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
+#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1605
 msgid "Valid signature"
 msgstr "æ??æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "æ­¤é?µä»¶å·²ç°½å??è??ä¸?æ??æ??ï¼?表示å®?é??常æ??å?¯è?½æ?¯é©?è­?ç??é?µä»¶ã??"
 
-#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1606
 msgid "Invalid signature"
 msgstr "ç?¡æ??ç??ç°½å??"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "é?µä»¶ç??ç°½å??ç?¡æ³?檢é©?ï¼?å?¯è?½å·²å?¨å?³é??æ??被æ?´å??äº?ã??"
 
-#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1607
 msgid "Valid signature, but cannot verify sender"
 msgstr "ç°½å??æ??æ??ï¼?ä½?æ?¯ç?¡æ³?檢é©?å¯?件è??"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯é?µä»¶ç??å¯?件è??ç?¡æ³?檢é©?ã??"
 
-#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1608
 msgid "Signature exists, but need public key"
 msgstr "簽章å­?å?¨ï¼?ä½?é??è¦?å?¬é??é??é?°"
 
-#: ../mail/em-format-html-display.c:94
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æ­¤é?µä»¶æ??ä¸?å??æ??æ??ç??ç°½å??ï¼?ä½?æ?¯æ²?æ??å°?æ??ç??å?¬é??é??é?°ã??"
 
-#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
+#: ../mail/em-format-html-display.c:99 ../mail/em-format-html.c:1614
 msgid "Unencrypted"
 msgstr "���"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æ­¤é?µä»¶æ?ªå? å¯?ã??å®?ç??å?§å®¹å?¨é??é??網é??網路å?³é??å?¯è?½æ??被檢é?±ã??"
 
-#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
+#: ../mail/em-format-html-display.c:100 ../mail/em-format-html.c:1615
 msgid "Encrypted, weak"
 msgstr "已������"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -10632,21 +9510,21 @@ msgstr ""
 "æ­¤é?µä»¶å·²å? å¯?ï¼?ä½?æ?¯ä½¿ç?¨ä¸?å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??å¤?é?¢ç??人å¾?é?£æª¢é?±å?§å®¹ï¼?ä½?å?ªè¦?ä¸?äº?æ??"
 "æ?¥ï¼?並ä¸?æ?¯ç?¡æ³?檢è¦?æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1616
 msgid "Encrypted"
 msgstr "已��"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "æ­¤é?µä»¶å·²å? å¯?ã??å¤?é?¢ç??人é?£ä»¥æª¢è¦?æ­¤é?µä»¶ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1617
 msgid "Encrypted, strong"
 msgstr "已�����"
 
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -10655,15 +9533,15 @@ msgstr ""
 "æ­¤é?µä»¶å·²å? å¯?ï¼?使ç?¨å?´å¯?ç??å? å¯?æ¼?ç®?æ³?ã??縱使ç¶?é??ä¸?段æ??é??ï¼?å¤?é?¢ç??人å¾?é?£æª¢é?±æ­¤é?µä»¶"
 "ç??å?§å®¹ã??"
 
-#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
+#: ../mail/em-format-html-display.c:238 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "檢è¦?æ??è­?(_V)"
 
-#: ../mail/em-format-html-display.c:248
+#: ../mail/em-format-html-display.c:251
 msgid "This certificate is not viewable"
 msgstr "æ­¤æ??è­?ç?¡æ³?檢è¦?"
 
-#: ../mail/em-format-html-display.c:497
+#: ../mail/em-format-html-display.c:506
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -10671,85 +9549,85 @@ msgstr ""
 "Evolution ç?¡æ³?顯示此å°?é?»å­?é?µä»¶ï¼?å? ç?ºå®?å·²è¶?å?ºè?½è??ç??ç??大å°?ã??æ?¨å?¯ä»¥ç?¨ä¸?æ??ç??ç??æ?¹"
 "å¼?æ??使ç?¨å¤?é?¨æ??å­?編輯å?¨ä¾?é?±è®?å®?ã??"
 
-#: ../mail/em-format-html-display.c:725
+#: ../mail/em-format-html-display.c:749
 msgid "Completed on"
 msgstr "å·²å®?æ??æ?¼"
 
-#: ../mail/em-format-html-display.c:733
+#: ../mail/em-format-html-display.c:757
 msgid "Overdue:"
 msgstr "å?°æ??æ?¥:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:737
+#: ../mail/em-format-html-display.c:761
 msgid "by"
 msgstr "æ?¼"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
+#: ../mail/em-format-html-display.c:978 ../mail/em-format-html-display.c:1025
 msgid "View _Unformatted"
 msgstr "檢é?±æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:980
 msgid "Hide _Unformatted"
 msgstr "é?±è??æ?ªæ??ç??ç??(_U)"
 
-#: ../mail/em-format-html-display.c:1016
+#: ../mail/em-format-html-display.c:1045
 msgid "O_pen With"
-msgstr "以...é??å??(_O)"
+msgstr "以â?¦é??å??(_O)"
 
 #: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d �"
 
-#: ../mail/em-format-html.c:153
+#: ../mail/em-format-html.c:165
 msgid "Formatting message"
 msgstr "æ ¼å¼?å??é?µä»¶"
 
-#: ../mail/em-format-html.c:352
+#: ../mail/em-format-html.c:364
 msgid "Formatting Message..."
-msgstr "æ ¼å¼?å??é?µä»¶..."
+msgstr "æ ¼å¼?å??é?µä»¶â?¦"
 
-#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#: ../mail/em-format-html.c:1448 ../mail/em-format-html.c:1458
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æ­£å?¨å??å??ã??%sã??"
 
-#: ../mail/em-format-html.c:1901
+#: ../mail/em-format-html.c:1979
 msgid "Unknown external-body part."
 msgstr "æ?ªç?¥ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1909
+#: ../mail/em-format-html.c:1987
 msgid "Malformed external-body part."
 msgstr "æ ¼å¼?ä¸?è?¯ç??å¤?å? æ?¬æ??é?¨å??ã??"
 
-#: ../mail/em-format-html.c:1939
+#: ../mail/em-format-html.c:2017
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP ç«?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1950
+#: ../mail/em-format-html.c:2028
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æ?¬å?°ç«¯æª?æ¡? (%s) æ?¼ ã??%sã??æ??æ??ç??æ??示"
 
-#: ../mail/em-format-html.c:1952
+#: ../mail/em-format-html.c:2030
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æ?¬å?°æª?æ¡?æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1973
+#: ../mail/em-format-html.c:2051
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "é? ç«¯è³?æ??æ??示 (%s)"
 
-#: ../mail/em-format-html.c:1984
+#: ../mail/em-format-html.c:2062
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "ä¸?æ??ç??å¤?é?¨æª?æ¡?æ??示 (ã??%sã??é¡?å??)"
 
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
-#: ../mail/em-format-html.c:2647
+#: ../mail/em-format-html.c:2762
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
@@ -10760,56 +9638,94 @@ msgstr "é??å°?é?µä»¶æ?¯ç?± %s 代表 %s å¯?å?º"
 msgid "No HTML stream available"
 msgstr "æ²?æ?? HTML 串æµ?å?¯ç?¨"
 
-#: ../mail/em-subscribe-editor.c:677
-msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "æ­¤å?²å­?å??ä¸?æ?¯æ?´è¨?é?±ï¼?æ??è??æ?ªå??ç?¨å®?å??ã??"
+#: ../mail/em-subscription-editor.c:1107
+msgid "Folder Subscriptions"
+msgstr "è³?æ??夾è¨?é?±"
+
+#: ../mail/em-subscription-editor.c:1146
+msgid "_Account:"
+msgstr "帳è??(_A):"
 
-#: ../mail/em-subscribe-editor.c:728
-msgid "Subscribed"
-msgstr "已��"
+#: ../mail/em-subscription-editor.c:1161
+msgid "Clear Search"
+msgstr "æ¸?é?¤æ??å°?"
 
-#: ../mail/em-subscribe-editor.c:732
-msgid "Folder"
-msgstr "è³?æ??夾"
+#: ../mail/em-subscription-editor.c:1179
+msgid "Sho_w items that contain:"
+msgstr "顯示é ?ç?®å??å?«(_W):"
 
-#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:1120
-msgid "Please select a server."
-msgstr "è«?é?¸æ??ä¸?å??伺æ??å?¨ã??"
+#: ../mail/em-subscription-editor.c:1218
+msgid "Subscribe to the selected folder"
+msgstr "è¨?é?±é?¸å??ç??è³?æ??夾"
 
-#: ../mail/em-subscribe-editor.c:1166
-msgid "No server has been selected"
-msgstr "å°?æ?ªé?¸æ??伺æ??å?¨"
+#: ../mail/em-subscription-editor.c:1219
+msgid "Su_bscribe"
+msgstr "��(_B)"
+
+#: ../mail/em-subscription-editor.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
+msgid "Unsubscribe from the selected folder"
+msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
 
-#. Translators: This message is shown only for ten or more messages to be opened.
-#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
-#. then write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-subscription-editor.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
+msgid "_Unsubscribe"
+msgstr "å??æ¶?è¨?é?±(_U)"
+
+#: ../mail/em-subscription-editor.c:1242
+msgid "Collapse all folders"
+msgstr "æ?¶æ?ºæ??æ??ç??è³?æ??夾"
+
+#: ../mail/em-subscription-editor.c:1243
+msgid "C_ollapse All"
+msgstr "����(_O)"
+
+#: ../mail/em-subscription-editor.c:1253
+msgid "Expand all folders"
+msgstr "å±?é??æ??æ??ç??è³?æ??夾"
+
+#: ../mail/em-subscription-editor.c:1254
+msgid "E_xpand All"
+msgstr "å?¨é?¨å±?é??(_X)"
+
+#: ../mail/em-subscription-editor.c:1264
+msgid "Refresh the folder list"
+msgstr "é??æ?°æ?´ç??è³?æ??夾æ¸?å?®"
+
+#: ../mail/em-subscription-editor.c:1276
+msgid "Stop the current operation"
+msgstr "å??æ­¢ç?®å??ç??æ??ä½?"
+
+#. Translators: This message is shown only for ten or more
+#. * messages to be opened.  The %d is replaced with the actual
+#. * count of messages. If you need a '%' in your text, then
+#. * write it doubled, like '%%'.
+#: ../mail/em-utils.c:101
 #, c-format
-msgid "Are you sure you want to open %d messages at once?"
+msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "æ?¨ç¢ºå®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
 msgstr[1] "æ?¨ç¢ºå®?è¦?ä¸?次é??å?? %d å°?é?µä»¶ï¼?"
 
-#: ../mail/em-utils.c:152
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../mail/em-utils.c:153
+#: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:327
 msgid "Message Filters"
 msgstr "é?µä»¶è¦?å??"
 
-#: ../mail/em-utils.c:848
+#: ../mail/em-utils.c:883
 #, c-format
 msgid "Messages from %s"
 msgstr "ä¾?è?ª %s ç??é?µä»¶"
 
-#: ../mail/em-vfolder-editor.c:126
+#: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "æ??å°?è³?æ??夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:525
+#: ../mail/em-vfolder-rule.c:603
 msgid "Add Folder"
 msgstr "å? å?¥è³?æ??夾"
 
@@ -10826,159 +9742,188 @@ msgid "\"Filter Editor\" window width"
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?寬度"
 
 #: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Folder Subscriptions\" window height"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?é«?度"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?æ??大å??ç??æ??"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Folder Subscriptions\" window width"
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?寬度"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?æ??大å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
 msgstr "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?æ??大å??ç??æ??"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "ä¸?å®?è¦?æ±?è®?ä¿¡å??æ¢?"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "é?¯èª¤è¨?æ?¯å?¨ç??æ??å??中顯示ç??æ??é??(ç§?)ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr "ç?¶ä½¿ç?¨è??è½?å¯?æ??å??è¦?è¦?çª?中顯示ç??é?µä»¶æ??è©¢å??æ?¯å?¦è¦?é??é??é?µä»¶è¦?çª?"
+
+#: ../mail/evolution-mail.schemas.in.h:16
+#, fuzzy
+#| msgid "Attached message"
+msgid "Attribute message."
+msgstr "����"
+
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
 msgstr "è?ªå??表æ??辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "è?ªå??é?£çµ?辨è­?"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Check for new messages in all active accounts"
+msgstr "檢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶"
+
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Check for new messages on start"
+msgstr "å??å??æ??檢æ?¥æ?°é?µä»¶"
+
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
 msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
 msgstr "å¼?ç?¨å??ç?½è?²å½©"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
 msgstr "å¼?ç?¨å??ç?½è?²å½©ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
 msgstr "�寫���設�度"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
 msgstr "�寫���設寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
 msgstr "編輯å?¨è®?å??/é??å? ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "å£?縮å?¨ TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "å°? TO/CC/BCC 中ä½?å??ç??顯示æ?¹å¼?å£?縮ç?º address_count 中æ??å®?ç??é?·åº¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "æ?§å?¶æ?¬å?°ç«¯è®?æ?´è??é? ç«¯é?µä»¶ä¼ºæ??å?¨å??æ­¥ç??é »ç??ã??é??é??å¿?é ?è?³å°?æ?? 30 ç§?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk."
 msgstr "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 "檢æ?¥å??å?¾é?µä»¶ç?¨ç??è?ªè¨?æ¨?é ­ã??æ­¤æ¸?å?®ä¸­ç??å??ç´ æ ¼å¼?ç?ºã??headername=valueã??å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to compose messages."
 msgstr "ç?¨æ?¼æ?°å¯«é?µä»¶ç??é ?設å­?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages"
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?å??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default charset in which to display messages."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??é ?設å­?å??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default forward style"
 msgstr "é ?設è½?é??樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default height of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default height of the subscribe dialog."
-msgstr "è¨?é?±å°?話ç??ç??é ?設é«?度ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default maximized state of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??æ??大å??ç??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default reply style"
 msgstr "é ?設å??è¦?樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default value for thread expand state"
 msgstr "ç?¸é??é?µä»¶å±?é??ç??æ??ç??é ?設æ?¸å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "æ?°å¯«è¦?çª?ç??é ?設寬度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Default width of the mail browser window."
 msgstr "é?µä»¶ç??覽å?¨è¦?çª?ç??é ?設寬度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default width of the subscribe dialog."
-msgstr "è¨?é?±å°?話ç??ç??é ?設寬度ã??"
-
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中å°?æ?¾æª¢æ?¥å??å?¾é?µä»¶ç?¨ç??é?»å­?é?µä»¶ä½?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "決å®?æ?¯å?¦å?¨é??è¨?é??中å°?æ?¾å¯?件è??é?»å­?é?µä»¶å¸³è??"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10989,11 +9934,11 @@ msgstr ""
 "æ??æ??å°?æ¨?è¨?ç?ºè?ªå??è£?é½?ç??é??è¨?é??ã??ä½?è?¥æ¨?è¨?ç?ºè?ªå??è£?é½?ç??æ?¯é? ç«¯é??è¨?é??ï¼?å?? LDAPï¼?ï¼?å??"
 "é??度å?¯è?½æ??å¾?æ?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "決å®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -11002,53 +9947,53 @@ msgstr ""
 "決å®?æ?¯å?¦ä½¿ç?¨è?ªè¨?æ¨?é ­ä¾?檢æ?¥å??å?¾é?µä»¶ã??å¦?æ??å??ç?¨é??å??é?¸é ?並ä¸?æ??ä¾?æ¨?é ­ï¼?å°?æ??æ??å??å??"
 "å?¾é?µä»¶æª¢æ?¥ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "決å®?æ?¯å?¦å?¨å??ç?´æª¢è¦?ç??ã??é?µä»¶ã??裡ç??ã??å¯?件人ã??å??ã??主æ?¨ã??中使ç?¨å??樣ç??å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for loading/attaching files to composer."
 msgstr "ç?¨ä¾?é?µä»¶ç·¨è¼¯å?¨è¼?å?¥/é??件ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Directory for saving mail component files."
 msgstr "ç?¨ä¾?å?²å­?é?µä»¶å??件æª?ç??ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "å??ç?¨æ??å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Display only message texts not exceeding certain size"
 msgstr "å?ªé¡¯ç¤ºä¸?è¶?é??æ??å??大å°?ç??é?µä»¶æ??å­?"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Do not add signature delimiter"
 msgstr "ç?¡æ³?å? å?¥ç°½å??æª?å??é??符è??"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Draw spelling error indicators on words as you type."
 msgstr "ç?¶æ?¨è¼¸å?¥å?§å®¹æ??å?¨æ??å­?ä¸?顯示æ?¼å­?é?¯èª¤æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Junk folders on exit"
 msgstr "é?¢é??æ??æ¸?空å??å?¾é?µä»¶è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty Trash folders on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "é?¢é?? Evolution æ??æ¸?空æ??æ??å??å?¾é?µä»¶è³?æ??夾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "çµ?æ?? Evolution æ??æ¸?空æ??æ??å??å?¾è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -11056,43 +10001,43 @@ msgstr ""
 "å??ç?¨ HTML é?µä»¶ä¸­ç??å??ç?«å??ç??ã??許å¤?使ç?¨è??èª?ç?ºå??ç?«å??ç??å¾?ç?©äººï¼?å? è??å??好以é??æ??å??ç??"
 "代æ?¿ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "å??ç?¨æ??å?¥è??模å¼?ï¼?å¦?æ­¤æ?¨å?¯ä»¥å?¨é?±è®?é?µä»¶æ??ç??å?°æ¸¸æ¨?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "å??ç?¨æ??å??ç?¨é­?è¡?空ç?½é?µ"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "å??ç?¨æ??å??ç?¨æ¨?è¨?å¤?å??é?µä»¶æ??ç??æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "å??ç?¨æ??å??ç?¨é?¨æ??å?³æ?¥å??è?½"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "å??ç?¨æ??å°?è³?æ??夾"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "å??ç?¨ç¨?å¼?é??å§?æ??æ??å°?è³?æ??夾ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "å??ç?¨å?´é??å??æ??å°?å??è?½å??許äº?å??å¼?æ??å°?è³?æ??夾å??稱ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "å??ç?¨æ­¤é?¸é ?å?¯å?¨é?µä»¶é ?覽ã??é?µä»¶æ¸?å?®å??è³?æ??夾中使ç?¨ç©ºç?½é?µæ?²å??ç?«é?¢ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -11100,23 +10045,23 @@ msgstr ""
 "å??ç?¨å??å?ªæ??顯示ä¸?è¶?é??ã??message_text_part_limitã??設å®?é?µä¸­æ??å®?義ç??大å°?ç??é?µä»¶æ??"
 "å­?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "å??ç?¨ä»¥å?¨æ??æ??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "å??ç?¨æ­¤é?¸é ?æ??è®?æ??æ??ç??è³?æ??夾使ç?¨é¡?ä¼¼ç??é?µä»¶æ¸?å?®æª¢è¦?設å®?å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "å??ç?¨/å??ç?¨æ??å?¥è??模å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:44
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "å°?æª?æ¡?å??稱編碼ç?º Outlook/GMail å½¢å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11127,33 +10072,37 @@ msgstr ""
 "Evolution å¯?å?ºç?? UTF-8 å­?å??æª?æ¡?å??稱ï¼?å? ç?ºå®?å??並æ?ªé?µå¾ª RFC 2231 è¦?ç¯?ï¼?è??ç?¨äº?ä¸?"
 "正確ç?? RFC 2047 æ¨?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "é??濾å¾?æ¸?空å¯?件å?£"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Forward message."
+msgstr "è½?å¯?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "群çµ?å??è¦?å??ä¿¡å?°é??ä¿¡è«?å£?"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "�件���格�度"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??é«?度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "é?±è??å??è³?æ??夾é ?覽並移é?¤é?¸å??å??"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "å¦?æ??使ç?¨è??å??試ä¸?次é??å?? 10 æ??æ?´å¤?ç??é?µä»¶ï¼?è©¢å??使ç?¨è??æ?¯å?¦ç¢ºå®?è¦?é??麼å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -11163,30 +10112,36 @@ msgstr ""
 "MIME é¡?å??ä¸?å°?æ??è?³ GNOME ç?? MIME é¡?å??è³?æ??庫ä¹? Bonobo å??件檢è¦?å?¨ï¼?æ??ç?¨æ?¼é¡¯ç¤ºå?§"
 "容ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "忽ç?¥é??ä¿¡è«?å£? Reply-To:"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial height of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?é«?度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?å??ç?´æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11197,7 +10152,18 @@ msgstr ""
 "è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??é??濾æ¢?件編輯"
 "å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Initial maximize state of the \"Folder Subscriptions\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Folder Subscriptions\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?æ??大å??ç??æ??ã??é??å??æ?¸å?¼æ??å?¨ä½¿ç?¨è??æ??大å??æ??å??æ¶?æ??大å??è¦?çª?"
+"æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??è³?æ??夾è¨?é?±ã??è¦?çª?ä¸?"
+"è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11208,7 +10174,7 @@ msgstr ""
 "å??è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??æ??å°?è³?æ??夾編"
 "輯å?¨ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11220,26 +10186,32 @@ msgstr ""
 "è¦?çª?æ??æ?´æ?°ã??注æ??ï¼?é??å??ç?¹å®?ç??æ?¸å?¼ä¸?è?½å?¨ Evolution 中使ç?¨ï¼?å? ç?ºã??å?³é??è??æ?¥æ?¶é?µ"
 "件ã??è¦?çª?ä¸?è?½æ??大å??ã??é??å??é?µå?¼å?ªç?ºäº?實ä½?é??è¦?è??å­?å?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
 msgstr "ã??é??濾æ¢?件編輯å?¨ã??è¦?çª?ç??å??å§?寬度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid ""
+"Initial width of the \"Folder Subscriptions\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "ã??è³?æ??夾è¨?é?±ã??è¦?çª?ç??å??å§?寬度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
 "ã??æ??å°?è³?æ??夾編輯å?¨ã??è¦?çª?ç??å??å§?寬度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "ã??å?³é??è??æ?¥æ?¶é?µä»¶ã??è¦?çª?ç??å??å§?寬度ã??é??å??æ?¸å?¼æ??å?¨è¦?çª?æ°´å¹³æ?¹è®?大å°?æ??æ?´æ?°ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -11249,7 +10221,7 @@ msgstr ""
 "æ??å?¥æ?¼ä¸?è?¬ç??ã??å??è¦?å?¨é?¨ã??è¡?ç?ºï¼?é??å??é?¸é ?æ??è®?ã??群çµ?å??è¦?ã??å·¥å?·å??æ??é??å??試å?ªå??ä¿¡å?°"
 "é??ä¿¡è«?å£?ï¼?ä¹?å°±æ?¯æ?¨æ?¶å?°è¦?å??è¦?ç??é??å°?ä¿¡ç??ä¾?æº?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -11258,19 +10230,19 @@ msgstr ""
 "å®?å??ç?¨/å??ç?¨å?¨å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶æ??æ?¯å?¦é??è¤?æ??示以警å??é?£å°?æ??æ°¸ä¹?å?ªé?¤é?µä»¶ï¼?è??"
 "é??å??æ?¯å°?é?µä»¶è?ªæ??å°?çµ?æ??中移é?¤ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??示警å??æ?¨æ­£è©¦è??å??è¦?ç§?人信件給é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr "å®?æ??å??ç?¨/å??ç?¨è­¦å??æ?¨ã??æ?¨æ­£å??è¦?給å¾?å¤?人ã??ç??é??è¦?æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -11279,35 +10251,40 @@ msgstr ""
 "å®?æ??å??ç?¨/å??ç?¨é??è¦?æ??示警å??æ?¨æ­£è©¦è??å??è¦?ç§?人信件給é??é??é??ä¿¡è«?å£?å¯?å?ºç??ä¿¡ã??è??é??ä¿¡è«?"
 "å£?設å®?ç?? Reply-To: æ¨?é ­æ??å°?æ?¨ç??å??ä¿¡é??æ?°å°?å??è?³é??ä¿¡è«?å£?ä¸?ç??æ??æ??æ??å?¡"
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Last time Empty Junk was run"
 msgstr "ä¸?次æ¸?空å??å?¾é?µä»¶ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Trash was run"
 msgstr "ä¸?次æ¸?空å??æ?¶ç­?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Layout style"
 msgstr "é??置樣å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:104
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Level beyond which the message should be logged."
+msgstr "æ??è¨?é??ç??é?µä»¶ç­?ç´?ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "List of Labels and their associated colors"
 msgstr "æ¨?籤å??ç?¸é??è?²å½©ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME é¡?å??æ¸?å?®ï¼?檢æ?¥ Bonobo å??件檢è¦?å?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of accepted licenses"
 msgstr "æ?¥æ?¶ç??æ??æ¬?æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accounts"
 msgstr "帳è??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -11315,15 +10292,15 @@ msgstr ""
 "Evolution ç??é?µä»¶å??件已ç?¥ç??帳è??æ¸?å?®ã??æ¸?å?®å??å?«è?? /apps/evolution/mail/accounts "
 "ç?¸é??ç??å­?串å?½å??å­?ç?®é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "List of custom headers and whether they are enabled."
 msgstr "è?ªè¨?æª?頭以å??å®?å??æ?¯å?¦å??ç?¨ç??æ¸?å?®"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of dictionary language codes used for spell checking."
 msgstr "ç?¨æ?¼æ?¼å­?檢æ?¥ç??å­?å?¸èª?è¨?碼æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 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."
@@ -11331,15 +10308,15 @@ msgstr ""
 "Evolution ç??é?µä»¶å??件已ç?¥ç??æ¨?籤æ¸?å?®ã??æ¸?å?®å??å?«å­?串ï¼?å?¶ä¸­å??å?« name:colorï¼?color "
 "使ç?¨ HTML å??å?­é?²ä½?編碼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of protocol names whose license has been accepted."
 msgstr "å·²ç¶?æ?¥å??å?¶æ??æ¬?ç??å??å®?æ¸?å?®ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Load images for HTML messages over HTTP"
 msgstr "é??é?? HTTP è¼?å?¥ HTML é?µä»¶ç??å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 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 "
@@ -11348,285 +10325,297 @@ msgstr ""
 "é??é?? HTTP(S) è¼?å?¥ HTML é?µä»¶ç??å??ç??ã??å?¯è?½ç??å?¼ç?ºï¼?ã??0ã??â?? ä¸?å¾?網路è¼?å?¥å??ç??ã??"
 "ã??1ã??â?? å¦?æ??æ?¯å?¨é?£çµ¡äººè£¡ç??å¯?件è??æ??ï¼?è¼?å?¥å??ç??ã??ã??2ã??- ä¸?å®?å¾?網路è¼?å?¥å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Log filter actions"
 msgstr "è¨?é??é??濾å?¨å??ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions to the specified log file."
 msgstr "å°?é??濾å?¨å??ä½?è¨?é??å?°æ??å®?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Logfile to log filter actions"
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions."
 msgstr "ç?¨æ?¼è¨?é??é??濾å?¨å??ä½?ç??è¨?é??æª?æ¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Mail browser height"
 msgstr "é?µä»¶ç??覽å?¨é«?度"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser maximized"
 msgstr "é?µä»¶ç??覽å?¨æ??大å??"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser width"
 msgstr "é?µä»¶ç??覽å?¨å¯¬åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mark as Seen after specified timeout"
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout."
 msgstr "å?¨æ??å®?ç??æ??é??é??å¾?ï¼?æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark citations in the message \"Preview\""
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\"."
 msgstr "å?¨é?µä»¶ã??é ?覽ã??中æ¨?示å¼?ç?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Message text limit for display"
 msgstr "顯示é?µä»¶æ??å­?é??å?¶"
 
 # (pofilter) gconf: do not translate gconf attribute: "normal", "source"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "è¨?æ?¯é¡¯ç¤ºæ¨£å¼? (ã??normalã??[ä¸?è?¬]ã??ã??full headersã??[å®?æ?´æª?é ­]ã??ã??sourceã??[ä¾?æº?])"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Minimum days between emptying the junk on exit"
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the trash on exit"
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??å?¾é?µä»¶æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "çµ?æ??æ??æ¸?空å??æ?¶ç­?æ??å°?é??é??天æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示æ?¼ TO/CC/BCC 中ä½?å??ç??é?·åº¦"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Original message."
+msgstr "å??å§?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
+msgstr ""
+"å?¯è?½ç??æ?¸å?¼æ??ï¼?never - æ°¸ä¸?é??é??ç??覽å?¨è¦?çª? always - 總æ?¯é??é??ç??覽å?¨è¦?çª? ask - "
+"(æ??ä»»ä½?å?¶ä»?æ?¸å?¼) æ??è©¢å??使ç?¨è??"
+
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt on empty subject"
 msgstr "æ²?æ??主æ?¨æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ç?¶ä½¿ç?¨è??å??試æ¸?空è³?æ??夾æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt when deleting messages in search folder"
 msgstr "ç?¶å?ªé?¤æ??å°?è³?æ??夾中ç??é?µä»¶æ??顯示æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "ç?¶é??ä¿¡è«?å£?å?«æ??ç§?人å??è¦?æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt when replying privately to list messages"
 msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when replying to many recipients"
 msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when user expunges"
 msgstr "使ç?¨è??æ¸?空æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when user only fills Bcc"
 msgstr "ç?¶ä½¿ç?¨è??å?ªå¡«å¯«å¯?件å?¯æ?¬æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ç?¶ä½¿ç?¨è??å??試ä¸?次é??å?? 10 å??æ??æ?´å¤?é?µä»¶æ??æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é?? HTML é?µä»¶å?°ä¸?æ?³æ?¥å?? HTML é?µä»¶ç??æ?¶ä»¶è??æ??ï¼?顯示æ??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ç?¶ä½¿ç?¨è??å?³é??ä¸?å?«æ?¶ä»¶è??æ??å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶æ??ï¼?æ??示使ç?¨è??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ç?¶ä½¿ç?¨è??å??試å?³é??ä¸?æ?³è¦?ç?? HTML æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "ç?¶æ¨?è¨?å¤?å??é?µä»¶æ??æ??示"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Put personalized signatures at the top of replies"
 msgstr "å°?å??人å??ç°½å??æª?ç½®æ?¼å??ä¿¡é ?端"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Put the cursor at the bottom of replies"
 msgstr "å??è¦?æ??å°?游æ¨?ç½®æ?¼åº?é?¨"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "辨èª?æ??å­?中ç??表æ??符è??並å??代æ??å??示ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Recognize links in text and replace them."
 msgstr "辨èª?æ??å­?中ç??é?£çµ?並å°?ä¹?å??代ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Run junk test on incoming mail."
 msgstr "å?¨å?§é??ç??é?µä»¶å?·è¡?å??å?¾é?µä»¶æª¢æ?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Save directory"
 msgstr "å?²å­?ç?®é??"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Search for the sender photo in local address books"
 msgstr "å?¨æ?¬å?°ç«¯é??è¨?é??æ??å°?å¯?件è??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Send HTML mail by default"
 msgstr "é ?設å?³é?? HTML é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Send HTML mail by default."
 msgstr "é ?設å?³é?? HTML é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Sender email-address column in the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®ç??å¯?件è??é?»å­?é?µä»¶æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Server synchronization interval"
 msgstr "伺æ??å?¨å??æ­¥é??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:161
 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:151
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å?¯æ?¬ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??群çµ?æ??顯示ã??å¯?件è??ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "張貼å?°æ?°è??群çµ?æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å??è¦?ã??æ¬?ä½?"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show Animations"
 msgstr "顯示å??ç?«"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show all message headers"
 msgstr "顯示æ??æ??é?µä»¶æª?é ­"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show all the headers when viewing a messages."
 msgstr "檢è¦?é?µä»¶æ??顯示æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show animated images as animations."
 msgstr "æ?­æ?¾å??ç?«å??ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤è??)"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show deleted messages in the message-list"
 msgstr "å?¨é?µä»¶æ¸?å?®ä¸­é¡¯ç¤ºå?ªé?¤ç??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show image animations"
 msgstr "顯示å??ç?«å??ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show original \"Date\" header value."
 msgstr "顯示å??å§?ç??ã??æ?¥æ??ã??æ¨?é ­æ?¸å?¼ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show photo of the sender"
 msgstr "顯示å¯?件è??ç??ç?¸ç??"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 "å?³é??é?µä»¶è¨?æ?¯æ??顯示ã??å¯?件å?¯æ?¬ã??æ¬?ä½?ã??é??æ?¯å?¨é?¸å??é?µä»¶å¸³è??æ??ç?±æª¢è¦?é?¸å?®æ??æ?§å?¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:177
 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:167
+#: ../mail/evolution-mail.schemas.in.h:178
 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:168
+#: ../mail/evolution-mail.schemas.in.h:179
 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:169
+#: ../mail/evolution-mail.schemas.in.h:180
 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:170
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "å?¨é?µä»¶æ¸?å?®ç??中以å??é?¢ç??æ¬?ä½?顯示å¯?件è??ç??é?»å­?é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:182
 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 "
@@ -11635,11 +10624,11 @@ msgstr ""
 "顯示å??å§?ç??ã??æ?¥æ??ã??æª?é ­ï¼?è?¥æ??å??ä¸?å??æ??æ??使ç?¨ç?¶å?°æ??é??ï¼?ã??å?¦å??æ°¸é? ä»¥ä½¿ç?¨è??å??好ç??"
 "æ ¼å¼?å??æ?¬å?°æ??å??顯示ã??æ?¥æ??ã??æª?é ­ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "å?¨é?µä»¶é?±è®?çª?格中顯示å¯?件è??ç??ç?¸ç??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 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. "
@@ -11655,45 +10644,37 @@ msgstr ""
 "é?²è¡?å??信給å??人ç??å??ä½?ï¼?è??å¦?æ??æ?¨ä½¿ç?¨ã??å??è¦?å?°è«?å£?ã??å??ä½?ï¼?å®?ä¹?æ??ç?§å??ã??å®?ç??é??ä½?æ?¹"
 "å¼?æ?¯æ¯?å°? Reply-To: æ¨?é ­å?? List-Post: æ¨?é ­ï¼?å¦?æ??æ??ç??話ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Spell check inline"
 msgstr "����檢�"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Spell checking color"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Subscribe dialog default height"
-msgstr "è¨?é?±å°?話ç??é ?設é«?度"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Subscribe dialog default width"
-msgstr "è¨?é?±å°?話ç??é ?設寬度"
-
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Terminal font"
 msgstr "çµ?端æ©?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "å??å?¾é?£é?¤ç??é ?設å¤?æ??ç¨?å¼?"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次å?·è¡?æ¸?空å??å?¾é?µä»¶ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "ä¸?次å?·è¡?æ¸?å?®å??æ?¶ç­?ç??æ??é??ï¼?å¾? 1970 å¹´ä¸?æ??ä¸?æ?¥(é?»è?¦ç´?å??)å¾?ç®?èµ·ç??æ?¥æ?¸ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:192
 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 "
@@ -11703,21 +10684,39 @@ msgstr ""
 "é??ç½®æ?¹å¼?決å®?äº?å?¨é?µä»¶æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶"
 "æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?µä»¶æ¸?å?®æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "The terminal font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??çµ?端æ©?å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr "å?¨è½?å¯?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?說æ??æ?¥ä¸?ä¾?æ?¯è½?å¯?ç??é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?ç½®é ?張貼ï¼?ï¼?說æ??æ?¥ä¸?ä¾?æ?¯å??å§?é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr "å?¨å??è¦?é?µä»¶æ??è¦?æ??å?¥ç??æ??å­?ï¼?說æ??é?µä»¶ç??å??ä½?è??ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "The variable width font for mail display."
 msgstr "ç?¨æ?¼é¡¯ç¤ºé?µä»¶ç??è®?å??寬度å­?å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "é??裡å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ï¼?ã??1ã??ç?ºè­¦å??ï¼?ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11726,7 +10725,7 @@ msgstr ""
 "é??裡決å®?äº?é?µä»¶å?§æ??å?¨ Evolution 中å?¯é¡¯ç¤ºç??æ??大容é??ï¼?以 KB ç?ºå?®ä½?æ??å®?ã??é ?設å?¼"
 "ç?º 4096 (4MB)ã??é??å??æ?¸å?¼å?ªæ??å?¨ä½¿ç?¨ã??force_message_limitã??設å®?é?µæ??æ??æ??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:200
 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 "
@@ -11735,7 +10734,7 @@ msgstr ""
 "é??æ?¯é ?設ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?ï¼?å?³ä½¿å·²å??ç?¨äº?å?¶ä»?ç??å¤?æ??ç¨?å¼?ã??å¦?æ??å??ç?¨é??裡å??å?ºç??é ?"
 "設å¤?æ??ç¨?å¼?ï¼?並ä¸?æ??å½±é?¿å?¶ä»?å?¯ç?¨ç??å¤?æ??ç¨?å¼?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:201
 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."
@@ -11743,7 +10742,7 @@ msgstr ""
 "é??å??é?µå?¼å?ªè?½è®?å??ä¸?次ï¼?並æ??å?¨è®?å??å¾?設ç?ºã??falseã??ã??é??樣æ??å??æ¶?å?¨æ¸?å?®ä¸­å°?該é?µä»¶ç??"
 "é?¸å??並移é?¤å°?該è³?æ??夾ç??é ?覽ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:202
 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;"
@@ -11753,7 +10752,7 @@ msgstr ""
 "æ­¤é??é?°æ??該å??å?« XML æ¸?å?®ï¼?å®?æ??æ??å®?è?ªè¨?æª?é ­ï¼?以å??æ?¯å?¦é¡¯ç¤ºå®?å??ã??XML çµ?æ§?ç??æ ¼å¼?"
 "æ?¯ &lt;header enabled&gt; - å¦?æ??æª?é ­æ??顯示å?¨é?µä»¶æª¢è¦?ï¼?å??設å®?æ?? enabledã??"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:203
 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 "
@@ -11762,24 +10761,24 @@ msgstr ""
 "é??å??é?¸é ?ç?¸é??æ?¼é?µå?¼ã??lookup_addressbookã??ï¼?æ?¯ç?¨ä¾?決å®?æ?¯å?¦å?ªå?¨æ?¬å?°ç«¯é??è¨?é??中æ?¥"
 "è©¢é?»å­?é?µä»¶ä½?å??以ç?¨æ?¼å??å?¾é?µä»¶é??濾æ??ã??æ??é?¤å·²ç?¥é?£çµ¡äººå¯?å?ºç??é?µä»¶ã??å??è?½ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "This option would help in improving the speed of fetching."
 msgstr "é??å??é?¸é ?è?½å??å?©å¢?é?²æ?¥æ?¶ç??é??度ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
-msgstr "é??æ??設å®?å?¨é ?設é?µä»¶æ¸?å?®æª¢è¦?中顯示ä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??顯示ã??...ã??ã??"
+msgstr "é??æ??設å®?å?¨é ?設é?µä»¶æ¸?å?®æª¢è¦?中顯示ä½?å??ç??é?·åº¦ï¼?è¶?é??ç??é?¨å??æ??顯示ã??â?¦ã??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶é ?設ç?ºå±?é??æ??æ?¶æ?ºç??ç??æ??ã??Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:207
 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 "
@@ -11788,51 +10787,51 @@ msgstr ""
 "é??å??設å®?å?¼æ??å®?ç?¸é??é?µä»¶è¦?ä¾?æ¯?å??é?µä»¶ç¾¤çµ?æ??æ?°ç??é?µä»¶æ??åº?ï¼?è??é??ä¾?ç?§é?µä»¶ç??æ?¥æ??ã??"
 "Evolution å°?é??è¦?é??æ?°å??å??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Thread the message-list based on Subject"
 msgstr "以主����串��件��"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Timeout for marking message as seen"
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Timeout for marking message as seen."
 msgstr "å°?é?µä»¶æ¨?示æ??å·²é?±è®?ç??æ??é??ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "UID string of the default account."
 msgstr "é ?設帳è??ç?? UID å­?串ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "使ç?¨è¡?å?§æ?¼å­?檢æ?¥æ??å°?æ?¼é?¯å­?ç??åº?ç·?é¡?è?²ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Use SpamAssassin daemon and client"
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯"
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使ç?¨ SpamAsssassin 伺æ??ç¨?å¼?å??客æ?¶ç«¯ (spamc/spamd)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Use custom fonts"
 msgstr "使ç?¨è?ªè¨?å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Use custom fonts for displaying mail."
 msgstr "使ç?¨è?ªè¨?å­?å??ä¾?顯示é?µä»¶ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Use only local spam tests."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "Use only the local spam tests (no DNS)."
 msgstr "å?ªä½¿ç?¨æ?¬å?°å??å?¾é?µä»¶æ¸¬è©¦ (æ²?æ?? DNS)ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:219
 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 "
@@ -11840,7 +10839,7 @@ msgid ""
 msgstr ""
 "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??游æ¨?å??å?¨ä½?è??ã??é??æ??決å®?游æ¨?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:220
 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 "
@@ -11849,30 +10848,45 @@ msgstr ""
 "使ç?¨è??å?¨å??è¦?é?µä»¶æ??å¸?æ??ä»?å??ç°½å??æª?æ?¾å?¨ä½?è??ã??é??æ??決å®?ç°½å??æª?æ?¾ç½®å?¨é?µä»¶ç??é ?端æ??åº?"
 "é?¨ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Variable width font"
 msgstr "è®?å??寬度å­?å??"
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "æ?¯å?¦é ?設å?¨æ¯?å°?é?µä»¶å? å?¥è®?ä¿¡å??æ¢?ç??è¦?æ±?"
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid ""
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶è??ä¸?管ã??檢æ?¥æ?°é?µä»¶æ?¼æ¯? X å??"
+"é??ã??é?¸é ?ã??é??å??é?¸é ?å?ªè?½å??ã??send_recv_on_startã??é?¸é ?ä¸?起使ç?¨ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:224
+msgid ""
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr "ç?¶ Evolution å??å??æ??æ?¯å?¦æª¢æ?¥æ?°é?µä»¶ã??é??ä¹?å??å?«å¯?å?ºå¯?件å?£ä¸­ç??é?µä»¶ã??"
+
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "æ?¯å?¦å??ç?¨å?´é??å??ç??è³?æ??夾å??稱ç??ç?¥ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 "ç?¶é?µä»¶ä¸?å??å?« In-Reply-To æ?? References æª?é ­æ??ï¼?æ?¯å?¦æ??ç?§ä¸»æ?¨æ?¾å??é?µä»¶ç¾¤çµ?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "æ?¯å?¦ä¾?é?µä»¶ç¾¤çµ?中æ??æ?°ç??é?µä»¶ä¾?æ??åº?ç?¸é??é?µä»¶"
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:228
 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 "
@@ -11881,102 +10895,100 @@ msgstr ""
 "æ?¯å?¦å?¨é??濾å®?å¾?æ¸?空å¯?件å?£ã??å¯?件å?£ç??æ¸?空å?ªç?¨å?¨ç?¶ä½¿ç?¨äº?ä»»ä½?ã??è½?å¯?è?³ã??é??濾å?¨å??"
 "ä½?ï¼?並ä¸?å?¨é??å??å??ä½?å¾?大ç´?ä¸?å??é??é??å§?é?²è¡?ã??"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Width of the message-list pane"
 msgstr "�件���格寬度"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Width of the message-list pane."
 msgstr "é?µä»¶æ¸?å?®çª?æ ¼ç??寬度ã??"
 
-#: ../mail/importers/elm-importer.c:176
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "輸å?¥ Elm è³?æ??"
 
-#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
-#: ../modules/mail/e-mail-shell-view.c:951
+#: ../mail/importers/elm-importer.c:339 ../mail/importers/pine-importer.c:415
+#: ../modules/mail/e-mail-shell-view.c:1045
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
-#: ../widgets/misc/e-send-options.c:499
+#: ../widgets/misc/e-send-options.c:500
 msgid "Mail"
 msgstr "�件"
 
-#: ../mail/importers/elm-importer.c:366
+#: ../mail/importers/elm-importer.c:380
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸��"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:381
 msgid "Import mail from Elm."
 msgstr "å¾? Elm å?¯å?¥é?µä»¶ã??"
 
-#: ../mail/importers/evolution-mbox-importer.c:116
-#: ../plugins/dbx-import/dbx-importer.c:226
+#: ../mail/importers/evolution-mbox-importer.c:127
+#: ../plugins/dbx-import/dbx-importer.c:227
 msgid "_Destination folder:"
 msgstr "ç?®ç??端è³?æ??夾(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/dbx-import/dbx-importer.c:232
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:133
+#: ../plugins/dbx-import/dbx-importer.c:233
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder"
 msgstr "é?¸æ??è³?æ??夾"
 
-#: ../mail/importers/evolution-mbox-importer.c:122
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/pst-import/pst-importer.c:316
 msgid "Select folder to import into"
 msgstr "é?¸å??è³?æ??夾ä¾?輸å?¥"
 
-#. Translators: Column header for a message subject
-#: ../mail/importers/evolution-mbox-importer.c:372
+#: ../mail/importers/evolution-mbox-importer.c:403
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "主�"
 
-#. Translators: Column header for a message From address
-#: ../mail/importers/evolution-mbox-importer.c:376
+#: ../mail/importers/evolution-mbox-importer.c:408
 msgctxt "mboxImp"
 msgid "From"
 msgstr "å¯?件è??"
 
-#: ../mail/importers/evolution-mbox-importer.c:412
-#: ../shell/e-shell-utils.c:251
+#: ../mail/importers/evolution-mbox-importer.c:452
+#: ../shell/e-shell-utils.c:253
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley �件信箱 (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:413
+#: ../mail/importers/evolution-mbox-importer.c:453
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "å?¯å?¥ Berkeley é?µä»¶ä¿¡ç®±æ ¼å¼?è³?æ??夾"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:65
 msgid "Importing mailbox"
 msgstr "正���信箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:150
-#: ../plugins/dbx-import/dbx-importer.c:554
-#: ../plugins/pst-import/pst-importer.c:452
-#: ../plugins/pst-import/pst-importer.c:558
+#: ../mail/importers/mail-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:568
+#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:587
 #, c-format
 msgid "Importing '%s'"
 msgstr "æ­£å?¨å?¯å?¥ã??%sã??"
 
-#: ../mail/importers/mail-importer.c:295
+#: ../mail/importers/mail-importer.c:308
 #, c-format
 msgid "Scanning %s"
 msgstr "æ??æ?? %s"
 
-#: ../mail/importers/pine-importer.c:221
+#: ../mail/importers/pine-importer.c:223
 msgid "Importing Pine data"
 msgstr "輸å?¥ç®¡é??è³?æ??"
 
-#: ../mail/importers/pine-importer.c:405
-#: ../modules/addressbook/addressbook-config.c:1006
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/addressbook/addressbook-config.c:1016
 msgid "Address Book"
 msgstr "é??è¨?é??"
 
-#: ../mail/importers/pine-importer.c:447
+#: ../mail/importers/pine-importer.c:462
 msgid "Evolution Pine importer"
 msgstr "Evolution 管é??輸å?¥å?¨"
 
-#: ../mail/importers/pine-importer.c:448
+#: ../mail/importers/pine-importer.c:463
 msgid "Import mail from Pine."
 msgstr "å¾? Pine å?¯å?¥é?µä»¶ã??"
 
@@ -12000,102 +11012,106 @@ msgstr "主�� %s"
 msgid "%s mailing list"
 msgstr "%s é?µä»¶å??表"
 
-#: ../mail/mail-autofilter.c:363
+#: ../mail/mail-autofilter.c:382
 msgid "Add Filter Rule"
 msgstr "æ?°å¢?é??濾å?¨è¦?å??"
 
-#. Translators: The first %s is name of the affected filter rule(s),
-#. the second %s is uri of the removed folder. For more than one filter
-#. rule is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-autofilter.c:450
+#. 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:480
 #, c-format
 msgid ""
-"The filter rule \"%s\" has been updated, because it used just removed "
-"folder\n"
+"The filter rule \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following filter rules\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"é??濾å?¨è¦?å??ã??%sã??å·²ç¶?ä¿®æ?¹ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 msgstr[1] ""
 "ä¸?å??é??濾å?¨è¦?å??\n"
-"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\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 "(Not Recommended)"
-msgstr "(�建議)"
-
-#: ../mail/mail-config.ui.h:3
-msgid "(Note: Requires restart of the application)"
-msgstr "(注æ??ï¼?é??è¦?é??æ?°å??å??æ­¤æ??ç?¨ç¨?å¼?)"
-
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "帳è??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
-msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)..."
+msgstr "å? å?¥æ?°ç??ç°½å??æª?(_W)â?¦"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:3
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使ç?¨æ­¤å¸³è??æ??ä¸?å®?å?¨å¤?é??ç??é?µä»¶ç°½å??(_W)"
 
-#: ../mail/mail-config.ui.h:8
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:5
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "å??許ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?(_M)"
+
+#: ../mail/mail-config.ui.h:6
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??ä¹?å? å¯?æ?¬èº«(_F)"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:7
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (_Cc) 給:"
+msgstr "ä¸?å®?å¯?é??å?¯æ?¬ (cc) 給(_S):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:8
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (_Bcc) 給:"
+msgstr "ä¸?å®?å¯?é??å¯?件å?¯æ?¬ (bcc) 給(_B):"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:9
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "å? å¯?æ??æ°¸é? ä¿¡ä»»æ??ç??é?°å??å??裡ç??é??é?°(_T)"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:10
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "ç?¶å?³é??å? å¯?é?µä»¶æ??æ°¸é? è?ªæ??å? å¯?(_M)"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "æ°¸é? è¦?æ±?è®?ä¿¡å??æ¢?(_D)"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:12
 msgid "Apply the same _view settings to all folders"
 msgstr "å?¨æ??æ??è³?æ??夾å¥?ç?¨ç?¸å??ç??檢è¦?設å®?å?¼(_V)"
 
-#: ../mail/mail-config.ui.h:16
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/mail-config.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1023
 msgid "Authentication"
 msgstr "é©?è­?"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "è?ªå??æ??å?¥è¡¨æ??符è??(_E)"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "å­?å??é??(_H):"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:17
 msgid "Ch_eck for Supported Types"
 msgstr "檢æ?¥æ?¯æ?´ç??é¡?å??(_E) "
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "以è?ªè¨?æ¨?頭檢æ?¥å??å?¾é?µä»¶(_S)"
 
+#: ../mail/mail-config.ui.h:19
+msgid "Check for new _messages on start"
+msgstr "å??å??æ??檢æ?¥æ?°é?µä»¶(_M)"
+
+#: ../mail/mail-config.ui.h:20
+msgid "Check for new messa_ges in all active accounts"
+msgstr "檢æ?¥æ??æ??使ç?¨ä¸­å¸³è??ç??æ?°é?µä»¶(_G)"
+
 #: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "檢æ?¥å?§é??é?µä»¶æ?¯å?¦ç?ºå??å?¾é?µä»¶(_M)"
@@ -12105,33 +11121,40 @@ msgid "Check spelling while I _type"
 msgstr "ç?¶æ??輸å?¥æ??檢æ?¥æ?¼å­?(_T)"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Checks incoming mail messages to be Junk"
-msgstr "檢æ?¥å?§é??ç??å??å?¾é?µä»¶è¨?æ?¯"
-
-#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "��(_A)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:24
 msgid "Clea_r"
 msgstr "��(_R)"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:25
 msgid "Color for _misspelled words:"
 msgstr "æ?¼é?¯å­?ç??é¡?è?²(_M):"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:26
 msgid "Composing Messages"
 msgstr "正�編輯�件"
 
-#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:27
+#: ../modules/plugin-manager/evolution-plugin-manager.c:157
 msgid "Configuration"
 msgstr "çµ?æ??"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:28
 msgid "Confirm _when expunging a folder"
 msgstr "å?ªé?¤è³?æ??夾æ??確èª?(_W)"
 
+#: ../mail/mail-config.ui.h:29
+msgid "Confirmations"
+msgstr "確�"
+
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:155
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "Date/Time Format"
+msgstr "æ?¥æ??/æ??å?»æ ¼å¼?"
+
 #: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "�設��"
@@ -12140,377 +11163,331 @@ msgstr "�設��"
 msgid "Default character e_ncoding:"
 msgstr "é ?設å­?å??編碼(_N):"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:34
 msgid "Delete Mail"
 msgstr "���件"
 
-#: ../mail/mail-config.ui.h:36
+#: ../mail/mail-config.ui.h:35
 msgid "Delete junk messages on e_xit"
 msgstr "é?¢é??æ??å?ªé?¤å??å?¾é?µä»¶(_X)"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:37
 msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ä½?簽章 [é ?設å?¼] (_U)"
+msgstr "ç?ºå¤?é??ç??é?µä»¶å? ä¸?æ?¸ä½?簽章 [é ?設å?¼](_U)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:38
 msgid "Displayed Message Headers"
 msgstr "顯示ç??é?µä»¶æª?é ­"
 
-#: ../mail/mail-config.ui.h:40
-msgid "Do not display messages when text si_ze exceeds"
-msgstr "ä¸?顯示é?µä»¶å?§æ??ç??æ??å­?大å°?ä¸?é??(_Z)"
-
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:39
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "è?¥å¯?件è??å?¨æ??ç??é??è¨?é??中就ä¸?è¦?å°?é?µä»¶æ¨?è¨?ç?ºå??å?¾é?µä»¶(_K)"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:40
 msgid "Do not quote"
 msgstr "ä¸?使ç?¨å¼?æ??"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:41
 msgid "Drafts _Folder:"
 msgstr "è??稿å?£(_F):"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:42
 msgid "Email _Address:"
 msgstr "é?»å­?é?µä»¶ä½?å??(_A):"
 
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:43
 msgid "Empty trash folders on e_xit"
 msgstr "é?¢é??æ??æ¸?空å??æ?¶ç­?è³?æ??夾(_X)"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Enable Magic S_pacebar"
-msgstr "å??ç?¨é­?è¡?空ç?½é?µ(_P)"
-
-#: ../mail/mail-config.ui.h:47
-msgid "Enable Sea_rch Folders"
-msgstr "å??ç?¨æ??å°?è³?æ??夾(_R)"
-
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:45
 msgid "Encry_ption certificate:"
 msgstr "å? å¯?æ??è­?(_P):"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:46
 msgid "Encrypt out_going messages (by default)"
 msgstr "å? å¯?å¤?é??ç??é?µä»¶ (é ?設å?¼)(_E)"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Fi_xed-width:"
-msgstr "��寬度(_X):"
+#: ../mail/mail-config.ui.h:47
+msgid "F_all back to threading messages by subject"
+msgstr "é??å??å?°ä¾?主æ?¨ç??ç?¸é??é?µä»¶(_A)"
 
-#: ../mail/mail-config.ui.h:52
-msgid "Fix_ed width Font:"
+#: ../mail/mail-config.ui.h:48
+msgid "Fix_ed Width Font:"
 msgstr "å?ºå®?寬度å­?å??(_E):"
 
-#: ../mail/mail-config.ui.h:53
-msgid "Font Properties"
-msgstr "å­?å??å?§å®¹"
-
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:49
 msgid "Format messages in _HTML"
 msgstr "å°?é?µä»¶æ ¼å¼?å??ç?º _HTML"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:50
 msgid "Full Nam_e:"
 msgstr "å?¨å??(_E):"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:52
 msgid "Group Reply goes only to mailing list, if possible"
 msgstr "å¦?æ??å?¯è?½ï¼?群çµ?å??è¦?å?ªç?¨æ?¼é??ä¿¡è«?å£?"
 
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:53
 msgid "HTML Messages"
 msgstr "HTML �件"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:54
 msgid "H_TTP Proxy:"
 msgstr "H_TTP 代ç??伺æ??å?¨:"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:55
 msgid "Headers"
 msgstr "�頭"
 
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:56
 msgid "Highlight _quotations with"
 msgstr "強調å¼?æ??ç?º(_Q)"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:57
 msgid "Ignore Reply-To: for mailing lists"
 msgstr "忽ç?¥é??ä¿¡è«?å£?ç?? Reply-To:"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:58
 msgid "Inline"
 msgstr "è¡?å?§"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:59
 msgid "Inline (Outlook style)"
 msgstr "���Outlook 風格�"
 
-#: ../mail/mail-config.ui.h:67
-msgid "KB"
-msgstr "KB"
-
-#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:61 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "�籤"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:62
 msgid "Languages Table"
 msgstr "��表"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:63
 msgid "Loading Images"
 msgstr "æ­£å?¨è¼?å?¥å??ç??"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:64
 msgid "Mail Headers Table"
 msgstr "�件�頭表"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:65
 msgid "Mailbox location"
 msgstr "信箱�置"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:66
 msgid "Message Display"
 msgstr "�件顯示"
 
-#: ../mail/mail-config.ui.h:74
-msgid "Message Fonts"
-msgstr "é?µä»¶å­?å??"
-
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:67
 msgid "Message Receipts"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:68
 msgid "No _Proxy for:"
 msgstr "æ²?æ??代ç??伺æ??å?¨çµ¦(_P):"
 
-#: ../mail/mail-config.ui.h:78
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
-msgstr "注æ??ï¼?å?¨é¦?次é?£ç·?ä¹?å??å°?ä¸?æ??æ??示æ?¨è¼¸å?¥å¯?碼"
-
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:70
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "å¦?æ??æ?¾å?°ç¬¦å??ç??è?ªè¨?å??å?¾é?µä»¶æ¨?é ­é??å??é?¸é ?å°±æ??被忽ç?¥ã??"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:71
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "é?¸æ??æ?§ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:73
 msgid "Or_ganization:"
 msgstr "å??é«?(_G):"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:74
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG é??é?° ID:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:75
 msgid "Pass_word:"
 msgstr "�碼(_W):"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Pick a color"
+msgstr "æ??é?¸é¡?è?²"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Port:"
 msgstr "���:"
 
-#: ../mail/mail-config.ui.h:87
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "ç?¶å?³é??ç??é?µä»¶å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??æ??顯示æ??示(_O)"
-
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:78
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "����� (PGP/GPG)"
 
-# zh_HK: msgstr "å??å?°å??å¿?é??"
-#: ../mail/mail-config.ui.h:90
-msgid "Printed Fonts"
-msgstr "å??å?°ç?¨å­?å??"
-
-#: ../mail/mail-config.ui.h:91
-msgid "Prompt when mailing list redirects private reply back to list"
-msgstr "ç?¶é??ä¿¡è«?å£?å°?ç§?人å??è¦?å°?å??è«?å£?æ??å??æ??é??"
-
-#: ../mail/mail-config.ui.h:92
-msgid "Prompt when sending private replies to mailing _list messages"
-msgstr "ç?¶ç§?人å??è¦?é??ä¿¡è«?å£?é?µä»¶æ??æ??示(_L)"
-
-#: ../mail/mail-config.ui.h:93
-msgid "Prompt when sending replies to _many recipients"
-msgstr "ç?¶å??è¦?給許å¤?æ?¶ä»¶è??æ??æ??示(_M)"
-
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:80
 msgid "Proxy Settings"
 msgstr "代ç??伺æ??å?¨è¨­å®?å?¼"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:81
 msgid "Quoted"
 msgstr "å¼?æ??"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:82
 msgid "Re_member password"
 msgstr "���碼(_M)"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:83
 msgid "Re_ply-To:"
 msgstr "å??è¦?å?°å??(_P):"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:84
 msgid "Remember _password"
 msgstr "���碼(_P)"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:85
+msgid "Replies and Forwards"
+msgstr "å??è¦?å??è½?å¯?"
+
+#: ../mail/mail-config.ui.h:86
 msgid "Required Information"
 msgstr "å¿?è¦?ç??è³?è¨?"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:87
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:88
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:89
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:90
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:92
 msgid "SSL is not supported in this build of Evolution"
 msgstr "æ­¤ Evolution ç??æ?¬ä¸?æ?¯æ?´ SSL"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:93
 msgid "S_earch for sender photograph only in local address books"
 msgstr "å?ªæ??å°?æ?¬å?°ç«¯é??è¨?é??中ç??å¯?件è??ç?¸ç??(_E)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:94
 msgid "S_elect..."
-msgstr "é?¸å??(_E)..."
+msgstr "é?¸å??(_E)â?¦"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:95
 msgid "S_end message receipts:"
 msgstr "å?³é??é?µä»¶å??æ¢?(_E):"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:96
 msgid "S_tandard Font:"
 msgstr "æ¨?æº?å­?å??(_T):"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:97
 msgid "Secure MIME (S/MIME)"
 msgstr "��� MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:113
-msgid "Select Drafts Folder"
-msgstr "é?¸æ??è??稿è³?æ??夾"
-
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:99
 msgid "Select HTML fixed width font"
 msgstr "é?¸æ?? HTML å?ºå®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Select HTML fixed width font for printing"
-msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?ºå®?寬度å­?å??"
-
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:100
 msgid "Select HTML variable width font"
 msgstr "é?¸æ?? HTML å?¯è®?寬度å­?å??"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Select HTML variable width font for printing"
-msgstr "é?¸æ??ç?¨æ?¼å??å?°ç?? HTML å?¯è®?寬度å­?å??"
-
-#: ../mail/mail-config.ui.h:118
-msgid "Select Junk Folder"
-msgstr "é?¸æ??å??å?¾é?µä»¶è³?æ??夾"
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "å¯?件è??ç?¸ç??"
 
-#: ../mail/mail-config.ui.h:119
-msgid "Select Sent Folder"
-msgstr "é?¸æ??å¯?件è³?æ??夾"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:103
+msgid "Sending a _private reply to a mailing list message"
+msgstr "å?³é??ç§?人å??è¦?å?°é??ä¿¡è«?å£?(_P)"
 
-#: ../mail/mail-config.ui.h:120
-msgid "Select Trash Folder"
-msgstr "é?¸æ??å??æ?¶ç­?è³?æ??夾"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:105
+msgid "Sending a message with an _empty subject line"
+msgstr "å?³é??æ²?æ??主æ?¨ç??é?µä»¶(_E)"
 
-#: ../mail/mail-config.ui.h:121
-msgid "Sender Photograph"
-msgstr "å¯?件è??ç?¸ç??"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:107
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "å?³é??å?ªæ??æ??å®?å¯?件å?¯æ?¬æ?¶ä»¶è??ç??é?µä»¶(_B)"
 
-#: ../mail/mail-config.ui.h:122
-msgid "Sending Mail"
-msgstr "å?³é??é?µä»¶"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:109
+msgid "Sending a reply to a large _number of recipients"
+msgstr "å?³é??æ??大é??æ?¶ä»¶è??ç??é?µä»¶(_N)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:110
 msgid "Sent _Messages Folder:"
 msgstr "å?³é??é?µä»¶è³?æ??夾(_M):"
 
-#: ../mail/mail-config.ui.h:124
-msgid "Sent and Draft Messages"
-msgstr "å¯?件è??è??稿é?µä»¶"
-
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "伺æ??å?¨è¦?æ±?é©?è­?(_V)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:112
 msgid "Server Configuration"
 msgstr "伺æ??å?¨çµ?æ??"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:113
 msgid "Server _Type:"
 msgstr "伺æ??å?¨é¡?å??(_T):"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:114
 msgid "Si_gning algorithm:"
 msgstr "簽章���(_G):"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_natures"
 msgstr "ç°½å??æª?(_N)"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:116
 msgid "Sig_ning certificate:"
 msgstr "ç°½å??æ??è­?(_N):"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:117
 msgid "Signat_ure:"
 msgstr "ç°½å??æª?(_U):"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:118
 msgid "Signatures"
 msgstr "ç°½å??æª?"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:119
 msgid "Signing _algorithm:"
 msgstr "簽章���(_A):"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:120
+msgid "Special Folders"
+msgstr "ç?¹æ®?è³?æ??夾"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:122
 msgid "Start _typing at the bottom on replying"
 msgstr "å??è¦?æ??å¾?åº?é?¨é??å§?輸å?¥(_T)"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:123
+msgid "Start up"
+msgstr "å??å??"
+
+#: ../mail/mail-config.ui.h:125
 msgid "T_ype:"
 msgstr "é¡?å??(_Y):"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??裡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºå·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:127
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12520,12 +11497,15 @@ msgstr ""
 "ç°½å??æª?ã??æ?¨æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
-#: ../mail/mail-config.ui.h:143
-msgid "Top Posting Option"
-msgstr "置�張貼��"
+#: ../mail/mail-config.ui.h:130
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr ""
+"è¦?é?¿å??é?»å­?é?µä»¶å?ºç?¾æ??å¤?æ??令人é?£å ªç??æ??æ³?ï¼?å?¨é?²è¡?ä¸?å??已核å??å??ä½?æ??è©¢å??使ç?¨è??以å??"
+"�確��"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:131
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12533,166 +11513,141 @@ msgstr ""
 "輸å?¥æ?³ç?¨ä¾?代表é??å??帳è??ç??å??稱ã??\n"
 "ä¾?å¦?ï¼?ã??å·¥ä½?ã??æ??ã??å??人ã??"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:133
 msgid "Us_ername:"
 msgstr "使ç?¨è??å??稱(_E):"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:134
 msgid "Use Authe_ntication"
 msgstr "使���(_N)"
 
-#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
-#: ../plugins/google-account-setup/google-contacts-source.c:286
-#: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
-msgid "User_name:"
+#: ../mail/mail-config.ui.h:135
+msgid "User _Name:"
 msgstr "使ç?¨è??å??稱(_N):"
 
-#: ../mail/mail-config.ui.h:149
-msgid "V_ariable-width:"
-msgstr "��寬度(_A):"
-
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:136
 msgid "_Add Signature"
 msgstr "å? å?¥ç°½å??æª?(_A)"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:137
 msgid "_Always load images from the Internet"
 msgstr "ä¸?å®?è?ªç¶²è·¯ä¸?è¼?å??ç??(_A)"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:138
 msgid "_Authentication Type"
 msgstr "é©?è­?é¡?å??(_A)"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:139
 msgid "_Default junk plugin:"
 msgstr "é ?設å??å?¾é?µä»¶å¤?æ??ç¨?å¼?(_D):"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:140
 msgid "_Direct connection to the Internet"
 msgstr "ç?´æ?¥é?£ç·?å?°ç¶²é??網路(_D)"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:141
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "ä¸?簽署æ??è­°é??è«? (ç?¸å®¹æ?¼ _Outlook)"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:142
 msgid "_Forward style:"
 msgstr "����(_F):"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:143
 msgid "_Junk Folder:"
 msgstr "å??å?¾é?µä»¶è³?æ??夾(_J):"
 
-#: ../mail/mail-config.ui.h:158
-msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:144
+msgid "_Keep signature above the original message on replying"
 msgstr "å??ä¿¡æ??ä¿?ç??å??å§?é?µä»¶ç??ç°½å??(_K)"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:145
 msgid "_Languages"
 msgstr "��(_L)"
 
-#: ../mail/mail-config.ui.h:160
-msgid "_Load images in messages from contacts"
-msgstr "è¼?å?¥ç?±é?£çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
+#: ../mail/mail-config.ui.h:146
+msgid "_Load images only in messages from contacts"
+msgstr "å?ªè¼?å?¥ç?±é?£çµ¡äººå¯?å?ºé?µä»¶ä¸­ç??å??ç??(_L)"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:147
 msgid "_Lookup in local address book only"
 msgstr "å?ªå?¨æ?¬å?°é??è¨?é??æ?¥è©¢(_L)"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:148
 msgid "_Make this my default account"
 msgstr "設ç?ºæ??ç??é ?設帳è??(_M)"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:149
 msgid "_Manual proxy configuration:"
 msgstr "æ??å??代ç??伺æ??å?¨çµ?æ??(_M):"
 
-#: ../mail/mail-config.ui.h:164
-msgid "_Mark messages as read after"
-msgstr "�示�件�已���(_M)"
-
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:151
 msgid "_Never load images from the Internet"
 msgstr "ä¸?å®?ä¸?è?ªç¶²è·¯ä¸?è¼?å??ç??(_N)"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:152
 msgid "_Path:"
 msgstr "路�(_P):"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:153
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "ç?¶å?³é?? HTML é?µä»¶çµ¦ä¸?æ?³æ?¶å?°é??é¡?é?µä»¶ç??é?£çµ¡äººæ??顯示æ??示(_P)"
 
-#: ../mail/mail-config.ui.h:169
-msgid "_Prompt when sending messages with an empty subject line"
-msgstr "ç?¶å?³é??æ²?æ??主æ?¨ç??é?µä»¶æ??顯示æ??示(_P)"
-
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:154
 msgid "_Reply style:"
 msgstr "å??è¦?æ?¹å¼?(_R):"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:155
 msgid "_Script:"
 msgstr "�令稿(_S):"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:156
 msgid "_Secure HTTP Proxy:"
 msgstr "å®?å?¨ HTTP 代ç??伺æ??å?¨(_S):"
 
-#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "伺æ??å?¨(_S):"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:176
-msgid "_Show image animations"
-msgstr "顯示å??ç?«å??ç??(_S)"
+#: ../mail/mail-config.ui.h:160
+msgid "_Show animated images"
+msgstr "æ?­æ?¾å??ç?«å??ç??(_S)"
 
-#: ../mail/mail-config.ui.h:177
+#: ../mail/mail-config.ui.h:161
 msgid "_Show the photograph of sender in the message preview"
 msgstr "å?¨é?µä»¶é ?覽顯示å¯?件è??ç?¸ç??(_S)"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:179
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "縮� _To / Cc / Bcc �頭�"
-
-#: ../mail/mail-config.ui.h:180
+#: ../mail/mail-config.ui.h:162
 msgid "_Trash Folder:"
 msgstr "å??æ?¶ç­?è³?æ??夾(_T):"
 
-#: ../mail/mail-config.ui.h:181
+#: ../mail/mail-config.ui.h:163
 msgid "_Use Secure Connection:"
 msgstr "使�����(_U):"
 
-#: ../mail/mail-config.ui.h:182
+#: ../mail/mail-config.ui.h:164
 msgid "_Use system defaults"
 msgstr "使�系統�設�(_U)"
 
-#: ../mail/mail-config.ui.h:183
+#: ../mail/mail-config.ui.h:165
 msgid "_Use the same fonts as other applications"
 msgstr "使ç?¨è??å?¶ä»?æ??ç?¨ç¨?å¼?ç?¸å??ç??å­?å??(_U)"
 
-#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/mail-config.ui.h:166 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
-#: ../mail/mail-config.ui.h:186
-msgid "addresses"
-msgstr "å?°å??"
-
-#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:167 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:188
+#: ../mail/mail-config.ui.h:168
 msgid "color"
 msgstr "�彩"
 
-#: ../mail/mail-config.ui.h:189
+#: ../mail/mail-config.ui.h:169
 msgid "description"
 msgstr "æ??è¿°"
 
@@ -12717,78 +11672,58 @@ msgid "Co_mpleted"
 msgstr "å·²å®?æ??(_M)"
 
 #: ../mail/mail-dialogs.ui.h:6
-msgid "Collapse _all"
-msgstr "���起(_A)"
-
-#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "��簽章"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Do Not Forward"
 msgstr "����"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "E_xpand all"
-msgstr "å?¨é?¨å±?é??(_X)"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Encryption"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:11
-msgid "Folder Subscriptions"
-msgstr "è³?æ??夾è¨?é?±"
-
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Follow-Up"
 msgstr "è·?é?¨"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "For Your Information"
 msgstr "給æ?¨ç??è³?è¨?"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Forward"
 msgstr "��"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:12
 msgid "License Agreement"
 msgstr "æ??æ¬?å??ç´?"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "ä¸?é??è¦?å??æ??"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "å??è¦?å?¨é?¨"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "檢�"
 
-#: ../mail/mail-dialogs.ui.h:22
-msgid "S_erver:"
-msgstr "伺æ??å?¨(_E):"
-
-#: ../mail/mail-dialogs.ui.h:23
-msgid "S_how only items containing:"
-msgstr "å?ªé¡¯ç¤ºé ?ç?®å?«æ??(_S):"
-
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Search Folder Sources"
 msgstr "æ??å°?è³?æ??夾ä¾?æº?"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Security Information"
 msgstr "�����"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Specific folders"
 msgstr "æ??å®?ç??è³?æ??夾"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:22
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12796,334 +11731,251 @@ msgstr ""
 "æ?¨é?¸æ??è¦?è·?é?¨ç??é?µä»¶å·²å?¨ä¸?é?¢å??å?ºã??\n"
 "è«?å¾?ã??æ¨?å¹?ã??é?¸å?®ä¸­é?¸æ??è·?é?¨ç??å??ä½?ã??"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:24
 msgid "_Accept License"
 msgstr "æ?¥å??æ??æ¬?(_A)"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Due By:"
 msgstr "å?°æ??æ?¼(_D):"
 
-#: ../mail/mail-dialogs.ui.h:31
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Flag:"
 msgstr "��(_F):"
 
-#: ../mail/mail-dialogs.ui.h:32
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Tick this to accept the license agreement"
 msgstr "é?¸å??æ­¤é ?ä¾?æ?¥å??æ??æ¬?å??ç´?(_T)"
 
-#: ../mail/mail-folder-cache.c:783
+#: ../mail/mail-folder-cache.c:792
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: ../mail/mail-ops.c:84
+#: ../mail/mail-ops.c:85
 msgid "Filtering Selected Messages"
 msgstr "é??濾é?¸æ??ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:245
+#: ../mail/mail-ops.c:226
 msgid "Fetching Mail"
 msgstr "���件"
 
-#: ../mail/mail-ops.c:592
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "ç?¡æ³?å¥?ç?¨å¤?å¯?é??濾å?¨ï¼?%s"
-
-#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"ç?¡æ³?é??å? è?³ %sï¼?%s\n"
-"æ?¹é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ã??"
-
-#: ../mail/mail-ops.c:654
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ç?¡æ³?é??å? è?³æ?¬å?°ã??å¯?件å?£ã??è³?æ??夾ï¼?%s"
-
-#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
-msgid "Sending message"
-msgstr "æ­£å?¨å?³é??é?µä»¶"
-
-#: ../mail/mail-ops.c:782
+#: ../mail/mail-ops.c:785
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "æ­£å?¨å?³é??é?µä»¶ %d / %d"
 
-#: ../mail/mail-ops.c:826
+#: ../mail/mail-ops.c:831
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "ç?¡æ³?å?³é??第 %d å??é?µä»¶ (å?± %d å??)"
 
-#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
+#: ../mail/mail-ops.c:833 ../mail/mail-send-recv.c:788
 msgid "Canceled."
 msgstr "å·²å??æ¶?ã??"
 
-#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:835 ../mail/mail-send-recv.c:790
 msgid "Complete."
 msgstr "å®?æ??ã??"
 
-#: ../mail/mail-ops.c:938
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "å?²å­?é?µä»¶å?°è³?æ??夾ã??%sã??"
-
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "å°?é?µä»¶ç§»å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1018
+#: ../mail/mail-ops.c:941
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "å°?é?µä»¶è¤?製å?°ã??%sã??"
 
-#: ../mail/mail-ops.c:1127
+#: ../mail/mail-ops.c:1062
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "æ??æ??ã??%sã??å?§ç??è³?æ??夾"
 
-#: ../mail/mail-ops.c:1235
+#: ../mail/mail-ops.c:1178
 msgid "Forwarded messages"
 msgstr "å·²è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-ops.c:1276
-#, c-format
-msgid "Opening folder '%s'"
-msgstr "é??å??è³?æ??夾ã??%sã??"
-
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1295
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "å??å¾?è³?æ??夾ã??%sã??ç??ç?¨é??é??é¡?è³?è¨?"
 
-#: ../mail/mail-ops.c:1414
+#: ../mail/mail-ops.c:1370
 #, c-format
 msgid "Opening store '%s'"
 msgstr "é??å??貯è??ã??%sã??"
 
-#: ../mail/mail-ops.c:1485
+#: ../mail/mail-ops.c:1446
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "移é?¤è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1609
+#: ../mail/mail-ops.c:1585
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "æ­£å?¨è²¯è??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1672
+#: ../mail/mail-ops.c:1654
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "æ¸?空å??å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1673
+#: ../mail/mail-ops.c:1655
 #, c-format
 msgid "Storing account '%s'"
 msgstr "å?²å­?帳è?? '%s'"
 
-#: ../mail/mail-ops.c:1727
+#: ../mail/mail-ops.c:1713
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "é??æ?°æ?´ç??è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1767
+#: ../mail/mail-ops.c:1877
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "æ­£å?¨å?ªå?»è³?æ??夾ã??%sã??"
 
-#: ../mail/mail-ops.c:1812
+#: ../mail/mail-ops.c:1949
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "æ¸?空ã??%sã??ç??å??æ?¶ç­?"
 
-#: ../mail/mail-ops.c:1813
+#: ../mail/mail-ops.c:1950
 msgid "Local Folders"
 msgstr "æ?¬æ©?è³?æ??夾"
 
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2123
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "å??å?? %d å°?é?µä»¶"
 msgstr[1] "å??å?? %d å°?é?µä»¶"
 
-#: ../mail/mail-ops.c:2105
+#: ../mail/mail-ops.c:2216
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "�� %d ��件"
 msgstr[1] "�� %d ��件"
 
-#: ../mail/mail-ops.c:2192
+#: ../mail/mail-ops.c:2312
 #, c-format
 msgid "Error saving messages to: %s:\n"
 msgstr "å?²å­?é?µä»¶å?°ï¼?%s æ??ç?¼ç??é?¯èª¤ï¼?\n"
 
-#: ../mail/mail-ops.c:2265
-msgid "Saving attachment"
-msgstr "å?²å­?é??件"
-
-#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
+#: ../mail/mail-ops.c:2387
 #, c-format
-msgid ""
-"Cannot create output file: %s:\n"
-" %s"
-msgstr ""
-"��建�輸����%s�\n"
-" %s"
+msgid "Preparing account '%s' for offline"
+msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
 
-#: ../mail/mail-ops.c:2310
-msgid "Could not write data: "
-msgstr "ç?¡æ³?寫å?¥è³?æ??ï¼?"
+#: ../mail/mail-ops.c:2478
+msgid "Checking Service"
+msgstr "檢æ?¥æ??å??"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2558
 #, c-format
-msgid "Disconnecting from '%s'"
-msgstr "中æ?·è??ã??%sã??ç??é?£ç·?"
+msgid "Disconnecting %s"
+msgstr "正�中� %s"
 
-#: ../mail/mail-ops.c:2454
+#: ../mail/mail-ops.c:2615
 #, c-format
-msgid "Reconnecting to '%s'"
-msgstr "é??æ?°é?£ç·?å?°ã??%sã??"
+msgid "Removing attachments"
+msgstr "æ­£å?¨ç§»é?¤é??件"
 
-#: ../mail/mail-ops.c:2550
+#: ../mail/mail-ops.c:2662
 #, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
+msgid "File \"%s\" has been removed."
+msgstr "æª?æ¡?ã??%sã??å·²ç¶?被移é?¤ã??"
 
-#: ../mail/mail-ops.c:2636
-msgid "Checking Service"
-msgstr "檢æ?¥æ??å??"
-
-#: ../mail/mail-send-recv.c:184
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
-msgstr "æ­£å?¨å??æ¶?..."
+msgstr "æ­£å?¨å??æ¶?â?¦"
 
-#: ../mail/mail-send-recv.c:424
+#: ../mail/mail-send-recv.c:435
 msgid "Send & Receive Mail"
 msgstr "å?³é??è??æ?¥æ?¶é?µä»¶"
 
-#: ../mail/mail-send-recv.c:441
+#: ../mail/mail-send-recv.c:452
 msgid "Cancel _All"
 msgstr "å?¨é?¨å??æ¶?(_A)"
 
-#: ../mail/mail-send-recv.c:551
+#: ../mail/mail-send-recv.c:569
 msgid "Updating..."
-msgstr "��中..."
+msgstr "��中�"
 
-#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
+#: ../mail/mail-send-recv.c:569 ../mail/mail-send-recv.c:653
 msgid "Waiting..."
-msgstr "正���..."
+msgstr "正����"
 
-#: ../mail/mail-send-recv.c:866
+#: ../mail/mail-send-recv.c:903
 #, c-format
 msgid "Checking for new mail"
 msgstr "檢���件"
 
-#: ../mail/mail-session.c:225
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "è«?輸å?¥ %s æ??é??ç??å¯?èª?"
-
-#: ../mail/mail-session.c:227
-msgid "Enter Passphrase"
-msgstr "輸���"
-
-#: ../mail/mail-session.c:230
-#, c-format
-msgid "Enter Password for %s"
-msgstr "è«?輸å?¥ %s æ??é??ç??å¯?碼"
-
-#: ../mail/mail-session.c:232
-msgid "Enter Password"
-msgstr "輸��碼"
-
-#: ../mail/mail-session.c:277
-#, c-format
-msgid "User canceled operation."
-msgstr "使ç?¨è??å·²å??æ¶?æ??ä½?ã??"
-
-#: ../mail/mail-session.c:724
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "æ²?æ??æ??ä¾?ç?®ç??å?°ä½?å??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/mail-session.c:733
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "æ?¾ä¸?å?°å?¯ä½¿ç?¨ç??帳è??ï¼?é?µä»¶ç??è½?å¯?å·²ç¶?å??æ¶?ã??"
-
-#: ../mail/mail-tools.c:128
+#: ../mail/mail-tools.c:69
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "ç?¡æ³?建ç«?æ?«å­?åº?å??ç?®é??ã??%sã??ï¼?%s"
 
-#: ../mail/mail-tools.c:161
+#: ../mail/mail-tools.c:102
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "æ­£å?¨å??試移å??é?? mbox ä¾?æº?ã??%sã??ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:273
+#: ../mail/mail-tools.c:214
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "è½?å¯?ç??é?µä»¶ - %s"
 
-#: ../mail/mail-tools.c:275
+#: ../mail/mail-tools.c:216
 msgid "Forwarded message"
 msgstr "è½?å¯?ç??é?µä»¶"
 
-#: ../mail/mail-tools.c:318
-#, c-format
-msgid "Invalid folder: '%s'"
-msgstr "ç?¡æ??ç??è³?æ??夾ï¼?ã??%sã??"
-
-#: ../mail/mail-vfolder.c:85
+#: ../mail/mail-vfolder.c:86
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設å®?æ??å°?è³?æ??夾ï¼? %s"
 
-#: ../mail/mail-vfolder.c:224
+#: ../mail/mail-vfolder.c:235
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "æ?´æ?° '%s:%s' ç??æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:231
+#: ../mail/mail-vfolder.c:242
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "æ?´æ?° '%s' ç??æ??å°?è³?æ??夾"
 
-#. Translators: The first %s is name of the affected search folder(s),
-#. the second %s is uri of the removed folder. For more than one search
-#. folder is each of them on a separate line, with four spaces in front
-#. of its name, without quotes.
-#: ../mail/mail-vfolder.c:674
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../mail/mail-vfolder.c:709
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been updated, because it used just removed "
+"The Search Folder \"%s\" has been modified to account for the deleted "
 "folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
-"%s have been updated, because they used just removed folder\n"
+"%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
-"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"æ??å°?è³?æ??夾ã??%sã??å·²ç¶?ä¿®æ?¹ï¼?å? ç?ºå®?å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 msgstr[1] ""
 "ä¸?å??æ??å°?è³?æ??夾\n"
-"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??移é?¤ç??è³?æ??夾\n"
+"%s å·²ç¶?æ?´æ?°ï¼?å? ç?ºå®?å??å?ªç?¨å?¨å??å??å?ªé?¤ç??è³?æ??夾\n"
 "ã??%sã??ã??"
 
-#: ../mail/mail-vfolder.c:1182
+#: ../mail/mail-vfolder.c:1273
 msgid "Edit Search Folder"
 msgstr "編輯æ??å°?è³?æ??夾"
 
-#: ../mail/mail-vfolder.c:1287
+#: ../mail/mail-vfolder.c:1380
 msgid "New Search Folder"
 msgstr "æ?°å¢?æ??å°?è³?æ??夾"
 
@@ -13314,86 +12166,113 @@ msgstr ""
 "è«?檢æ?¥å¯?碼æ?¼å­?æ?¯å?¦æ­£ç¢ºã??è«?注æ??ï¼?å¾?å¤?å¯?碼å??å??大å°?寫ï¼?æ?¨å?¯è?½æ??äº? Caps Lockã??"
 
 #: ../mail/mail.error.xml.h:43
+msgid "Close message window."
+msgstr "é??é??é?µä»¶è¦?çª?ã??"
+
+#: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
 msgstr "ç?¡æ³?å?²å­?簽章æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
+msgid ""
+"Default local store has been changed from mbox to maildir format. Do you "
+"want to migrate now ?\n"
+"\n"
+"A mbox account will be created to preserve the old mbox folders. You can "
+"delete it after ensuring the data is safely migrated. Please make sure there "
+"is enough space if you choose to migrate."
+msgstr ""
+"é ?設ç??æ?¬å?°ç«¯å?²å­?å??å·²ç¶?å¾? mbox æ?¹è®?ç?º maildir æ ¼å¼?ã??æ?¨ç?¾å?¨æ?¯å?¦è¦?è½?æ??ï¼?\n"
+"\n"
+"ç¨?å¼?æ??建ç«?ä¸?å?? mbox 帳è??ä¾?ä¿?ç??è??ç?? mbox è³?æ??夾ã??æ?¨å?¯ä»¥å?¨ç¢ºèª?è³?æ??é?½å®?å?¨è½?æ??å¾?"
+"å??å°?å®?å?ªé?¤ã??å¦?æ??æ?¨é?¸æ??è½?æ??ï¼?è«?確å®?æ??足夠ç??空é??ã??"
+
+#: ../mail/mail.error.xml.h:48
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "æ?¯å?¦å?ªé?¤æ??å°?è³?æ??夾ã??{0}ã??中ç??é?µä»¶ï¼?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 msgid "Do _Not Disable"
 msgstr "ä¸?è¦?å??ç?¨(_N)"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Do _Not Send"
 msgstr "ä¸?è¦?å?³é??(_N)"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 msgid "Do _Not Synchronize"
 msgstr "ä¸?è¦?å??æ­¥(_N)"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "æ?¯å?¦è¦?å?¨æ?¬å?°ç«¯å??æ­¥é?£äº?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you want to mark all messages as read?"
 msgstr "æ?¯å?¦è¦?å°?å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ï¼?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Do you wish to save your changes?"
 msgstr "è¦?å?²å­?æ??å??ç??è®?æ?´ï¼?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Enter password."
 msgstr "輸å?¥å¯?碼ã??"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error loading filter definitions."
 msgstr "è¼?å?¥é??濾å?¨å®?義æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while performing operation."
 msgstr "å?·è¡?ä½?業æ??ï¼?ç?¼ç??é?¯èª¤ã??"
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid "Error while {0}."
 msgstr "ç?¶ {0} æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
+msgid "Failed to unsubscribe from folder."
+msgstr "ç?¡æ³?å??æ¶?è¨?é?±è³?æ??夾ã??"
+
+#: ../mail/mail.error.xml.h:64
 msgid "File exists but cannot overwrite it."
 msgstr "æª?æ¡?å­?å?¨ä½?ç?¡æ³?è¦?寫ã??"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "File exists but is not a regular file."
 msgstr "æª?æ¡?å­?å?¨ä½?ä¸?æ?¯ä¸?è?¬æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:61
+#. Translators: {0} is replaced with a folder name
+#: ../mail/mail.error.xml.h:67
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "è³?æ??夾ã??{0}ã??並æ?ªå??å?«ä»»ä½?é??è¤?ç??é?µä»¶ã??"
+
+#: ../mail/mail.error.xml.h:68
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "å¦?æ??æ?¨é?¸æ??ç¹¼çº?ï¼?å°?ç?¡æ³?復å??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "å¦?æ??æ?¨å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹å??å­?è³?æ??夾å?§å®¹æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:70
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "å¦?æ??æ?¨é?¸æ??å?ªé?¤è³?æ??夾ï¼?å®?ç??æ??æ??å?§å®¹æ??æ°¸é? æ¶?失ã??"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:71
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?æ??æ??ç??代ç??伺æ??å?¨å¸³è??æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13401,33 +12280,33 @@ msgstr ""
 "å¦?æ??ç¹¼çº?ï¼?該帳è??ç??è³?è¨?以å??\n"
 "å®?æ??æ??ç??代ç??伺æ??å?¨æ??æ°¸é? å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:74
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "å¦?æ??ç¹¼çº?ï¼?帳è??è³?è¨?æ??æ°¸ä¹?å?ªé?¤ã??"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:75
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "å¦?æ??æ?¨é?¸æ??çµ?æ??ï¼?å??次å??å?? Evolution ä¹?å??ï¼?ä¸?æ??å?³é??é??äº?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:76
 msgid "Ignore"
 msgstr "忽�"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid "Invalid authentication"
 msgstr "ç?¡æ??ç??é©?è­?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:78
 msgid "Mail Deletion Failed"
 msgstr "å?ªé?¤é?µä»¶å¤±æ??"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:79
 msgid "Mail filters automatically updated."
 msgstr "é?µä»¶é??濾å?¨è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
 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 "
@@ -13438,27 +12317,39 @@ msgstr ""
 "äº?æ­¤æª?é ­ï¼?æ??æ°¸é? å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
 "è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã??"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:81
+msgid "Migrate local mbox folders to maildir"
+msgstr "å°?æ?¬å?°ç«¯ mbox è³?æ??夾è½?æ??ç?º maildir"
+
+#: ../mail/mail.error.xml.h:82
 msgid "Missing folder."
 msgstr "é?ºæ¼?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
+msgid "N_ever"
+msgstr "永�(_E)"
+
+#: ../mail/mail.error.xml.h:85
+msgid "No duplicate messages found."
+msgstr "æ?¾ä¸?å?°é??è¤?ç??é?µä»¶ã??"
+
+#: ../mail/mail.error.xml.h:86
 msgid "No sources selected."
 msgstr "æ?ªé?¸å??ä¾?æº?ã??"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:87
 msgid "Opening too many messages at once may take a long time."
 msgstr "ä¸?次é??å??é??å¤?é?µä»¶å?¯è?½æ??è?±è²»è¨±å¤?æ??é??ã??"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:88
 msgid "Please check your account settings and try again."
 msgstr "è«?檢æ?¥å¸³è??設å®?並å??試ä¸?次ã??"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:89
 msgid "Please enable the account or send using another account."
 msgstr "è«?å??ç?¨è©²å¸³è??æ??使ç?¨å?¶ä»?帳è??å?³é??ã??"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -13466,7 +12357,7 @@ msgstr ""
 "è«?å?¨ã??æ?¶ä»¶è??ï¼?ã??æ¬?ä½?輸å?¥ä¸?å??æ??æ??ç??é?»å­?é?µä»¶å?°å??ã??æ?¨å?¯ä»¥æ??ä¸?ä¸?輸å?¥æ?¹å¡?æ??é??ç??"
 "ã??æ?¶ä»¶è??ï¼?ã??æ??é??ï¼?æ??å°?é?»å­?é?µä»¶å?°å??ã??"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13475,59 +12366,63 @@ msgstr ""
 "è«?確å®?以ä¸?æ?¶ä»¶è??å¸?æ??並ä¸?å?¯ä»¥æ?¥æ?¶ HTML é?»å­?é?µä»¶ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:93
 msgid "Please provide an unique name to identify this signature."
 msgstr "è«?輸å?¥å?¯ä¾?辨è­?é??å??ç°½å??æª?ç??ç?¨ç?¹å??稱ã??"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:94
 msgid "Please wait."
 msgstr "è«?ç¨?å??ã??"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:95
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "è½?移è??é?µä»¶è³?æ??夾ã??{0}ã??ç?¼ç??å??é¡?ã??"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:96
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "å??伺æ??å?¨æ?¥è©¢æ?¯æ?´ç??é©?è­?æ¼?ç®?æ³?æ¸?å?®ã??"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:97
 msgid "Read receipt requested."
 msgstr "è¦?æ±?è®?ä¿¡å??æ¢?ã??"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:98
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??以å??å®?æ??æ??ç??å­?è³?æ??夾?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:99
 msgid "Really delete folder \"{0}\"?"
 msgstr "確å®?è¦?å?ªé?¤è³?æ??夾ã??{0}ã??ï¼?"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:100
+msgid "Remove duplicate messages?"
+msgstr "æ?¯å?¦ç§»é?¤é??è¤?ç??é?µä»¶ï¼?"
+
+#: ../mail/mail.error.xml.h:101
 msgid "Reply _Privately"
 msgstr "ç§?人å??è¦?(_P)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:104
 msgid "Search Folders automatically updated."
 msgstr "æ??å°?è³?æ??夾è?ªå??æ?´æ?°ã??"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:105
 msgid "Send private reply?"
 msgstr "æ?¯å?¦å?³é??ç§?人å??è¦?ï¼?"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:106
 msgid "Send reply to all recipients?"
 msgstr "æ?¯å?¦å??è¦?給æ??æ??ç??æ?¶ä»¶è??ï¼?"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:107
 msgid "Signature Already Exists"
 msgstr "ç°½å??æª?å·²ç¶?å­?å?¨"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:108
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æ?¯å?¦å??æ­¥è³?æ??夾以ä¾?é?¢ç·?使ç?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -13535,7 +12430,7 @@ msgstr ""
 "Evolution é??è¦?系統è³?æ??夾æ??è?½æ­£å¸¸ä½?業ï¼?è??ä¸?該è³?æ??夾ä¸?å?¯ä»¥é??æ?°å?½å??ã??移å??æ??å?ª"
 "é?¤ã??"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13550,7 +12445,7 @@ msgstr ""
 "æ­¤æª?é ­ï¼?æ??å??示é?µä»¶ä¸­æ??æ??ç??æ?¶ä»¶è??ã??è¦?é?¿å??æ­¤æ??æ³?ï¼?æ?¨æ??該è?³å°?æ?°å¢?ä¸?å??ã??æ?¶ä»¶"
 "è??ï¼?ã??æ??ã??å?¯æ?¬ï¼?ã??æ?¶ä»¶è??ã?? "
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13558,7 +12453,7 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13566,11 +12461,11 @@ msgstr ""
 "ä¸?å??æ?¶ä»¶è??ç?¡æ³?辨èª?ç?ºæ??æ??ç??é?µä»¶ä½?å??ï¼?\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:118
 msgid "The script file must exist and be executable."
 msgstr "å?½ä»¤ç¨¿æª?æ¡?å¿?é ?å­?å?¨è??ä¸?å?¯ä»¥å?·è¡?ã??"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13578,60 +12473,60 @@ msgstr ""
 "æ­¤è³?æ??夾å?¯è?½å·²ç¶?è?ªå??æ?°å¢?ã??\n"
 "é??è¦?æ??ï¼?è«?移è?³æ??å°?è³?æ??夾編輯å?¨ï¼?以æ??å??æ?¹å¼?æ?°å¢?å®?ã??"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "å? ç?ºæ?¨æ²?æ??å??ç?¨é?¸æ??ç?¨ä¾?å¯?é??ç??帳è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "å? ç?ºæ?¨æ²?æ??æ??å®?ä»»ä½?æ?¶ä»¶è??ï¼?æ??以ç?¡æ³?å?³é??æ­¤é?µä»¶"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺æ??å?¨ä¸?æ?¯æ?´æ­¤é©?è­?é¡?å??è??ä¸?æ ¹æ?¬ä¸?æ?¯æ?´é©?è­?ã??"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:124
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已ç¶?è®?æ?´ï¼?ä½?å°?æ?ªå?²å­?ã??"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "é??æ??å°?æ¨?示é?¸å®?ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:126
 msgid "This will mark all messages as read in the selected folder."
 msgstr "é??æ??å°?æ¨?示é?¸å??ç??è³?æ??夾中æ??æ??é?µä»¶ç?ºå·²é?±è®?ã??"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:127
 msgid "Unable to connect to the GroupWise server."
 msgstr "ç?¡æ³?é?£ç·?è?³ GroupWise 伺æ??å?¨ã??"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:128
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "ç?¡æ³?é??å??此帳è??ç??è??稿è³?æ??夾ã??æ?¯å?¦ä½¿ç?¨ç³»çµ±è??稿è³?æ??夾代æ?¿ï¼?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:129
 msgid "Unable to read license file."
 msgstr "ç?¡æ³?è®?å??æ??æ¬?æª?æ¡?ã??"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:130
 msgid "Use _Default"
 msgstr "使��設�(_D)"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:131
 msgid "Use default drafts folder?"
 msgstr "使ç?¨é ?設ç??è??稿è³?æ??夾ï¼?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Warning: Deleting messages from a Search Folder will delete the actual "
 "message from one of your local or remote folders.\n"
@@ -13640,7 +12535,11 @@ msgstr ""
 "è­¦å??ï¼?å¾?æ??å°?è³?æ??夾中å?ªé?¤é?µä»¶å°?æ??è?ªæ?¨ç??æ?¬å?°æ??é? ç«¯è³?æ??夾å?ªé?¤å¯¦é??ç??é?µä»¶ã??\n"
 "æ?¯å?¦ç¢ºå®?è¦?é??麼å??ï¼?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:134
+msgid "Would you like to close the message window?"
+msgstr "æ?¨æ?³è¦?é??é??é?µä»¶è¦?çª?å??ï¼?"
+
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13649,7 +12548,7 @@ msgstr ""
 "æ?¨æ­£ä»¥ç§?人å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯é??å??é??ä¿¡è«?å£?å??試å°?æ?¨ç??å??ä¿¡å°?å??è«?å£?ã??æ?¨"
 "確å®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13658,37 +12557,37 @@ msgstr ""
 "æ?¨æ­£å?¨å??è¦?ä¾?è?ªé??ä¿¡è«?å£?ç??é?µä»¶ï¼?ä½?æ?¯æ?¨ä»¥ç§?人å??è¦?æ?¹å¼?å¯?給å??å¯?件è??ï¼?è??é??å¯?å??é??ä¿¡"
 "è«?å£?ã??æ?¨ç¢ºå®?è¦?ç¹¼çº?å??ï¼?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:137
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "æ?¨æ­£å?¨å??è¦?ç??信件æ??å?³é??給許å¤?æ?¶ä»¶è??ã??æ?¨ç¢ºå®?å??信給ä»?å??å?¨é?¨ï¼?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:138
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æ?¨æ²?æ??足夠ç??æ¬?é??å?ªé?¤æ­¤å°?é?µä»¶ã??"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:139
 msgid "You have not filled in all of the required information."
 msgstr "æ?¨æ²?æ??å¡«å?¥æ??æ??å¿?é ?ç??è³?è¨?ã??"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:140
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æ?¨æ??æ?ªå¯?å?ºç??é?µä»¶ï¼?æ?¨ç?¡è«?å¦?ä½?é?½è¦?é?¢é??å??ï¼?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:141
 msgid "You may not create two accounts with the same name."
 msgstr "æ?¨ä¸?è?½ç?¨ç?¸å??ç??å??稱建ç«?å?©å??帳è??ã??"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:142
 msgid "You must name this Search Folder."
 msgstr "æ?¨å¿?é ?å?½å??æ­¤æ??å°?è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:143
 msgid "You must specify a folder."
 msgstr "æ?¨å¿?é ?æ??å®?ä¸?å??è³?æ??夾ã??"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13697,128 +12596,144 @@ msgstr ""
 "æ?¨å¿?é ?è?³å°?æ??å®?ä¸?å??è³?æ??夾ç?¶æ??ä¾?æº?ã??\n"
 "å??å?¥é?¸å??è³?æ??夾ï¼?ç?¶å¾?/æ??é?¸å??æ??æ??æ?¬å?°è³?æ??夾ã??æ??æ??é? ç«¯è³?æ??夾æ??äº?è??ç??é?¸ã??"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:146
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æ?¨ç?»å?¥ä¼ºæ??å?¨ã??{0}ã??ç??帳è??ç?ºã??{0}ã??ï¼?ä½?失æ??äº?ã??"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:147
+msgid "_Always"
+msgstr "總�(_A)"
+
+#: ../mail/mail.error.xml.h:148
 msgid "_Append"
 msgstr "添�(_A)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:149
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:150
 msgid "_Discard changes"
 msgstr "����(_D)"
 
-#: ../mail/mail.error.xml.h:137
-#: ../modules/mail/e-mail-shell-view-actions.c:827
+#: ../mail/mail.error.xml.h:151
+#: ../modules/mail/e-mail-shell-view-actions.c:1054
 msgid "_Empty Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_E)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:152
 msgid "_Expunge"
 msgstr "��(_E)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:153
+msgid "_No"
+msgstr "å?¦(_N)"
+
+#: ../mail/mail.error.xml.h:154
 msgid "_Open Messages"
 msgstr "é??å??é?µä»¶(_O)"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:157
 msgid "_Send Receipt"
 msgstr "å?³é??å??æ¢?(_S)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:158
 msgid "_Synchronize"
 msgstr "å??æ­¥å??(_S)"
 
-#: ../mail/message-list.c:1170
+#: ../mail/mail.error.xml.h:159
+msgid "_Yes"
+msgstr "æ?¯(_Y)"
+
+#: ../mail/message-list.c:1213
 msgid "Unseen"
 msgstr "���"
 
-#: ../mail/message-list.c:1171
+#: ../mail/message-list.c:1214
 msgid "Seen"
 msgstr "已��"
 
-#: ../mail/message-list.c:1172
+#: ../mail/message-list.c:1215
 msgid "Answered"
 msgstr "å·²å??è¦?"
 
-#: ../mail/message-list.c:1173
+#: ../mail/message-list.c:1216
 msgid "Forwarded"
 msgstr "��"
 
-#: ../mail/message-list.c:1174
+#: ../mail/message-list.c:1217
 msgid "Multiple Unseen Messages"
 msgstr "å¤?å??æ?ªé?±è®?ç??é?µä»¶"
 
-#: ../mail/message-list.c:1175
+#: ../mail/message-list.c:1218
 msgid "Multiple Messages"
 msgstr "å¤?å??é?µä»¶"
 
-#: ../mail/message-list.c:1179
+#: ../mail/message-list.c:1222
 msgid "Lowest"
 msgstr "æ??ä½?"
 
-#: ../mail/message-list.c:1180
+#: ../mail/message-list.c:1223
 msgid "Lower"
 msgstr "ä½?"
 
-#: ../mail/message-list.c:1184
+#: ../mail/message-list.c:1227
 msgid "Higher"
 msgstr "é«?"
 
-#: ../mail/message-list.c:1185
+#: ../mail/message-list.c:1228
 msgid "Highest"
 msgstr "æ??é«?"
 
-#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1837 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1844 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1811
+#: ../mail/message-list.c:1853
 msgid "Yesterday %l:%M %p"
 msgstr "�天 %p %l:%M"
 
-#: ../mail/message-list.c:1823
+#: ../mail/message-list.c:1865
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1831
+#: ../mail/message-list.c:1873
 msgid "%b %d %l:%M %p"
 msgstr "%mæ??%dæ?¥%p %l:%M"
 
-#: ../mail/message-list.c:1833
+#: ../mail/message-list.c:1875
 msgid "%b %d %Y"
 msgstr "%Y/%m/%d"
 
-#: ../mail/message-list.c:2598
+#: ../mail/message-list.c:2642
 msgid "Select all visible messages"
 msgstr "é?¸æ??å?¨é?¨å?¯è¦?ç??é?µä»¶"
 
+#: ../mail/message-list.c:2800 ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "�件"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4412 ../mail/message-list.c:4820
+#: ../mail/message-list.c:4468 ../mail/message-list.c:4892
 msgid "Generating message list"
 msgstr "ç?¢ç??é?µä»¶æ¸?å?®"
 
-#: ../mail/message-list.c:4643
+#: ../mail/message-list.c:4707
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 "æ²?æ??é?µä»¶ç¬¦å??æ?¨ç??æ??å°?æ¢?ä½?ã??å?¯ä»¥ä½¿ç?¨ã??æ??å°?->æ¸?é?¤ã??é?¸å?®é ?ç?®ä¾?æ¸?é?¤æ??å°?æ??æ?¹è®?å®?ã??"
 
-#: ../mail/message-list.c:4645
+#: ../mail/message-list.c:4709
 msgid "There are no messages in this folder."
 msgstr "é??å??è³?æ??夾中æ²?æ??é?µä»¶ã??"
 
@@ -13847,7 +12762,7 @@ msgid "Sent Messages"
 msgstr "å?³é??é?µä»¶"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:576
+#: ../widgets/misc/e-attachment-tree-view.c:570
 msgid "Size"
 msgstr "大�"
 
@@ -13856,27 +12771,27 @@ msgid "Subject - Trimmed"
 msgstr "主� - 已��"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1218
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Body contains"
 msgstr "å?§æ??å??å?«"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1225
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "Message contains"
 msgstr "é?µä»¶å??å?«"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1232
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "Recipients contain"
 msgstr "æ?¶ä»¶è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1239
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "Sender contains"
 msgstr "å¯?件è??å??å?«"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1246
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Subject contains"
 msgstr "主æ?¨å??å?«"
 
@@ -13884,7 +12799,7 @@ msgstr "主æ?¨å??å?«"
 msgid "Subject or Addresses contains"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/addressbook/addressbook-config.c:206
+#: ../modules/addressbook/addressbook-config.c:209
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13892,7 +12807,7 @@ msgstr ""
 "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP 伺æ??å?¨ (å¦?æ??æ?¨ç?? LDAP 伺æ??å?¨æ?¯"
 "æ?´ SSL)ã??"
 
-#: ../modules/addressbook/addressbook-config.c:208
+#: ../modules/addressbook/addressbook-config.c:211
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13900,7 +12815,7 @@ msgstr ""
 "é?¸å??æ­¤é?¸é ?表示ï¼?Evolution å?ªæ??é?£ç·?å?°æ?¨ç?? LDAP 伺æ??å?¨ (å¦?æ??æ?¨ç?? LDAP 伺æ??å?¨æ?¯"
 "æ?´ TLS)ã??"
 
-#: ../modules/addressbook/addressbook-config.c:210
+#: ../modules/addressbook/addressbook-config.c:213
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -13909,15 +12824,15 @@ msgstr ""
 "é?¸å??æ­¤é?¸é ?表示ï¼?æ?¨ç??伺æ??å?¨ä¸?æ?¯æ?´ SSL æ?? TLSã??é??表示æ?¨ç??é?£ç·?å°?ä¸?å®?å?¨ï¼?è??ä¸?æ?¨ç??"
 "å®?å?¨æ??æ¼?æ´?ã?? "
 
-#: ../modules/addressbook/addressbook-config.c:602
+#: ../modules/addressbook/addressbook-config.c:612
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ç?¨æ?¼ç??æ?¥å??é?±å¹´ç´?念æ?¥è¡?äº?æ??(_S)"
 
-#: ../modules/addressbook/addressbook-config.c:638
+#: ../modules/addressbook/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "è¤?製é??è¨?é??å?§å®¹è?³æ?¬å?°ç?¨æ?¼é?¢ç·?ä½?業(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:746
+#: ../modules/addressbook/addressbook-config.c:756
 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 "
@@ -13926,7 +12841,7 @@ msgstr ""
 "é??æ?¯ LDAP 伺æ??å?¨ä¸?ç??å? ï¼?Evolution æ??å??試é?£ç·?å?°é??å??å?°æ?¹ã??å·²æ??ä¾?æ¨?æº?å? æ¸?å?®ã??è«?"
 "洽詢æ?¨ç??系統管ç??å?¡ï¼?ç?­è§£æ?¨æ??該æ??å®?ç??å? ã??"
 
-#: ../modules/addressbook/addressbook-config.c:820
+#: ../modules/addressbook/addressbook-config.c:830
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13935,7 +12850,7 @@ msgstr ""
 "é??æ?¯ Evolution å°?è¦?ç?¨ä¾?é©?è­?æ?¨ç??æ?¹æ³?ã??注æ??è¦?設å®?æ­¤é ?è?³ã??é?»å­?é?µä»¶ä½?å??ã??é??è¦?è?½å?¿"
 "å??å­?å??æ?¨ç?? LDAP 伺æ??å?¨ã??"
 
-#: ../modules/addressbook/addressbook-config.c:895
+#: ../modules/addressbook/addressbook-config.c:905
 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 "
@@ -13945,29 +12860,29 @@ msgstr ""
 "æ??å°?ç¯?å??æ??å®?義æ?¨æ?³å¾?網路ç?®é??樹å¾?ä¸?延伸æ??å°?ç??深度ã??ã??subã??(å­?é ?)ç??æ??å°?ç¯?å??æ??å??"
 "æ?¬æ??å°?å?ºç¤?åº?ä¸?æ??æ??ç??é ?ç?®ã??ã??oneã??(å?®ä¸?)ç??æ??å°?ç¯?å??å?ªæ??å??æ?¬å?ºç¤?åº?ä¸?ç??ä¸?å??層ç´?ã??"
 
-#: ../modules/addressbook/addressbook-config.c:1011
+#: ../modules/addressbook/addressbook-config.c:1021
 msgid "Server Information"
 msgstr "伺æ??å?¨è³?è¨?"
 
-#: ../modules/addressbook/addressbook-config.c:1016
+#: ../modules/addressbook/addressbook-config.c:1026
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "詳細è³?æ??"
 
-#: ../modules/addressbook/addressbook-config.c:1017
+#: ../modules/addressbook/addressbook-config.c:1027
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "æ­£å?¨æ??å°?"
 
-#: ../modules/addressbook/addressbook-config.c:1019
+#: ../modules/addressbook/addressbook-config.c:1029
 msgid "Downloading"
 msgstr "��中"
 
-#: ../modules/addressbook/addressbook-config.c:1225
+#: ../modules/addressbook/addressbook-config.c:1235
 msgid "Address Book Properties"
 msgstr "é??è¨?é??å?§å®¹"
 
-#: ../modules/addressbook/addressbook-config.c:1227
+#: ../modules/addressbook/addressbook-config.c:1237
 msgid "New Address Book"
 msgstr "æ?°é??è¨?é??"
 
@@ -14004,14 +12919,24 @@ msgid "Position of the contact preview pane when oriented vertically."
 msgstr "æ?¹å??ç?ºå??ç?´æ??é?£çµ¡äººé ?覽çª?æ ¼ç??ä½?ç½®ã??"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Primary address book"
+msgstr "主é??è¨?é??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "顯示è?ªå??è£?é½?ç??å§?å??è??ä½?å??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show preview pane"
 msgstr "顯示�覽�格"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view."
+msgstr "ã??é?£çµ¡äººã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -14021,89 +12946,89 @@ msgstr ""
 "é??ç½®æ?¹å¼?決å®?äº?å?¨é?£çµ¡äººæ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?£"
 "絡人æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨é?£çµ¡äººæ¸?å?®æ??é??ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "å?¨ Evolution å??試è?ªå??å®?æ??ä¹?å??ï¼?å¿?é ?輸å?¥ç??å­?å??æ?¸ç?®ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "URI for the folder last used in the select names dialog"
 msgstr "ä¸?次ç?¨æ?¼é?¸å??å??稱å°?話ç??ç??è³?æ??夾 URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog."
 msgstr "ä¸?次ç?¨æ?¼é?¸å??å??稱å°?話ç??ç??è³?æ??夾 URI"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr "æ?¯å?¦å¼·å?¶é¡¯ç¤ºå?¨é ?ç?®ä¸­è?ªå??è£?é½?ç??é?£çµ¡äººå§?å??è??é?»å­?é?µä»¶ä½?å??ã??"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "Whether to show the preview pane."
 msgstr "æ?¯å?¦é¡¯ç¤ºé ?覽çª?æ ¼ã??"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:162
-#: ../modules/mail/em-mailer-prefs.c:1165
+#: ../modules/addressbook/autocompletion-config.c:161
+#: ../modules/mail/em-mailer-prefs.c:1138
 msgid "_Table column:"
 msgstr "表格�(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:164
 msgid "Autocompletion"
 msgstr "è?ªå??å®?æ??"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:167
 msgid "Always _show address of the autocompleted contact"
 msgstr "æ°¸é? é¡¯ç¤ºè?ªå??è£?é½?ç??é?£çµ¡äººä½?å??(_S)"
 
 #. Create the LDAP source group
 #: ../modules/addressbook/e-book-shell-backend.c:98
-#: ../modules/addressbook/e-book-shell-migrate.c:148
+#: ../modules/addressbook/e-book-shell-migrate.c:153
 msgid "On LDAP Servers"
 msgstr "å?¨ LDAP 伺æ??å?¨"
 
-#: ../modules/addressbook/e-book-shell-backend.c:281
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "_Contact"
 msgstr "�絡人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:283
+#: ../modules/addressbook/e-book-shell-backend.c:282
 #: ../modules/addressbook/e-book-shell-view-actions.c:773
 msgid "Create a new contact"
 msgstr "建ç«?æ?°ç??é?£çµ¡äºº"
 
-#: ../modules/addressbook/e-book-shell-backend.c:288
+#: ../modules/addressbook/e-book-shell-backend.c:287
 msgctxt "New"
 msgid "Contact _List"
 msgstr "�絡人��(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:290
+#: ../modules/addressbook/e-book-shell-backend.c:289
 #: ../modules/addressbook/e-book-shell-view-actions.c:780
 msgid "Create a new contact list"
 msgstr "建ç«?æ?°ç??é?£çµ¡äººæ¸?å?®"
 
-#: ../modules/addressbook/e-book-shell-backend.c:298
+#: ../modules/addressbook/e-book-shell-backend.c:297
 msgctxt "New"
 msgid "Address _Book"
 msgstr "é??è¨?é??(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:300
+#: ../modules/addressbook/e-book-shell-backend.c:299
 #: ../modules/addressbook/e-book-shell-view-actions.c:703
 msgid "Create a new address book"
 msgstr "建ç«?æ?°é??è¨?é??"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:317
+#: ../modules/addressbook/e-book-shell-backend.c:316
 #: ../modules/addressbook/e-book-shell-view.c:401
-#: ../modules/calendar/e-cal-shell-backend.c:104
-#: ../modules/calendar/e-cal-shell-migrate.c:57
+#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-migrate.c:59
 msgid "Contacts"
 msgstr "�絡人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:326
+#: ../modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "æ??è­?"
 
@@ -14115,7 +13040,7 @@ msgstr "��� vCard"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Co_py All Contacts To..."
-msgstr "è¤?製æ??æ??ç??é?£çµ¡äººå?°(_P)..."
+msgstr "è¤?製æ??æ??ç??é?£çµ¡äººå?°(_P)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:682
 msgid "Copy the contacts of the selected address book to another"
@@ -14131,7 +13056,7 @@ msgstr "å?ªé?¤é?¸å??ç??é??è¨?é??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Mo_ve All Contacts To..."
-msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)..."
+msgstr "å°?æ??æ??ç??é?£çµ¡äººç§»å?°(_V)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:696
 msgid "Move the contacts of the selected address book to another"
@@ -14150,12 +13075,12 @@ msgid "Show properties of the selected address book"
 msgstr "顯示é?¸å??é??è¨?é??ç??屬æ?§"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:715
-#: ../modules/calendar/e-cal-shell-view-actions.c:1354
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/mail/e-mail-shell-view-actions.c:1138
 msgid "_Rename..."
-msgstr "é??æ?°å?½å??(_R)..."
+msgstr "é??æ?°å?½å??(_R)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:717
 msgid "Rename the selected address book"
@@ -14175,7 +13100,7 @@ msgstr "å??æ­¢è¼?å?¥"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "_Copy Contact To..."
-msgstr "�製�絡人�(_C)..."
+msgstr "�製�絡人�(_C)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:738
 msgid "Copy selected contacts to another address book"
@@ -14187,7 +13112,7 @@ msgstr "���絡人(_D)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "_Find in Contact..."
-msgstr "��絡人���(_F)..."
+msgstr "��絡人���(_F)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:752
 msgid "Search for text in the displayed contact"
@@ -14195,7 +13120,7 @@ msgstr "æ??å°?顯示ç??é?£çµ¡äººä¸­ç??æ??å­?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "_Forward Contact..."
-msgstr "���絡人(_F)..."
+msgstr "���絡人(_F)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:759
 msgid "Send selected contacts to another person"
@@ -14203,7 +13128,7 @@ msgstr "å?³é??é?¸å??é?£çµ¡äººçµ¦å?¶ä»?使ç?¨è??ã??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "_Move Contact To..."
-msgstr "��絡人移�(_M)..."
+msgstr "��絡人移�(_M)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:766
 msgid "Move selected contacts to another address book"
@@ -14211,11 +13136,11 @@ msgstr "å°?é?¸å??ç??é?£çµ¡äººç§»è?³å?¦ä¸?å??é??è¨?é??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "_New Contact..."
-msgstr "���絡人(_N)..."
+msgstr "���絡人(_N)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "New Contact _List..."
-msgstr "���絡人��(_L)..."
+msgstr "���絡人��(_L)�"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:785
 msgid "_Open Contact"
@@ -14227,29 +13152,29 @@ msgstr "檢è¦?ç?®å??ç??é?£çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:792
 msgid "_Send Message to Contact..."
-msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)..."
+msgstr "å?³é??é?µä»¶çµ¦é?£çµ¡äºº(_S)â?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:794
 msgid "Send a message to the selected contacts"
 msgstr "å?³é??é?µä»¶è?³é?¸å??ç??é?£çµ¡äºº"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1500
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Actions"
 msgstr "å??ä½?(_A)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:808
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:809
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "_Preview"
 msgstr "�覽(_P)"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:817
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:822
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-memo-shell-view-actions.c:676
+#: ../modules/calendar/e-task-shell-view-actions.c:828
 msgid "_Delete"
 msgstr "��(_D)"
 
@@ -14261,7 +13186,7 @@ msgstr "屬�(_P)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:830
 #: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_Save as vCard..."
-msgstr "å?²å­?æ?? _vCard..."
+msgstr "å?²å­?æ?? _vCardâ?¦"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:858
 msgid "Contact _Preview"
@@ -14272,9 +13197,9 @@ msgid "Show contact preview window"
 msgstr "顯示�絡人�覽��"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:879
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
-#: ../modules/calendar/e-task-shell-view-actions.c:891
-#: ../modules/mail/e-mail-shell-view-actions.c:1128
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:897
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "_Classic View"
 msgstr "�統檢�(_C)"
 
@@ -14283,9 +13208,9 @@ msgid "Show contact preview below the contact list"
 msgstr "��絡人����顯示�絡人�覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:886
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:898
-#: ../modules/mail/e-mail-shell-view-actions.c:1135
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "_Vertical View"
 msgstr "å??ç?´æª¢è¦?(_V)"
 
@@ -14294,25 +13219,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "å?¨é?£çµ¡äººæ¸?å?®æ??é??顯示é?£çµ¡äººé ?覽"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
-#: ../modules/calendar/e-memo-shell-view-actions.c:744
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Any Category"
 msgstr "ä»»ä½?å??é¡?"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Unmatched"
 msgstr "æ²?æ??ç?¸ç¬¦è³?æ??"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
-#: ../modules/calendar/e-memo-shell-view-actions.c:761
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1211
-#: ../shell/e-shell-content.c:459
+#: ../modules/calendar/e-cal-shell-view-actions.c:1684
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+#: ../shell/e-shell-content.c:613
 msgid "Advanced Search"
 msgstr "é?²é??æ??å°?"
 
@@ -14472,115 +13397,867 @@ msgstr "使�����(_U):"
 msgid "cards"
 msgstr "å??ç??"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u è?? %d æ??被æ?¿æ??ç?ºé?»å­?é?µä»¶ä½?å??中ç??使ç?¨è??è??網å??å??稱ã??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(顯示��檢�)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
+msgid "05 minutes"
+msgstr "05 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
+msgid "10 minutes"
+msgstr "10 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
+msgid "15 minutes"
+msgstr "15 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
+msgid "30 minutes"
+msgstr "30 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "60 minutes"
+msgstr "60 å??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Alerts"
+msgstr "警示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "Day _ends:"
+msgstr "ä¸?æ?¥çµ?æ??æ?¼(_E):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Days"
+msgstr "天"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "é ?設ç??空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "Display"
+msgstr "顯示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "å?ªå?¨é??ç?¥å??å??中顯示鬧é?´(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Hours"
+msgstr "å°?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Minutes"
+msgstr "å??é??"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "S_un"
+msgstr "��(_U)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "以é?±æ?²å??æ??檢è¦?(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Se_cond zone:"
+msgstr "第äº?æ??å??(_C):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "Select the calendars for alarm notification"
+msgstr "é?¸æ??鬧é?´é??ç?¥ç??è¡?äº?æ??"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Sh_ow a reminder"
+msgstr "顯示æ??é??æ?¼ç´?æ??(_O)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "Show a _reminder"
+msgstr "顯示æ??é??(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "å?¨å·¦ä¸?è¡?äº?æ??中å°?é?±æ??æ?§äº?件以æ??é«?顯示(_E)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "Show week _numbers"
+msgstr "顯示��(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_asks due today:"
+msgstr "ä»?天å?°æ??ç??å·¥ä½?(_A):"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "T_hu"
+msgstr "é?±å??(_H)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "Template:"
+msgstr "樣�:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../widgets/misc/e-dateedit.c:606
+msgid "Time"
+msgstr "æ??é??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Time format:"
+msgstr "æ??å?»æ ¼å¼?:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Use s_ystem time zone"
+msgstr "使ç?¨ç³»çµ±æ??å??(_Y)"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "Wee_k starts on:"
+msgstr "ä¸?é?±é??å§?æ?¼(_K):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1643
+msgid "Work Week"
+msgstr "工��"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Work days:"
+msgstr "工��:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "_12 hour (AM/PM)"
+msgstr "_12 å°?æ?? (AM/PM)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "_24 hour"
+msgstr "_24 å°?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Compress weekends in month view"
+msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "_Day begins:"
+msgstr "ä¸?æ?¥é??å§?æ?¼(_D):"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "_Fri"
+msgstr "��(_F)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?(_H)"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+msgid "_Mon"
+msgstr "��(_M)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "_Overdue tasks:"
+msgstr "é??æ??ç??å·¥ä½?(_O):"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "_Sat"
+msgstr "��(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "_Show appointment end times in week and month view"
+msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "_Time divisions:"
+msgstr "æ??é??é??é??(_T):"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "_Tue"
+msgstr "��(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "_Wed"
+msgstr "��(_W)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "before every anniversary/birthday"
+msgstr "å?¨æ¯?å??é?±å¹´ç´?念æ?¥/ç??æ?¥ä¹?å??"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "before every appointment"
+msgstr "å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Alarm programs"
+msgstr "鬧���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Ask for confirmation when deleting items"
+msgstr "ç?¶å?ªé?¤é ?ç?®æ??å??確èª?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "ä»?天å?°æ??ç??å·¥ä½?è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "é??æ??å·¥ä½?ç??è??æ?¯è?²å½©ï¼?使ç?¨ \"#rrggbb\" æ ¼å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+msgid "Birthday and anniversary reminder"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "Birthday and anniversary reminder units"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Birthday and anniversary reminder value"
+msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Calendars to run alarms for"
+msgstr "å?·è¡?鬧é?´ç??è¡?äº?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "å?¨æ??å?»å??中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©(ç??空表示使ç?¨é ?設å?¼)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "å?¨æ?¥æª¢è¦?中ç?¨ä¾?繪製 Marcus Bains ç·?ç??è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+msgid "Compress weekends in month view"
+msgstr "å?¨æ??檢è¦?å?§ç¸®å°?é?±æ?«é¡¯ç¤º"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Confirm expunge"
+msgstr "æ¸?空æ??確èª?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "å¿?é ?æ??æ??å·¥ä½?æ?¥é??å§?è??çµ?æ??æ?¼å¹¾æ??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Default appointment reminder"
+msgstr "é ?設ç??ç´?æ??æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Default reminder units"
+msgstr "é ?設æ??é??ç??å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Default reminder value"
+msgstr "é ?設æ??é??ç??æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Directory for saving alarm audio files"
+msgstr "ç?¨ä¾?å­?æ?¾é¬§é?´é?³æ??æª?ç??ç?®é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Free/busy server URLs"
+msgstr "空é??/å¿?ç¢?伺æ??å?¨ç¶²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Free/busy template URL"
+msgstr "空é??/å¿?ç¢?ç¯?æ?¬ç¶²å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Hide completed tasks"
+msgstr "é?±è??å·²å®?æ??ç??å·¥ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Hide task units"
+msgstr "é?±è??å·¥ä½?å?®ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Hide task value"
+msgstr "é?±è??å·¥ä½?æ?¸å?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Horizontal pane position"
+msgstr "水平�格�置"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥çµ?æ??æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "å·¥ä½?æ?¥é??å§?æ?¼å¹¾é»?ï¼?以 24 å°?æ??æ ¼å¼?ï¼?0 è?³ 23ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示å??å¿?é??é ?覽çª?æ ¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??å?¨ä¸»è¦?çª?中顯示工ä½?é ?覽çª?æ ¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr "å?¨ã??æ?¥ã??å??ã??å·¥ä½?é?±ã??檢è¦?中顯示é??é??ï¼?以å??é??è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Last alarm time"
+msgstr "ä¸?次鬧é?´æ??å?»"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "List of recently used second time zones in a Day View."
+msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??æ¸?å?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "List of server URLs for free/busy publishing."
+msgstr "ç?¨æ?¼ç©ºé??/å¿?ç¢?ç?¼å¸?ç??伺æ??å?¨ URL æ¸?å?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains ç·?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains ç·?è?²å½©â??æ?¥æª¢è¦?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains ç·?è?²å½©â??æ??å?»å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr "å?¨ã??day_second_zonesã??æ¸?å?®ä¸­è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+msgid "Maximum number of recently used timezones to remember."
+msgstr "è¦?è¨?ä½?ç??æ??è¿?使ç?¨æ??å??æ?¸ç?®ç??æ??大å?¼ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Memo layout style"
+msgstr "å??å¿?é??é??ç½®æ?¹å¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+msgid "Memo preview pane position (horizontal)"
+msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?æ°´å¹³ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+msgid "Memo preview pane position (vertical)"
+msgstr "å??å¿?é??é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "å·¥ä½?æ?¥çµ?æ??å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "å·¥ä½?æ?¥é??å§?å??é??ï¼?0 å?° 59ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+msgid "Month view horizontal pane position"
+msgstr "æ??檢è¦?ç??æ°´å¹³çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "æ??檢è¦?ç??å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "決å®?ç??æ?¥æ??é?±å¹´ç´?念æ?¥æ??é??ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+msgid "Number of units for determining a default reminder."
+msgstr "決å®?é ?設æ??é??ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Number of units for determining when to hide tasks."
+msgstr "決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?æ?¸ç?®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+msgid "Overdue tasks color"
+msgstr "é??æ??ç??å·¥ä½?è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"æ°´å¹³çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å??å¿?é??é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr "æ?¹å??ç?ºæ°´å¹³æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "æ?¹å??ç?ºå??ç?´æ??å·¥ä½?é ?覽çª?æ ¼ç??ä½?ç½®ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨è¡?äº?æ??æ¸?å?®è??æ?¥æ??å°?覽è¡?äº?æ??ä¹?é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?å?¨æ??檢è¦?中ç??è¦?çª?è??æ?¥æ??å°?覽è¡?äº?æ??ã??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"å??ç?´çª?æ ¼ç??ä½?ç½®ï¼?ç?¶ä¸?å?¨æ??檢è¦?中æ??ï¼?å?¨æ?¥æ??å°?覽è¡?äº?æ??è??å·¥ä½?æ¸?å?®ä¹?é??ï¼?以å??ç´ è¨?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Primary calendar"
+msgstr "主è¦?è¡?äº?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+msgid "Primary memo list"
+msgstr "主è¦?å??å¿?é??æ¸?å?®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary task list"
+msgstr "主�工���"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Programs that are allowed to be run by alarms."
+msgstr "ç?¨ä¾?å??ç?ºé¬§é?´è??å?·è¡?ç??ç¨?å¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recently used second time zones in a Day View"
+msgstr "æ??è¿?å?¨æ?¥æª¢è¦?中使ç?¨ç??第äº?æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Recurrent Events in Italic"
+msgstr "é?±æ??æ?§äº?件以æ??é«?顯示"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
+msgid "Save directory for alarm audio"
+msgstr "å?²å­?鬧é?´é?³æ??æª?ç?®é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Scroll Month View by a week"
+msgstr "以é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
+msgid "Show appointment end times in week and month views"
+msgstr "å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "å?¨äº?件/æ??è­°/å·¥ä½?編輯å?¨ä¸­é¡¯ç¤º å??é¡? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr "å?¨å·¦ä¸?è¡?äº?æ??中å°?é?±æ??æ?§äº?件é?£å¹¾å¤©ä»¥æ??é«?顯示ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Show display alarms in notification tray"
+msgstr "å?¨é??ç?¥å??中顯示鬧é?´ç?«é?¢"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
+msgid "Show status field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Show the memo preview pane"
+msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
+msgid "Show the task preview pane"
+msgstr "顯示工��覽�格"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Show timezone field in the event/meeting editor"
+msgstr "å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
+msgid "Show type field in the event/task/meeting editor"
+msgstr "å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "å?¨æ?¥æª¢è¦?ã??å·¥ä½?é?±æª¢è¦?å??æ?¥æ??å°?覽顯示é?±æ?¸"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"å¦?æ??設å®?å??æ??å?¨æ?¥æª¢è¦?中顯示第äº?æ??å??ã??æ?¸å?¼é¡?ä¼¼æ?¼ã??timezoneã??設å®?é?µç??ç?¨æ³?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Task layout style"
+msgstr "å·¥ä½?é??ç½®æ?¹å¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
+msgid "Task preview pane position (horizontal)"
+msgstr "工��覽�格�置�水平�"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Task preview pane position (vertical)"
+msgstr "å·¥ä½?é ?覽çª?æ ¼ä½?ç½®ï¼?å??ç?´ï¼?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Tasks due today color"
+msgstr "ä»?天å?°æ??å·¥ä½?ç??è?²å½©"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr "ã??è¡?äº?æ??ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view."
+msgstr "ã??å??å¿?é??ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view."
+msgstr "ã??å·¥ä½?ã??檢è¦?å?´é??æ¬?中已é?¸å??ï¼?æ??ã??主è¦?ã??ï¼?é??è¨?é??ç?? UIDã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"ä½?ç?ºç©ºé??/å¿?ç¢?è³?æ??å??é¥?ä¹?ç?¨ç??網å??ç¯?æ?¬ï¼?%u è¦?以é?»å­?é?µä»¶ä½?å??ç??使ç?¨è??å??稱é?¨å??ä¾?å??"
+"代ï¼?è?? %d è¦?æ?¿æ??ç?ºç¶²å??å??稱ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"ç?¨æ?¼è¡?äº?æ??中æ?¥æ??è??æ??å?»ç??é ?設æ??å??ï¼?æ?ªç¿»è­¯ç?? Olsen æ??å??è³?æ??庫ä½?置就å?? "
+"\"America/New York\"ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"é??ç½®æ?¹å¼?決å®?äº?å?¨å??å¿?é??æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??"
+"å¿?é??æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å??å¿?é??æ¸?å?®æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"é??ç½®æ?¹å¼?決å®?äº?å?¨å·¥ä½?æ¸?å?®ä¸­é ?覽çª?æ ¼ç??ä½?ç½®ã??ã??0ã??ï¼?æ¨?æº?檢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?"
+"æ¸?å?®ä¸?æ?¹ã??ã??1ã??ï¼?å??ç?´æª¢è¦?ï¼?å°?é ?覽çª?æ ¼æ?¾å?¨å·¥ä½?æ¸?å?®æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "The second timezone for a Day View"
+msgstr "ç?¨æ?¼æ?¥æª¢è¦?ç??第äº?æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "é??裡å?¯ä½¿ç?¨ä¸?種æ?¸å?¼ã??ã??0ã??ç?ºé?¯èª¤ã??ã??1ã??ç?ºè­¦å??ã??ã??2ã??ç?ºé?¤é?¯è¨?æ?¯ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Time divisions"
+msgstr "æ??é??å??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
+msgid "Time the last alarm ran, in time_t."
+msgstr "ä¸?次鬧é?´å?·è¡?ç??æ??é??(_T)"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Timezone"
+msgstr "æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
+msgid "Twenty four hour time format"
+msgstr "24 å°?æ??å?¶æ ¼å¼?"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr ""
+"ç??æ?¥å??é?±å¹´ç´?念æ?¥æ??é??ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??"
+"(æ?¥)ã??"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "é ?設æ??é??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+
+# (pofilter) gconf: do not translate gconf attribute: "minutes", "hours", "days"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"決å®?ä½?æ??é?±è??å·¥ä½?ç??å?®ä½?ï¼?ã??minutesã??(å??é??)ã??ã??hoursã??(å°?æ??)æ??ã??daysã??(æ?¥)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
+msgid "Use system timezone"
+msgstr "使ç?¨ç³»çµ±æ??å??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "使ç?¨ç³»çµ±æ??å??å??代å?¨ Evolution 中é?¸å??ç??æ??å??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
+msgid "Vertical pane position"
+msgstr "å??ç?´çª?æ ¼ä½?ç½®"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Week start"
+msgstr "ä¸?é?±é??å§?æ?¼"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "æ¯?é?±ç??é??å§?ï¼?å¾?æ??æ??æ?¥ (0) å?°æ??æ??å?­ (6)ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr "æ?¯å?¦ä½¿ç?¨é??ç?¥å??顯示鬧é?´ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "å?ªé?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "æ¸?é?¤ç´?æ??æ??å·¥ä½?æ??æ?¯å?¦è¦?æ±?確èª?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr "æ?¯å?¦å£?縮æ??檢è¦?中ç??é?±æ?«ï¼?é??æ??å°?ä¸?é?±ä¸­ç??é?±å?­è??é?±æ?¥ç½®æ?¼ä¸?å??空ä½?中ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "æ?¯å?¦å?¨é?±å??æ??ç??檢è¦?å?§é¡¯ç¤ºç´?æ??ç??çµ?æ??æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??中繪å?º Marcus Bains ç·?ï¼?代表ç?®å??æ??å?»ç??ç?´ç·?ï¼?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "æ?¯å?¦å?¨å·¥ä½?檢è¦?中é?±è??å®?æ??ç??å·¥ä½?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr "æ?¯å?¦ä»¥é?±ç?ºå?®ä½?æ?²å??æ??檢è¦?ï¼?è??é??以æ??ç?ºå?®ä½?ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to set a default reminder for appointments."
+msgstr "æ?¯å?¦è¨­å®?ç´?æ??ç??é ?設æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "æ?¯å?¦è¨­å®?ç??æ?¥å??é?±å¹´ç´?念æ?¥ç??æ??é??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º RSVP æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º è§?è?² æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º ç??æ?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "æ?¯å?¦ä½¿ç?¨ 24 å°?æ??å?¶æ??é??è??ä¸?æ?¯ä½¿ç?¨ä¸?å??/ä¸?å??ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/æ??議編輯å?¨ä¸­é¡¯ç¤º æ??å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "æ?¯å?¦å?¨äº?件/å·¥ä½?/æ??議編輯å?¨ä¸­é¡¯ç¤º é¡?å?? æ¬?ä½?"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "æ?¯å?¦å?¨è¡?äº?æ??ç??å¤?å??ä½?置顯示é?±æ?¸ã??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Work days"
+msgstr "工��"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Workday end hour"
+msgstr "å·¥ä½?æ?¥çµ?æ??å°?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Workday end minute"
+msgstr "å·¥ä½?æ?¥çµ?æ??å??é??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Workday start hour"
+msgstr "å·¥ä½?æ?¥é??å§?å°?æ??"
+
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
+msgid "Workday start minute"
+msgstr "å·¥ä½?æ?¥é??å§?å??é??"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:259
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "��(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:341
+#: ../modules/calendar/e-cal-attachment-handler.c:343
 msgid "Select a Calendar"
 msgstr "é?¸æ??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:368
+#: ../modules/calendar/e-cal-attachment-handler.c:370
 msgid "Select a Task List"
 msgstr "é?¸æ??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:378
+#: ../modules/calendar/e-cal-attachment-handler.c:380
 msgid "I_mport to Calendar"
 msgstr "å?¯å?¥è?³è¡?äº?æ??(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:385
+#: ../modules/calendar/e-cal-attachment-handler.c:387
 msgid "I_mport to Tasks"
 msgstr "���工�(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:106
-#: ../modules/calendar/e-cal-shell-migrate.c:176
-#: ../modules/calendar/e-memo-shell-backend.c:94
-#: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:94
-#: ../modules/calendar/e-task-shell-migrate.c:145
+#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-migrate.c:192
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-migrate.c:149
+#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-migrate.c:158
 msgid "On The Web"
 msgstr "�網��"
 
-#: ../modules/calendar/e-cal-shell-backend.c:108
-#: ../plugins/calendar-weather/calendar-weather.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../plugins/calendar-weather/calendar-weather.c:120
 msgid "Weather"
 msgstr "天氣"
 
-#: ../modules/calendar/e-cal-shell-backend.c:193
-#: ../modules/calendar/e-cal-shell-migrate.c:60
+#: ../modules/calendar/e-cal-shell-backend.c:200
+#: ../modules/calendar/e-cal-shell-migrate.c:62
 msgid "Birthdays & Anniversaries"
 msgstr "ç??æ?¥å??é?±å¹´ç´?念æ?¥"
 
-#: ../modules/calendar/e-cal-shell-backend.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:425
 msgctxt "New"
 msgid "_Appointment"
 msgstr "ç´?æ??(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:398
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-backend.c:427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new appointment"
 msgstr "建ç«?ä¸?å??æ?°ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:403
+#: ../modules/calendar/e-cal-shell-backend.c:432
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "å?¨æ?¥ç´?æ??(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:405
+#: ../modules/calendar/e-cal-shell-backend.c:434
 msgid "Create a new all-day appointment"
 msgstr "建ç«?æ?°ç??å?¨æ?¥ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:410
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "M_eeting"
 msgstr "æ??è­°(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:412
+#: ../modules/calendar/e-cal-shell-backend.c:441
 msgid "Create a new meeting request"
 msgstr "建ç«?æ?°æ??è­°è¦?æ±?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:420
+#: ../modules/calendar/e-cal-shell-backend.c:449
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:422
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-backend.c:451
+#: ../modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Create a new calendar"
 msgstr "建ç«?æ?°è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-backend.c:707
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../modules/calendar/e-cal-shell-backend.c:754
+#: ../plugins/itip-formatter/itip-formatter.c:2809
 msgid "Calendar and Tasks"
 msgstr "è¡?äº?æ??è??å·¥ä½?"
 
-#: ../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"
-"%s"
-msgstr ""
-"%s ç?¼ç??é?¯èª¤\n"
-"%s"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:237
+#: ../modules/calendar/e-cal-shell-sidebar.c:217
 msgid "Loading calendars"
 msgstr "æ­£å?¨è¼?å?¥è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#: ../modules/calendar/e-cal-shell-sidebar.c:641
 msgid "_New Calendar..."
-msgstr "æ?°å¢?è¡?äº?æ??(_N)..."
+msgstr "æ?°å¢?è¡?äº?æ??(_N)â?¦"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:681
+#: ../modules/calendar/e-cal-shell-sidebar.c:658
 msgid "Calendar Selector"
 msgstr "è¡?äº?æ??é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1022
+#: ../modules/calendar/e-cal-shell-sidebar.c:1001
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "é??å??å?¨ %s ç??è¡?äº?æ??"
@@ -14615,294 +14292,294 @@ 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:1126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1131
 msgid "event"
 msgstr "�件"
 
-#: ../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:504
-#: ../modules/calendar/e-task-shell-view-actions.c:621
+#: ../modules/calendar/e-cal-shell-view-actions.c:1133
+#: ../modules/calendar/e-cal-shell-view-memopad.c:216
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:510
+#: ../modules/calendar/e-task-shell-view-actions.c:627
 msgid "Save as iCalendar"
 msgstr "��� iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Copy..."
-msgstr "�製(_C)..."
+msgstr "�製(_C)�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "D_elete Calendar"
 msgstr "å?ªé?¤è¡?äº?æ??(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Delete the selected calendar"
 msgstr "å?ªé?¤é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Go Back"
 msgstr "å??å¾?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Go Forward"
 msgstr "å??å??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1318
 msgid "Select today"
 msgstr "é?¸å??ä»?æ?¥"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1323
 msgid "Select _Date"
 msgstr "é?¸æ??æ?¥æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Select a specific date"
 msgstr "é?¸å??ç?¹å®?æ?¥æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1330
 msgid "_New Calendar"
 msgstr "æ?°å¢?è¡?äº?æ??(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1340
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "Purg_e"
 msgstr "��(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Purge old appointments and meetings"
 msgstr "å?ªé?¤è??ç´?æ??å??æ??è­°"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "Re_fresh"
 msgstr "é??æ?°æ?´ç??(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Refresh the selected calendar"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Rename the selected calendar"
 msgstr "é??æ?°å?½å??é?¸å??ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Show _Only This Calendar"
 msgstr "å?ªé¡¯ç¤ºé??å??è¡?äº?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Cop_y to Calendar..."
-msgstr "è¤?製è?³è¡?äº?æ??(_Y)..."
+msgstr "è¤?製è?³è¡?äº?æ??(_Y)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "_Delegate Meeting..."
-msgstr "å§?æ´¾æ??è­°(_D)..."
+msgstr "å§?æ´¾æ??è­°(_D)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delete Appointment"
 msgstr "å?ªé?¤ç´?æ??(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Delete selected appointments"
 msgstr "å?ªé?¤é?¸å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Delete This _Occurrence"
 msgstr "å?ªé?¤é??次ç?¼ç??ç??äº?件(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete this occurrence"
 msgstr "å?ªé?¤æ­¤é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete All Occ_urrences"
 msgstr "å?ªé?¤æ??æ??ç?¼ç??ç??äº?件(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete all occurrences"
 msgstr "å?ªé?¤å?¨é?¨é?±æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "New All Day _Event..."
-msgstr "���天�件(_E)..."
+msgstr "���天�件(_E)�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Create a new all day event"
 msgstr "建ç«?æ?°ç??å?¨å¤©äº?件"
 
-#: ../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:578
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Forward as iCalendar..."
-msgstr "以 iCale_ndar ��..."
+msgstr "以 iCale_ndar ���"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New _Meeting..."
-msgstr "æ?°å¢?æ??è­°(_M)..."
+msgstr "æ?°å¢?æ??è­°(_M)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new meeting"
 msgstr "建ç«?æ?°ç??æ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Mo_ve to Calendar..."
-msgstr "移è?³è¡?äº?æ??(_V)..."
+msgstr "移è?³è¡?äº?æ??(_V)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "New _Appointment..."
-msgstr "æ?°å¢?ç´?æ??(_A)..."
+msgstr "æ?°å¢?ç´?æ??(_A)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Make this Occurrence _Movable"
 msgstr "å°?é??å??äº?件æ¨?示æ??å?¯ç§»å??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "_Open Appointment"
 msgstr "é??å??ç´?æ??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "View the current appointment"
 msgstr "檢è¦?ç?®å??ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "_Reply"
 msgstr "å??è¦?(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1466
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
 msgid "Save as iCalendar..."
-msgstr "��� iCalendar..."
+msgstr "��� iCalendar�"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "_Schedule Meeting..."
-msgstr "æ??è­°æ??ç¨?(_S)..."
+msgstr "æ??è­°æ??ç¨?(_S)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Converts an appointment to a meeting"
 msgstr "å°?ç´?æ??è½?æ??ç?ºæ??è­°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1480
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Conv_ert to Appointment..."
-msgstr "è½?æ??ç?ºç´?æ??(_E)..."
+msgstr "è½?æ??ç?ºç´?æ??(_E)â?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts a meeting to an appointment"
 msgstr "å°?æ??è­°è½?æ??ç?ºç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Quit"
 msgstr "çµ?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-cal-shell-view-actions.c:1615
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1613
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
 msgid "Show one day"
 msgstr "顯示�天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1622
 msgid "List"
 msgstr "��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1624
 msgid "Show as list"
 msgstr "顯示æ??æ¸?å?®"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1629
 msgid "Month"
 msgstr "æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1631
 msgid "Show one month"
 msgstr "顯示ä¸?å??æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1636
 msgid "Week"
 msgstr "é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1638
 msgid "Show one week"
 msgstr "顯示��"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1645
 msgid "Show one work week"
 msgstr "顯示ä¸?å??å·¥ä½?é?±"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Active Appointments"
 msgstr "é?²è¡?中ç??ç´?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Next 7 Days' Appointments"
 msgstr "æ?ªä¾? 7 天ç??ç´?æ??(_P)"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Description contains"
 msgstr "æ??è¿°å??å?«"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1705
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Summary contains"
 msgstr "主æ?¨å??å?«"
 
 # zh_HK: msgstr "å??å?°é??å??è¡?äº?æ??"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1713
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Print this calendar"
 msgstr "å??å?°é??å??è¡?äº?æ??"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??å?§å®¹"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1724
 msgid "Preview the calendar to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??è¡?äº?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1793
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 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:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:502
+#: ../modules/calendar/e-cal-shell-view-memopad.c:214
+#: ../modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
 msgid "New _Memo"
 msgstr "æ?°å¢?å??å¿?é??(_M)"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-backend.c:287
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Create a new memo"
 msgstr "建ç«?æ?°ç??å??å¿?é??"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "_Open Memo"
 msgstr "é??å??å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:260
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:266
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "View the selected memo"
 msgstr "檢è¦?é?¸å??ç??å??å¿?é??"
 
-#: ../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:648
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "Open _Web Page"
 msgstr "é??å??網é ?(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:284
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:290
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the selected memo"
 msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 
@@ -14910,101 +14587,113 @@ msgstr "å??å?°é?¸å??ç??å??å¿?é??"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. 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:619
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:281
+#: ../modules/calendar/e-task-shell-view-actions.c:625
 msgid "task"
 msgstr "工�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:681
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:687
 msgid "_Assign Task"
 msgstr "æ??派工ä½?(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:764
 msgid "_Mark as Complete"
 msgstr "æ¨?示ç?ºå®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Mark selected tasks as complete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??å®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 msgid "_Mark as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Mark selected tasks as incomplete"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¨?示æ??æ?ªå®?æ??"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "New _Task"
 msgstr "��工�(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:277
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-backend.c:286
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Create a new task"
 msgstr "建ç«?ä¸?å??æ?°ç??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "_Open Task"
 msgstr "é??å??å·¥ä½?(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "View the selected task"
 msgstr "檢è¦?é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "_Save as iCalendar..."
-msgstr "��� iCalendar[_S]..."
+msgstr "��� iCalendar[_S]�"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the selected task"
 msgstr "å??å?°é?¸å??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:277
+#: ../modules/calendar/e-calendar-preferences.c:437
+msgid "Selected Calendars for Alarms"
+msgstr "é?¸æ??鬧é?´è¡?äº?æ??"
+
+#: ../modules/calendar/e-calendar-preferences.c:836
+msgid "Ti_me and date:"
+msgstr "æ??å?»å??æ?¥æ??(_M):"
+
+#: ../modules/calendar/e-calendar-preferences.c:837
+msgid "_Date only:"
+msgstr "å?ªæ??æ?¥æ??(_D):"
+
+#: ../modules/calendar/e-memo-shell-backend.c:285
 msgctxt "New"
 msgid "Mem_o"
 msgstr "å??å¿?é??(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:284
+#: ../modules/calendar/e-memo-shell-backend.c:292
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "å?±ç?¨å??å¿?é??(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:286
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgid "Create a new shared memo"
 msgstr "建ç«?æ?°ç??å?±ç?¨å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:302
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "å??å¿?é??æ¸?å?®(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-backend.c:304
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Create a new memo list"
 msgstr "建ç«?æ?°å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:231
+#: ../modules/calendar/e-memo-shell-sidebar.c:225
 msgid "Loading memos"
 msgstr "æ­£å?¨è¼?å?¥å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:603
+#: ../modules/calendar/e-memo-shell-sidebar.c:594
 msgid "Memo List Selector"
 msgstr "å??å¿?é??æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:908
+#: ../modules/calendar/e-memo-shell-sidebar.c:899
 #, c-format
 msgid "Opening memos at %s"
 msgstr "é??å??å?¨ %s ç??å??å¿?é??"
@@ -15015,77 +14704,77 @@ msgstr "é??å??å?¨ %s ç??å??å¿?é??"
 msgid "Print Memos"
 msgstr "å??å?°å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
 msgid "_Find in Memo..."
-msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)..."
+msgstr "å?¨å??å¿?é??å?§å°?æ?¾(_F)â?¦"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "æ??å°?顯示ç??å??å¿?é??中ç??æ??å­?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "å?ªé?¤å??å¿?é??æ¸?å?®(_E)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "å?ªé?¤é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_New Memo List"
 msgstr "æ?°å¢?å??å¿?é??æ¸?å?®(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Refresh the selected memo list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Rename the selected memo list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 msgid "Show _Only This Memo List"
 msgstr "å?ªé¡¯ç¤ºæ­¤å??å¿?é??æ¸?å?®(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:706
+#: ../modules/calendar/e-memo-shell-view-actions.c:712
 msgid "Memo _Preview"
 msgstr "å??å¿?é??é ?覽(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:708
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
 msgid "Show memo preview pane"
 msgstr "顯示å??å¿?é??é ?覽çª?æ ¼"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:735
 msgid "Show memo preview below the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®ä¸?æ?¹é¡¯ç¤ºå??å¿?é??é ?覽"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:742
 msgid "Show memo preview alongside the memo list"
 msgstr "å?¨å??å¿?é??æ¸?å?®æ??é??顯示å??å¿?é??é ?覽"
 
 # zh_HK: msgstr "å??å?°å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:794
+#: ../modules/calendar/e-memo-shell-view-actions.c:800
 msgid "Print the list of memos"
 msgstr "å??å?°å??å¿?é??æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:807
 msgid "Preview the list of memos to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å??å¿?é??æ¸?å?®"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:416
+#: ../modules/calendar/e-memo-shell-view-private.c:420
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d é ?å??å¿?é??"
 msgstr[1] "%d é ?å??å¿?é??"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:420
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-memo-shell-view-private.c:424
+#: ../modules/calendar/e-task-shell-view-private.c:575
 #, c-format
 msgid "%d selected"
 msgstr "å·²é?¸æ?? %d å??"
@@ -15098,40 +14787,40 @@ msgstr "å?ªé?¤å??å¿?é??"
 msgid "Delete Memo"
 msgstr "å?ªé?¤å??å¿?é??"
 
-#: ../modules/calendar/e-task-shell-backend.c:275
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgctxt "New"
 msgid "_Task"
 msgstr "工�(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:282
+#: ../modules/calendar/e-task-shell-backend.c:291
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "æ??æ´¾ç??å·¥ä½?(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:293
 msgid "Create a new assigned task"
 msgstr "建ç«?æ?°æ??å®?ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-backend.c:292
+#: ../modules/calendar/e-task-shell-backend.c:301
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "工���(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:294
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-backend.c:303
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Create a new task list"
 msgstr "建��工���"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:231
+#: ../modules/calendar/e-task-shell-sidebar.c:225
 msgid "Loading tasks"
 msgstr "正���工�"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:603
+#: ../modules/calendar/e-task-shell-sidebar.c:594
 msgid "Task List Selector"
 msgstr "å·¥ä½?æ¸?å?®é?¸æ??å?¨"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:908
+#: ../modules/calendar/e-task-shell-sidebar.c:899
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "é??å??å?¨ %s ç??å·¥ä½?"
@@ -15141,7 +14830,7 @@ msgstr "é??å??å?¨ %s ç??å·¥ä½?"
 msgid "Print Tasks"
 msgstr "å??å?°å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:563
+#: ../modules/calendar/e-task-shell-view-actions.c:569
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15153,578 +14842,613 @@ msgstr ""
 "\n"
 "確å®?æ¸?é?¤é??äº?å·¥ä½?ï¼?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:694
 msgid "_Delete Task"
 msgstr "��工�(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Find in Task..."
-msgstr "�工����(_F)..."
+msgstr "�工����(_F)�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Search for text in the displayed task"
 msgstr "æ??å°?顯示ç??å·¥ä½?中ç??æ??å­?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "Copy..."
-msgstr "�製..."
+msgstr "�製�"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "D_elete Task List"
 msgstr "��工���(_E)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "Delete the selected task list"
 msgstr "å?ªé?¤é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "_New Task List"
 msgstr "��工���(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Refresh the selected task list"
 msgstr "é??æ?°æ?´ç??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Rename the selected task list"
 msgstr "é??æ?°å?½å??é?¸å??ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Show _Only This Task List"
 msgstr "�顯示此工���(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mar_k as Incomplete"
 msgstr "æ¨?示ç?ºæ?ªå®?æ??(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "Delete completed tasks"
 msgstr "å?ªé?¤å·²å®?æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:870
+#: ../modules/calendar/e-task-shell-view-actions.c:876
 msgid "Task _Preview"
 msgstr "工��覽(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:872
+#: ../modules/calendar/e-task-shell-view-actions.c:878
 msgid "Show task preview pane"
 msgstr "顯示工��覽�格"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:899
 msgid "Show task preview below the task list"
 msgstr "�工�����顯示工��覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:906
 msgid "Show task preview alongside the task list"
 msgstr "å?¨å·¥ä½?æ¸?å?®æ??é??顯示工ä½?é ?覽"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:908
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Active Tasks"
 msgstr "é?²è¡?中ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Completed Tasks"
 msgstr "å·²å®?æ??ç??å·¥ä½? "
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Next 7 Days' Tasks"
 msgstr "æ?ªä¾? 7 天ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Overdue Tasks"
 msgstr "é??æ??ç??å·¥ä½?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Tasks with Attachments"
 msgstr "æ??é??件ç??å·¥ä½?"
 
 # zh_HK: msgstr "å??å?°å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:993
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Print the list of tasks"
 msgstr "å??å?°å·¥ä½?æ¸?å?®"
 
 # zh_HK: msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1006
 msgid "Preview the list of tasks to be printed"
 msgstr "é ?覽å°?è¦?å??å?°ç??å·¥ä½?æ¸?å?®"
 
-#: ../modules/calendar/e-task-shell-view-private.c:463
+#: ../modules/calendar/e-task-shell-view-private.c:468
 msgid "Expunging"
 msgstr "��中"
 
-#: ../modules/calendar/e-task-shell-view-private.c:565
+#: ../modules/calendar/e-task-shell-view-private.c:571
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d �工�"
 msgstr[1] "%d �工�"
 
-#: ../modules/calendar/e-task-shell-view.c:351
+#: ../modules/calendar/e-task-shell-view.c:358
 msgid "Delete Tasks"
 msgstr "��工�"
 
-#: ../modules/calendar/e-task-shell-view.c:353
+#: ../modules/calendar/e-task-shell-view.c:360
 msgid "Delete Task"
 msgstr "��工�"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:345
+#: ../modules/mail/e-mail-attachment-handler.c:380
 #, 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:89
+#: ../modules/mail/e-mail-junk-hook.c:94
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../modules/mail/e-mail-shell-backend.c:171
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "�件��(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:173
+#: ../modules/mail/e-mail-shell-backend.c:172
 msgid "Compose a new mail message"
 msgstr "編輯æ?°ç??é?µä»¶è¨?æ?¯"
 
-#: ../modules/mail/e-mail-shell-backend.c:181
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "é?µä»¶è³?æ??夾(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:183
+#: ../modules/mail/e-mail-shell-backend.c:182
 msgid "Create a new mail folder"
 msgstr "建ç«?æ?°é?µä»¶è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-backend.c:489
+#: ../modules/mail/e-mail-shell-backend.c:481
 msgid "Mail Accounts"
 msgstr "é?µä»¶å¸³è??"
 
-#: ../modules/mail/e-mail-shell-backend.c:497
+#: ../modules/mail/e-mail-shell-backend.c:489
 msgid "Mail Preferences"
 msgstr "é?µä»¶å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:505
+#: ../modules/mail/e-mail-shell-backend.c:497
 msgid "Composer Preferences"
 msgstr "é?µä»¶ç·¨è¼¯å?¨å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-backend.c:513
+#: ../modules/mail/e-mail-shell-backend.c:505
 msgid "Network Preferences"
 msgstr "網路å??好設å®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:820
-#: ../modules/mail/e-mail-shell-view.c:870
+#: ../modules/mail/e-mail-shell-view-actions.c:1047
+#: ../modules/mail/e-mail-shell-view.c:954
 msgid "_Disable Account"
 msgstr "å??ç?¨å¸³è??(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:822
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "Disable this account"
 msgstr "å??ç?¨é??å??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??è³?æ??夾å?§ç??å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:834
+#: ../modules/mail/e-mail-shell-view-actions.c:1061
 msgid "C_reate Search Folder From Search..."
-msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)..."
+msgstr "å¾?æ??å°?建ç«?æ??å°?è³?æ??夾(_R)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:841
+#: ../modules/mail/e-mail-shell-view-actions.c:1068
 msgid "_Download Messages for Offline Usage"
 msgstr "ä¸?è¼?é?¢ç·?使ç?¨ç??é?µä»¶(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:843
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "ä¸?è¼?æ¨?è¨?ç?ºé?¢ç·?使ç?¨ç??帳è??è??è³?æ??夾ä¹?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:848
+#: ../modules/mail/e-mail-shell-view-actions.c:1075
 msgid "Fl_ush Outbox"
 msgstr "æ¸?ç??å¯?件å?£(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1082
 msgid "_Copy Folder To..."
-msgstr "è¤?製è³?æ??夾å?°(_C)..."
+msgstr "è¤?製è³?æ??夾å?°(_C)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1084
 msgid "Copy the selected folder into another folder"
 msgstr "è¤?製已é?¸å®?ç??è³?æ??夾å?°å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Permanently remove this folder"
 msgstr "æ°¸ä¹?移é?¤é??å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:1096
 msgid "E_xpunge"
 msgstr "��(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:871
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "æ°¸ä¹?移é?¤å?¨é??å??è³?æ??夾å?§å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:1103
 msgid "Mar_k All Messages as Read"
 msgstr "æ¨?示æ??æ??é?µä»¶ç?ºå·²é?±è®?(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "Mark all messages in the folder as read"
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:1110
 msgid "_Move Folder To..."
-msgstr "移å??è³?æ??夾å?°(_M)..."
+msgstr "移å??è³?æ??夾å?°(_M)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:885
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "Move the selected folder into another folder"
 msgstr "å°?é?¸å®?ç??è³?æ??夾移è?³å?¦ä¸?å??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:1117
 msgid "_New..."
-msgstr "��(_N)..."
+msgstr "��(_N)�"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "Create a new folder for storing mail"
 msgstr "建ç«?ä¸?å??æ?°è³?æ??夾以å?²å­?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Change the properties of this folder"
 msgstr "è®?æ?´é??å??è³?æ??夾ç??屬æ?§"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "Refresh the folder"
 msgstr "é??æ?°è¼?å?¥è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Change the name of this folder"
 msgstr "è®?æ?´é??å??è³?æ??夾ç??å??稱"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "Select Message _Thread"
 msgstr "é?¸æ??é?µä»¶æª?é ­(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "Select all messages in the same thread as the selected message"
 msgstr "é?¸æ??æ??æ??ç?¸é??ç??é?µä»¶ç?ºé?¸å®?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Select Message S_ubthread"
 msgstr "é?¸æ??é?µä»¶å­?群çµ?(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Select all replies to the currently selected message"
 msgstr "é?¸æ??æ??æ??å??è¦?é?¸å®?é?µä»¶ç??ä¿¡"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:932
-msgid "_Unsubscribe"
-msgstr "å??æ¶?è¨?é?±(_U)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:934
-msgid "Unsubscribe from the selected folder"
-msgstr "å??æ¶?è¨?é?±é?¸å??ç??è³?æ??夾"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:939
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Empty _Trash"
 msgstr "æ¸?ç??å??æ?¶ç­?(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "æ°¸ä¹?移é?¤å?¨æ??æ??帳è??å?§å?¨é?¨å·²å?ªé?¤ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "_New Label"
 msgstr "���籤(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "N_one"
 msgstr "æ²?æ??(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "_Manage Subscriptions"
+msgstr "管ç??è¨?é?±(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "è¨?é?±æ??å??æ¶?è¨?é?±å?¨é? ç«¯ä¼ºæ??å?¨ç??è³?æ??夾"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
+msgid "Send / _Receive"
+msgstr "å?³é??/æ?¥æ?¶(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+msgid "Send queued items and retrieve new items"
+msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "R_eceive all"
+msgstr "����(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Receive new items from all accounts"
+msgstr "æ?¥æ?¶å?¨æ??æ??帳è??å?§ç??æ?°é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
+msgid "_Send all"
+msgstr "å?¨é?¨å?³é??(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "Send queued items in all accounts"
+msgstr "å?³é??å?¨æ??æ??帳è??å?§å¾?é??ç??é ?ç?®"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../widgets/misc/e-activity-proxy.c:314
+msgid "Cancel"
+msgstr "å??æ¶?"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "Cancel the current mail operation"
 msgstr "å??æ¶?ç?®å??é?µä»¶æ??ä½?ç??è¡?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Collapse All _Threads"
 msgstr "æ?¶æ?ºæ??æ??ç?¸é??é?µä»¶(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
 msgid "Collapse all message threads"
 msgstr "æ?¶æ?ºæ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "E_xpand All Threads"
 msgstr "å±?é??æ??æ??ç?¸é??é?µä»¶(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:992
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "Expand all message threads"
 msgstr "å±?é??æ??æ??ç??ç?¸é??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "_Message Filters"
 msgstr "é?µä»¶è¦?å??(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:999
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "Create or edit rules for filtering new mail"
 msgstr "ç?ºæ?°é?µä»¶å»ºç«?æ??編輯é??濾è¦?å??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Search F_olders"
 msgstr "æ??å°?è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Create or edit search folder definitions"
 msgstr "建ç«?æ??編輯æ??å°?è³?æ??夾ç??å®?義"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "_Subscriptions..."
-msgstr "��(_S)..."
+msgstr "��(_S)�"
 
-#: ../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:1020
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "F_older"
 msgstr "è³?æ??夾(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "_Label"
 msgstr "�籤(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
 msgid "_New Folder..."
-msgstr "æ?°å¢?è³?æ??夾(_N)..."
+msgstr "æ?°å¢?è³?æ??夾(_N)â?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Show Message _Preview"
 msgstr "顯示�件�覽(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Show message preview pane"
 msgstr "顯示�件�覽�格"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Show _Deleted Messages"
 msgstr "顯示已���件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#: ../modules/mail/e-mail-shell-view-actions.c:1374
 msgid "Show deleted messages with a line through them"
 msgstr "顯示已å?ªé?¤ç??é?µä»¶ (å? ä¸?å?ªé?¤ç·?)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "_Group By Threads"
 msgstr "ä¾?ç?¸é??é?µä»¶ç?ºç¾¤çµ?(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1109
+#: ../modules/mail/e-mail-shell-view-actions.c:1382
 msgid "Threaded message list"
 msgstr "ç?¸é??é?µä»¶æ¸?å?®"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1130
+#: ../modules/mail/e-mail-shell-view-actions.c:1403
 msgid "Show message preview below the message list"
 msgstr "��件����顯示�件�覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1137
+#: ../modules/mail/e-mail-shell-view-actions.c:1410
 msgid "Show message preview alongside the message list"
 msgstr "å?¨é?µä»¶æ¸?å?®æ??é??顯示é?µä»¶é ?覽"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "All Messages"
 msgstr "æ??æ??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Important Messages"
 msgstr "é??è¦?é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Last 5 Days' Messages"
 msgstr "æ??è¿? 5 天ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Messages Not Junk"
 msgstr "é??å??å?¾é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Messages with Attachments"
 msgstr "æ??é??件ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
 msgid "No Label"
 msgstr "��籤"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1460
 msgid "Read Messages"
 msgstr "已��件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "Recent Messages"
 msgstr "æ??è¿?ç??é?µä»¶"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Unread Messages"
 msgstr "���件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1253
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
 msgid "Subject or Addresses contain"
 msgstr "主æ?¨æ??é?»å­?é?µä»¶ä½?å??å??å?«"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "All Accounts"
 msgstr "æ??æ??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Current Account"
 msgstr "ç?®å??ç??帳è??"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Current Folder"
 msgstr "ç?®å??ç??è³?æ??夾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:936
+#: ../modules/mail/e-mail-shell-view-private.c:1030
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "å·²é?¸æ?? %d å??ï¼?"
 msgstr[1] "å·²é?¸æ?? %d å??ï¼?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:947
+#: ../modules/mail/e-mail-shell-view-private.c:1041
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d �已��"
 msgstr[1] "%d �已��"
 
-#: ../modules/mail/e-mail-shell-view-private.c:953
-#: ../modules/mail/e-mail-shell-view-private.c:960
+#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d å°?å??å?¾"
 msgstr[1] "%d å°?å??å?¾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d å??è??稿"
 msgstr[1] "%d å??è??稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d å°?æ?ªå?³é??"
 msgstr[1] "%d å°?æ?ªå?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d å°?å·²å?³é??"
 msgstr[1] "%d å°?å·²å?³é??"
 
-#: ../modules/mail/e-mail-shell-view-private.c:990
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d ����"
 msgstr[1] "%d ����"
 
-#: ../modules/mail/e-mail-shell-view-private.c:993
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å?± %d å°?"
 msgstr[1] "å?± %d å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:548
+#: ../modules/mail/e-mail-shell-view-private.c:1107
+msgid "Trash"
+msgstr "å??æ?¶ç­?"
+
+#: ../modules/mail/e-mail-shell-view-private.c:1461
+msgid "Send / Receive"
+msgstr "å?³é??/æ?¥æ?¶"
+
+#: ../modules/mail/e-mail-shell-view.c:564
 msgid "All Account Search"
 msgstr "æ??æ??ç??帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:675
+#: ../modules/mail/e-mail-shell-view.c:747
 msgid "Account Search"
 msgstr "帳è??æ??å°?"
 
-#: ../modules/mail/e-mail-shell-view.c:868
+#: ../modules/mail/e-mail-shell-view.c:952
 msgid "Proxy _Logout"
 msgstr "ç?»å?ºä»£ç??伺æ??å?¨(_L)"
 
-#: ../modules/mail/em-account-prefs.c:130
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳è??å?©ç??"
 
-#: ../modules/mail/em-account-prefs.c:179
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "帳è??編輯å?¨"
 
-#: ../modules/mail/em-composer-prefs.c:530
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
+#: ../modules/mail/em-composer-prefs.c:495
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:831
+#: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../modules/mail/em-composer-prefs.c:534
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Every time"
 msgstr "�次"
 
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per day"
 msgstr "�天�次"
 
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per week"
 msgstr "���次"
 
-#: ../modules/mail/em-mailer-prefs.c:100
+#: ../modules/mail/em-mailer-prefs.c:95
 msgid "Once per month"
 msgstr "æ¯?æ??ä¸?次"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:177
 msgid "Add Custom Junk Header"
 msgstr "å? å?¥è?ªè¨?å??å?¾é?µä»¶æª?é ­"
 
-#: ../modules/mail/em-mailer-prefs.c:233
+#: ../modules/mail/em-mailer-prefs.c:185
 msgid "Header Name:"
 msgstr "æ¨?é ­å??稱:"
 
-#: ../modules/mail/em-mailer-prefs.c:234
+#: ../modules/mail/em-mailer-prefs.c:186
 msgid "Header Value Contains:"
 msgstr "æ¨?é ­æ?¸å?¼å??å?«:"
 
-#: ../modules/mail/em-mailer-prefs.c:334
+#: ../modules/mail/em-mailer-prefs.c:286
 msgid "Header"
 msgstr "��"
 
-#: ../modules/mail/em-mailer-prefs.c:338
+#: ../modules/mail/em-mailer-prefs.c:290
 msgid "Contains Value"
 msgstr "å??å?«æ?¸å?¼"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:693 ../modules/mail/em-mailer-prefs.c:764
 #, 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:739 ../modules/mail/em-mailer-prefs.c:811
+#: ../modules/mail/em-mailer-prefs.c:701 ../modules/mail/em-mailer-prefs.c:773
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s å¤?æ??ç¨?å¼?å°?ç?¡æ³?使ç?¨ã??è«?檢æ?¥æ?¯å?¦æ??å®?è£?該å¥?件ã??"
 
-#: ../modules/mail/em-mailer-prefs.c:775
+#: ../modules/mail/em-mailer-prefs.c:737
 msgid "No junk plugin available"
 msgstr "æ²?æ??å?¯ç?¨ç??å??å?¾é?µä»¶å¤?æ??ç¨?å¼?"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1167
+#: ../modules/mail/em-mailer-prefs.c:1140
 msgid "_Date header:"
 msgstr "æ?¥æ??æ¨?é ­(_D):"
 
-#: ../modules/mail/em-mailer-prefs.c:1168
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "Show _original header value"
 msgstr "顯示å??å§?æ¨?é ­æ?¸å?¼(_O)"
 
@@ -15737,10 +15461,59 @@ msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "æ¯?次å??å?? Evolution æ??ï¼?檢æ?¥å®?æ?¯å?¦ç?ºé ?設ç??é?µä»¶ç¨?å¼?ã??"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "æ?¯å?¦è¦?å°? Evolution 設ç?ºæ?¨ç??é ?設é?»å­?é?µä»¶å®¢æ?¶ç«¯ï¼?"
 
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Click 'Work Online' to return to online mode."
+msgstr "é»?é?¸ã??ç·?ä¸?å·¥ä½?ã??以å??å?°ç·?ä¸?模å¼?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+msgid "Evolution is currently offline due to a network outage."
+msgstr "å? ç?ºç¶²è·¯ç?¡æ³?使ç?¨ï¼?Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
+msgid "Evolution is currently offline."
+msgstr "Evolution ç?®å??ç?ºé?¢ç·?å·¥ä½?ã??"
+
+# zh_HK: msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥ä½?ã??"
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
+msgid ""
+"Evolution will return to online mode once a network connection is "
+"established."
+msgstr "ä¸?æ?¦ç¶²è·¯é?£ç·?建ç«?ï¼?Evolution å°±æ??å??å?°ç·?ä¸?模å¼?ã??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+msgid "Author(s)"
+msgstr "ä½?è??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:251
+msgid "Plugin Manager"
+msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:267
+msgid "Note: Some changes will not take effect until restart"
+msgstr "注æ??ï¼?æ??äº?è®?æ?´å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
+msgid "Overview"
+msgstr "�覽"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
+msgid "Plugin"
+msgstr "å¤?æ??ç¨?å¼?"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
+msgid "_Plugins"
+msgstr "å¤?æ??ç¨?å¼?(_P)"
+
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+msgid "Enable and disable plugins"
+msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Hello Python"
@@ -15757,39 +15530,39 @@ 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:393
+#: ../modules/startup-wizard/evolution-startup-wizard.c:276
+#: ../widgets/misc/e-import-assistant.c:399
 msgid "Please select the information that you would like to import:"
 msgstr "è«?é?¸æ??æ?¨æ?³è¦?å?¯å?¥ç??è³?è¨?ï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:302
-#: ../widgets/misc/e-import-assistant.c:549
+#: ../modules/startup-wizard/evolution-startup-wizard.c:308
+#: ../widgets/misc/e-import-assistant.c:555
 #, c-format
 msgid "From %s:"
 msgstr "ä¾?è?ª %sï¼?"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
-#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#: ../modules/startup-wizard/evolution-startup-wizard.c:319
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Importing Files"
 msgstr "正�����"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+#: ../modules/startup-wizard/evolution-startup-wizard.c:394
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "å?¯å?¥å·²å??æ¶?ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+#: ../modules/startup-wizard/evolution-startup-wizard.c:412
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "å?¯å?¥å·²å®?æ??ã??è«?æ??ã??ä¸?ä¸?æ­¥ã??ç¹¼çº?ã??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+#: ../modules/startup-wizard/evolution-startup-wizard.c:482
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設å®?å?©ç??"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+#: ../modules/startup-wizard/evolution-startup-wizard.c:488
 msgid "Welcome"
 msgstr "歡�使�"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+#: ../modules/startup-wizard/evolution-startup-wizard.c:493
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15815,8 +15588,13 @@ msgid ""
 "body"
 msgstr "è®?é??件æ??é??å¤?æ??ç¨?å¼?ç?¨ä¾?æ??å°?é?µä»¶å?§æ??ç??é??é?µå­?æ¸?å?®"
 
+#. Check buttons
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
+msgid "_Do not show this message again."
+msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯(_D)"
+
 #: ../plugins/attachment-reminder/attachment-reminder.c:451
-#: ../plugins/templates/templates.c:409
+#: ../plugins/templates/templates.c:411
 msgid "Keywords"
 msgstr "é??é?µå­?"
 
@@ -15832,7 +15610,7 @@ msgstr "é?µä»¶æ²?æ??é??件"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
-msgstr "æ?°å¢?é??件(_A)..."
+msgstr "æ?°å¢?é??件(_A)â?¦"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -15854,172 +15632,171 @@ msgstr "è¡?å?§é?³æ??"
 msgid "Play audio attachments directly in mail messages."
 msgstr "ç?´æ?¥æ?­æ?¾é?µä»¶ä¸­ç??é?³æ??é??件ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:160
-msgid "Select name of the Evolution backup file"
+#: ../plugins/backup-restore/backup-restore.c:183
+msgid "Select name of the Evolution back up file"
 msgstr "é?¸æ?? Evolution å??份æª?æ¡?ç??å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:191
-msgid "_Restart Evolution after backup"
-msgstr "å??份å¾?é??æ?°å??å?? Evolution(_R)"
+#: ../plugins/backup-restore/backup-restore.c:216
+msgid "_Restart Evolution after back up"
+msgstr "å??份å¾?é??æ?°å??å?? Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:217
-msgid "Select name of the Evolution backup file to restore"
+#: ../plugins/backup-restore/backup-restore.c:242
+msgid "Select name of the Evolution back up file to restore"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution å??份æª?æ¡?å??稱"
 
-#: ../plugins/backup-restore/backup-restore.c:230
+#: ../plugins/backup-restore/backup-restore.c:255
 msgid "_Restart Evolution after restore"
 msgstr "é??å??å¾?é??æ?°å??å?? Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:298
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
+"You can restore Evolution from your back up. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
 "æ?¨å?¯ä»¥å¾?å??份中é??å?? Evolutionã??å®?å?¯ä»¥é??å??æ??æ??ç??é?µä»¶ã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??ã??é?£"
 "絡人ã??å®?ä¹?å?¯ä»¥é??å??æ?¨æ??æ??ç??å??人設å®?ã??é?µä»¶é??濾å?¨ç­?ã??"
 
-#: ../plugins/backup-restore/backup-restore.c:305
-msgid "_Restore Evolution from the backup file"
-msgstr "å¾?å??份æª?æ¡?é??å?? Evol_ution"
+#: ../plugins/backup-restore/backup-restore.c:330
+msgid "_Restore Evolution from the back up file"
+msgstr "å¾?å??份æª?æ¡?é??å?? Evolution (_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:312
+#: ../plugins/backup-restore/backup-restore.c:337
 msgid "Please select an Evolution Archive to restore:"
 msgstr "é?¸æ??è¦?é??å??ç?? Evolution æª?æ¡?庫ï¼?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:340
 msgid "Choose a file to restore"
 msgstr "é?¸æ??è¦?é??å??ç??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup-restore.c:323
-msgid "Restore from backup"
-msgstr "å¾?å??份é??å??"
+#: ../plugins/backup-restore/backup-restore.c:348
+msgid "Restore from back up"
+msgstr "å¾?å??份æª?æ¡?é??å??"
 
-#: ../plugins/backup-restore/backup-restore.c:361
-msgid "_Backup Evolution Settings..."
-msgstr "æ­£å?¨å??份 Evolution ç??設å®?å?¼(_B)..."
+#: ../plugins/backup-restore/backup-restore.c:386
+msgid "_Back up Evolution Data..."
+msgstr "å??份 Evolution è³?æ??(_B)..."
 
-#: ../plugins/backup-restore/backup-restore.c:363
-msgid "Backup Evolution data and settings to an archive file"
+#: ../plugins/backup-restore/backup-restore.c:388
+msgid "Back up Evolution data and settings to an archive file"
 msgstr "å°? Evolution ç??è³?æ??è??設å®?å?¼å??份ç?ºæª?æ¡?庫"
 
-#: ../plugins/backup-restore/backup-restore.c:368
-msgid "R_estore Evolution Settings..."
-msgstr "æ­£å?¨é??å?? Evolution ç??設å®?å?¼(_E)..."
+#: ../plugins/backup-restore/backup-restore.c:393
+msgid "R_estore Evolution Data..."
+msgstr "é??å?? Evolution è³?æ??(_E)..."
 
-#: ../plugins/backup-restore/backup-restore.c:370
+#: ../plugins/backup-restore/backup-restore.c:395
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "å¾?æª?æ¡?庫é??å?? Evolution ç??è³?æ??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:63
-msgid "Backup Evolution directory"
-msgstr "å??份 Evolution ç?®é??"
+#: ../plugins/backup-restore/backup.c:79
+msgid "Back up Evolution directory"
+msgstr "å??份 Evolution è³?æ??夾"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:81
 msgid "Restore Evolution directory"
 msgstr "é??å?? Evolution ç?®é??"
 
-#: ../plugins/backup-restore/backup.c:67
-msgid "Check Evolution Backup"
+#: ../plugins/backup-restore/backup.c:83
+msgid "Check Evolution Back up"
 msgstr "檢æ?¥ Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:85
 msgid "Restart Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:87
 msgid "With Graphical User Interface"
 msgstr "使ç?¨å??形使ç?¨è??ä»?é?¢"
 
-#: ../plugins/backup-restore/backup.c:189
-#: ../plugins/backup-restore/backup.c:251
+#: ../plugins/backup-restore/backup.c:289
+#: ../plugins/backup-restore/backup.c:399
 msgid "Shutting down Evolution"
 msgstr "æ­£å?¨é??é?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:196
+#: ../plugins/backup-restore/backup.c:296
 msgid "Backing Evolution accounts and settings"
 msgstr "å??份 Evolution ç??帳è??è??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:202
+#: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "æ­£å?¨å??份 Evolution è³?æ?? (é?µä»¶ã??é?£çµ¡äººã??è¡?äº?æ??ã??å·¥ä½?ã??å??å¿?é??)"
 
-#: ../plugins/backup-restore/backup.c:213
-msgid "Backup complete"
+#: ../plugins/backup-restore/backup.c:317
+msgid "Back up complete"
 msgstr "å??份å®?æ??"
 
-#: ../plugins/backup-restore/backup.c:218
-#: ../plugins/backup-restore/backup.c:239
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:322
+#: ../plugins/backup-restore/backup.c:496
 msgid "Restarting Evolution"
 msgstr "é??æ?°å??å?? Evolution"
 
-#: ../plugins/backup-restore/backup.c:255
+#: ../plugins/backup-restore/backup.c:403
 msgid "Back up current Evolution data"
 msgstr "å??份ç?®å??ç?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:260
-msgid "Extracting files from backup"
+#: ../plugins/backup-restore/backup.c:409
+msgid "Extracting files from back up"
 msgstr "å¾?å??份解é??æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:466
 msgid "Loading Evolution settings"
 msgstr "æ­£å?¨è®?å?? Evolution ç??設å®?å?¼"
 
-#: ../plugins/backup-restore/backup.c:274
-msgid "Removing temporary backup files"
+#: ../plugins/backup-restore/backup.c:481
+msgid "Removing temporary back up files"
 msgstr "移é?¤æ?«å­?ç??å??份æª?æ¡?"
 
-#: ../plugins/backup-restore/backup.c:281
+#: ../plugins/backup-restore/backup.c:491
 msgid "Ensuring local sources"
 msgstr "正�確���端��"
 
-#: ../plugins/backup-restore/backup.c:428
+#: ../plugins/backup-restore/backup.c:678
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "æ­£å??份è?³è³?æ??夾 %s"
 
-#: ../plugins/backup-restore/backup.c:433
+#: ../plugins/backup-restore/backup.c:683
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "å¾?è³?æ??夾é??å?? %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:455
-msgid "Evolution Backup"
+#: ../plugins/backup-restore/backup.c:705
+msgid "Evolution Back up"
 msgstr "Evolution å??份"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:705
 msgid "Evolution Restore"
 msgstr "Evolution é??å??"
 
-#: ../plugins/backup-restore/backup.c:494
+#: ../plugins/backup-restore/backup.c:746
 msgid "Backing up Evolution Data"
 msgstr "å??份 Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:495
+#: ../plugins/backup-restore/backup.c:747
 msgid "Please wait while Evolution is backing up your data."
 msgstr "å?¨ Evolution å??份æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:497
+#: ../plugins/backup-restore/backup.c:749
 msgid "Restoring Evolution Data"
 msgstr "é??å?? Evolution è³?æ??"
 
-#: ../plugins/backup-restore/backup.c:498
+#: ../plugins/backup-restore/backup.c:750
 msgid "Please wait while Evolution is restoring your data."
 msgstr "å?¨ Evolution é??å??æ?¨ç??è³?æ??æ??è«?ç¨?å??ã??"
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:768
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "é??å??å??ä½?æ??è?±ç??æ??é??å??決æ?¼æ?¨ç??帳è??中è³?æ??ç??å¤?寡ã??"
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-msgid "Backup and Restore"
+msgid "Back up and Restore"
 msgstr "å??份è??é??å??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore your Evolution data and settings."
+msgid "Back up and restore your Evolution data and settings."
 msgstr "å??份è??é??å?? Evolution ç??è³?æ??è??設å®?å?¼ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
@@ -16028,11 +15805,11 @@ msgstr "確å®?è¦?é??é?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
 msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr "確å®?è¦?å¾?é?¸å®?ç??å??份æª?æ¡?é??å?? Evolutionï¼?"
+"Are you sure you want to restore Evolution from the selected back up file?"
+msgstr "確å®?è¦?å¾?é?¸å??ç??å??份æª?æ¡?é??å?? Evolutionï¼?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Backup Evolution"
+msgid "Close and Back up Evolution"
 msgstr "é??é??並å??份 Evolution"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
@@ -16044,11 +15821,11 @@ msgid "Insufficient Permissions"
 msgstr "æ¬?é??ä¸?足"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution backup file"
+msgid "Invalid Evolution back up file"
 msgstr "ç?¡æ??ç?? Evolution å??份æª?æ¡?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid backup file to restore."
+msgid "Please select a valid back up file to restore."
 msgstr "è«?é?¸æ??æ??æ??ç??å??份æª?æ¡?ä¾?é??å??ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
@@ -16057,7 +15834,7 @@ msgstr "é?¸å??ç??è³?æ??夾ç?¡æ³?寫å?¥ã??"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
-"To backup your data and settings, you must first close Evolution. Please "
+"To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
 "è¦?å??份æ?¨ç??è³?æ??å??設å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?確å®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å­?"
@@ -16067,8 +15844,8 @@ msgstr ""
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your "
-"backup."
+"all your current Evolution data and settings and restore them from your back "
+"up."
 msgstr ""
 "è¦?é??å??æ?¨ç??è³?æ??å??設å®?å?¼ï¼?æ?¨å¿?é ?å??é??é?? Evolutionã??è«?確å®?æ?¨å?¨ç¹¼çº?é?²è¡?ä¹?å??å·²å?²å­?"
 "ä»»ä½?å°?æ?ªå?²å­?ç??è³?æ??ã??é??å??å??ä½?æ??å?ªé?¤æ?¨ç?®å?? Evolution æ??æ??ç??è³?æ??å??設å®?å?¼ï¼?並å¾?æ?¨"
@@ -16123,33 +15900,33 @@ msgstr ""
 "å??è¦?é?µä»¶æ??è?ªå??å?¨é??è¨?é??中填å?¥å§?å??è??é?»å­?é?µä»¶ä½?å??ã??å??æ??ä¹?æ??å?¨å¥½å??æ¸?å?®ä¸­å¡«å?¥ IM "
 "é?£çµ¡äººè³?è¨?ã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:163
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter å°?æ?ªå??妥ã??è«?å??å®?è£?å®?ã??"
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:167
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "å?¨ç?¢ç?? %s æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
-msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
+msgstr "Bogofilter å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?â?¦"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:198
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "�� Bogofilter ���中�����..."
+msgstr "�� Bogofilter ���中������"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:221
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "å°?管è?³ Bogofilter 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%dã??"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:406
 msgid "Convert message text to _Unicode"
 msgstr "å°?é?µä»¶æ??å­?è½?æ??ç?º _Unicode"
 
@@ -16175,15 +15952,15 @@ msgstr "Bogofilter ��"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使ç?¨ Bogofilter é??濾å??å?¾é?µä»¶ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:197
+#: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Authentication failed. Server requires correct login."
 msgstr "é©?è­?失æ??ã??伺æ??å?¨è¦?æ±?正確ç??ç?»å?¥ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:199
+#: ../plugins/caldav/caldav-browse-server.c:207
 msgid "Given URL cannot be found."
 msgstr "æ?¾ä¸?å?°æ??å®?ç?? URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:211
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16192,101 +15969,120 @@ msgstr ""
 "伺æ??å?¨å?³å??äº?æ?ªé ?æ??ç??è³?æ??ã??\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:333
-#: ../plugins/caldav/caldav-browse-server.c:584
+#: ../plugins/caldav/caldav-browse-server.c:341
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Failed to parse server response."
 msgstr "ç?¡æ³?å??æ??伺æ??å?¨ç??å??æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:427
+#: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Events"
 msgstr "�件"
 
-#: ../plugins/caldav/caldav-browse-server.c:449
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "User's calendars"
 msgstr "使ç?¨è??ç??è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-browse-server.c:557
-#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:566
+#: ../plugins/caldav/caldav-browse-server.c:734
 msgid "Failed to get server URL."
 msgstr "ç?¡æ³?å??å¾?伺æ??å?¨ URLã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:626
-#: ../plugins/caldav/caldav-browse-server.c:667
-#: ../plugins/caldav/caldav-browse-server.c:1277
+#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:773
+#: ../plugins/caldav/caldav-browse-server.c:1432
 msgid "Searching for user's calendars..."
-msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??..."
+msgstr "æ­£å?¨æ??å°?使ç?¨è??ç??è¡?äº?æ??â?¦"
 
-#: ../plugins/caldav/caldav-browse-server.c:665
+#: ../plugins/caldav/caldav-browse-server.c:771
 msgid "Could not find any user calendar."
 msgstr "æ?¾ä¸?å?°ä»»ä½?使ç?¨è??è¡?äº?æ??ã??"
 
-#: ../plugins/caldav/caldav-browse-server.c:794
+#: ../plugins/caldav/caldav-browse-server.c:903
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "å??ä¸?次ç??å??試失æ??ï¼?%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:796
+#: ../plugins/caldav/caldav-browse-server.c:905
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "å??ä¸?次ç??å??試失æ??代碼ç?º %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:801
+#: ../plugins/caldav/caldav-browse-server.c:910
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "輸å?¥ä½¿ç?¨è?? %s å?¨ä¼ºæ??å?¨ %s ä¸?ç??å¯?碼 "
 
-#: ../plugins/caldav/caldav-browse-server.c:860
+#: ../plugins/caldav/caldav-browse-server.c:969
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "ä¸?è?½å»ºç«? URLã??%sã??ç?? soup è¨?æ?¯"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1095
+#: ../plugins/caldav/caldav-browse-server.c:1215
 msgid "Searching folder content..."
-msgstr "æ??å°?è³?æ??夾å?§å®¹..."
+msgstr "æ??å°?è³?æ??夾å?§å®¹â?¦"
 
-#: ../plugins/caldav/caldav-browse-server.c:1138
+#: ../plugins/caldav/caldav-browse-server.c:1264
+#: ../plugins/caldav/caldav-source.c:255
+msgid "Server _handles meeting invitations"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1271
 msgid "List of available calendars:"
 msgstr "å?¯ç?¨ç??è¡?äº?æ??ç??æ¸?å?®ï¼?"
 
-#: ../plugins/caldav/caldav-browse-server.c:1175
+#: ../plugins/caldav/caldav-browse-server.c:1309
 msgid "Supports"
 msgstr "��"
 
-#: ../plugins/caldav/caldav-browse-server.c:1254
+#: ../plugins/caldav/caldav-browse-server.c:1336
+#: ../plugins/caldav/caldav-source.c:254
+#, fuzzy
+#| msgid "User _Name:"
+msgid "User e-_mail:"
+msgstr "使ç?¨è??å??稱(_N):"
+
+#: ../plugins/caldav/caldav-browse-server.c:1408
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "��建�����%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1362
+#: ../plugins/caldav/caldav-browse-server.c:1517
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "伺æ??å?¨ URLã??%sã??ä¸?æ?¯æ??æ??ç?? URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1368
+#: ../plugins/caldav/caldav-browse-server.c:1523
 msgid "Browse for a CalDAV calendar"
 msgstr "ç??覽 CalDAV è¡?äº?æ??"
 
-#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/caldav/caldav-source.c:235
 #: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "網å??(_U):"
 
-#: ../plugins/caldav/caldav-source.c:223
-#: ../plugins/google-account-setup/google-contacts-source.c:308
+#: ../plugins/caldav/caldav-source.c:242
+#: ../plugins/google-account-setup/google-contacts-source.c:348
 msgid "Use _SSL"
 msgstr "使� _SSL"
 
-#: ../plugins/caldav/caldav-source.c:235
+#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:638
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:268
+msgid "User_name:"
+msgstr "使ç?¨è??å??稱(_N):"
+
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Brows_e server for a calendar"
 msgstr "ç??覽伺æ??å?¨ç??è¡?äº?æ??(_E)"
 
-#: ../plugins/caldav/caldav-source.c:251
-#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/caldav/caldav-source.c:275
+#: ../plugins/calendar-file/calendar-file.c:194
 #: ../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
+#: ../plugins/calendar-weather/calendar-weather.c:398
+#: ../plugins/google-account-setup/google-contacts-source.c:366
+#: ../plugins/google-account-setup/google-source.c:645
 msgid "Re_fresh:"
 msgstr "é??æ?°æ?´ç??(_F):"
 
@@ -16298,31 +16094,31 @@ msgstr "å? å?¥ Evolution å°? CalDAV ç??æ?¯æ?´ã??"
 msgid "CalDAV Support"
 msgstr "CalDAV ��"
 
-#: ../plugins/calendar-file/calendar-file.c:125
+#: ../plugins/calendar-file/calendar-file.c:128
 msgid "_Customize options"
 msgstr "����(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:144
+#: ../plugins/calendar-file/calendar-file.c:147
 msgid "File _name:"
 msgstr "æª?æ¡?å??稱(_N):"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:151
 msgid "Choose calendar file"
 msgstr "é?¸æ??è¡?äº?æ??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:196
+#: ../plugins/calendar-file/calendar-file.c:199
 msgid "On open"
 msgstr "æ?¼é??å??ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:197
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "On file change"
 msgstr "æ?¼è®?æ?´ç??æª?æ¡?"
 
-#: ../plugins/calendar-file/calendar-file.c:198
+#: ../plugins/calendar-file/calendar-file.c:201
 msgid "Periodically"
 msgstr "é?±æ??æ?§ç??"
 
-#: ../plugins/calendar-file/calendar-file.c:213
+#: ../plugins/calendar-file/calendar-file.c:216
 msgid "Force read _only"
 msgstr "強���(_O)"
 
@@ -16350,62 +16146,62 @@ msgstr "å°?網路è¡?äº?æ??å? å?¥ Evolutionã??"
 msgid "Web Calendars"
 msgstr "網路è¡?äº?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:60
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Fog"
 msgstr "天氣�起�"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Cloudy"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Cloudy Night"
 msgstr "天氣ï¼?å¤?é?²ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Overcast"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Showers"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Snow"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Sunny"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Clear Night"
 msgstr "天氣ï¼?æ?´æ??ç??å¤?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Thunderstorms"
 msgstr "天氣���"
 
-#: ../plugins/calendar-weather/calendar-weather.c:222
+#: ../plugins/calendar-weather/calendar-weather.c:225
 msgid "Select a location"
 msgstr "é?¸æ??ä¸?å??ä½?ç½®"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:328
-#: ../plugins/calendar-weather/calendar-weather.c:373
+#: ../plugins/calendar-weather/calendar-weather.c:331
+#: ../plugins/calendar-weather/calendar-weather.c:376
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/calendar-weather/calendar-weather.c:448
+#: ../plugins/calendar-weather/calendar-weather.c:451
 msgid "_Units:"
 msgstr "��(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:455
+#: ../plugins/calendar-weather/calendar-weather.c:460
 msgid "Metric (Celsius, cm, etc)"
 msgstr "å?¬å?¶(æ??æ°?ã??å?¬å??ç­?)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:463
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "è?±å?¶(è?¯æ°?ã??å?¬å??ç­?)"
 
@@ -16434,11 +16230,11 @@ msgstr "å?¨å?¯ä»¥ç??æ??å??å? å?¥ä¸?å¼µå?°å??ä¾?顯示é?£çµ¡äººç??ä½?ç½®ã??"
 msgid "Map for contacts"
 msgstr "é?£çµ¡äººç??å?°å??"
 
-#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/dbx-import/dbx-importer.c:233
 msgid "Select folder to import OE folder into"
 msgstr "é?¸å??å?¯å?¥ OE è³?æ??夾ç?¨ç??è³?æ??夾"
 
-#: ../plugins/dbx-import/dbx-importer.c:251
+#: ../plugins/dbx-import/dbx-importer.c:252
 msgid "Importing Outlook Express data"
 msgstr "æ­£å?¨å?¯å?¥ Outlook Express è³?æ??"
 
@@ -16495,40 +16291,52 @@ msgstr ""
 "é??å??é?µå?¼æ??å®?ç??æ?¯æ?¨å?¯ä»¥å? å?°å¤?å¯?é?µä»¶ç??è?ªè¨?æ¨?é ­æ¸?å?®ã??æ??å®?æ¨?é ­è??æ¨?é ­æ?¸å?¼ç??æ ¼å¼?"
 "ç?ºï¼?è?ªè¨?æ¨?é ­å??稱å? ä¸?ã??=ã??ï¼?å¾?é?¢ç??æ?¸å?¼å??以ã??;ã??é??é??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:319
+msgctxt "email-custom-header-Security"
 msgid "Security:"
-msgstr "���:"
+msgstr "����"
+
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgctxt "email-custom-header-Security"
+msgid "Personal"
+msgstr "å??人"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "�歸�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:325
+msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "已�護"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../plugins/email-custom-header/email-custom-header.c:326
+msgctxt "email-custom-header-Security"
+msgid "Confidential"
+msgstr "��"
+
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "�"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:328
+msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "極��"
 
-#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from Composer,
-#. indicating the header will not be added to a mail message
-#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/email-custom-header/email-custom-header.c:394
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:571
+#: ../plugins/email-custom-header/email-custom-header.c:586
 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:830
+#: ../plugins/email-custom-header/email-custom-header.c:845
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16536,12 +16344,12 @@ msgstr ""
 "æ??å®?è?ªè¨?æ¨?é ­é?µå?¼ç??æ ¼å¼?ï¼?\n"
 "è?ªè¨?æ¨?é ­é?µå?¼ç??å??稱è«?以ã??;ã??é??é??ã??"
 
-#: ../plugins/email-custom-header/email-custom-header.c:884
+#: ../plugins/email-custom-header/email-custom-header.c:899
 msgid "Key"
 msgstr "設��"
 
-#: ../plugins/email-custom-header/email-custom-header.c:900
-#: ../plugins/templates/templates.c:415
+#: ../plugins/email-custom-header/email-custom-header.c:915
+#: ../plugins/templates/templates.c:417
 msgid "Values"
 msgstr "��"
 
@@ -16563,7 +16371,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "å?¨é?µä»¶ç·¨è¼¯å?¨ä¸­æ??ä¸?æ??é?µæ??è?ªå??å?·è¡?編輯å?¨"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:126
+#: ../plugins/external-editor/external-editor.c:128
 msgid "Automatically launch when a new mail is edited"
 msgstr "ç?¶ç·¨è¼¯æ?°é?µä»¶æ??è?ªå??å?·è¡?"
 
@@ -16575,11 +16383,11 @@ msgstr "�設��編輯�"
 msgid "The default command that must be used as the editor."
 msgstr "é ?設ç??æ??令å¿?é ?è?½å??ç?ºç·¨è¼¯å?¨ã??"
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:117
 msgid "Command to be executed to launch the editor: "
 msgstr "ç?¨ä¾?å??å??編輯å?¨ç??æ??令: "
 
-#: ../plugins/external-editor/external-editor.c:116
+#: ../plugins/external-editor/external-editor.c:118
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16587,8 +16395,8 @@ msgstr ""
 "Emacs 使ç?¨ã??xemacsã??\n"
 "VI 使ç?¨ã??gvim -fã??"
 
-#: ../plugins/external-editor/external-editor.c:382
 #: ../plugins/external-editor/external-editor.c:384
+#: ../plugins/external-editor/external-editor.c:386
 msgid "Compose in External Editor"
 msgstr "���編輯�中�寫"
 
@@ -16691,17 +16499,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:274
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#: ../plugins/google-account-setup/google-contacts-source.c:314
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:244
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../plugins/google-account-setup/google-source.c:437
+#: ../plugins/google-account-setup/google-source.c:438
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "輸å?¥ä½¿ç?¨è?? %s ç??å¯?碼以å­?å??å·²è¨?é?±ç??è¡?äº?æ??æ¸?å?®ã??"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16710,17 +16518,17 @@ msgstr ""
 "ä¸?è?½å¾? Google 伺æ??å?¨è®?å??è³?æ??ã??\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/google-account-setup/google-source.c:549
 #: ../plugins/mail-to-task/mail-to-task.c:736
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 msgid "Unknown error."
 msgstr "ä¸?æ??ç??é?¯èª¤ã??"
 
-#: ../plugins/google-account-setup/google-source.c:634
+#: ../plugins/google-account-setup/google-source.c:649
 msgid "Cal_endar:"
 msgstr "è¡?äº?æ??(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/google-account-setup/google-source.c:684
 msgid "Retrieve _List"
 msgstr "å??å??æ¸?å?®(_L)"
 
@@ -16738,38 +16546,46 @@ msgstr "檢���"
 
 #: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
-msgstr "æ?°å¢?å??享è³?æ??夾(_S)..."
+msgstr "æ?°å¢?å??享è³?æ??夾(_S)â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
-msgstr "代ç??伺æ??å?¨ç?»å?¥(_P)..."
+msgstr "代ç??伺æ??å?¨ç?»å?¥(_P)â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
-msgstr "å??å?¾é?µä»¶è¨­å®?å?¼..."
+msgstr "å??å?¾é?µä»¶è¨­å®?å?¼â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:177
 msgid "Track Message Status..."
-msgstr "追蹤é?µä»¶ç??æ??..."
+msgstr "追蹤é?µä»¶ç??æ??â?¦"
 
 #: ../plugins/groupwise-features/gw-ui.c:183
 msgid "Retract Mail"
 msgstr "æ?¶å??é?µä»¶"
 
+#: ../plugins/groupwise-features/gw-ui.c:331
+msgid "Accept"
+msgstr "æ?¥å??"
+
 #: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "æ?«æ??å¥?ç?¨"
 
+#: ../plugins/groupwise-features/gw-ui.c:345
+msgid "Decline"
+msgstr "æ??çµ?"
+
 #: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
-msgstr "é??å¯?æ??è­°(_N)..."
+msgstr "é??å¯?æ??è­°(_N)â?¦"
 
-#: ../plugins/groupwise-features/install-shared.c:165
-#: ../plugins/groupwise-features/share-folder-common.c:343
+#: ../plugins/groupwise-features/install-shared.c:178
+#: ../plugins/groupwise-features/share-folder-common.c:353
 msgid "Create folder"
 msgstr "建ç«?è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:217
+#: ../plugins/groupwise-features/install-shared.c:230
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16794,11 +16610,11 @@ msgstr ""
 "æ??ã??å¥?ç?¨ã??以å®?è£?å??享è³?æ??夾\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:229
+#: ../plugins/groupwise-features/install-shared.c:242
 msgid "Install the shared folder"
 msgstr "å®?è£?å??享è³?æ??夾"
 
-#: ../plugins/groupwise-features/install-shared.c:233
+#: ../plugins/groupwise-features/install-shared.c:246
 msgid "Shared Folder Installation"
 msgstr "å??享è³?æ??夾å®?è£?"
 
@@ -16828,7 +16644,7 @@ msgid "_Junk List"
 msgstr "å??å?¾é?µä»¶æ¸?å?®(_J)"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:8
-#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../plugins/groupwise-features/properties.ui.h:12
 #: ../widgets/table/e-table-config.ui.h:21
 msgid "_Remove"
 msgstr "移�(_R)"
@@ -16851,6 +16667,11 @@ msgstr "é?µä»¶å·²æ??å??æ?¶å??"
 msgid "Insert Send options"
 msgstr "æ??å?¥å?³é??é?¸é ?"
 
+#: ../plugins/groupwise-features/notification.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:6
+msgid "The participants will receive the following notification.\n"
+msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to GroupWise messages"
 msgstr "å°? å?³é?? é?¸é ?å? å?¥ GroupWise è¨?æ?¯"
@@ -16967,31 +16788,23 @@ msgstr "è?ªè¨?é??ç?¥è¨?æ?¯(_U)"
 
 #: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
-msgstr "�絡人(_T)..."
+msgstr "�絡人(_T)�"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Shared Folder Notification"
 msgstr "å??享è³?æ??夾é??ç?¥"
 
-#: ../plugins/groupwise-features/properties.ui.h:7
-msgid "The participants will receive the following notification.\n"
-msgstr "å??è??è??å°?æ??æ?¶å?°ä¸?å??é??ç?¥ã??\n"
-
-#: ../plugins/groupwise-features/properties.ui.h:9
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "Users:"
 msgstr "使ç?¨è??ï¼?"
 
-#: ../plugins/groupwise-features/properties.ui.h:12
+#: ../plugins/groupwise-features/properties.ui.h:11
 msgid "_Not Shared"
 msgstr "æ?ªå??享(_N)"
 
-#: ../plugins/groupwise-features/properties.ui.h:14
+#: ../plugins/groupwise-features/properties.ui.h:13
 msgid "_Shared With..."
-msgstr "å??享給(_S)..."
-
-#: ../plugins/groupwise-features/properties.ui.h:15
-msgid "_Sharing"
-msgstr "å??享(_S)"
+msgstr "å??享給(_S)â?¦"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
@@ -17038,7 +16851,7 @@ msgid "Proxy"
 msgstr "代ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../widgets/misc/e-account-tree-view.c:243
 msgid "Account Name"
 msgstr "帳è??å??稱"
 
@@ -17048,104 +16861,108 @@ msgstr "ç?»å?¥ä»£ç??伺æ??å?¨"
 
 #: ../plugins/groupwise-features/proxy-login.c:208
 #: ../plugins/groupwise-features/proxy-login.c:251
-#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/proxy.c:494
 #: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sè«?輸å?¥ %s æ??é??ç??å¯?碼(使ç?¨è?? %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:689
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å¸³è??ä¸?ç·?æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:695
+#: ../plugins/groupwise-features/proxy.c:704
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代ç??伺æ??å?¨é ?籤å?ªæ??å?¨å??ç?¨æ­¤å¸³è??æ??æ??æ??å?ºç?¾ã??"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:700
+#: ../plugins/groupwise-features/proxy.c:709
 msgctxt "GW"
 msgid "Proxy"
 msgstr "代ç??"
 
-#: ../plugins/groupwise-features/proxy.c:926
-#: ../plugins/groupwise-features/share-folder.c:691
+#: ../plugins/groupwise-features/proxy.c:935
+#: ../plugins/groupwise-features/share-folder.c:692
 msgid "Add User"
 msgstr "å? å?¥ä½¿ç?¨è??"
 
-#: ../plugins/groupwise-features/send-options.c:212
+#: ../plugins/groupwise-features/send-options.c:214
 msgid "Advanced send options"
 msgstr "é?²é??å?³é??é?¸é ?"
 
-#: ../plugins/groupwise-features/share-folder-common.c:309
-#: ../plugins/groupwise-features/share-folder.c:726
+#: ../plugins/groupwise-features/share-folder-common.c:316
+#: ../plugins/groupwise-features/share-folder.c:727
 msgid "Users"
 msgstr "使ç?¨è??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:310
+#: ../plugins/groupwise-features/share-folder-common.c:317
 msgid "Enter the users and set permissions"
 msgstr "輸å?¥ä½¿ç?¨è??並設å®?æ¬?é??"
 
-#: ../plugins/groupwise-features/share-folder-common.c:410
+#: ../plugins/groupwise-features/share-folder-common.c:418
 msgid "Sharing"
 msgstr "å??享"
 
-#: ../plugins/groupwise-features/share-folder.c:529
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "è?ªè¨?é??ç?¥"
 
-#: ../plugins/groupwise-features/share-folder.c:731
+#: ../plugins/groupwise-features/share-folder.c:732
 msgid "Add   "
 msgstr "��"
 
-#: ../plugins/groupwise-features/status-track.c:123
+#: ../plugins/groupwise-features/share-folder.c:738
+msgid "Modify"
+msgstr "修�"
+
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "é?µä»¶ç??æ??"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:137
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "主�:"
 
-#: ../plugins/groupwise-features/status-track.c:151
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "å¯?件è??:"
 
-#: ../plugins/groupwise-features/status-track.c:166
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "建ç«?æ?¥æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:208
 msgid "Recipient: "
 msgstr "æ?¶ä»¶è??:"
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:215
 msgid "Delivered: "
 msgstr "å·²é??é??:"
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:221
 msgid "Opened: "
 msgstr "å·²é??å??:"
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:226
 msgid "Accepted: "
 msgstr "å·²æ?¥å??:"
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:231
 msgid "Deleted: "
 msgstr "已��:"
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:236
 msgid "Declined: "
 msgstr "å·²å©?æ??:"
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:241
 msgid "Completed: "
 msgstr "å·²å®?æ??: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:246
 msgid "Undelivered: "
 msgstr "æ?ªé??é??:"
 
@@ -17157,12 +16974,12 @@ msgstr "è¡?å?§å??ç??"
 msgid "View image attachments directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤ºå??ç??ã??"
 
-#: ../plugins/imap-features/imap-headers.c:330
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "���頭"
 
-#: ../plugins/imap-features/imap-headers.c:343
+#: ../plugins/imap-features/imap-headers.c:342
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP �頭"
@@ -17215,190 +17032,203 @@ msgstr "IMAP å??è?½"
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "ç?¡æ³?è¼?å?¥è¡?äº?æ??ã??%sã??(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:649
+#: ../plugins/itip-formatter/itip-formatter.c:654
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "è¡?äº?æ?? '%s' 中ç??ç´?æ??å??é??å??æ??è­°ç?¸è¡?çª?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:685
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "å°?æ?¾å?¨è¡?äº?æ??ã??%sã??中ç??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:784
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "æ?¾ä¸?å?°ä»»ä½?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "ç?¡æ³?å?¨ä»»ä½?è¡?äº?æ??中æ?¾å?°é??å??ç´?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å·¥ä½?æ¸?å?®ä¸­æ?¾å?°é??é ?å·¥ä½?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:799
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "ç?¡æ³?å?¨ä»»ä½?å??å¿?é??æ¸?å?®ä¸­æ?¾å?°é??é ?å??å¿?é??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:873
+#: ../plugins/itip-formatter/itip-formatter.c:880
 msgid "Opening the calendar. Please wait.."
-msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??..."
+msgstr "æ­£å?¨é??å??è¡?äº?æ??ã??è«?ç¨?å??â?¦"
 
-#: ../plugins/itip-formatter/itip-formatter.c:876
+#: ../plugins/itip-formatter/itip-formatter.c:883
 msgid "Searching for an existing version of this appointment"
 msgstr "å°?æ?¾é??å??ç´?æ??æ?¢å­?ç??ç??æ?¬"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1166
 msgid "Unable to parse item"
 msgstr "ç?¡æ³?å??æ??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1255
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "ç?¡æ³?å?³é??é ?ç?®è?³è¡?äº?æ??ã??%sã??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1156
+#: ../plugins/itip-formatter/itip-formatter.c:1267
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²æ?¥å??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:1271
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºä¸?確å®?ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1165
+#: ../plugins/itip-formatter/itip-formatter.c:1276
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "å?³é??è?³è¡?äº?æ?? '%s' 並設ç?ºå·²å©?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1170
+#: ../plugins/itip-formatter/itip-formatter.c:1281
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "å?³é??è?³è¡?äº?æ??ã??%sã??並設ç?ºå·²å??æ¶?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1375
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æ??è­°å?¬é??人已移é?¤ä»£ç??人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1382
 msgid "Sent a cancelation notice to the delegate"
 msgstr "å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1273
+#: ../plugins/itip-formatter/itip-formatter.c:1384
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "ç?¡æ³?å?³é??å??æ¶?é??ç?¥çµ¦ä»£ç??人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1384
+#: ../plugins/itip-formatter/itip-formatter.c:1495
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1413
+#: ../plugins/itip-formatter/itip-formatter.c:1524
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "ç?¡æ³?æ?´æ?°å?°æ??è??ã??%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 msgid "Attendee status updated"
 msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1532
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "å?°æ??è??ç??æ??ä¸?è?½æ?´æ?°ï¼?å? ç?ºé ?ç?®å·²ç¶?ä¸?å­?å?¨"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1554
 msgid "Meeting information sent"
 msgstr "æ??è­°è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1557
 msgid "Task information sent"
 msgstr "工�����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1560
 msgid "Memo information sent"
 msgstr "å??å¿?é??è³?è¨?å¯?å?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1569
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "ç?¡æ³?å¯?å?ºæ??è­°è³?è¨?ï¼?該æ??議並ä¸?å­?å?¨"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1461
+#: ../plugins/itip-formatter/itip-formatter.c:1572
 msgid "Unable to send task information, the task does not exist"
 msgstr "����工����該�工����"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1464
+#: ../plugins/itip-formatter/itip-formatter.c:1575
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "ç?¡æ³?å¯?å?ºå??å¿?é??è³?è¨?ï¼?該å??å¿?é??並ä¸?å­?å?¨"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1529
+#: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1534
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Save Calendar"
 msgstr "å?²å­?è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1587
-#: ../plugins/itip-formatter/itip-formatter.c:1598
+#: ../plugins/itip-formatter/itip-formatter.c:1703
+#: ../plugins/itip-formatter/itip-formatter.c:1714
 msgid "The calendar attached is not valid"
 msgstr "é??帶ç??è¡?äº?æ??æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
-#: ../plugins/itip-formatter/itip-formatter.c:1599
+#: ../plugins/itip-formatter/itip-formatter.c:1704
+#: ../plugins/itip-formatter/itip-formatter.c:1715
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æ­¤é?µä»¶å®£å??å?¶å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?å?¶è¡?äº?æ??並é??æ??æ??ç?? iCalendarã??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1639
-#: ../plugins/itip-formatter/itip-formatter.c:1667
-#: ../plugins/itip-formatter/itip-formatter.c:1773
+#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../plugins/itip-formatter/itip-formatter.c:1783
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid "The item in the calendar is not valid"
 msgstr "è¡?äº?æ??中ç??é ?ç?®æ?¯ç?¡æ??ç??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1640
-#: ../plugins/itip-formatter/itip-formatter.c:1668
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:1756
+#: ../plugins/itip-formatter/itip-formatter.c:1784
+#: ../plugins/itip-formatter/itip-formatter.c:1893
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "æ­¤é?µä»¶ç¢ºå¯¦å?«æ??è¡?äº?æ??å?§å®¹ï¼?ä½?該å?§å®¹ä¸¦æ?ªå??å?«ä»»ä½?äº?件ã??å·¥ä½?æ??空é??/å¿?ç¢?è³?è¨?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1797
 msgid "The calendar attached contains multiple items"
 msgstr "é??å? ç??è¡?äº?æ??å?§å®¹å?«æ??å¤?å??é ?ç?®"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1682
+#: ../plugins/itip-formatter/itip-formatter.c:1798
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "è¦?è??ç??é??äº?å?¨é?¨ç??é ?ç?®ï¼?æ??該å°?æ­¤æª?æ¡?å?²å­?å¾?å?¯å?¥å?¶ä¸­ç??è¡?äº?æ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2452
+#: ../plugins/itip-formatter/itip-formatter.c:2460
+msgctxt "cal-itip"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2476
+msgid "Tentatively Accepted"
+msgstr "æ?«æ??æ?¥å??"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2594
 msgid "This meeting recurs"
-msgstr "é??å??æ??è­°ç??循ç?°è¦?å??ç?º"
+msgstr "é??å??æ??è­°ç??é?±æ??è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2455
+#: ../plugins/itip-formatter/itip-formatter.c:2597
 msgid "This task recurs"
-msgstr "é??é ?å·¥ä½?ç??循ç?°è¦?å??ç?º"
+msgstr "é??é ?å·¥ä½?ç??é?±æ??è¦?å??ç?º"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2458
+#: ../plugins/itip-formatter/itip-formatter.c:2600
 msgid "This memo recurs"
-msgstr "é??å??å??å¿?é??ç??循ç?°è¦?å??ç?º"
+msgstr "é??å??å??å¿?é??ç??é?±æ??è¦?å??ç?º"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2834
 msgid "_Delete message after acting"
 msgstr "å®?æ??å¾?å?ªé?¤é?µä»¶(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2702
-#: ../plugins/itip-formatter/itip-formatter.c:2735
+#: ../plugins/itip-formatter/itip-formatter.c:2844
+#: ../plugins/itip-formatter/itip-formatter.c:2877
 msgid "Conflict Search"
 msgstr "è¡?çª?ç??æ??å°?"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2859
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "é?¸æ??è¦?æ??å°?æ??è­°è¡?çª?ç??è¡?äº?æ??"
 
@@ -17534,6 +17364,14 @@ msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M"
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y å¹´ %-m æ?? %-d æ?¥ (%A) %p %-l:%M:%S"
 
+#: ../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 "ä¸?æ??人士"
+
 #: ../plugins/itip-formatter/itip-view.c:367
 #: ../plugins/itip-formatter/itip-view.c:455
 #: ../plugins/itip-formatter/itip-view.c:542
@@ -17551,12 +17389,12 @@ msgstr "代表 %s ��"
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "%s through %s has published the following meeting information:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s has published the following meeting information:"
-msgstr "%s å·²ç¶?ç?¼ä½?ä¸?å??æ??è­°è³?è¨?ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?ä¸?å??æ??è­°è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
@@ -17638,12 +17476,12 @@ msgstr "%s å·²ç¶?å©?æ??äº?ä¸?å??æ??è­°è®?æ?´ã??"
 #: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "%s through %s has published the following task:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?äº?ä¸?å??å·¥ä½?è³?è¨?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s has published the following task:"
-msgstr "%s å·²ç¶?ç?¼ä½?äº?ä¸?å??å·¥ä½?ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?äº?ä¸?å??å·¥ä½?ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
@@ -17726,12 +17564,12 @@ msgstr "%s å·²ç¶?å©?æ??ä¸?å??æ??æ´¾ç??å·¥ä½?ï¼?"
 #: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s through %s has published the following memo:"
-msgstr "%s é??é?? %s å·²ç¶?ç?¼ä½?äº?ä¸?å??å??å¿?é??ï¼?"
+msgstr "%s é??é?? %s å·²ç¶?ç?¼å¸?äº?ä¸?å??å??å¿?é??ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s has published the following memo:"
-msgstr "%s å·²ç¶?ç?¼ä½?äº?å??å¿?é??ï¼?"
+msgstr "%s å·²ç¶?ç?¼å¸?äº?å??å¿?é??ï¼?"
 
 #: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
@@ -17763,7 +17601,7 @@ msgstr "é??å§?æ?¥ï¼?"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1053
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Start time:"
 msgstr "é??å§?æ??é??:"
 
@@ -17773,7 +17611,7 @@ msgstr "çµ?æ??æ?¥ï¼?"
 
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1065
 msgid "End time:"
 msgstr "çµ?æ??æ??é??:"
 
@@ -17832,41 +17670,41 @@ msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1084
-#: ../plugins/itip-formatter/itip-view.c:1138
+#: ../plugins/itip-formatter/itip-view.c:1085
+#: ../plugins/itip-formatter/itip-view.c:1139
 msgid "Comment:"
 msgstr "註解:"
 
-#: ../plugins/itip-formatter/itip-view.c:1123
+#: ../plugins/itip-formatter/itip-view.c:1124
 msgid "Send _reply to sender"
 msgstr "å??è¦?å¯?件è??(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1153
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "Send _updates to attendees"
 msgstr "å?³é??æ?´æ?°çµ¦å?°æ??è??(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1163
 msgid "_Apply to all instances"
 msgstr "å¥?ç?¨è?³æ??æ??實é«?(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1172
 msgid "Show time as _free"
 msgstr "顯示æ??é??ç?ºç©ºé??(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1174
+#: ../plugins/itip-formatter/itip-view.c:1175
 msgid "_Preserve my reminder"
 msgstr "ä¿?ç??æ??ç??æ??é??(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1181
 msgid "_Inherit reminder"
 msgstr "ç¹¼æ?¿æ??é??(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1924
 msgid "_Tasks:"
 msgstr "工�(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1926
 msgid "_Memos:"
 msgstr "å??å¿?é??(_M):"
 
@@ -17896,84 +17734,68 @@ msgid "Beep or play sound file."
 msgstr "ç?¼å?ºå?¶è?²æ??æ?­æ?¾è?²é?³æª?æ¡?ã??"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Blink icon in notification area."
-msgstr "è®?é??ç?¥å??ç??å??示é??ç??ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable D-Bus messages."
 msgstr "å??ç?¨ D-Bus è¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "å??ç?¨é??ç?¥å??ç??å??示ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??ç?¢ç?? D-BUS è¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr "å¦?æ??ç?ºã??trueã??ï¼?å??ç?¶æ?°é?µä»¶æ?µé??æ??ç?¼å?ºå?¶è?²å?¦å??å°±æ?­æ?¾è?²é?³æª?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Notify new messages for Inbox only."
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Play sound when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr "å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ï¼?å?¨æ?°é?µä»¶é??å?°æ??æ?­æ?¾ä¸»é¡?ç??é?³æ??ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Popup message together with the icon."
 msgstr "å?¨å??示ä¸?å½?å?ºæ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??å?¨é??ç?¥å??顯示æ?°é?µä»¶å??示ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
 msgstr "è¦?æ?­æ?¾ç??è?²é?³æª?æ¡?å??稱ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "æ?°é?µä»¶é??å?°æ??è¦?æ?­æ?¾ç??é?³æ??æª?æ¡?ï¼?å¦?æ??ä¸?æ?¯ä½¿ç?¨å?¶è?²æ¨¡å¼?ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Use sound theme"
 msgstr "使ç?¨é?³æ??主é¡?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?¯å?¦æ?­æ?¾è?²é?³æª?æ¡?æ??ç?¼å?ºå?¶è?²ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "æ?¯å?¦å?¨æ?°é?µä»¶æ?µé??æ??æ?¼å??示ä¸?å½?å?ºè¨?æ?¯ã??"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
-msgid "Whether the icon should blink or not."
-msgstr "å??示æ?¯å?¦è¦?é??ç??ã??"
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "æ?¯å?¦å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶ã??"
 
-#: ../plugins/mail-notification/mail-notification.c:369
-msgid "Evolution's Mail Notification"
-msgstr "Evolution ç??æ?°é?µä»¶é??ç?¥"
-
-#: ../plugins/mail-notification/mail-notification.c:391
-msgid "Mail Notification Properties"
-msgstr "æ?°é?µä»¶é??ç?¥å±¬æ?§"
-
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:390
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17990,67 +17812,64 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:539
+#: ../plugins/mail-notification/mail-notification.c:402
 #, c-format
 msgid "From: %s"
 msgstr "å¯?件è??ï¼?%s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:552
+#: ../plugins/mail-notification/mail-notification.c:415
 #, c-format
 msgid "Subject: %s"
 msgstr "主��%s"
 
-#: ../plugins/mail-notification/mail-notification.c:562
+#: ../plugins/mail-notification/mail-notification.c:425
 #, 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:584
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:438
+#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:449
 msgid "New email"
 msgstr "��件"
 
-#: ../plugins/mail-notification/mail-notification.c:652
+#: ../plugins/mail-notification/mail-notification.c:498
 msgid "Show icon in _notification area"
 msgstr "å?¨é??ç?¥å??中顯示å??示(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:680
-msgid "B_link icon in notification area"
-msgstr "è®?é??ç?¥å??å??示é??ç??(_L)"
-
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:528
 msgid "Popup _message together with the icon"
 msgstr "å?¨å??示ä¸?å½?å?ºè¨?æ?¯(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:877
+#: ../plugins/mail-notification/mail-notification.c:715
 msgid "_Play sound when new messages arrive"
 msgstr "ç?¶æ?°é?µä»¶å?°é??æ??æ?­æ?¾è?²é?³æª?æ¡?(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:906
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "_Beep"
 msgstr "��(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:919
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Use sound _theme"
 msgstr "使ç?¨é?³æ??主é¡?(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:938
+#: ../plugins/mail-notification/mail-notification.c:777
 msgid "Play _file:"
 msgstr "����(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:949
+#: ../plugins/mail-notification/mail-notification.c:788
 msgid "Select sound file"
 msgstr "é?¸æ??è?²é?³æª?æ¡?"
 
-#: ../plugins/mail-notification/mail-notification.c:1007
+#: ../plugins/mail-notification/mail-notification.c:846
 msgid "Notify new messages for _Inbox only"
 msgstr "å?ªé??ç?¥æ?¶ä»¶å?£ç??æ?°é?µä»¶(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:1016
+#: ../plugins/mail-notification/mail-notification.c:855
 msgid "Generate a _D-Bus message"
 msgstr "ç?¢ç?? _D-Bus è¨?æ?¯"
 
@@ -18063,7 +17882,7 @@ 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:158
+#: ../plugins/mail-to-task/mail-to-task.c:157
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "å¾? %s ç??é?µä»¶æ??建ç«?"
@@ -18194,40 +18013,40 @@ msgid ""
 "source, please."
 msgstr "é?¸å??ç??ä¾?æº?æ?¯å?¯è®?ç??ï¼?å? æ­¤ä¸?è?½å?¨é??裡建ç«?å??å¿?é??ã??è«?é?¸æ??å?¶ä»?ç??ä¾?æº?ã??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:952
+#: ../plugins/mail-to-task/mail-to-task.c:955
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "ä¸?è?½å??å¾?ä¾?æº?æ¸?å?®ã??%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create an _Event"
 msgstr "建��件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1073
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new event from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??äº?件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1081
 msgid "Create a Mem_o"
 msgstr "建ç«?å??å¿?é??(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1080
+#: ../plugins/mail-to-task/mail-to-task.c:1083
 msgid "Create a new memo from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å??å¿?é??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1088
 msgid "Create a _Task"
 msgstr "建�工�(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1090
 msgid "Create a new task from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??å·¥ä½?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1095
+#: ../plugins/mail-to-task/mail-to-task.c:1098
 msgid "Create a _Meeting"
 msgstr "建ç«?æ??è­°(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1097
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Create a new meeting from the selected message"
 msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 
@@ -18235,55 +18054,55 @@ msgstr "以é?¸å??ç??é?µä»¶å»ºç«?æ?°ç??æ??è­°"
 msgid "Convert a mail message to a task."
 msgstr "å°?é?µä»¶è½?æ??ç?ºå·¥ä½?ã??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:294
 msgid "Get List _Archive"
 msgstr "å??å¾?æ¸?å?®æª?æ¡?庫(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "Get an archive of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??æª?æ¡?庫"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:301
 msgid "Get List _Usage Information"
 msgstr "å??å¾?æ¸?å?®ä½¿ç?¨è³?è¨?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "å??å¾?æ­¤é?µä»¶æ??屬è«?å£?ç??使ç?¨æ?¹æ³?ç?¸é??è³?è¨?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:308
 msgid "Contact List _Owner"
 msgstr "é?£çµ¡äººæ¸?å?®æ??æ??è??(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "é?£çµ¡æ­¤é?µä»¶æ??屬é??ä¿¡è«?å£?ç??管ç??è??"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:315
 msgid "_Post Message to List"
 msgstr "å?³é??é?µä»¶çµ¦è«?å£?(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:317
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "æ?°å¯«é?µä»¶çµ¦æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:322
 msgid "_Subscribe to List"
 msgstr "����(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:324
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:326
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:329
 msgid "_Unsubscribe from List"
 msgstr "å??æ¶?è¨?é?±è«?å£?(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:328
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:331
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "å??æ¶?è¨?é?±æ­¤é?µä»¶æ??屬ç??é??ä¿¡è«?å£?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:335
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:338
 msgid "Mailing _List"
 msgstr "é??ä¿¡è«?å£?(_L)"
 
@@ -18383,15 +18202,15 @@ msgstr ""
 "æ?¨è¦?å°?ç?®å??ç??è³?æ??夾中ç??é?µä»¶å·²é?±è®?ï¼?æ??æ?¯å??å?«ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾中æ??æ??é?µ"
 "件ã??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:194
+#: ../plugins/mark-all-read/mark-all-read.c:196
 msgid "In Current Folder and _Subfolders"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾å??å?¶å­?è³?æ??夾(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:208
+#: ../plugins/mark-all-read/mark-all-read.c:210
 msgid "In Current _Folder Only"
 msgstr "æ?¼ç?®å??ç??è³?æ??夾(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:437
+#: ../plugins/mark-all-read/mark-all-read.c:447
 msgid "Mark Me_ssages as Read"
 msgstr "�示�件�已�(_S)"
 
@@ -18403,40 +18222,6 @@ msgstr "å?¨é?¨æ¨?示æ??å·²è®?"
 msgid "Mark all messages in a folder as read."
 msgstr "å°?è³?æ??夾中å?¨é?¨ç??é?µä»¶æ¨?示æ??å·²é?±è®?ã??"
 
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "Manage your Evolution plugins."
-msgstr "管ç??æ?¨ç?? Evolution å¤?æ??ç¨?å¼?ã??"
-
-#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:244
-msgid "Plugin Manager"
-msgstr "å¤?æ??ç¨?å¼?管ç??å?¡"
-
-#: ../plugins/plugin-manager/plugin-manager.c:59
-msgid "Author(s)"
-msgstr "ä½?è??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:259
-msgid "Note: Some changes will not take effect until restart"
-msgstr "注æ??ï¼?æ??äº?è®?æ?´å?¨é??æ?°å??å??å¾?æ??æ??ç??æ??"
-
-#: ../plugins/plugin-manager/plugin-manager.c:285
-msgid "Overview"
-msgstr "�覽"
-
-#: ../plugins/plugin-manager/plugin-manager.c:356
-#: ../plugins/plugin-manager/plugin-manager.c:418
-msgid "Plugin"
-msgstr "å¤?æ??ç¨?å¼?"
-
-#: ../plugins/plugin-manager/plugin-manager.c:430
-msgid "_Plugins"
-msgstr "å¤?æ??ç¨?å¼?(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:432
-msgid "Enable and disable plugins"
-msgstr "å??ç?¨è??å??ç?¨å¤?æ??ç¨?å¼?"
-
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
@@ -18450,39 +18235,39 @@ msgstr "å??好ç´?æ??å­?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "以ç´?æ??å­?æ?¹å¼?檢è¦?é?µä»¶ï¼?å?³ä½¿å®?å??å?«æ?? HTML å?§å®¹ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Show HTML if present"
 msgstr "å¦?æ??ä¾? HTML å??顯示ä¹?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:198
+#: ../plugins/prefer-plain/prefer-plain.c:225
 msgid "Let Evolution choose the best part to show."
 msgstr "è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid "Show plain text if present"
 msgstr "å¦?æ??ä¾?ç´?æ??å­?å??顯示å®?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:199
+#: ../plugins/prefer-plain/prefer-plain.c:226
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "å¦?æ??æ??ç´?æ??å­?ç??é?¨å??就顯示å®?ï¼?å?¦å??è®? Evolution é?¸æ??æ??ä½³ç??é?¨å??ä¾?顯示ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid "Only ever show plain text"
 msgstr "å?ªä»¥ç´?æ??å­?顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:200
+#: ../plugins/prefer-plain/prefer-plain.c:227
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "å¦?æ??æ??è¦?æ±?æ??ï¼?æ°¸é? é¡¯ç¤ºç´?æ??å­?ç??é?¨å??並å¾?å?¶ä»?ç??é?¨å??製ä½?é??件ã??"
 
-#: ../plugins/prefer-plain/prefer-plain.c:247
+#: ../plugins/prefer-plain/prefer-plain.c:274
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "å°?æ??å?¶ç?? HTML é?¨å??顯示ç?ºé??件(_U)"
 
-#: ../plugins/prefer-plain/prefer-plain.c:267
+#: ../plugins/prefer-plain/prefer-plain.c:294
 msgid "HTML _Mode"
 msgstr "HT_ML 模�"
 
@@ -18506,43 +18291,44 @@ msgstr "Outlook PST ��"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook å??人è³?æ??夾 (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:295
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "_Mail"
 msgstr "�件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:307
+#: ../plugins/pst-import/pst-importer.c:323
 msgid "Destination folder:"
 msgstr "ç?®ç??å?°è³?æ??夾:"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:313
+#: ../plugins/pst-import/pst-importer.c:329
 msgid "_Address Book"
 msgstr "é??è¨?é??(_A)"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:320
+#: ../plugins/pst-import/pst-importer.c:336
 msgid "A_ppointments"
 msgstr "ç´?æ??(_P)"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:342 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "工�(_T)"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:348
 msgid "_Journal entries"
 msgstr "����(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:347
+#: ../plugins/pst-import/pst-importer.c:363
 msgid "Importing Outlook data"
 msgstr "å?¯å?¥ Outlook è³?æ??"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:153
+#: ../plugins/publish-calendar/publish-calendar.c:154
+#: ../plugins/publish-calendar/publish-calendar.c:156
 msgid "Calendar Publishing"
-msgstr "è¡?äº?æ??ç?¼ä½?"
+msgstr "è¡?äº?æ??ç?¼å¸?"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
@@ -18550,53 +18336,53 @@ msgstr "ä½?ç½®"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
-msgstr "å°?è¡?äº?æ??ç?¼ä½?ç?ºç¶²é ?ã??"
+msgstr "å°?è¡?äº?æ??ç?¼å¸?ç?ºç¶²é ?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:208
-#: ../plugins/publish-calendar/publish-calendar.c:449
+#: ../plugins/publish-calendar/publish-calendar.c:212
+#: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
 msgstr "ç?¡æ³?é??å?? %sï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:210
+#: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "ç?¡æ³?é??å?? %sï¼?æ?ªç?¥ç??é?¯èª¤"
 
-#: ../plugins/publish-calendar/publish-calendar.c:230
+#: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr "ç?¼ä½?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
+msgstr "ç?¼å¸?å?° %s æ??ç?¼ç??é?¯èª¤ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:232
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr "ç?¼ä½?å?° %s å·²æ??å??çµ?æ??"
+msgstr "ç?¼å¸?å?° %s å·²æ??å??çµ?æ??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:276
+#: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "æ??è¼? %s 失æ??ï¼?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "å??ç?¨(_E)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:739
+#: ../plugins/publish-calendar/publish-calendar.c:743
 msgid "Are you sure you want to remove this location?"
 msgstr "確å®?è¦?移é?¤é??å??ä½?ç½®ï¼?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. where the publishing should be done, fails. Basically, this shouldn't
 #. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1051
+#: ../plugins/publish-calendar/publish-calendar.c:1055
 msgid "Could not create publish thread."
-msgstr "ç?¡æ³?建ç«?ç?¼ä½?å?·è¡?ç·?ã??"
+msgstr "ç?¡æ³?建ç«?ç?¼å¸?å?·è¡?ç·?ã??"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1059
+#: ../plugins/publish-calendar/publish-calendar.c:1063
 msgid "_Publish Calendar Information"
-msgstr "ç?¼ä½?è¡?äº?æ??è³?è¨?(_P)"
+msgstr "ç?¼å¸?è¡?äº?æ??è³?è¨?(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Custom Location"
@@ -18624,11 +18410,11 @@ msgstr "�� FTP"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
-msgstr "���置"
+msgstr "���置"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
-msgstr "ç?¼ä½?é »ç??(_F):"
+msgstr "ç?¼å¸?é »ç??(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
@@ -18672,7 +18458,7 @@ msgstr "�碼(_P):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
-msgstr "���(_P):"
+msgstr "���(_P):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
@@ -18690,57 +18476,57 @@ msgstr "iCal"
 #: ../plugins/publish-calendar/publish-format-ical.c:82
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "ç?¡æ³?ç?¼ä½?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
+msgstr "ç?¡æ³?ç?¼å¸?è¡?äº?æ??ï¼?è¡?äº?æ??å¾?端ç¨?å¼?å·²ä¸?å­?å?¨"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:476
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "æ?°ç??ä½?ç½®"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "編輯�置"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "��� SpamAssassin�代碼�%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "建ç«?å°?管失æ??ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
 #, c-format
 msgid "Error after fork: %s"
 msgstr "fork ä¹?å¾?ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?..."
+msgstr "SpamAssassin å­?ç¨?åº?æ²?æ??å??æ??ï¼?中止å®?â?¦"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "�� SpamAssassin ���中�����..."
+msgstr "�� SpamAssassin ���中������"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "å°?管è?³ SpamAssassin 失æ??ï¼?é?¯èª¤ä»£ç¢¼ï¼?%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "SpamAssassin ç?¡æ³?使ç?¨ã??è«?å??å®?è£?å®?ã??"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:940
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "é??æ??è®? SpamAssasin æ?´å?¯é? ï¼?ä½?é??度è®?æ?¢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:948
 msgid "I_nclude remote tests"
 msgstr "å??å?«é? ç«¯æ¸¬è©¦(_N)"
 
@@ -18792,6 +18578,10 @@ msgstr "é??å§?"
 msgid "End"
 msgstr "çµ?æ??"
 
+#: ../plugins/save-calendar/csv-format.c:372
+msgid "Due"
+msgstr "�止"
+
 #: ../plugins/save-calendar/csv-format.c:373
 msgid "percent Done"
 msgstr "ï¼?å·²å®?æ??"
@@ -18877,23 +18667,6 @@ msgstr "å°?é?¸å??ç??å??å¿?é??æ¸?å?®å?²å­?è?³ç£?ç¢?"
 msgid "Save the selected task list to disk"
 msgstr "å°?é?¸å??ç??å·¥ä½?æ¸?å?®å?²å­?è?³ç£?ç¢?"
 
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Sort mail message threads by subject."
-msgstr "以主æ?¨ç?ºå?ºç¤?串æ?¥é?µä»¶ã??"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
-msgid "Subject Threading"
-msgstr "主æ?¨æ??å??"
-
-#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
-msgid "Thread messages by subject"
-msgstr "以主����串��件"
-
-#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:63
-msgid "F_all back to threading messages by subject"
-msgstr "é??å??å?°ä¾?主æ?¨ç??ç?¸é??é?µä»¶(_A)"
-
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
 msgid ""
 "List of keyword/value pairs for the Templates plugin to substitute in a "
@@ -18904,15 +18677,15 @@ msgstr "使ç?¨é?µä»¶å?§æ??ç??ç¯?æ?¬å¤?æ??ç¨?å¼?å?¯ç?¨ç??é??é?µå­?/æ?¸å?¼çµ?æ¸?
 msgid "Drafts based template plugin"
 msgstr "å?ºæ?¼è??稿ç??ç¯?æ?¬å¤?æ??ç¨?å¼?"
 
-#: ../plugins/templates/templates.c:620
+#: ../plugins/templates/templates.c:631
 msgid "No Title"
 msgstr "æ²?æ??æ¨?é¡?"
 
-#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:741
 msgid "Save as _Template"
 msgstr "�����(_T)"
 
-#: ../plugins/templates/templates.c:693
+#: ../plugins/templates/templates.c:743
 msgid "Save as Template"
 msgstr "�����"
 
@@ -18932,27 +18705,27 @@ msgstr "è¡?å?§ vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "ç?´æ?¥å?¨é?µä»¶ä¸­é¡¯ç¤º vCardã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:181
-#: ../plugins/vcard-inline/vcard-inline.c:266
+#: ../plugins/vcard-inline/vcard-inline.c:195
+#: ../plugins/vcard-inline/vcard-inline.c:280
 msgid "Show Full vCard"
 msgstr "顯示å®?æ?´ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:184
+#: ../plugins/vcard-inline/vcard-inline.c:198
 msgid "Show Compact vCard"
 msgstr "顯示精簡ç?? vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:259
 msgid "There is one other contact."
 msgstr "é??æ??é?£çµ¡äººã??"
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:268
 #, 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:275
+#: ../plugins/vcard-inline/vcard-inline.c:289
 msgid "Save in Address Book"
 msgstr "å­?å?¥é??è¨?é??"
 
@@ -18968,11 +18741,11 @@ msgstr "WebDAV �絡人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:256
 msgid "URL:"
 msgstr "網å??:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:282
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "é?¿å?? IfM_atch (é??使ç?¨ Apache < 2.2.8)"
 
@@ -18990,7 +18763,7 @@ msgstr "çµ?æ??ç??æ?¬"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "é ?設è³?è¨?æ?¹å¡?å??寬度"
+msgstr "é ?設å?´é??æ¬?寬度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
@@ -19130,7 +18903,7 @@ msgstr "顯示å?´é??æ¬?"
 msgid "Skip development warning dialog"
 msgstr "忽ç?¥é??ç?¼è­¦å??å°?話ç??"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:371
 msgid "Start in offline mode"
 msgstr "以é?¢ç·?模å¼?å??å??"
 
@@ -19285,11 +19058,11 @@ msgstr "è¦?çª?æ??é??風格"
 msgid "Window buttons are visible"
 msgstr "è¦?çª?æ??é??æ?¯å?¯è¦?ç??"
 
-#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
+#: ../shell/e-shell-content.c:674 ../shell/e-shell-content.c:675
 msgid "Searches"
 msgstr "æ??å°?"
 
-#: ../shell/e-shell-content.c:563
+#: ../shell/e-shell-content.c:717
 msgid "Save Search"
 msgstr "å?²å­?æ??å°?çµ?æ??"
 
@@ -19297,38 +19070,42 @@ msgstr "å?²å­?æ??å°?çµ?æ??"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:921
+#: ../shell/e-shell-searchbar.c:941
 msgid "Sho_w:"
 msgstr "顯示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:952
+#: ../shell/e-shell-searchbar.c:974
 msgid "Sear_ch:"
 msgstr "æ??å°?(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1013
+#: ../shell/e-shell-searchbar.c:1037
 msgid "i_n"
 msgstr "æ?¼(_N)"
 
-#: ../shell/e-shell-utils.c:253
+#: ../shell/e-shell-utils.c:255
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:255
+#: ../shell/e-shell-utils.c:257
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:276
+#: ../shell/e-shell-utils.c:278
 msgid "All Files (*)"
 msgstr "æ??æ??æª?æ¡? (*)"
 
+#: ../shell/e-shell-view.c:297
+msgid "Saving user interface state"
+msgstr "å?²å­?使ç?¨è??ä»?é?¢ç??æ??"
+
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:645
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -19339,307 +19116,299 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:656
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution 網�"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1216
 msgid "Bug Buddy is not installed."
 msgstr "å°?æ?ªå®?è£? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1238
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Bug Buddy could not be run."
 msgstr "ç?¡æ³?å?·è¡? Bug Buddyã??"
 
-#: ../shell/e-shell-window-actions.c:1419
+#: ../shell/e-shell-window-actions.c:1399
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution ç?¸é??è³?è¨?"
 
-#: ../shell/e-shell-window-actions.c:1424
-#: ../shell/e-shell-window-actions.c:1438
+#: ../shell/e-shell-window-actions.c:1404
+#: ../shell/e-shell-window-actions.c:1418
 msgid "_Close Window"
 msgstr "é??é??è¦?çª?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1445
+#: ../shell/e-shell-window-actions.c:1425
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../shell/e-shell-window-actions.c:1447
+#: ../shell/e-shell-window-actions.c:1427
 msgid "Open the Evolution User Guide"
 msgstr "é??å?? Evolution 使ç?¨è??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1473
+#: ../shell/e-shell-window-actions.c:1453
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1475
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "é??å??常è¦?å??é¡?(FAQ)網é ?"
 
-#: ../shell/e-shell-window-actions.c:1480
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Forget Passwords"
 msgstr "���碼(_F)"
 
-#: ../shell/e-shell-window-actions.c:1482
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Forget all remembered passwords"
 msgstr "å¿?è¨?æ??æ??è¨?æ?¶ç??å¯?碼"
 
-#: ../shell/e-shell-window-actions.c:1487
+#: ../shell/e-shell-window-actions.c:1467
 msgid "I_mport..."
-msgstr "��(_M)..."
+msgstr "��(_M)�"
 
-#: ../shell/e-shell-window-actions.c:1489
+#: ../shell/e-shell-window-actions.c:1469
 msgid "Import data from other programs"
 msgstr "å?¯å?¥å?¶ä»?ç¨?å¼?ç??è³?æ??"
 
-#: ../shell/e-shell-window-actions.c:1494
+#: ../shell/e-shell-window-actions.c:1474
 msgid "New _Window"
 msgstr "é??æ?°è¦?çª?(_W)"
 
-#: ../shell/e-shell-window-actions.c:1496
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Create a new window displaying this view"
 msgstr "建ç«?ä¸?å??æ?°ç??è¦?çª?ä¾?顯示é??å??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1510
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Configure Evolution"
 msgstr "設� Evolution"
 
-#: ../shell/e-shell-window-actions.c:1515
+#: ../shell/e-shell-window-actions.c:1495
 msgid "_Quick Reference"
 msgstr "å¿«é??å??好設å®?(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1517
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Show Evolution's shortcut keys"
 msgstr "顯示 Evolution ç??æ?·å¾?é?µ"
 
-#: ../shell/e-shell-window-actions.c:1524
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Exit the program"
 msgstr "é?¢é??é??å??ç¨?å¼?"
 
-#: ../shell/e-shell-window-actions.c:1529
+#: ../shell/e-shell-window-actions.c:1509
 msgid "_Advanced Search..."
-msgstr "é?²é??æ??å°?(_A)..."
+msgstr "é?²é??æ??å°?(_A)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1531
+#: ../shell/e-shell-window-actions.c:1511
 msgid "Construct a more advanced search"
 msgstr "建æ§?æ?´é?²é??ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1538
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Clear the current search parameters"
 msgstr "æ¸?é?¤ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1543
+#: ../shell/e-shell-window-actions.c:1523
 msgid "_Edit Saved Searches..."
-msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)..."
+msgstr "編輯å?²å­?ç??æ??å°?çµ?æ??(_E)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1545
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Manage your saved searches"
 msgstr "管ç??æ?¨å·²å?²å­?ç??æ??å°?"
 
-#: ../shell/e-shell-window-actions.c:1552
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Click here to change the search type"
 msgstr "æ??é??裡以æ?¹è®?æ??å°?é¡?å??"
 
-#: ../shell/e-shell-window-actions.c:1557
+#: ../shell/e-shell-window-actions.c:1537
 msgid "_Find Now"
 msgstr "ç«?å?³æ??å°?(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1559
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Execute the current search parameters"
 msgstr "å?·è¡?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1564
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Save Search..."
-msgstr "å?²å­?æ??å°?çµ?æ??(_S)..."
+msgstr "å?²å­?æ??å°?çµ?æ??(_S)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1566
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Save the current search parameters"
 msgstr "å?²å­?ç?®å??ç??æ??å°?å??æ?¸"
 
-#: ../shell/e-shell-window-actions.c:1578
-msgid "Send / _Receive"
-msgstr "å?³é??/æ?¥æ?¶(_R)"
-
-#: ../shell/e-shell-window-actions.c:1580
-msgid "Send queued items and retrieve new items"
-msgstr "å?³é??å¾?é??ç??é ?ç?®ä¸¦æ?¥æ?¶æ?°ç??é ?ç?®"
-
-#: ../shell/e-shell-window-actions.c:1585
+#: ../shell/e-shell-window-actions.c:1558
 msgid "Submit _Bug Report..."
-msgstr "å?³é??é?¯èª¤å ±å??(_B)..."
+msgstr "å?³é??é?¯èª¤å ±å??(_B)â?¦"
 
-#: ../shell/e-shell-window-actions.c:1587
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使ç?¨ Bug Buddy é??å?ºé?¯èª¤å ±å??ã??"
 
-#: ../shell/e-shell-window-actions.c:1592
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Work Offline"
 msgstr "��工�(_W)"
 
-#: ../shell/e-shell-window-actions.c:1594
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Put Evolution into offline mode"
 msgstr "� Evolution ����模�"
 
 # zh_HK: msgstr "��工�(_W)"
-#: ../shell/e-shell-window-actions.c:1599
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Work Online"
 msgstr "��工�(_W)"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/e-shell-window-actions.c:1601
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Put Evolution into online mode"
 msgstr "� Evolution ����模�"
 
-#: ../shell/e-shell-window-actions.c:1629
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Lay_out"
 msgstr "ä½?å±?(_O)"
 
-#: ../shell/e-shell-window-actions.c:1636
+#: ../shell/e-shell-window-actions.c:1609
 msgid "_New"
 msgstr "��(_N)"
 
-#: ../shell/e-shell-window-actions.c:1643
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Search"
 msgstr "æ??å°?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1650
+#: ../shell/e-shell-window-actions.c:1623
 msgid "_Switcher Appearance"
 msgstr "å??æ??å¤?è§?(_S)"
 
-#: ../shell/e-shell-window-actions.c:1664
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Window"
 msgstr "��(_O)"
 
-#: ../shell/e-shell-window-actions.c:1693
+#: ../shell/e-shell-window-actions.c:1666
 msgid "Show Side _Bar"
 msgstr "顯示å?´é??æ¬?(_B)"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show the side bar"
 msgstr "顯示å?´é??å??"
 
-#: ../shell/e-shell-window-actions.c:1701
+#: ../shell/e-shell-window-actions.c:1674
 msgid "Show _Buttons"
 msgstr "顯示æ??é??(_B)"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show the switcher buttons"
 msgstr "顯示å??æ??ç¨?å¼?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1709
+#: ../shell/e-shell-window-actions.c:1682
 msgid "Show _Status Bar"
 msgstr "顯示ç??æ??å??(_S)"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show the status bar"
 msgstr "顯示ç??æ??å??"
 
-#: ../shell/e-shell-window-actions.c:1717
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show _Tool Bar"
 msgstr "顯示工å?·å??(_T)"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the tool bar"
 msgstr "顯示工å?·å??"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1714
 msgid "_Icons Only"
 msgstr "å?ªæ??å??示(_I)"
 
-#: ../shell/e-shell-window-actions.c:1743
+#: ../shell/e-shell-window-actions.c:1716
 msgid "Display window buttons with icons only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??å??示"
 
-#: ../shell/e-shell-window-actions.c:1748
+#: ../shell/e-shell-window-actions.c:1721
 msgid "_Text Only"
 msgstr "å?ªæ??æ??å­?(_T)"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1723
 msgid "Display window buttons with text only"
 msgstr "å?ªé¡¯ç¤ºè¦?çª?æ??é??ç??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1755
+#: ../shell/e-shell-window-actions.c:1728
 msgid "Icons _and Text"
 msgstr "å??示å??æ??å­?(_A)"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Display window buttons with icons and text"
 msgstr "顯示è¦?çª?æ??é??ç??å??示å??æ??å­?"
 
-#: ../shell/e-shell-window-actions.c:1762
+#: ../shell/e-shell-window-actions.c:1735
 msgid "Tool_bar Style"
 msgstr "å·¥å?·å??風格(_B)"
 
-#: ../shell/e-shell-window-actions.c:1764
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使ç?¨æ¡?é?¢å·¥å?·å??設å®?å?¼é¡¯ç¤ºè¦?çª?æ??é??"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1745
 msgid "Define Views..."
-msgstr "�義檢�..."
+msgstr "�義檢��"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Create or edit views"
 msgstr "建ç«?æ??編輯檢è¦?(_C)"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Save Custom View..."
-msgstr "����檢�..."
+msgstr "����檢��"
 
-#: ../shell/e-shell-window-actions.c:1781
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save current custom view"
 msgstr "å?²å­?ç?®å??ç??è?ªè¨?檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1761
 msgid "C_urrent View"
 msgstr "ç?®å??檢è¦?(_U)"
 
-#: ../shell/e-shell-window-actions.c:1798
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Custom View"
 msgstr "��檢�"
 
-#: ../shell/e-shell-window-actions.c:1800
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Current view is a customized view"
 msgstr "ç?®å??ç??檢è¦?æ?¹å¼?æ?¯è?ªè¨?ç??檢è¦?"
 
-#: ../shell/e-shell-window-actions.c:1810
+#: ../shell/e-shell-window-actions.c:1783
 msgid "Change the page settings for your current printer"
 msgstr "ä¿®æ?¹ç?®å??å?°è¡¨æ©?ç??é ?é?¢å??å?°è¨­å®?"
 
-#: ../shell/e-shell-window-actions.c:2183
+#: ../shell/e-shell-window-actions.c:2168
 #, c-format
 msgid "Switch to %s"
 msgstr "å??æ??è?³ %s"
 
-#: ../shell/e-shell-window-actions.c:2396
+#: ../shell/e-shell-window-actions.c:2381
 msgid "Execute these search parameters"
 msgstr "å?·è¡?é??äº?æ??å°?å??æ?¸"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:576
+#: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:416
+#: ../shell/e-shell-window.c:434
 msgid "New"
 msgstr "��"
 
-#: ../shell/e-shell.c:226
+#: ../shell/e-shell.c:247
 msgid "Preparing to go offline..."
-msgstr "æº?å??é?²å?¥é?¢ç·?..."
+msgstr "æº?å??é?²å?¥é?¢ç·?â?¦"
 
-#: ../shell/e-shell.c:276
+#: ../shell/e-shell.c:300
 msgid "Preparing to go online..."
-msgstr "æº?å??é?²å?¥ä¸?ç·?..."
+msgstr "æº?å??é?²å?¥ä¸?ç·?â?¦"
 
-#: ../shell/e-shell.c:335
+#: ../shell/e-shell.c:362
 msgid "Preparing to quit..."
-msgstr "æº?å??çµ?æ??..."
+msgstr "æº?å??çµ?æ??â?¦"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:180
+#: ../shell/main.c:191
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19674,7 +19443,7 @@ msgstr ""
 "æ??å??å¸?æ??æ?¨äº«å??å·¥ä½?æ??æ??ï¼?è??ä¸?æ??å??\n"
 "ç?±å??å¸?æ??æ?¨æ??ä¾?æ??è¦?ï¼?\n"
 
-#: ../shell/main.c:204
+#: ../shell/main.c:215
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19682,63 +19451,79 @@ msgstr ""
 "��\n"
 "Evolution ����\n"
 
-#: ../shell/main.c:211
+#: ../shell/main.c:222
 msgid "Do not tell me again"
 msgstr "ä¸?è¦?å??顯示é??å??è¨?æ?¯"
 
-#: ../shell/main.c:327
-msgid "Start Evolution activating the specified component"
-msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
+#. Translators: Do NOT translate the five component names, they MUST remain in English!
+#: ../shell/main.c:367
+msgid ""
+"Start Evolution showing the specified component. Available options are "
+"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
+msgstr ""
 
-#: ../shell/main.c:329
+#: ../shell/main.c:369
 msgid "Apply the given geometry to the main window"
 msgstr "å°?æ??å®?ç??尺寸å¥?ç?¨å?°ä¸»è¦?çª?"
 
 # zh_HK: msgstr "以ç·?ä¸?模å¼?å??å??"
-#: ../shell/main.c:333
+#: ../shell/main.c:373
 msgid "Start in online mode"
 msgstr "以ç·?ä¸?模å¼?å??å??"
 
-#: ../shell/main.c:335
+#: ../shell/main.c:375
+msgid "Ignore network availability"
+msgstr "忽ç?¥ç¶²é??網路æ?¯å?¦å?¯ç?¨"
+
+#: ../shell/main.c:377
 msgid "Start in \"express\" mode"
 msgstr "以ã??å¿«é??ã??模å¼?å??å??"
 
-#: ../shell/main.c:338
+#: ../shell/main.c:380
 msgid "Forcibly shut down Evolution"
 msgstr "å¼·å?¶é??é?? Evoultion"
 
-#: ../shell/main.c:341
+#: ../shell/main.c:383
 msgid "Send the debugging output of all components to a file."
 msgstr "å°?å?¨é?¨å??件ç??é?¤é?¯è¼¸å?ºè³?æ??å?³é??è?³ä¸?å??æª?æ¡?ã??"
 
-#: ../shell/main.c:343
+#: ../shell/main.c:385
 msgid "Disable loading of any plugins."
 msgstr "å??ç?¨å°?ä»»ä½?å¤?æ??ç¨?å¼?ç??è¼?å?¥ã??"
 
-#: ../shell/main.c:345
+#: ../shell/main.c:387
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "å??ç?¨é?µä»¶ã??é?£çµ¡äººå??å·¥ä½?ç??é ?覽çª?æ ¼ã??"
 
-#: ../shell/main.c:349
+#: ../shell/main.c:391
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "å°?æ??å®?ç?? URI æ??æª?æ¡?å??稱å?¯å?¥ç?ºæ?¥ä¸?ä¾?ç??å¼?æ?¸ã??"
 
-#: ../shell/main.c:351
+#: ../shell/main.c:393
 msgid "Request a running Evolution process to quit"
 msgstr "è¦?æ±?å?·è¡?中ç?? Evolution ç¨?åº?çµ?æ??"
 
-#: ../shell/main.c:475 ../shell/main.c:483
+#: ../shell/main.c:557 ../shell/main.c:565
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM è??é?µä»¶å®¢æ?¶ç«¯"
 
-#: ../shell/main.c:545
+#: ../shell/main.c:627
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
+"  Run '%s --help' for more information.\n"
 msgstr ""
 "%sï¼? --online å?? --offline ä¸?è?½ä¸?起使ç?¨ã??\n"
-"  使ç?¨ %s --help å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
+"  使ç?¨ '%s --help' å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
+
+#: ../shell/main.c:633
+#, c-format
+msgid ""
+"%s: --force-online and --offline cannot be used together.\n"
+"  Run '%s --help' for more information.\n"
+msgstr ""
+"%sï¼? --force-online å?? --offline ä¸?è?½ä¸?起使ç?¨ã??\n"
+"  使ç?¨ '%s --help' å??å¾?é?²ä¸?æ­¥è³?è¨?ã??\n"
 
 #: ../shell/shell.error.xml.h:1
 msgid "Are you sure you want to forget all remembered passwords?"
@@ -19819,27 +19604,27 @@ msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "ç?¡æ³?辨è­?ç??æ¡?é?¢æª?æ¡?ç??æ?¬ã??%sã??"
 
-#: ../smclient/eggdesktopfile.c:958
+#: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
 msgstr "æº?å??å??å?? %s"
 
-#: ../smclient/eggdesktopfile.c:1100
+#: ../smclient/eggdesktopfile.c:1098
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "æ??ç?¨ç¨?å¼?ä¸?æ?¥å??以å?½ä»¤å??é??å??æ??件"
 
-#: ../smclient/eggdesktopfile.c:1168
+#: ../smclient/eggdesktopfile.c:1166
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "ç?¡æ³?辨è­?ç??å??å??é?¸é ?ï¼?%d"
 
-#: ../smclient/eggdesktopfile.c:1373
+#: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "ä¸?è?½å?³é??æ??件 URI è?³ã??Type=Linkã??æ¡?é?¢é ?ç?®"
 
-#: ../smclient/eggdesktopfile.c:1394
+#: ../smclient/eggdesktopfile.c:1386
 #, c-format
 msgid "Not a launchable item"
 msgstr "ä¸?æ?¯å?¯ä»¥å??å??ç??é ?ç?®"
@@ -19905,7 +19690,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:460
 #: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
-msgstr "é?¸å??è¦?å?¯å?¥ç??æ??è­?..."
+msgstr "é?¸å??è¦?å?¯å?¥ç??æ??è­?â?¦"
 
 #: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
@@ -19999,7 +19784,7 @@ msgstr ""
 "ç?¼ç?§è??:\n"
 "  主��%s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
 msgstr "é?¸å??æ??è­?"
 
@@ -20145,7 +19930,7 @@ msgstr "æ??æ??æ?§"
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr "æ?¨å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??æ??è­?ï¼?å?¯ä»¥è­?å?¥æ?¨ç??身份:"
+msgstr "æ?¨å·²ç¶?æ??ä¾?è?ªé??äº?çµ?ç¹?ç??æ??è­?ï¼?å?¯ä»¥è­?å?¥æ?¨ç??身å??:"
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
@@ -20160,13 +19945,14 @@ msgstr "æ?¨å·²ç¶?æ??æ??æª?æ¡?ç??ç?¸é??æ??è­?ï¼?å?¯ä»¥è­?å?¥é??äº?人å?¡:"
 msgid "Your Certificates"
 msgstr "æ?¨ç??æ??è­?"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Backup"
 msgstr "å??份(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
-msgstr "編輯æ??è­?管ç??中å¿? (_CA) 信任度"
+msgstr "編輯æ??è­?管ç??中å¿? (CA) 信任度(_E)"
 
 #: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
@@ -20491,7 +20277,7 @@ msgstr "å®?義ã??%sã??ç??檢è¦?"
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "å?²å­?ç?®å??檢è¦?"
 
@@ -20519,122 +20305,122 @@ msgstr "檢è¦?ç??é¡?å??"
 msgid "Type of view:"
 msgstr "檢è¦?ç??é¡?å??:"
 
-#: ../widgets/misc/e-account-manager.c:348
+#: ../widgets/misc/e-account-manager.c:355
 msgid "De_fault"
 msgstr "�設�(_F)"
 
-#: ../widgets/misc/e-account-tree-view.c:255
+#: ../widgets/misc/e-account-tree-view.c:274
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../widgets/misc/e-attachment-dialog.c:305
+#: ../widgets/misc/e-attachment-dialog.c:307
 msgid "Attachment Properties"
 msgstr "é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment-dialog.c:328
+#: ../widgets/misc/e-attachment-dialog.c:332
 msgid "_Filename:"
 msgstr "æª?æ¡?å??稱(_F):"
 
-#: ../widgets/misc/e-attachment-dialog.c:363
+#: ../widgets/misc/e-attachment-dialog.c:367
 msgid "MIME Type:"
 msgstr "MIME é¡?å??ï¼?"
 
-#: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-dialog.c:375
+#: ../widgets/misc/e-attachment-store.c:533
 msgid "_Suggest automatic display of attachment"
 msgstr "建議è?ªå??顯示é??件(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:97
+#: ../widgets/misc/e-attachment-handler-image.c:100
 msgid "Could not set as background"
 msgstr "ç?¡æ³?設ç?ºè??æ?¯"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
+#: ../widgets/misc/e-attachment-handler-image.c:152
 msgid "Set as _Background"
 msgstr "設ç?ºè??æ?¯(_B)"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:87
+#: ../widgets/misc/e-attachment-handler-sendto.c:90
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
 msgstr[0] "ç?¡æ³?é??å?ºé??件ã??"
 msgstr[1] "ç?¡æ³?é??å?ºé??件ã??"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:129
+#: ../widgets/misc/e-attachment-handler-sendto.c:132
 msgid "_Send To..."
-msgstr "å?³é??è?³(_S)..."
+msgstr "å?³é??è?³(_S)â?¦"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#: ../widgets/misc/e-attachment-handler-sendto.c:134
 msgid "Send the selected attachments somewhere"
 msgstr "å?³é??é?¸å??ç??é??件å?°å?¥è??"
 
-#: ../widgets/misc/e-attachment-icon-view.c:511
-#: ../widgets/misc/e-attachment-tree-view.c:551
+#: ../widgets/misc/e-attachment-icon-view.c:506
+#: ../widgets/misc/e-attachment-tree-view.c:545
 msgid "Loading"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-icon-view.c:523
-#: ../widgets/misc/e-attachment-tree-view.c:563
+#: ../widgets/misc/e-attachment-icon-view.c:518
+#: ../widgets/misc/e-attachment-tree-view.c:557
 msgid "Saving"
 msgstr "��中"
 
-#: ../widgets/misc/e-attachment-paned.c:88
+#: ../widgets/misc/e-attachment-paned.c:100
 msgid "Hide Attachment _Bar"
 msgstr "é?±è??é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:90
-#: ../widgets/misc/e-attachment-paned.c:637
+#: ../widgets/misc/e-attachment-paned.c:102
+#: ../widgets/misc/e-attachment-paned.c:640
 msgid "Show Attachment _Bar"
 msgstr "顯示é??件å??(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:538
+#: ../widgets/misc/e-attachment-store.c:521
 msgid "Add Attachment"
 msgstr "å? å?¥é??件"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:524
 msgid "A_ttach"
 msgstr "é??å? (_T)"
 
-#: ../widgets/misc/e-attachment-store.c:604
+#: ../widgets/misc/e-attachment-store.c:587
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "å?²å­?é??件"
 msgstr[1] "å?²å­?é??件"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
+#: ../widgets/misc/e-attachment-store.c:616
+#: ../widgets/misc/e-attachment.c:1786 ../widgets/misc/e-attachment.c:2328
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:346
+#: ../widgets/misc/e-attachment-view.c:352
 msgid "S_ave All"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:372
+#: ../widgets/misc/e-attachment-view.c:378
 msgid "A_dd Attachment..."
-msgstr "å? å?¥é??件(_A)..."
+msgstr "å? å?¥é??件(_A)â?¦"
 
-#: ../widgets/misc/e-attachment-view.c:396
+#: ../widgets/misc/e-attachment-view.c:402
 msgid "_Hide"
 msgstr "é?±è??(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:403
+#: ../widgets/misc/e-attachment-view.c:409
 msgid "Hid_e All"
 msgstr "å?¨é?¨é?±è??(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:410
+#: ../widgets/misc/e-attachment-view.c:416
 msgid "_View Inline"
 msgstr "檢���(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:417
+#: ../widgets/misc/e-attachment-view.c:423
 msgid "Vie_w All Inline"
 msgstr "��以��檢�(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:734
+#: ../widgets/misc/e-attachment-view.c:740
 #, c-format
 msgid "Open with \"%s\""
 msgstr "以ã??%sã??é??å??"
 
-#: ../widgets/misc/e-attachment-view.c:737
+#: ../widgets/misc/e-attachment-view.c:743
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "å?¨ %s 中é??å??é??å??é??件"
@@ -20643,160 +20429,160 @@ 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:1021
+#: ../widgets/misc/e-attachment.c:997
 msgid "Attached message"
 msgstr "é??å? ç??é?µä»¶"
 
-#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2630
 msgid "A load operation is already in progress"
 msgstr "è¼?å?¥æ??ä½?å·²å?¨é?²è¡?中"
 
-#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
+#: ../widgets/misc/e-attachment.c:1837 ../widgets/misc/e-attachment.c:2638
 msgid "A save operation is already in progress"
 msgstr "å?²å­?æ??ä½?å·²å?¨é?²è¡?中"
 
-#: ../widgets/misc/e-attachment.c:1949
+#: ../widgets/misc/e-attachment.c:1929
 #, c-format
 msgid "Could not load '%s'"
 msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:1952
+#: ../widgets/misc/e-attachment.c:1932
 #, c-format
 msgid "Could not load the attachment"
 msgstr "ç?¡æ³?è¼?å?¥é??件"
 
-#: ../widgets/misc/e-attachment.c:2228
+#: ../widgets/misc/e-attachment.c:2208
 #, c-format
 msgid "Could not open '%s'"
 msgstr "ç?¡æ³?é??å??ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2211
 #, c-format
 msgid "Could not open the attachment"
 msgstr "ç?¡æ³?é??å??é??件"
 
-#: ../widgets/misc/e-attachment.c:2666
+#: ../widgets/misc/e-attachment.c:2646
 msgid "Attachment contents not loaded"
 msgstr "ç?¡æ³?è¼?å?¥é??件å?§å®¹"
 
-#: ../widgets/misc/e-attachment.c:2742
+#: ../widgets/misc/e-attachment.c:2722
 #, c-format
 msgid "Could not save '%s'"
 msgstr "ç?¡æ³?å?²å­?ã??%sã??"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2725
 #, c-format
 msgid "Could not save the attachment"
 msgstr "ç?¡æ³?å?²å­?é??件"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:359
+#: ../widgets/misc/e-buffer-tagger.c:362
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl-å?®æ??以é??å??é?£çµ?"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1255
+#: ../widgets/misc/e-calendar-item.c:1259
 msgid "%B %Y"
 msgstr "%Y å¹´ %-m æ??"
 
-#: ../widgets/misc/e-calendar.c:217
+#: ../widgets/misc/e-calendar.c:220
 msgid "Month Calendar"
 msgstr "æ??è¡?äº?æ??"
 
-#: ../widgets/misc/e-charset-combo-box.c:93
+#: ../widgets/misc/e-charset-combo-box.c:96
 msgid "Character Encoding"
 msgstr "å­?å??編碼"
 
-#: ../widgets/misc/e-charset-combo-box.c:117
+#: ../widgets/misc/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "輸å?¥è¦?使ç?¨ç??å­?å??é??"
 
-#: ../widgets/misc/e-charset-combo-box.c:336
+#: ../widgets/misc/e-charset-combo-box.c:341
 msgid "Other..."
-msgstr "��..."
+msgstr "���"
 
-#: ../widgets/misc/e-dateedit.c:502
+#: ../widgets/misc/e-dateedit.c:507
 msgid "Date and Time"
 msgstr "æ?¥æ??è??æ??å?»"
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:528
 msgid "Text entry to input date"
 msgstr "ç?¨ä¾?輸å?¥æ?¥æ??ç??æ??å­?é ?ç?®"
 
-#: ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:550
 msgid "Click this button to show a calendar"
 msgstr "æ??æ­¤æ??é??以顯示è¡?äº?æ??"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:605
 msgid "Drop-down combination box to select time"
 msgstr "ç?¨ä»¥é?¸æ??æ??å?»ç??ä¸?æ??å¼?çµ?å??æ?¹å¡?"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:677
 msgid "No_w"
 msgstr "��(_W)"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:683
 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:677
+#: ../widgets/misc/e-dateedit.c:691
 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:1682 ../widgets/misc/e-dateedit.c:1914
+#: ../widgets/misc/e-dateedit.c:1698 ../widgets/misc/e-dateedit.c:1930
 msgctxt "date"
 msgid "None"
 msgstr "æ²?æ??"
 
-#: ../widgets/misc/e-dateedit.c:1809
+#: ../widgets/misc/e-dateedit.c:1825
 msgid "Invalid Date Value"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?¼"
 
-#: ../widgets/misc/e-dateedit.c:1853
+#: ../widgets/misc/e-dateedit.c:1869
 msgid "Invalid Time Value"
 msgstr "ç?¡æ??ç??æ??å?»æ?¸å?¼"
 
-#: ../widgets/misc/e-import-assistant.c:246
+#: ../widgets/misc/e-import-assistant.c:252
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "é?¸å??è¦?å?¯å?¥ Evolution ç??æª?æ¡?ï¼?並ä¸?å?¨æ¸?å?®å?§é?¸å??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:263
+#: ../widgets/misc/e-import-assistant.c:269
 msgid "F_ilename:"
 msgstr "æª?æ¡?å??稱(_I):"
 
-#: ../widgets/misc/e-import-assistant.c:273
+#: ../widgets/misc/e-import-assistant.c:279
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:287
-#: ../widgets/misc/e-import-assistant.c:462
+#: ../widgets/misc/e-import-assistant.c:293
+#: ../widgets/misc/e-import-assistant.c:468
 msgid "File _type:"
 msgstr "æª?æ¡?é¡?å??(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:330
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:336
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Choose the destination for this import"
 msgstr "é?¸æ??此輸å?¥ç??ç?®ç??å?°"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:361
 msgid "Choose the type of importer to run:"
 msgstr "é?¸æ??å?¯å?¥æ??å??è¦?å?·è¡?ç??é¡?å??ï¼?"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:369
 msgid "Import data and settings from _older programs"
 msgstr "å¾?è??ç¨?å¼?輸å?¥è³?æ??å??設å®?å?¼(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:371
+#: ../widgets/misc/e-import-assistant.c:377
 msgid "Import a _single file"
 msgstr "������(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:523
+#: ../widgets/misc/e-import-assistant.c:529
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20806,37 +20592,37 @@ msgstr ""
 "iCalendarã??æ?¾ä¸?å?°å?¯ä»¥è¼¸å?¥ç??設å®?å?¼ã??å¦?æ??æ?¨æ?³å??試ä¸?次ï¼?è«?æ??ä¸?ä¸?ã??å??å¾?ã??æ??é??ã??"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:770
+#: ../widgets/misc/e-import-assistant.c:769
 msgid "_Cancel Import"
 msgstr "å??æ¶?å?¯å?¥(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:911
 msgid "Preview data to be imported"
 msgstr "é ?覽é??è¦?å?¯å?¥ç??è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1347
-#: ../widgets/misc/e-import-assistant.c:1356
+#: ../widgets/misc/e-import-assistant.c:917
+#: ../widgets/misc/e-import-assistant.c:930
+#: ../widgets/misc/e-import-assistant.c:1280
+#: ../widgets/misc/e-import-assistant.c:1346
+#: ../widgets/misc/e-import-assistant.c:1355
 msgid "Import Data"
 msgstr "å?¯å?¥è³?æ??"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:925
 msgid "Select what type of file you want to import from the list."
 msgstr "é?¸æ??æ?¨æ?³è¦?å¾?æ¸?å?®ä¸­å?¯å?¥ç??æª?æ¡?é¡?å??ã??"
 
-#: ../widgets/misc/e-import-assistant.c:1271
-#: ../widgets/misc/e-import-assistant.c:1305
+#: ../widgets/misc/e-import-assistant.c:1270
+#: ../widgets/misc/e-import-assistant.c:1304
 msgid "Evolution Import Assistant"
 msgstr "Evolution å?¯å?¥å?©ç??"
 
-#: ../widgets/misc/e-import-assistant.c:1288
-#: ../widgets/misc/e-import-assistant.c:1335
+#: ../widgets/misc/e-import-assistant.c:1287
+#: ../widgets/misc/e-import-assistant.c:1334
 msgid "Import Location"
 msgstr "輸��置"
 
-#: ../widgets/misc/e-import-assistant.c:1299
+#: ../widgets/misc/e-import-assistant.c:1298
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20845,27 +20631,27 @@ msgstr ""
 "æ­¡è¿?使ç?¨ Evolution ç??å?¯å?¥å?©ç??ã??\n"
 "é??å??ç²¾é??å°?æ??é ?å°?æ?¨å¦?ä½?å°?å¤?é?¨ç??æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-import-assistant.c:1313
+#: ../widgets/misc/e-import-assistant.c:1312
 msgid "Importer Type"
 msgstr "輸å?¥å?¨é¡?å??"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1320
 msgid "Select Information to Import"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??è³?è¨?"
 
-#: ../widgets/misc/e-import-assistant.c:1328
+#: ../widgets/misc/e-import-assistant.c:1327
 msgid "Select a File"
 msgstr "é?¸å??æª?æ¡?"
 
-#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1341
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "æ??ã??å¥?ç?¨ã??é??å§?å°?æª?æ¡?å?¯å?¥å?° Evolutionã??"
 
-#: ../widgets/misc/e-map.c:624
+#: ../widgets/misc/e-map.c:752
 msgid "World Map"
 msgstr "ä¸?ç??å?°å??"
 
-#: ../widgets/misc/e-map.c:626
+#: ../widgets/misc/e-map.c:754
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20888,56 +20674,56 @@ msgstr "Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??æ??ä¸?ä¸?æ­¤æ??é??以é?²è¡?ç·?ä¸?å·¥
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "å? ç?ºç¶²è·¯ç?¡æ³?使ç?¨ï¼?Evolution ç?®å??ç?ºé?¢ç·?模å¼?ã??"
 
-#: ../widgets/misc/e-preferences-window.c:276
+#: ../widgets/misc/e-preferences-window.c:281
 msgid "Evolution Preferences"
 msgstr "Evolution å??好設å®?"
 
-#: ../widgets/misc/e-search-bar.c:77
+#: ../widgets/misc/e-search-bar.c:82
 #, c-format
 msgid "Matches: %d"
 msgstr "符å??ï¼?%d"
 
-#: ../widgets/misc/e-search-bar.c:554
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "é??é??æ??å°?å·¥å?·å??"
 
-#: ../widgets/misc/e-search-bar.c:562
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "å°?æ?¾(_D):"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "æ¸?é?¤æ­¤æ??å°?"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "ä¸?ä¸?å??(_P)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "ä¸?ä¸?å??(_N)"
 
-#: ../widgets/misc/e-search-bar.c:619
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾ç??å­?è©?"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
 msgstr "å??å??大å°?寫(_C)"
 
-#: ../widgets/misc/e-search-bar.c:657
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
 msgstr "å?°é??é ?é?¢åº?é?¨ï¼?å¾?é ?端繼çº?"
 
-#: ../widgets/misc/e-search-bar.c:679
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
 msgstr "å?°é??é ?é?¢é ?端ï¼?å¾?åº?é?¨ç¹¼çº?"
 
-#: ../widgets/misc/e-send-options.c:515
+#: ../widgets/misc/e-send-options.c:516
 msgid "When de_leted:"
 msgstr "å?ªé?¤æ??(_L):"
 
@@ -20958,132 +20744,152 @@ msgid "Delivery Options"
 msgstr "é??é??é?¸é ?"
 
 #: ../widgets/misc/e-send-options.ui.h:6
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "ç?´å?°(_U)"
+
+#: ../widgets/misc/e-send-options.ui.h:7
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "æ??æ?¼(_A)"
+
+#: ../widgets/misc/e-send-options.ui.h:8
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
+
+#: ../widgets/misc/e-send-options.ui.h:9
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "��(_T)"
+
+#: ../widgets/misc/e-send-options.ui.h:10
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
+
+#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "æ??é«?æ©?å¯?"
 
-#: ../widgets/misc/e-send-options.ui.h:7
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
 msgstr "����(_R)"
 
-#: ../widgets/misc/e-send-options.ui.h:10
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "Mail Receipt"
 msgstr "é?µä»¶å??æ¢?"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:17
 msgid "Proprietary"
 msgstr "å°?å?©"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
 msgstr "è¦?æ±?å??è¦?(_E)"
 
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
 msgstr "è¿?å??é??ç?¥"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:21
+msgid "Secret"
+msgstr "�"
+
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Sta_tus Tracking"
 msgstr "ç??æ??追蹤(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Standard"
 msgstr "��"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "Status Tracking"
 msgstr "ç??æ??追蹤"
 
-#: ../widgets/misc/e-send-options.ui.h:23
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "Top Secret"
 msgstr "æ??é«?æ©?å¯?"
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
 msgstr "ç?¶æ?¥å??æ??(_P):"
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
 msgstr "ç?¶å®?æ??æ??(_M):"
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
 msgstr "ç?¶æ??çµ?æ??(_N):"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Wi_thin"
-msgstr "��(_T)"
-
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_After"
-msgstr "æ??æ?¼(_A)"
-
-#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "����(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Classification:"
 msgstr "歸�(_C):"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delay message delivery"
 msgstr "延é?²é?µä»¶é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delivered"
 msgstr "å·²é??é??(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
 msgstr "設å®?é?¾æ??æ?¥æ??(_S)"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "_Until"
-msgstr "ç?´å?°(_U)"
-
-#: ../widgets/misc/e-send-options.ui.h:40
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "ç?¶æ??空æ??(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:41
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "ç?¶é??å??æ??(_W):"
 
-#: ../widgets/misc/e-signature-editor.c:133
-#: ../widgets/misc/e-signature-editor.c:549
-#: ../widgets/misc/e-signature-manager.c:349
-#: ../widgets/misc/e-signature-script-dialog.c:218
+#. Translators: Used in send options dialog
+#: ../widgets/misc/e-send-options.ui.h:40
+msgctxt "send-options"
+msgid "None"
+msgstr "æ²?æ??"
+
+#: ../widgets/misc/e-signature-editor.c:138
+#: ../widgets/misc/e-signature-editor.c:563
+#: ../widgets/misc/e-signature-manager.c:355
+#: ../widgets/misc/e-signature-script-dialog.c:219
 msgid "Unnamed"
 msgstr "æ?ªå?½å??ç??"
 
-#: ../widgets/misc/e-signature-editor.c:210
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_Save and Close"
 msgstr "å?²å­?å¾?é??é??(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:389
+#: ../widgets/misc/e-signature-editor.c:430
 msgid "Edit Signature"
 msgstr "編輯簽å??æª?"
 
-#: ../widgets/misc/e-signature-editor.c:404
+#: ../widgets/misc/e-signature-editor.c:445
 msgid "_Signature Name:"
 msgstr "ç°½å??æª?å??稱(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:294
+#: ../widgets/misc/e-signature-manager.c:300
 msgid "Add Signature Script"
 msgstr "æ?°å¢?ç°½å??å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:359
+#: ../widgets/misc/e-signature-manager.c:365
 msgid "Edit Signature Script"
 msgstr "編輯簽å??å?½ä»¤ç¨¿"
 
-#: ../widgets/misc/e-signature-manager.c:576
+#: ../widgets/misc/e-signature-manager.c:583
 msgid "Add _Script"
 msgstr "���令稿(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:266
+#: ../widgets/misc/e-signature-script-dialog.c:269
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -21093,53 +20899,53 @@ msgstr ""
 "ç°½å??æª?ã??æ?¨æ??å®?ç??å??稱å?ªæ??ä½?ç?º\n"
 "顯示ä¹?ç?¨ã??"
 
-#: ../widgets/misc/e-signature-script-dialog.c:311
+#: ../widgets/misc/e-signature-script-dialog.c:314
 msgid "S_cript:"
 msgstr "�令稿(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:342
+#: ../widgets/misc/e-signature-script-dialog.c:345
 msgid "Script file must be executable."
 msgstr "å?½ä»¤ç¨¿å¿?é ?ç?ºå?¯å?·è¡?æª?ã??"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:78
 msgid "Click here to go to URL"
 msgstr "æ??é??裡以移è?³ URL"
 
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:373
 msgid "_Copy Link Location"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:371
+#: ../widgets/misc/e-web-view.c:375
 msgid "Copy the link to the clipboard"
 msgstr "è¤?製é?£çµ?å?°å?ªè²¼è??"
 
-#: ../widgets/misc/e-web-view.c:379
+#: ../widgets/misc/e-web-view.c:383
 msgid "_Open Link in Browser"
 msgstr "å?¨ç??覽å?¨å?§é??å??é?£çµ?(_O)"
 
-#: ../widgets/misc/e-web-view.c:381
+#: ../widgets/misc/e-web-view.c:385
 msgid "Open the link in a web browser"
 msgstr "å?¨ç¶²é ?ç??覽å?¨ä¸­é??å??æ­¤é?£çµ?"
 
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:393
 msgid "_Copy Email Address"
 msgstr "è¤?製é?»å­?é?µä»¶ä½?å??(_C)"
 
-#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
+#: ../widgets/misc/e-web-view.c:422 ../widgets/misc/e-web-view.c:1077
 msgid "Select all text and images"
 msgstr "é?¸æ??æ??æ??æ??å­?å??å??ç??"
 
-#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
-#: ../widgets/misc/e-web-view.c:854
+#: ../widgets/misc/e-web-view.c:854 ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to call %s"
 msgstr "æ??ä¸?ä¸?æ?­è??給 %s"
 
-#: ../widgets/misc/e-web-view.c:856
+#: ../widgets/misc/e-web-view.c:860
 msgid "Click to hide/unhide addresses"
 msgstr "æ??é??裡é?±è??/解é?¤é?±è??ä½?å??"
 
-#: ../widgets/misc/e-web-view.c:858
+#: ../widgets/misc/e-web-view.c:862
 #, c-format
 msgid "Click to open %s"
 msgstr "æ??ä¸?ä¸?ä¾?é??å?? %s"
@@ -21158,7 +20964,7 @@ msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
 msgid "evolution calendar item"
 msgstr "evolution è¡?äº?æ??é ?ç?®"
 
-#: ../widgets/table/e-cell-combo.c:174
+#: ../widgets/table/e-cell-combo.c:177
 msgid "popup list"
 msgstr "�����"
 
@@ -21191,28 +20997,28 @@ msgstr "æ?¸å?¼å¿?é ?æ?¯ç?± 0 å?° 100 ç??æ?¸å­?"
 msgid "click to add"
 msgstr "è«?æ??é??裡å? å?¥"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Ascending)"
 msgstr "(é??å¢?)"
 
-#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
 msgid "(Descending)"
 msgstr "(é??æ¸?)"
 
-#: ../widgets/table/e-table-config.c:388
+#: ../widgets/table/e-table-config.c:392
 msgid "Not sorted"
 msgstr "æ?ªæ??åº?"
 
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:433
 msgid "No grouping"
 msgstr "æ?ªçµ?æ??群çµ?"
 
-#: ../widgets/table/e-table-config.c:647
+#: ../widgets/table/e-table-config.c:654
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "顯示��"
 
-#: ../widgets/table/e-table-config.c:667
+#: ../widgets/table/e-table-config.c:674
 msgid "Available Fields"
 msgstr "å?¯ç?¨ç??æ¬?ä½?"
 
@@ -21221,7 +21027,7 @@ msgid "A_vailable Fields:"
 msgstr "å?¯ç?¨ç??æ¬?ä½?(_V):"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Ascending"
 msgstr "é??å¢?"
 
@@ -21234,7 +21040,7 @@ msgid "Clear _All"
 msgstr "����(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1702
+#: ../widgets/table/e-table-header-item.c:1668
 msgid "Descending"
 msgstr "é??æ¸?"
 
@@ -21276,11 +21082,11 @@ msgstr "æ?¥è??ä¾?"
 
 #: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
-msgstr "��顯示(_F)..."
+msgstr "��顯示(_F)�"
 
 #: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
-msgstr "群��(_G)..."
+msgstr "群��(_G)�"
 
 #: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
@@ -21292,7 +21098,7 @@ msgstr "ä¾?åº?顯示é??äº?æ¬?ä½?(_S):"
 
 #: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
-msgstr "æ??åº?(_S)..."
+msgstr "æ??åº?(_S)â?¦"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
@@ -21313,7 +21119,7 @@ msgstr ""
 #. Finally the %d is replaced with count of items in this group.
 #. Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:354
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -21326,80 +21132,75 @@ msgstr[1] "%sï¼?%s (%d å??é ?ç?®)"
 #. The %d is replaced with count of items in this group.
 #. Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:363
+#: ../widgets/table/e-table-group-container.c:366
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d å??é ?ç?®)"
 msgstr[1] "%s (%d å??é ?ç?®)"
 
-#: ../widgets/table/e-table-header-item.c:1546
+#: ../widgets/table/e-table-header-item.c:1512
 msgid "Customize Current View"
 msgstr "è?ªè¨?ç?®å??ç??檢è¦?"
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1533
 msgid "Sort _Ascending"
 msgstr "é??å¢?æ??åº?(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1536
 msgid "Sort _Descending"
 msgstr "é??æ¸?æ??åº?(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Unsort"
 msgstr "ä¸?æ??åº?(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1576
+#: ../widgets/table/e-table-header-item.c:1542
 msgid "Group By This _Field"
 msgstr "ä¾?æ­¤æ¬?ä½?å??群çµ?(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1545
 msgid "Group By _Box"
 msgstr "����群�(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1583
+#: ../widgets/table/e-table-header-item.c:1549
 msgid "Remove This _Column"
 msgstr "移�此�(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1586
+#: ../widgets/table/e-table-header-item.c:1552
 msgid "Add a C_olumn..."
-msgstr "����(_O)..."
+msgstr "����(_O)�"
 
-#: ../widgets/table/e-table-header-item.c:1590
+#: ../widgets/table/e-table-header-item.c:1556
 msgid "A_lignment"
 msgstr "æ??å??(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1593
+#: ../widgets/table/e-table-header-item.c:1559
 msgid "B_est Fit"
 msgstr "æ??é?©å¡«æ»¿(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1596
+#: ../widgets/table/e-table-header-item.c:1562
 msgid "Format Column_s..."
-msgstr "æ ¼å¼?å??æ¬?(_S)..."
+msgstr "æ ¼å¼?å??æ¬?(_S)â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1566
 msgid "Custo_mize Current View..."
-msgstr "è?ªè¨?ç?®å??ç??檢è¦?(_M)..."
+msgstr "è?ªè¨?ç?®å??ç??檢è¦?(_M)â?¦"
 
-#: ../widgets/table/e-table-header-item.c:1659
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "_Sort By"
 msgstr "æ??åº?æ?¹å¼?(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1677
+#: ../widgets/table/e-table-header-item.c:1643
 msgid "_Custom"
 msgstr "��(_C)"
 
 #. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:123
+#: ../widgets/table/gal-a11y-e-cell-popup.c:126
 msgid "popup a child"
 msgstr "�����"
 
-#. Translators: description of an "edit" action
-#: ../widgets/table/gal-a11y-e-cell-text.c:618
-msgid "begin editing this cell"
-msgstr "é??å§?編輯此å?²å­?æ ¼"
-
 #. Translators: description of a "toggle" action
 #: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
@@ -21427,1213 +21228,295 @@ msgstr "å?®æ??"
 msgid "sort"
 msgstr "æ??åº?"
 
-#: ../widgets/text/e-text.c:2533
+#: ../widgets/text/e-text.c:2289
 msgid "Select All"
 msgstr "å?¨é?¨é?¸å??"
 
-#: ../widgets/text/e-text.c:2545
+#: ../widgets/text/e-text.c:2301
 msgid "Input Methods"
 msgstr "輸��"
 
-#~ msgid ""
-#~ "Evolution backup can start only when Evolution is not running. Please "
-#~ "make sure that you save and close all your unsaved windows before "
-#~ "proceeding.  If you want Evolution to restart automatically after backup, "
-#~ "please enable the toggle button."
-#~ msgstr ""
-#~ "Evolution å??份å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å?¨é?²è¡?ä¹?å??è«?確å®?æ?¨å·²å?²å­?並"
-#~ "é??é??æ??æ??æ?ªå?²å­?ç??è¦?çª?ã??å¦?æ??å¸?æ?? Evolution å?¨å??份å¾?è?ªå??é??æ?°å??å??ï¼?è«?å??ç?¨å??æ??"
-#~ "æ??é??ã??"
-
-#~ msgid ""
-#~ "This will delete all your current Evolution data and settings and restore "
-#~ "them from your backup. Evolution restore can start only when Evolution is "
-#~ "not running. Please make sure that you close all your unsaved windows "
-#~ "before you proceed. If you want Evolution to restart automatically "
-#~ "restart after restore, please enable the toggle button."
-#~ msgstr ""
-#~ "é??å°?æ??å?ªé?¤æ??æ?? Evolution ç?®å??ç??è³?æ??è??設å®?å?¼ä¸¦å¾?å??份中é??å??å®?å??ã??Evolution "
-#~ "é??å??å?ªè?½å?¨ Evolution æ²?æ??å?·è¡?æ??å??å??ã??å¦?æ??å¸?æ?? Evolution å?¨é??å??å¾?è?ªå??é??æ?°å??"
-#~ "å??ï¼?è«?å??ç?¨å??æ??æ??é??ã??"
-
-#~ msgid "{0}"
-#~ msgstr "{0}"
-
-#~ 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 "Start Evolution activating the specified component"
+#~ msgstr "å??å?? Evolution æ??å??å??æ??å®?ç??å??件"
 
-#~ msgid "The event could not be deleted due to a corba error"
-#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤äº?件ã??"
+#~ msgid "Count of default recurrence for a new event. -1 means forever."
+#~ msgstr "æ?°äº?件ç??é ?設é?±æ??æ?§æ¬¡æ?¸ã?? -1 代表永é? ã??"
 
-#~ msgid "The task could not be deleted due to a corba error"
-#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤å·¥ä½?ã??"
+#~ msgid "Default recurrence count"
+#~ msgstr "é ?設é?±æ??循ç?°æ¬¡æ?¸"
 
-#~ msgid "The memo could not be deleted due to a corba error"
-#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤è©²å??å¿?é??ã??"
+#~ msgid "Event Gradient"
+#~ msgstr "äº?件漸層æ??æ??"
 
-#~ msgid "The item could not be deleted due to a corba error"
-#~ msgstr "ç?±æ?¼ corba é?¯èª¤ï¼?æ??以ç?¡æ³?å?ªé?¤é ?ç?®ã??"
+#~ msgid "Event Transparency"
+#~ msgstr "äº?件é??æ??æ??æ??"
 
-#~ 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 "Gradient of the events in calendar views."
+#~ 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..."
+#~ "Transparency of the events in calendar views, a value between 0 "
+#~ "(transparent) and 1 (opaque)."
 #~ 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"
+#~ "è¡?äº?æ??檢è¦?中ç??äº?件é??æ??å??æ??æ??ï¼?æ?¸å?¼ä»?æ?¼ 0 (å®?å?¨é??æ??)å?° 10 (ä¸?é??æ??)ä¹?é??ã??"
 
-#~ msgid "GNOME Pilot is not installed."
-#~ msgstr "å°?æ?ªå®?è£? GNOME Pilotã??"
+#~ msgid "URI of the highlighted (\"primary\") calendar"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)è¡?äº?æ??ç?? URI"
 
-#~ msgid "GNOME Pilot could not be run."
-#~ msgstr "ç?¡æ³?å?·è¡? GNOME Pilotã??"
+#~ msgid "URI of the highlighted (\"primary\") memo list"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)å??å¿?é??æ¸?å?®ç?? URI"
 
-#~ msgid "GNOME Pilot _Synchronization..."
-#~ msgstr "GNOME Pilot å??æ­¥å??(_S)..."
+#~ msgid "URI of the highlighted (\"primary\") task list"
+#~ msgstr "çª?顯ç??(ã??主è¦?ã??)å·¥ä½?æ¸?å?®ç?? URI"
 
-#~ msgid "Set up GNOME Pilot configuration"
-#~ msgstr "設å®? GNOME Pilot çµ?æ??"
+#~ msgid "Recurring:"
+#~ msgstr "循�模��"
 
-#~ msgid "Active Shell View"
-#~ msgstr "使ç?¨ä¸­ç?? Shell 檢è¦?"
+#~ msgid "Yes. (Complex Recurrence)"
+#~ msgstr "æ?¯ã??(è¤?é??循ç?°)"
 
-#~ msgid "Name of the active shell view"
-#~ msgstr "使ç?¨ä¸­ Shell 檢è¦?ç??å??稱"
+#~ msgid "Every day"
+#~ msgid_plural "Every %d days"
+#~ msgstr[0] "�天"
+#~ msgstr[1] "� %d 天"
 
-#~ msgid "The shell window's EFocusTracker"
-#~ msgstr "shell è¦?çª?ç?? EFocus 追蹤ç¨?å¼?"
+#~ msgid "Every week"
+#~ msgid_plural "Every %d weeks"
+#~ msgstr[0] "��"
+#~ msgstr[1] "� %d �"
 
-#~ msgid "Geometry"
-#~ msgstr "�置大�"
+#~ msgid "Every week on "
+#~ msgid_plural "Every %d weeks on "
+#~ msgstr[0] "���"
+#~ msgstr[1] "� %d ��"
 
-#~ msgid "Initial window geometry string"
-#~ msgstr "è¦?çª?å??å§?大å°?å­?串"
+#~ msgid " and "
+#~ msgstr " å?? "
 
-#~ msgid "Safe Mode"
-#~ msgstr "��模�"
+#~ msgid "The %s day of "
+#~ msgstr "%s �� "
 
-#~ msgid "Whether the shell window is in safe mode"
-#~ msgstr "shell �������模�"
+#~ msgid "The %s %s of "
+#~ msgstr "%s %s �� "
 
-#~ msgid "Sidebar Visible"
-#~ msgstr "å?´é??æ¬?å?¯è¦?æ?§"
+#~ msgid "every month"
+#~ msgid_plural "every %d months"
+#~ msgstr[0] "æ¯?æ??"
+#~ msgstr[1] "æ¯? %d æ??"
 
-#~ msgid "Whether the shell window's side bar is visible"
-#~ msgstr "shell è¦?çª?ç??å?´é??æ¬?æ?¯å?¦é¡¯ç¤º"
+#~ msgid "Every year"
+#~ msgid_plural "Every %d years"
+#~ msgstr[0] "�年"
+#~ msgstr[1] "� %d 年"
 
-#~ msgid "Switcher Visible"
-#~ msgstr "å??æ??ç¨?å¼?å?¯è¦?æ?§"
+#~ msgid "a total of %d time"
+#~ msgid_plural "a total of %d times"
+#~ msgstr[0] "總� %d 次"
+#~ msgstr[1] "總� %d 次"
 
-#~ msgid "Whether the shell window's switcher buttons are visible"
-#~ msgstr "shell è¦?çª?ç??å??æ??ç¨?å¼?æ??é??æ?¯å?¦é¡¯ç¤º"
+#~ msgid ", ending on "
+#~ msgstr "ï¼?çµ?æ??æ?¼ "
 
-#~ msgid "Taskbar Visible"
-#~ msgstr "å·¥ä½?å??å?¯è¦?æ?§"
+#~ msgid "Starts"
+#~ msgstr "é??å§?"
 
-#~ msgid "Whether the shell window's task bar is visible"
-#~ msgstr "shell è¦?çª?ç??å·¥ä½?å??æ?¯å?¦é¡¯ç¤º"
+#~ msgid "Ends"
+#~ msgstr "çµ?æ??"
 
-#~ msgid "Whether the shell window's tool bar is visible"
-#~ msgstr "shell è¦?çª?ç??å·¥å?·å??æ?¯å?¦é¡¯ç¤º"
+#~ msgid "iCalendar Information"
+#~ msgstr "iCalendar ��"
 
-#~ 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 "iCalendar Error"
+#~ msgstr "iCalendar �誤"
 
 #~ 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"
+#~ "Please review the following information, and then select an action from "
+#~ "the menu below."
+#~ msgstr " è«?æ?¥é?±ä¸?å??è³?è¨?ï¼?ç?¶å¾?å?¨ä¸?é?¢ç??é?¸å?®ä¸­é?¸æ??ä¸?å??å??ä½?ã??"
 
 #~ 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"
+#~ "The meeting has been canceled, however it could not be found in your "
+#~ "calendars"
+#~ msgstr "æ??è­°å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??è¡?äº?æ??中æ?¾ä¸?å?°"
 
 #~ 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"
+#~ "The task has been canceled, however it could not be found in your task "
+#~ "lists"
+#~ msgstr "å·¥ä½?å·²ç¶?å??æ¶?ï¼?ä½?æ?¯å?¨æ?¨ç??å·¥ä½?æ¸?å?®ä¸­æ?¾ä¸?å?°"
 
-#~ msgid "Y1"
-#~ msgstr "Y1"
+#~ msgid "%s has published meeting information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?æ??è­°è³?è¨?ã??"
 
-#~ msgid "Y2"
-#~ msgstr "Y2"
+#~ msgid "Meeting Information"
+#~ msgstr "æ??è­°è³?è¨?"
 
-#~ msgid "Minimum width"
-#~ msgstr "æ??å°?寬度"
+#~ msgid "%s requests the presence of %s at a meeting."
+#~ msgstr "%s é??è«? %s å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#~ msgid "Minimum Width"
-#~ msgstr "æ??å°?寬度"
+#~ msgid "%s requests your presence at a meeting."
+#~ msgstr "%s é??è«?æ?¨å?ºå¸­æ­¤æ¬¡æ??è­°ã??"
 
-#~ msgid "Spacing"
-#~ msgstr "é??è·?"
+#~ msgid "Meeting Proposal"
+#~ msgstr "æ??è­°æ??æ¡?"
 
-#~ msgid "The button state is online"
-#~ msgstr "æ??é??ç??æ??ç?ºä¸?ç·?"
+#~ msgid "%s wishes to be added to an existing meeting."
+#~ msgstr "%s å¸?æ??å? å?¥ä¸?å??æ?¢å­?ç??æ??è­°ã??"
 
-#~ msgid "Horizontal Position"
-#~ msgstr "水平�置"
+#~ msgid "Meeting Update"
+#~ msgstr "æ??è­°æ?´æ?°"
 
-#~ msgid "Pane position when oriented horizontally"
-#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºæ°´å¹³æ??ç??çª?æ ¼ä½?ç½®"
+#~ msgid "%s wishes to receive the latest meeting information."
+#~ msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??æ??è­°è³?è¨?ã??"
 
-#~ msgid "Vertical Position"
-#~ msgstr "å??ç?´ä½?ç½®"
+#~ msgid "Meeting Update Request"
+#~ msgstr "æ??è­°æ?´æ?°è«?æ±?"
 
-#~ msgid "Pane position when oriented vertically"
-#~ msgstr "ç?¶æ??å??æ?¹å??ç?ºå??ç?´æ??ç??çª?æ ¼ä½?ç½®"
+#~ msgid "%s has replied to a meeting request."
+#~ msgstr "%s å·²ç¶?ç­?è¦?äº?æ??è­°è«?æ±?ã??"
 
-#~ msgid "Proportion"
-#~ msgstr "��"
+#~ msgid "Meeting Reply"
+#~ msgstr "æ??è­°ç­?è¦?"
 
-#~ msgid "Proportion of the 2nd pane size"
-#~ msgstr "第äº?çª?格尺寸ç??æ¯?ä¾?"
+#~ msgid "%s has canceled a meeting."
+#~ msgstr "%s å·²ç¶?æ¶?å??æ??è­°ã??"
 
-#~ msgid "Fixed Resize"
-#~ msgstr "��調�大�"
+#~ msgid "Meeting Cancelation"
+#~ msgstr "æ??è­°å??æ¶?"
 
-#~ msgid "Keep the 2nd pane fixed during resize"
-#~ msgstr "å?¨é??å®?尺寸æ??å?ºå®?第äº?çª?æ ¼"
+#~ msgid "%s has sent an unintelligible message."
+#~ msgstr "%s å?³é??äº?ä¸?å??é?£ä»¥ç??解ç??è¨?æ?¯ã??"
 
-#~ msgid "Sync with:"
-#~ msgstr "å??æ­¥å°?象:"
+#~ msgid "Bad Meeting Message"
+#~ msgstr "ä¸?正確ç??æ??è­°è¨?æ?¯"
 
-#~ msgid "Sync Private Records:"
-#~ msgstr "å??æ­¥ç§?人è¨?é??:"
+#~ msgid "%s has published task information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?äº?å·¥ä½?è³?è¨?ã??"
 
-#~ msgid "Sync Categories:"
-#~ msgstr "å??æ­¥å??é¡?:"
+#~ msgid "Task Information"
+#~ msgstr "工���"
 
-#~ msgid "Cursor Row"
-#~ msgstr "游æ¨?å??"
+#~ msgid "%s requests %s to perform a task."
+#~ msgstr "%s è¦?æ±? %s é?²è¡?å·¥ä½?ã??"
 
-#~ msgid "Cursor Column"
-#~ msgstr "游��"
+#~ msgid "%s requests you perform a task."
+#~ msgstr "%s è¦?æ±?æ?¨é?²è¡?å·¥ä½?ã??"
 
-#~ msgid "Sorter"
-#~ msgstr "å??é¡?å?¨"
+#~ msgid "Task Proposal"
+#~ 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 "%s wishes to be added to an existing task."
+#~ msgstr "%s å¸?æ??å? å?¥ä¸?é ?æ?¢å­?ç??å·¥ä½?ã??"
 
-#~ msgid "ETree table adapter"
-#~ msgstr "ETree 表格���"
+#~ msgid "Task Update"
+#~ msgstr "工���"
 
-#~ msgid "Retro Look"
-#~ msgstr "æ?·è??å¤?è§?"
+#~ msgid "%s wishes to receive the latest task information."
+#~ msgstr "%s å¸?æ??æ?¶å?°æ??æ?°ç??å·¥ä½?è³?è¨?ã??"
 
-#~ msgid "Draw lines and +/- expanders."
-#~ msgstr "繪å?ºç·?æ¢?è?? +/- å±?é??符è??ã??"
+#~ msgid "Task Update Request"
+#~ msgstr "工�����"
 
-#~ msgid "Expander Size"
-#~ msgstr "å±?é??å?¨å¤§å°?"
+#~ msgid "%s has replied to a task assignment."
+#~ msgstr "%s å·²ç¶?å??è¦?æ??æ´¾ç??å·¥ä½?ã??"
 
-#~ msgid "Size of the expander arrow"
-#~ msgstr "å±?é??å?¨ç®­è??ç??大å°?"
+#~ msgid "Task Reply"
+#~ msgstr "å·¥ä½?å??è¦?"
 
-#~ msgid "popup"
-#~ msgstr "å½?å?º"
+#~ msgid "%s has canceled a task."
+#~ msgstr "%s å·²ç¶?å??æ¶?å·¥ä½?ã??"
 
-#~ msgid "edit"
-#~ msgstr "編輯"
+#~ msgid "Task Cancelation"
+#~ msgstr "å·¥ä½?å??æ¶?"
 
-#~ msgid "toggle"
-#~ msgstr "å??æ??"
+#~ msgid "Bad Task Message"
+#~ msgstr "ä¸?正確ç??å·¥ä½?è¨?æ?¯"
 
-#~ msgid "expand"
-#~ msgstr "å±?é??"
+#~ msgid "%s has published free/busy information."
+#~ msgstr "%s å·²ç¶?ç?¼å¸?空é??/å¿?ç¢?è³?è¨?ã??"
 
-#~ msgid "Event Processor"
-#~ msgstr "äº?件è??ç??å?¨"
+#~ msgid "Free/Busy Information"
+#~ msgstr "空é??/å¿?ç¢?è³?è¨?"
 
-#~ msgid "Text"
-#~ msgstr "æ??å­?"
+#~ msgid "%s requests your free/busy information."
+#~ msgstr "%s è«?æ±?æ?¨ç??空é??/å¿?ç¢?è³?è¨?ã??"
 
-#~ msgid "Bold"
-#~ msgstr "ç²?é«?"
+#~ msgid "Free/Busy Request"
+#~ msgstr "空é??/å¿?ç¢?è«?æ±?"
 
-#~ msgid "Strikeout"
-#~ msgstr "���"
+#~ msgid "%s has replied to a free/busy request."
+#~ msgstr "%s å·²ç¶?ç­?è¦?空é??/å¿?ç¢?è«?æ±?ã??"
 
-#~ msgid "Anchor"
-#~ msgstr "��"
+#~ msgid "Free/Busy Reply"
+#~ msgstr "空é??/å¿?ç¢?å??è¦?"
 
-#~ msgid "Justification"
-#~ msgstr "左���"
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "ä¸?正確ç??空é??/å¿?ç¢?è¨?æ?¯"
 
-#~ msgid "Clip Width"
-#~ msgstr "�輯寬度"
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "é?µä»¶ä¼¼ä¹?æ²?æ??被é?©ç?¶å?°çµ?æ??"
 
-#~ msgid "Clip Height"
-#~ msgstr "�輯�度"
+#~ msgid "The message contains only unsupported requests."
+#~ msgstr "é??å??é?µä»¶å?ªå??å?«ä¸?æ?¯æ?´ç??è«?æ±?ã??"
 
-#~ msgid "Clip"
-#~ msgstr "�輯"
+#~ msgid "The attachment has no viewable calendar items"
+#~ msgstr "é??件æ²?æ??å?¯æª¢è¦?ç??è¡?äº?æ??é ?ç?®"
 
-#~ msgid "Fill clip rectangle"
-#~ msgstr "填滿�輯��"
+#~ msgid "Update complete\n"
+#~ msgstr "æ?´æ?°å®?æ??\n"
 
-#~ msgid "X Offset"
-#~ msgstr "X �移"
+#~ msgid "Object is invalid and cannot be updated\n"
+#~ msgstr "ç?©ä»¶æ?¯ç?¡æ??ç??è??ä¸?ä¸?è?½æ?´æ?°\n"
 
-#~ msgid "Y Offset"
-#~ msgstr "Y �移"
+#~ msgid "This response is not from a current attendee.  Add as an attendee?"
+#~ msgstr "é??å??å??è¦?並é??ä¾?è?ªç?®å??ç??å?°æ??è??ã??å°?ä»?å? å?¥ç?ºå?°æ??è??ï¼?"
 
-#~ msgid "Text width"
-#~ msgstr "æ??å­?寬度"
+#~ msgid "Attendee status could not be updated because of an invalid status!\n"
+#~ msgstr "ç?±æ?¼ä¸?å??æ³?ç??ç??æ??使å¾?å?°æ??è??ç??æ??ç?¡æ³?æ?´æ?°ï¼?\n"
 
-#~ msgid "Text height"
-#~ msgstr "æ??å­?é«?度"
+#~ msgid "Attendee status updated\n"
+#~ msgstr "å?°æ??è??ç??æ??å·²æ?´æ?°\n"
 
-#~ msgid "Use ellipsis"
-#~ msgstr "使ç?¨ç??ç?¥è??"
+#~ msgid "Item sent!\n"
+#~ msgstr "é ?ç?®å?³é??ï¼?\n"
 
-#~ msgid "Ellipsis"
-#~ msgstr "æ©¢å??"
+#~ msgid "The item could not be sent!\n"
+#~ msgstr "ç?¡æ³?å?³é??é??å??é ?ç?®ï¼?\n"
 
-#~ msgid "Line wrap"
-#~ msgstr "æ??è¡?"
+#~ msgid "Choose an action:"
+#~ msgstr "é?¸æ??ä¸?å??å??ä½?:"
 
-#~ msgid "Break characters"
-#~ msgstr "中æ?·å­?å??"
+#~ msgid "Update"
+#~ msgstr "æ?´æ?°"
 
-#~ msgid "Max lines"
-#~ msgstr "æ??大è¡?æ?¸"
+#~ msgid "Tentatively accept"
+#~ msgstr "æ?«æ??æ?¥å??"
 
-#~ msgid "Draw borders"
-#~ msgstr "繪製��"
+#~ msgid "Send Free/Busy Information"
+#~ msgstr "é??å?ºç©ºé??/å¿?ç¢?è³?è¨?"
 
-#~ msgid "Allow newlines"
-#~ msgstr "å??許æ?°è¡?"
+#~ msgid "Update respondent status"
+#~ msgstr "æ?´æ?°å??æ??ç??æ??"
 
-#~ msgid "Draw background"
-#~ msgstr "繪製è??æ?¯"
+#~ msgid "Send Latest Information"
+#~ msgstr "é??å?ºæ??æ?°è³?è¨?"
 
-#~ msgid "Draw button"
-#~ msgstr "繪製æ??é??"
+#~ msgid "--to--"
+#~ msgstr "--å?°--"
 
-#~ msgid "Cursor position"
-#~ msgstr "游��置"
+#~ msgid "Calendar Message"
+#~ msgstr "è¡?äº?æ??è¨?æ?¯"
 
-#~ msgid "IM Context"
-#~ msgstr "IM 快顯��"
+#~ msgid "Date:"
+#~ msgstr "æ?¥æ??:"
 
-#~ msgid "Handle Popup"
-#~ msgstr "è??ç??å½?å?ºå¼?é ?ç?®"
+#~ msgid "Loading Calendar"
+#~ msgstr "è¼?å?¥è¡?äº?æ??"
 
-#~ msgid "Loading appointments at %s"
-#~ msgstr "è¼?å?¥ %s ç??ç´?æ??"
+#~ msgid "Loading calendar..."
+#~ msgstr "è¼?å?¥è¡?äº?æ??â?¦"
 
-#~ msgid "_Security"
-#~ msgstr "���(_S)"
+#~ msgid "Organizer:"
+#~ msgstr "æ??è­°å?¬é??人:"
 
-#~ msgid "Copying `%s' to `%s'"
-#~ msgstr "å°?ã??%sã??è¤?製å?°ã??%sã??"
+#~ msgid "Server Message:"
+#~ msgstr "伺æ??å?¨è¨?æ?¯:"



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