Update Simplified Chinese translation.

1 files changed, 3515 insertions, 2971 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 65d79d7180..33d0d7ee28 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,19 +1,23 @@
-# Ximian Evolution 的简体中文翻译
+# Evolution 的简体中文翻译
 # Copyright (C) 2003 Ximian Inc.
+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # Wang Li <charles@linux.net.cn>, 2002, 2003.
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
+# Tao Wei <weitao1979@gmail.com>, 2009.
+# Andrew Zheng <andrew0zheng@gmail.com>, 2009.
 #
-#: ../shell/main.c:510
+#: ../shell/main.c:512
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 14:12+0700\n"
-"PO-Revision-Date: 2009-11-26 21:17+0100\n"
-"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
-"Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
+"Project-Id-Version: evolution master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=evolution\n"
+"POT-Creation-Date: 2010-02-05 14:47+0000\n"
+"PO-Revision-Date: 2010-02-03 01:45+0800\n"
+"Last-Translator: Andrew Zheng <andrew0zheng@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroup.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,50 +85,41 @@ msgid "Delete address book '{0}'?"
 msgstr "删除地址簿“{0}”吗？"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid "Error loading address book."
-msgstr "装入地址簿错误。"
-
-#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "将{0}保存到 {1} 出错：{2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Failed to authenticate with LDAP server."
 msgstr "认证到 IMAP 服务器失败。"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1022
+#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
 msgid "Failed to delete contact"
 msgstr "删除联系人失败"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise 地址簿创建："
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 服务器无法响应有效的大纲信息。"
 
-#: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:56
-msgid "Server Version"
-msgstr "服务器版本"
-
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr "某些特性可能无法在您目前的服务器下工作"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolution 地址簿异常退出。"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "您所选择的图像太大。您是否想要缩放并存储？"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -133,45 +128,45 @@ msgstr ""
 "此 LDAP 服务器可能使用较早版本的 LDAP，所以无法支持此功能，或者是配置错误。请"
 "询问您的管理员有关支持的搜索基础一事。"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book could not be opened."
 msgstr "无法打开此地址簿。"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book server does not have any suggested search bases."
 msgstr "此地址簿服务器不支持任何建议的搜索基础。"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:24
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "此地址簿服务器不可达，或者服务器名称拼错，又或者您的网络连接已断。"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This address book will be removed permanently."
 msgstr "此地址簿即将被永久删除。"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此服务器不支持 LDAPv3 大纲信息。"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open address book"
 msgstr "无法打开地址簿"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "无法执行搜索。"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "无法保存 {0}。"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "您希望保存更改吗？"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -179,7 +174,7 @@ msgstr ""
 "您即将把联系人从一个地址簿移至另外一个地址簿，但是无法从源地址簿删除该联系"
 "人。您想要换作复制联系人吗？"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -188,51 +183,51 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到 Evolution 支持的版本"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "您没有足够的权限从地址簿中删除联系人。"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "您已对此联系人作出了修改。您想要保存这些更改吗？"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则 {0} 的联系人无法使用。"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:521
+#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "_Discard"
 msgstr "丢弃(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Do not save"
 msgstr "不保存(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Resize"
 msgstr "缩放(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Use as it is"
 msgstr "原样使用(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
+#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:143
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:44
 msgid "{1}"
 msgstr "{1}"
 
@@ -252,7 +247,7 @@ msgstr "无法读入 Pilot 的地址应用程序块"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1834
+#: ../calendar/gui/e-calendar-view.c:1987
 msgid "Anniversary"
 msgstr "纪念日"
 
@@ -263,7 +258,7 @@ 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:1833 ../shell/main.c:113
+#: ../calendar/gui/e-calendar-view.c:1986 ../shell/main.c:111
 msgid "Birthday"
 msgstr "生日"
 
@@ -278,16 +273,16 @@ msgid "Calendar:"
 msgstr "日历："
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:311
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "联系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2496
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -297,7 +292,7 @@ msgstr "联系人编辑器"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:808
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
 msgid "Email"
 msgstr "电子邮件"
 
@@ -310,7 +305,7 @@ msgid "Full _Name..."
 msgstr "全名(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "家庭"
@@ -336,7 +331,7 @@ msgid "Mailing Address"
 msgstr "邮政地址"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "杂项"
 
@@ -347,16 +342,16 @@ msgstr "昵称(_K)："
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../modules/calendar/e-memo-shell-migrate.c:250
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:567
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 msgid "Notes"
 msgstr "笔记"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1695
 msgid "Other"
 msgstr "其它"
 
@@ -382,10 +377,10 @@ msgstr "网络日志："
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../mail/e-mail-migrate.c:954
 msgid "Work"
 msgstr "工作"
 
@@ -408,7 +403,7 @@ msgstr "生日(_B)："
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 #: ../calendar/gui/dialogs/event-page.c:823
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1928
+#: ../plugins/itip-formatter/itip-view.c:1909
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
@@ -491,122 +486,123 @@ msgid "_Zip/Postal Code:"
 msgstr "邮政编码(_Z)："
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1159
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:338
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "姓名"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
-#: ../addressbook/gui/widgets/e-addressbook-model.c:523
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-model.c:522
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
+#: ../addressbook/gui/widgets/e-minicard-view.c:548
 #: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
-#: ../widgets/text/e-text.c:3675
+#: ../widgets/table/e-cell-text.c:1655 ../widgets/text/e-text.c:3429
+#: ../widgets/text/e-text.c:3430
 msgid "Editable"
 msgstr "可编辑"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
+#: ../addressbook/gui/widgets/eab-gui-util.c:371
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:223
 msgid "Error modifying contact"
 msgstr "修改联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:237
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Source Book"
 msgstr "来源地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 msgid "Target Book"
 msgstr "目标地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
 msgid "Required Fields"
 msgstr "必需域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2491
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2888
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3162
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -614,23 +610,23 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3166
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3173
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3199
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3213
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
@@ -655,15 +651,14 @@ msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:355
-#, fuzzy
+#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:681
 msgid "Shell"
-msgstr "塞舌尔"
+msgstr "外壳"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:356
+#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:682
 msgid "The EShell singleton"
-msgstr ""
+msgstr "EShell 的一个"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
@@ -731,7 +726,7 @@ msgid "_Suffix:"
 msgstr "后缀(_S)："
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:695
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:692
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
@@ -756,36 +751,36 @@ msgstr "选择(_S)..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:788
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:785
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:936
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:933
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1345
 msgid "_Members"
 msgstr "成员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1185
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1199
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1213
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
-#: ../addressbook/gui/widgets/e-addressbook-model.c:513
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
+#: ../addressbook/gui/widgets/e-addressbook-model.c:512
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Book"
 msgstr "地址簿"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1277
 msgid "Is New List"
 msgstr "为新列表"
 
@@ -836,58 +831,58 @@ msgstr "合并联系人"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:978
 msgid "Any field contains"
 msgstr "任何域含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Name contains"
 msgstr "姓名含有"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:143
+#: ../addressbook/gui/widgets/e-addressbook-model.c:142
 msgid "No contacts"
 msgstr "无联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:147
+#: ../addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 个联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+#: ../addressbook/gui/widgets/e-addressbook-model.c:307
 msgid "Error getting book view"
 msgstr "获取名簿视图出错"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:533
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-addressbook-model.c:532
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
 msgid "Query"
 msgstr "查询"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+#: ../addressbook/gui/widgets/e-addressbook-model.c:706
 msgid "Search Interrupted"
 msgstr "搜索中断了"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
-#: ../addressbook/gui/widgets/e-addressbook-view.c:560
-#: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
-#: ../modules/calendar/e-memo-shell-content.c:601
-#: ../modules/calendar/e-task-shell-content.c:624
-#: ../widgets/table/e-table-click-to-add.c:505
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
+#: ../addressbook/gui/widgets/e-addressbook-view.c:758
+#: ../calendar/gui/e-memo-table.c:1048 ../calendar/gui/e-task-table.c:1347
+#: ../modules/calendar/e-memo-shell-content.c:603
+#: ../modules/calendar/e-task-shell-content.c:625
+#: ../widgets/table/e-table-click-to-add.c:511
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3344
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
+#: ../widgets/table/e-table.c:3349
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3296
+#: ../widgets/text/e-text.c:3297
 msgid "Model"
 msgstr "模型"
 
@@ -895,43 +890,63 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:570
-#: ../calendar/gui/e-calendar-table.c:888 ../calendar/gui/e-memo-table.c:671
-#, fuzzy
+#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+msgid "Cut selected contacts to the clipboard"
+msgstr "将选联系人剪切到剪贴板"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+msgid "Copy selected contacts to the clipboard"
+msgstr "将选中联系人复制到剪贴板"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+msgid "Paste contacts from the clipboard"
+msgstr "从剪贴板中粘贴联系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Delete selected contacts"
+msgstr "删除选中的联系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+msgid "Select all visible contacts"
+msgstr "选中全部可见联系人"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:774
+#: ../calendar/gui/e-memo-table.c:1065 ../calendar/gui/e-task-table.c:1364
 msgid "Shell View"
-msgstr "选择视图：%s"
+msgstr "外壳视图"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:581
+#: ../addressbook/gui/widgets/e-addressbook-view.c:785
 msgid "Source"
 msgstr "来源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1040
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1044
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1048
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您确定要删除联系人列表(%s)吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1054
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您确定要删除这些联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1058
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
 msgid "Are you sure you want to delete this contact?"
 msgstr "您确定要删除这些联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1062
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您确定要删除联系人(%s)吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -940,11 +955,11 @@ msgstr ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
 msgid "_Don't Display"
 msgstr "不显示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
 msgid "Display _All Contacts"
 msgstr "显示全部联系人(_A)"
 
@@ -1104,7 +1119,7 @@ msgid "Telex"
 msgstr "电传"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:520
+#: ../shell/e-shell-view.c:748
 msgid "Title"
 msgstr "头衔"
 
@@ -1119,27 +1134,27 @@ msgstr "网站"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:154
 #: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:519
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-group-container.c:994
-#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-click-to-add.c:525
+#: ../widgets/table/e-table-col.c:121
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1003
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/table/e-table-item.c:2879 ../widgets/table/e-table-item.c:2880
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Width"
 msgstr "宽度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:161
 #: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:526
-#: ../widgets/table/e-table-group-container.c:987
-#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-click-to-add.c:532
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-container.c:996
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:2885 ../widgets/table/e-table-item.c:2886
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Height"
 msgstr "高度"
 
@@ -1168,7 +1183,7 @@ msgstr "最大域名长度"
 msgid "Column Width"
 msgstr "列宽"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:179
+#: ../addressbook/gui/widgets/e-minicard-view.c:181
 msgid ""
 "\n"
 "\n"
@@ -1178,7 +1193,7 @@ msgstr ""
 "\n"
 "正在搜索联系人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -1192,7 +1207,7 @@ msgstr ""
 "\n"
 "或在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:185
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -1206,7 +1221,7 @@ msgstr ""
 "\n"
 "请在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:189
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1216,7 +1231,7 @@ msgstr ""
 "\n"
 "搜索联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1226,7 +1241,7 @@ msgstr ""
 "\n"
 "本视图中没有可显示的项。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Adapter"
 msgstr "适配器"
 
@@ -1292,17 +1307,17 @@ msgid "Copy _Email Address"
 msgstr "复制电子邮件地址(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:362
+#: ../widgets/misc/e-web-view.c:370
 msgid "Copy the email address to the clipboard"
 msgstr "复制电子邮件地址到剪贴板"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:367
+#: ../widgets/misc/e-web-view.c:375
 msgid "_Send New Message To..."
 msgstr "把新信发送到(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:369
+#: ../widgets/misc/e-web-view.c:377
 msgid "Send a mail message to this address"
 msgstr "发送一个邮件信息到这个地址"
 
@@ -1339,12 +1354,12 @@ msgstr "视频聊天"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:475
+#: ../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:465
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:450
-#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/groupwise-features/camel-gw-listener.c:445
+#: ../plugins/groupwise-features/camel-gw-listener.c:560
 #: ../plugins/hula-account-setup/camel-hula-listener.c:371
 #: ../plugins/hula-account-setup/camel-hula-listener.c:399
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
@@ -1380,22 +1395,22 @@ msgstr "主页"
 msgid "Web Log"
 msgstr "Web 日志"
 
+#. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#. orange
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:955
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-backend.c:171
 #: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-backend.c:154
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-backend.c:158
 #: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:958
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "个人"
 
@@ -1411,8 +1426,8 @@ msgstr "主页"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1042
-#: ../widgets/misc/e-web-view.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:1031
+#: ../widgets/misc/e-web-view.c:750
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
@@ -1466,14 +1481,14 @@ msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #. E_BOOK_ERROR_CANCELLED
+#. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:1
-#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:215
-#: ../calendar/gui/e-calendar-table.c:226
-#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
+#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/print.c:2608
 msgid "Canceled"
 msgstr "已取消"
 
@@ -1524,14 +1539,13 @@ msgid "Unsupported authentication method"
 msgstr "不支持的认证方式"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:107
-#, fuzzy
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the address book once in online mode to download its contents."
 msgstr ""
-"我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用，或者尚未下载完"
-"成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
+"无法打开此地址簿。这可能意味着此地址簿没有标为可脱机使用，或者尚未下载完成以"
+"供脱机使用。请在联机模式中载入此地址簿以便下载其内容。"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
@@ -1599,27 +1613,27 @@ msgstr "此查询未成功完成。"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:245
+#: ../addressbook/gui/widgets/eab-gui-util.c:244
 msgid "Select Address Book"
 msgstr "选择地址簿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:306
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
 msgid "list"
 msgstr "列表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Move contact to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:432
+#: ../addressbook/gui/widgets/eab-gui-util.c:434
 msgid "Copy contact to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Move contacts to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:439
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
@@ -1627,51 +1641,51 @@ msgstr "将联系人复制到"
 msgid "Card View"
 msgstr "名片视图"
 
-#: ../addressbook/importers/evolution-csv-importer.c:660
-#: ../addressbook/importers/evolution-ldif-importer.c:511
-#: ../addressbook/importers/evolution-vcard-importer.c:252
+#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-ldif-importer.c:516
+#: ../addressbook/importers/evolution-vcard-importer.c:253
 #: ../calendar/importers/icalendar-importer.c:310
 #: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:861
+#: ../addressbook/importers/evolution-csv-importer.c:858
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:862
+#: ../addressbook/importers/evolution-csv-importer.c:859
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:870
+#: ../addressbook/importers/evolution-csv-importer.c:867
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:871
+#: ../addressbook/importers/evolution-csv-importer.c:868
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:879
+#: ../addressbook/importers/evolution-csv-importer.c:876
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:880
+#: ../addressbook/importers/evolution-csv-importer.c:877
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:678
+#: ../addressbook/importers/evolution-ldif-importer.c:689
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 数据交换格式(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:679
+#: ../addressbook/importers/evolution-ldif-importer.c:690
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:556
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:557
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 导入器"
 
@@ -1723,24 +1737,24 @@ msgstr "异步模式中一个输出文件中的名片数，默认大小为 100�
 msgid "NUMBER"
 msgstr "数字"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "命令行参数错误，请使用 --help 选项查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
 msgstr "仅支持 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
 msgid "In async mode, output must be file."
 msgstr "在异步模式中，输出必须是文件。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
 msgid "In normal mode, there is no need for the size option."
 msgstr "在普通模式中，不应该有大小选项。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
 msgid "Unhandled error"
 msgstr "未处理的错误"
 
@@ -1749,20 +1763,21 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
 #: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:530
+#: ../plugins/groupwise-features/camel-gw-listener.c:525
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
 #: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:510
+#: ../plugins/groupwise-features/camel-gw-listener.c:505
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "输入 %s 的密码(用户 %s)"
 
 #: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/caldav/caldav-browse-server.c:809
+#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "输入密码"
@@ -1839,9 +1854,8 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "您确信您要删除标题为“{0}”的约会吗？"
 
 #: ../calendar/calendar.error.xml.h:17
-#, fuzzy
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "您确信您要删除标题为“{0}”的约会吗？"
+msgstr "您确信您要删除标题为“{0}”的会议吗？"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
@@ -1984,136 +1998,118 @@ msgid "No response from the server."
 msgstr "服务器无响应。"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "Save Appointment"
-msgstr "保存约会"
-
-#: ../calendar/calendar.error.xml.h:51
-#, fuzzy
-msgid "Save Meeting"
-msgstr "新会议"
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Save Memo"
-msgstr "保存备忘"
-
-#: ../calendar/calendar.error.xml.h:53
-msgid "Save Task"
-msgstr "保存任务"
-
-#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../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:57
+#: ../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:58
+#: ../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:59
+#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "某些特性可能无法在您目前的服务器下工作。"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:57
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 备忘异常退出。"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:59
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:60
 msgid "The memo list is not marked for offline usage."
 msgstr "备忘列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:61
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:63
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:64
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:65
 msgid "Unable to load the calendar"
 msgstr "无法装入日历"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:72
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this meeting?"
-msgstr "您想要保存对此备忘的更改吗？"
+msgstr "您想要保存对此会议的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this memo?"
 msgstr "您想要保存对此备忘的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "您是否想要为此备忘发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:76
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -2122,59 +2118,58 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到支持的版本。"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:83
-#, fuzzy
+#: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "您已经对此任务做出了更改，但尚未保存。"
+msgstr "您已经对此会议做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "您已经对此备忘做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:81
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:82
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的备忘将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:84
+#: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:90 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:86
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:92
-#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:142
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:94
+#: ../calendar/calendar.error.xml.h:89
 msgid "{0}."
 msgstr "{0}。"
 
@@ -2226,16 +2221,10 @@ msgid_plural "minutes"
 msgstr[0] "分钟"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
-#: ../plugins/caldav/caldav-source.c:449
-#: ../plugins/calendar-file/calendar-file.c:294
-#: ../plugins/calendar-http/calendar-http.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:515
-#: ../plugins/google-account-setup/google-contacts-source.c:331
-#: ../plugins/google-account-setup/google-source.c:740
-msgid "hours"
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
@@ -2254,9 +2243,9 @@ msgstr "全部错过(_A)"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1574
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "位置："
@@ -2270,11 +2259,11 @@ msgid "_Dismiss"
 msgstr "错过(_D)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1065
+#: ../calendar/gui/dialogs/comp-editor.c:1015
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:111
+#: ../mail/e-mail-browser.c:151
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1605
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
@@ -2283,49 +2272,55 @@ msgstr "编辑(_E)"
 msgid "_Snooze"
 msgstr "午睡(_S)"
 
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:422
+#: ../filter/filter.ui.h:15
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#, fuzzy
+#| msgid "hours"
+#| msgid_plural "hours"
+msgid "hours"
+msgstr "小时"
+
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "约会位置"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:32
-#: ../plugins/caldav/caldav-source.c:448
-#: ../plugins/calendar-file/calendar-file.c:293
-#: ../plugins/calendar-http/calendar-http.c:323
-#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:421
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
 #: ../plugins/google-account-setup/google-contacts-source.c:330
-#: ../plugins/google-account-setup/google-source.c:739
 msgid "minutes"
 msgstr "分钟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1436
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1435
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1557
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1497
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个提醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1669
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1697
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1673
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2337,7 +2332,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2353,7 +2348,7 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1717
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
@@ -2446,9 +2441,8 @@ msgid "Default appointment reminder"
 msgstr "默认约会提醒"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
-#, fuzzy
 msgid "Default recurrence count"
-msgstr "默认提醒单位"
+msgstr "默认反复计数"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
@@ -2508,11 +2502,11 @@ msgstr "工作日开始的小时，以 24 小时格式表示，0 到 23。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the memo preview pane in the main window."
-msgstr ""
+msgstr "如果 “true”，在主窗口中显示备忘预览面板。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "If \"true\", show the task preview pane in the main window."
-msgstr ""
+msgstr "如果 “true”，在主窗口中显示任务预览面板。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
@@ -2528,10 +2522,12 @@ msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的消息会被记录。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#, fuzzy
 msgid "List of recently used second time zones in a Day View."
-msgstr ""
+msgstr "列出在日视图中最近使用过的第二时区。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#, fuzzy
 msgid "List of server URLs for free/busy publishing."
 msgstr "列出发表忙/闲的服务器 URL。"
 
@@ -2551,24 +2547,23 @@ msgstr "Marcus Bains 线颜色 - 日期栏"
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
-msgstr ""
+msgstr "在 'day_second_zones' 列表中，最近使用过的时区最大记忆数目"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
-msgstr ""
+msgstr "最近使用过的时区最大记忆数目"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo layout style"
-msgstr ""
+msgstr "备忘外观风格"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (horizontal)"
-msgstr ""
+msgstr "备忘预览面板的水平位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
-#, fuzzy
 msgid "Memo preview pane position (vertical)"
-msgstr "月视图中垂直面板的位置"
+msgstr "备忘预览面板的垂直位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
@@ -2612,15 +2607,15 @@ msgstr "月视图中视图和日期导航器日历之间水平面板的位置，
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
-msgstr ""
+msgstr "当垂直定向时，备忘预览面板的位置。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented horizontally."
-msgstr ""
+msgstr "当水平定向时，任务预览面板的位置。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Position of the task preview pane when oriented vertically."
-msgstr ""
+msgstr "当垂直定向时，任务预览面板的位置。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
@@ -2658,7 +2653,7 @@ msgstr "允许提醒运行的程序。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
-msgstr ""
+msgstr "日视图中最近是用过的第二时区"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
@@ -2693,14 +2688,12 @@ msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示状态域"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-#, fuzzy
 msgid "Show the memo preview pane"
-msgstr "显示“预览”面板"
+msgstr "显示“备忘预览”面板"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-#, fuzzy
 msgid "Show the task preview pane"
-msgstr "显示“预览”面板"
+msgstr "显示“任务预览”面板"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
@@ -2722,21 +2715,19 @@ msgstr "在日期导航器中显示周数"
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
-msgstr ""
+msgstr "如果被设定，在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task layout style"
-msgstr ""
+msgstr "任务外观风格"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
-#, fuzzy
 msgid "Task preview pane position (horizontal)"
-msgstr "任务垂直面板位置"
+msgstr "任务预览面板的水平位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
-#, fuzzy
 msgid "Task preview pane position (vertical)"
-msgstr "任务垂直面板位置"
+msgstr "任务预览面板的垂直位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Tasks due today color"
@@ -2987,10 +2978,10 @@ msgstr "类别"
 msgid "Classification"
 msgstr "分类"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-task-table.c:487
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "机密"
@@ -3020,7 +3011,7 @@ msgstr "存在"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:368
 msgid "Location"
@@ -3031,15 +3022,15 @@ msgstr "位置"
 msgid "Organizer"
 msgstr "组织者"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:558 ../calendar/gui/e-task-table.c:486
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "保密"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
-#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
-#: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:549 ../calendar/gui/e-cal-model.c:556
+#: ../calendar/gui/e-task-table.c:485 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "公开"
 
@@ -3174,16 +3165,11 @@ msgstr "天"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:335
-#: ../plugins/caldav/caldav-source.c:450
-#: ../plugins/calendar-file/calendar-file.c:295
-#: ../plugins/calendar-http/calendar-http.c:325
-#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
 #: ../plugins/google-account-setup/google-contacts-source.c:332
-#: ../plugins/google-account-setup/google-source.c:741
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:39
 msgid "days"
 msgstr "天"
 
@@ -3221,42 +3207,31 @@ msgstr "添加(_D)"
 msgid "Alarms"
 msgstr "提醒"
 
-#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.c:2940
-#: ../calendar/gui/e-cal-model-tasks.c:727
-#: ../calendar/gui/e-day-view-time-item.c:798
-#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:744
-#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
-#: ../modules/mail/e-mail-junk-hook.c:88
-#: ../plugins/calendar-weather/calendar-weather.c:324
-#: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:379
-#: ../plugins/itip-formatter/itip-formatter.c:2300
-#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
-#: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
-#: ../widgets/misc/e-signature-combo-box.c:75
-#: ../widgets/table/e-cell-date-edit.c:312
+#. Translators: "None" indicates no second time zone set for a day view
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/e-day-view-time-item.c:797
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-second-zone"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/e-day-view-time-item.c:824
 #: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "选择..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:499
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
 msgid "Time and date:"
 msgstr "时间和日期："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
 msgid "Date only:"
 msgstr "只有日期："
 
@@ -3321,7 +3296,7 @@ msgstr "只在通知区域显示提醒(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
 #: ../calendar/gui/dialogs/recurrence-page.c:1113
-#: ../calendar/gui/e-itip-control.c:739
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "星期五"
 
@@ -3331,9 +3306,9 @@ msgstr "星期五"
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2654
+#: ../plugins/itip-formatter/itip-formatter.c:2653
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
 msgstr "常规"
 
@@ -3347,10 +3322,18 @@ msgstr "分钟"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.c:1109
-#: ../calendar/gui/e-itip-control.c:735
+#: ../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:80
 msgid "Pick a color"
@@ -3362,7 +3345,7 @@ msgstr "周日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 #: ../calendar/gui/dialogs/recurrence-page.c:1114
-#: ../calendar/gui/e-itip-control.c:740
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "星期六"
 
@@ -3396,7 +3379,7 @@ msgstr "在日视图和工作日视图中显示周数(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 #: ../calendar/gui/dialogs/recurrence-page.c:1115
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "星期日"
 
@@ -3419,13 +3402,13 @@ msgstr "模板："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 #: ../calendar/gui/dialogs/recurrence-page.c:1112
-#: ../calendar/gui/e-itip-control.c:738
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "星期四"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
-#: ../e-util/e-non-intrusive-error-dialog.c:282
-#: ../widgets/misc/e-dateedit.c:608
+#: ../e-util/e-non-intrusive-error-dialog.c:287
+#: ../widgets/misc/e-dateedit.c:613
 msgid "Time"
 msgstr "时间"
 
@@ -3440,7 +3423,7 @@ msgstr "时间格式："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../calendar/gui/dialogs/recurrence-page.c:1110
-#: ../calendar/gui/e-itip-control.c:736
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -3450,7 +3433,7 @@ msgstr "显示系统时区(_Y)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 #: ../calendar/gui/dialogs/recurrence-page.c:1111
-#: ../calendar/gui/e-itip-control.c:737
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -3459,7 +3442,7 @@ msgid "Wee_k starts on:"
 msgstr "一周开始于(_K)："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../modules/calendar/e-cal-shell-view-actions.c:1585
 msgid "Work Week"
 msgstr "工作日"
 
@@ -3541,7 +3524,7 @@ msgid "_Type:"
 msgstr "类型(_T)："
 
 #: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3641,246 +3624,266 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2391
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2380
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2395
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2384
 msgid " (Completed "
 msgstr " (完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2397
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2386
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2402
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2391
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2404
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2393
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:241
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "不能保存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:504
+#: ../calendar/gui/dialogs/comp-editor.c:509
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:599
+#: ../calendar/gui/dialogs/comp-editor.c:604
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:606
+#: ../calendar/gui/dialogs/comp-editor.c:611
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:608
+#: ../calendar/gui/dialogs/comp-editor.c:613
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:619
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分配的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:616
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:626
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:637
+#: ../calendar/gui/dialogs/comp-editor.c:642
 msgid "No Summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:791
+#: ../calendar/gui/dialogs/comp-editor.c:751
 msgid "Keep original item?"
 msgstr "保留原始条目？"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:938
 msgid "Click here to close the current window"
 msgstr "单击此处可关闭当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002
-msgid "Copy selected text to the clipboard"
-msgstr "将选中文字复制到剪贴板"
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../mail/e-mail-browser.c:116
+#: ../shell/e-shell-window-actions.c:1444
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+msgid "Copy the selection"
+msgstr "复制选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
-msgid "Cut selected text to the clipboard"
-msgstr "将选中文字剪切到剪贴板"
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../mail/e-mail-browser.c:123
+#: ../shell/e-shell-window-actions.c:1451
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:959
+msgid "Cut the selection"
+msgstr "剪切选中内容"
+
+#: ../calendar/gui/dialogs/comp-editor.c:959
+#: ../shell/e-shell-window-actions.c:1458
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
+#, fuzzy
+#| msgid "Cut the selection"
+msgid "Delete the selection"
+msgstr "剪切选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:966
 msgid "Click here to view help available"
 msgstr "单击此处可查看可用的帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023
-msgid "Paste text from the clipboard"
-msgstr "从剪贴板中粘贴文字"
+#: ../calendar/gui/dialogs/comp-editor.c:973 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:1493
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:971
+msgid "Paste the clipboard"
+msgstr "粘贴剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:994
 msgid "Click here to save the current window"
 msgstr "单击此处可保存当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051
+#: ../calendar/gui/dialogs/comp-editor.c:1001 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1563
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1058
+#: ../calendar/gui/dialogs/comp-editor.c:1008
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1649
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:1022 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1612
+#: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
-#: ../shell/e-shell-window-actions.c:1656
+#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1036
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1093
+#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../composer/e-composer-actions.c:351
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1691
+#: ../calendar/gui/dialogs/comp-editor.c:1050 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1654
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1060
 #: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1112
+#: ../calendar/gui/dialogs/comp-editor.c:1062
 msgid "Click here to attach a file"
 msgstr "单击此处可便附加文件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/comp-editor.c:1070
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1072
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/dialogs/comp-editor.c:1078
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1080
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1091
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1146
+#: ../calendar/gui/dialogs/comp-editor.c:1096
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1148
+#: ../calendar/gui/dialogs/comp-editor.c:1098
 msgid "Classify as private"
 msgstr "分类为私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1153
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1163
+#: ../calendar/gui/dialogs/comp-editor.c:1113
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1179
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1181
+#: ../calendar/gui/dialogs/comp-editor.c:1131
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1187
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1189
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "最近文档(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1690
+#: ../calendar/gui/dialogs/comp-editor.c:1683
 #: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:1738
 msgid "Save"
 msgstr "保存"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2022
-#: ../calendar/gui/dialogs/comp-editor.c:2071
-#: ../calendar/gui/dialogs/comp-editor.c:2960
+#: ../calendar/gui/dialogs/comp-editor.c:2015
+#: ../calendar/gui/dialogs/comp-editor.c:2064
+#: ../calendar/gui/dialogs/comp-editor.c:2955
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2928
+#: ../calendar/gui/dialogs/comp-editor.c:2923
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2990
+#: ../calendar/gui/dialogs/comp-editor.c:2985
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:64
+#: ../calendar/gui/dialogs/copy-source-dialog.c:91
 msgid "Could not open source"
 msgstr "无法打开源"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:72
+#: ../calendar/gui/dialogs/copy-source-dialog.c:99
 msgid "Could not open destination"
 msgstr "无法打开目的"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:81
+#: ../calendar/gui/dialogs/copy-source-dialog.c:108
 msgid "Destination is read only"
 msgstr "目的只读"
 
@@ -3967,7 +3970,7 @@ msgstr "将此事件标为重复发生"
 #: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:211
-#: ../widgets/misc/e-send-options.ui.h:18
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "发送选项"
 
@@ -4013,7 +4016,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者，因此无法编辑全部事件。"
 
 #: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2695
+#: ../calendar/gui/dialogs/event-page.c:2718
 msgid "This event has alarms"
 msgstr "此事件有提醒"
 
@@ -4031,50 +4034,50 @@ msgstr "代理人(_D)"
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1069
+#: ../calendar/gui/dialogs/event-page.c:1094
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1072
+#: ../calendar/gui/dialogs/event-page.c:1097
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
-#: ../calendar/gui/dialogs/memo-page.c:657
-#: ../calendar/gui/dialogs/task-page.c:836
+#: ../calendar/gui/dialogs/event-page.c:1268
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:861
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1253
+#: ../calendar/gui/dialogs/event-page.c:1278
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1301
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1283
+#: ../calendar/gui/dialogs/event-page.c:1308
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1445
-#: ../calendar/gui/dialogs/memo-page.c:698
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:921
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1451
-#: ../calendar/gui/dialogs/memo-page.c:704
-#: ../calendar/gui/dialogs/task-page.c:902
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:1501
+#: ../calendar/gui/dialogs/task-page.c:951
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:2568
+#: ../calendar/gui/dialogs/event-page.c:2591
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
@@ -4085,35 +4088,43 @@ 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:2612
-#: ../calendar/gui/dialogs/memo-page.c:916
-#: ../calendar/gui/dialogs/task-page.c:1720
+#: ../calendar/gui/dialogs/event-page.c:2635
+#: ../calendar/gui/dialogs/memo-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1743
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:2914
+#: ../calendar/gui/dialogs/event-page.c:2937
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:2926
+#: ../calendar/gui/dialogs/event-page.c:2949
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:2939
+#: ../calendar/gui/dialogs/event-page.c:2962
 msgid "Customize"
 msgstr "自定义"
 
+#. Translators: "None" for "No alarm set"
+#: ../calendar/gui/dialogs/event-page.c:2964
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-alarms"
+msgid "None"
+msgstr "无"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "约会的 1 天前"
@@ -4161,7 +4172,7 @@ msgid "_Description:"
 msgstr "描述(_D)："
 
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:363
+#: ../plugins/calendar-weather/calendar-weather.c:356
 msgid "_Location:"
 msgstr "位置(_L)："
 
@@ -4179,7 +4190,7 @@ msgstr "持续时间"
 msgid "until"
 msgstr "直到"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2540
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2529
 msgid "Memo"
 msgstr "备忘"
 
@@ -4191,14 +4202,14 @@ msgstr "因所选的备忘列表为只读，您无法编辑该备忘。"
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者，因此无法编辑全部备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:877
+#: ../calendar/gui/dialogs/memo-page.c:875
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s”中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
-#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
-#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
+#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
+#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2241
+#: ../mail/em-format-html.c:2299 ../mail/em-format-html.c:2324
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "收件人"
@@ -4440,78 +4451,78 @@ msgstr "完成日期有错"
 msgid "Web Page"
 msgstr "网页"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:290
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:213
-#: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:737
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:212
+#: ../calendar/gui/e-task-table.c:227 ../calendar/gui/e-task-table.c:582
+#: ../calendar/gui/print.c:2605 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:358
 msgid "Completed"
 msgstr "已完成"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:3
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
+#. 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:507 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1135 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "高"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:287
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:289
 #: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:731
-#: ../calendar/gui/e-cal-model-tasks.c:808
-#: ../calendar/gui/e-calendar-table.c:211
-#: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:210
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:581
+#: ../calendar/gui/print.c:2602
 msgid "In Progress"
 msgstr "进行中"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:5
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
+#. 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:509 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1133 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "低"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:7
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
-#: ../widgets/misc/e-send-options.ui.h:12
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-cal-model.c:1304 ../calendar/gui/e-task-table.c:508
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1134
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "中"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:297
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/e-cal-component-preview.c:299
 #: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:729
-#: ../calendar/gui/e-calendar-table.c:209
-#: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:208
+#: ../calendar/gui/e-task-table.c:223 ../calendar/gui/e-task-table.c:580
+#: ../calendar/gui/print.c:2599 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "尚未开始"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:9
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "完成百分比(_E)："
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "状态(_U)："
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1590
+#: ../calendar/gui/e-calendar-view.c:1743
 #: ../calendar/gui/e-meeting-list-view.c:603
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -4519,22 +4530,23 @@ msgstr "状态(_U)："
 msgid "Status"
 msgstr "状态"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:23
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "未定义"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "完成日期(_D)："
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
@@ -4573,11 +4585,11 @@ msgstr "无法发送此信件，因为您没有指定任何收件人"
 msgid "Organi_zer:"
 msgstr "组织者(_Z)："
 
-#: ../calendar/gui/dialogs/task-page.c:809
+#: ../calendar/gui/dialogs/task-page.c:834
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: ../calendar/gui/dialogs/task-page.c:1677
+#: ../calendar/gui/dialogs/task-page.c:1700
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
@@ -4672,47 +4684,47 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../calendar/gui/e-cal-component-preview.c:196
+#: ../calendar/gui/e-cal-component-preview.c:198
 #, fuzzy
 msgid "Categories:"
 msgstr "类别"
 
-#: ../calendar/gui/e-cal-component-preview.c:235
-#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "概要："
 
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:259
 msgid "Start Date:"
 msgstr "开始日期："
 
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Due Date:"
 msgstr "到期日期："
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:283
-#: ../calendar/gui/e-itip-control.c:1177
+#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-itip-control.c:1176
 #: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "状态："
 
-#: ../calendar/gui/e-cal-component-preview.c:310
+#: ../calendar/gui/e-cal-component-preview.c:312
 msgid "Priority:"
 msgstr "优先级："
 
-#: ../calendar/gui/e-cal-component-preview.c:335
-#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
 #: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "描述："
 
-#: ../calendar/gui/e-cal-component-preview.c:366
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "网页："
 
@@ -4739,13 +4751,12 @@ msgid "Start Date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:767
+#: ../calendar/gui/e-task-table.c:559
 msgid "Free"
 msgstr "空闲"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:768
-#: ../calendar/gui/e-meeting-time-sel.c:543
+#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:560
 msgid "Busy"
 msgstr "繁忙"
 
@@ -4759,7 +4770,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "无"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:187
 #: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
 #: ../calendar/gui/e-meeting-store.c:856
@@ -4767,149 +4786,58 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1310
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
-#: ../shell/e-shell.c:791
+#: ../calendar/gui/e-cal-model.c:377
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Client"
+msgstr "默认邮件客户端"
+
+#: ../calendar/gui/e-cal-model.c:387 ../calendar/gui/gnome-cal.c:518
+#: ../shell/e-shell.c:836
 #, fuzzy
 msgid "Shell Settings"
 msgstr "Exchange 设置"
 
-#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
-#: ../shell/e-shell.c:792
+#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:519
+#: ../shell/e-shell.c:837
 #, fuzzy
 msgid "Application-wide settings"
 msgstr "自动补全设置"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-cal-model.c:562 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:975
-#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:961
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:967
+#: ../calendar/gui/print.c:984 ../e-util/e-charset.c:52 ../mail/em-utils.c:931
 #: ../plugins/itip-formatter/itip-formatter.c:461
 #: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1282
+#: ../calendar/gui/e-cal-model.c:1306
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:1284
+#: ../calendar/gui/e-cal-model.c:1308
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
+#: ../calendar/gui/e-cal-model.c:2203
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
-msgid "* No Summary *"
-msgstr "* 没有概要 *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:364
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "组织者：%s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
-#, c-format
-msgid "Organizer: %s"
-msgstr "组织者：%s"
-
-#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
-msgid "Start: "
-msgstr "开始："
-
-#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
-msgid "Due: "
-msgstr "到期："
-
-#: ../calendar/gui/e-calendar-table.c:737
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-calendar-table.c:738
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-calendar-table.c:739
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-calendar-table.c:740
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-calendar-table.c:741
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-calendar-table.c:742
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-calendar-table.c:743
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-calendar-table.c:744
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-calendar-table.c:745
-msgid "80%"
-msgstr "80%"
-
-#: ../calendar/gui/e-calendar-table.c:746
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-calendar-table.c:747
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:432
-#: ../modules/calendar/e-task-shell-view-actions.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:302
-#: ../modules/calendar/e-task-shell-view.c:439
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:566
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
-msgid "Tasks"
-msgstr "任务"
-
-#: ../calendar/gui/e-calendar-table.c:1097
-#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
-msgid "Deleting selected objects"
-msgstr "删除选中的对象"
-
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
-msgid "Updating objects"
-msgstr "更新对象"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
@@ -4949,63 +4877,113 @@ msgstr "开始日期"
 msgid "Type"
 msgstr "类型"
 
-#: ../calendar/gui/e-calendar-view.c:1537
-#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-calendar-view.c:392
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected events to the clipboard"
+msgstr "将选中文字剪切到剪贴板"
+
+#: ../calendar/gui/e-calendar-view.c:398
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected events to the clipboard"
+msgstr "将选中文字复制到剪贴板"
+
+#: ../calendar/gui/e-calendar-view.c:404
+#, fuzzy
+#| msgid "Paste text from the clipboard"
+msgid "Paste events from the clipboard"
+msgstr "从剪贴板中粘贴文字"
+
+#: ../calendar/gui/e-calendar-view.c:410
+#, fuzzy
+#| msgid "Delete selected memos"
+msgid "Delete selected events"
+msgstr "删除选中的备忘"
+
+#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:186
+#: ../calendar/gui/e-task-table.c:264
+msgid "Deleting selected objects"
+msgstr "删除选中的对象"
+
+#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:841
+#: ../calendar/gui/e-task-table.c:1062
+msgid "Updating objects"
+msgstr "更新对象"
+
+#: ../calendar/gui/e-calendar-view.c:1690
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
 #: ../plugins/itip-formatter/itip-formatter.c:2313
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-calendar-view.c:1538
-#: ../calendar/gui/e-itip-control.c:1193
+#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
 #: ../plugins/itip-formatter/itip-formatter.c:2319
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-calendar-view.c:1692
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1693
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "Needs action"
 msgstr "需要动作"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:526
+#: ../calendar/gui/e-task-table.c:737
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "组织者：%s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:531
+#: ../calendar/gui/e-task-table.c:740
+#, c-format
+msgid "Organizer: %s"
+msgstr "组织者：%s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/print.c:2572
+#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2561
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1733
+#: ../calendar/gui/e-calendar-view.c:1886
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间：%s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:160
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:171
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -5018,12 +4996,12 @@ 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:760
+#: ../calendar/gui/e-day-view-time-item.c:759
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: ../calendar/gui/e-day-view-time-item.c:781
+#: ../calendar/gui/e-day-view-time-item.c:780
 msgid "Show the second time zone"
 msgstr "显示第二时区"
 
@@ -5033,8 +5011,8 @@ msgstr "显示第二时区"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
-#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1706
+#: ../calendar/gui/e-day-view-top-item.c:860 ../calendar/gui/e-day-view.c:1884
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1698
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
@@ -5044,10 +5022,10 @@ msgstr "%B%d日%A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-day-view-top-item.c:864 ../calendar/gui/e-day-view.c:1901
 #: ../calendar/gui/e-week-view-main-item.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../calendar/gui/ea-gnome-calendar.c:200
+#: ../modules/calendar/e-cal-shell-view-private.c:894
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
@@ -5056,334 +5034,342 @@ 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:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1917
 #: ../calendar/gui/e-week-view-main-item.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:946
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../modules/calendar/e-cal-shell-view-private.c:930
 msgid "%d %b"
 msgstr "%B%-d日"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
-#: ../calendar/gui/print.c:822
+#: ../calendar/gui/e-day-view.c:1120 ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/print.c:814
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
-#: ../calendar/gui/print.c:824
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/print.c:816
 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:2625
+#: ../calendar/gui/e-day-view.c:2614
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
 
-#: ../calendar/gui/e-itip-control.c:766
+#: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
 
-#: ../calendar/gui/e-itip-control.c:783
+#: ../calendar/gui/e-itip-control.c:782
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "每 %d 天"
 
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每 %d 周"
 
-#: ../calendar/gui/e-itip-control.c:803
+#: ../calendar/gui/e-itip-control.c:802
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "每 %d 周的"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:814
+#: ../calendar/gui/e-itip-control.c:813
 msgid " and "
 msgstr " 和 "
 
-#: ../calendar/gui/e-itip-control.c:823
+#: ../calendar/gui/e-itip-control.c:822
 #, c-format
 msgid "The %s day of "
 msgstr "第 %s 天属于"
 
-#: ../calendar/gui/e-itip-control.c:839
+#: ../calendar/gui/e-itip-control.c:838
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 属于"
 
-#: ../calendar/gui/e-itip-control.c:850
+#: ../calendar/gui/e-itip-control.c:849
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "每 %d 月"
 
-#: ../calendar/gui/e-itip-control.c:862
+#: ../calendar/gui/e-itip-control.c:861
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每 %d 年"
 
-#: ../calendar/gui/e-itip-control.c:875
+#: ../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 次"
 
 #. 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:886
+#: ../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:907
+#: ../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:917
+#: ../calendar/gui/e-itip-control.c:916
 msgid "Ends"
 msgstr "结束"
 
-#: ../calendar/gui/e-itip-control.c:945
+#: ../calendar/gui/e-itip-control.c:943
 #: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "到期"
 
-#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1010
+#: ../calendar/gui/e-itip-control.c:1008
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
-#: ../calendar/gui/e-itip-control.c:1082 ../calendar/gui/e-itip-control.c:1098
-#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
-#: ../plugins/itip-formatter/itip-view.c:349
+#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
+#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
 #: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:351
 #: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:439
 #: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "未知的人"
 
-#: ../calendar/gui/e-itip-control.c:1134
+#: ../calendar/gui/e-itip-control.c:1132
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
 
-#: ../calendar/gui/e-itip-control.c:1188
+#. Translators: "None" used as a default value for events without Summary received by mail
+#: ../calendar/gui/e-itip-control.c:1147
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-itip"
+msgid "None"
+msgstr "无"
+
+#: ../calendar/gui/e-itip-control.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "会议已经被取消，但无法在您的日历中找到该会议"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "任务已经被取消，但无法在您的任务列表中找到该任务"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "会议信息"
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已有的会议。"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "会议答复"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "会议取消"
 
-#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信件。"
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "错误的会议信件"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "任务信息"
 
-#: ../calendar/gui/e-itip-control.c:1441
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "任务建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s<b> 希望加入到已有的任务。"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "任务更新"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务分配。"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "任务回复"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 取消了任务。"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "任务取消"
 
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "错误的任务信件"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信件"
 
-#: ../calendar/gui/e-itip-control.c:1599
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "信件的格式可能不正确"
 
-#: ../calendar/gui/e-itip-control.c:1658
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "信件只含有不支持的请求。"
 
-#: ../calendar/gui/e-itip-control.c:1691
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日历信件"
 
-#: ../calendar/gui/e-itip-control.c:1729
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
@@ -5400,7 +5386,7 @@ msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
 #: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1409
+#: ../plugins/itip-formatter/itip-formatter.c:1408
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
@@ -5428,7 +5414,7 @@ msgid "Update"
 msgstr "更新"
 
 #: ../calendar/gui/e-itip-control.c:2353
-#: ../plugins/groupwise-features/gw-ui.c:332
+#: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "接受"
 
@@ -5437,7 +5423,7 @@ msgid "Tentatively accept"
 msgstr "暂时接受"
 
 #: ../calendar/gui/e-itip-control.c:2355
-#: ../plugins/groupwise-features/gw-ui.c:346
+#: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "拒绝"
 
@@ -5454,7 +5440,7 @@ msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
 #: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "取消"
@@ -5505,49 +5491,49 @@ msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
 #: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:971
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:963
 msgid "Individual"
 msgstr "个人"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
 #: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:972 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:964 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "组"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/print.c:973
+#: ../calendar/gui/print.c:965
 msgid "Resource"
 msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/print.c:974
+#: ../calendar/gui/print.c:966
 msgid "Room"
 msgstr "房间"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
 #: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
-#: ../calendar/gui/print.c:988
+#: ../calendar/gui/print.c:980
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:989
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:981
 msgid "Required Participant"
 msgstr "必需的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
-#: ../calendar/gui/print.c:990
+#: ../calendar/gui/print.c:982
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/print.c:991
+#: ../calendar/gui/print.c:983
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -5569,7 +5555,7 @@ msgstr "处理中"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2285
+#: ../calendar/gui/e-meeting-time-sel.c:2284
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -5578,7 +5564,7 @@ msgstr "%Y年%m月%d日%A"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2316
+#: ../calendar/gui/e-meeting-time-sel.c:2315
 msgid "%a %m/%d/%Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -5640,15 +5626,15 @@ msgstr "全部人和一个资源(_P)"
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:761
+#: ../calendar/gui/e-meeting-time-sel.c:760
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
-#: ../calendar/gui/e-meeting-time-sel.c:798
+#: ../calendar/gui/e-meeting-time-sel.c:797
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
@@ -5676,18 +5662,145 @@ msgstr "语言"
 msgid "Member"
 msgstr "成员"
 
-#: ../calendar/gui/e-memo-table.c:638
-#: ../modules/calendar/e-cal-shell-content.c:461
-#: ../modules/calendar/e-memo-shell-view-actions.c:254
-#: ../modules/calendar/e-memo-shell-view-actions.c:271
-#: ../modules/calendar/e-memo-shell-view.c:292
+#: ../calendar/gui/e-memo-table.c:410
+#: ../modules/calendar/e-cal-shell-content.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
+#: ../modules/calendar/e-memo-shell-view.c:289
+#: ../plugins/caldav/caldav-browse-server.c:432
 msgid "Memos"
 msgstr "备忘"
 
+#: ../calendar/gui/e-memo-table.c:488 ../calendar/gui/e-task-table.c:701
+msgid "* No Summary *"
+msgstr "* 没有概要 *"
+
+#: ../calendar/gui/e-memo-table.c:572 ../calendar/gui/e-task-table.c:781
+msgid "Start: "
+msgstr "开始："
+
+#: ../calendar/gui/e-memo-table.c:590 ../calendar/gui/e-task-table.c:799
+msgid "Due: "
+msgstr "到期："
+
+#: ../calendar/gui/e-memo-table.c:706
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected memos to the clipboard"
+msgstr "将选中文字剪切到剪贴板"
+
+#: ../calendar/gui/e-memo-table.c:712
+#, fuzzy
+#| msgid "Copy selected messages to the clipboard"
+msgid "Copy selected memos to the clipboard"
+msgstr "将选中信件复制到剪贴板"
+
+#: ../calendar/gui/e-memo-table.c:718
+#, fuzzy
+#| msgid "Paste memo from the clipboard"
+msgid "Paste memos from the clipboard"
+msgstr "从剪贴板中粘贴备忘"
+
+#: ../calendar/gui/e-memo-table.c:724
+#: ../modules/calendar/e-memo-shell-view-actions.c:577
+msgid "Delete selected memos"
+msgstr "删除选中的备忘"
+
+#: ../calendar/gui/e-memo-table.c:730
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible memos"
+msgstr "选中所有可见的信件"
+
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
+#: ../calendar/gui/e-task-table.c:529
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-task-table.c:530
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-task-table.c:531
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-task-table.c:532
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-task-table.c:533
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-task-table.c:534
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-task-table.c:535
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-task-table.c:536
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-task-table.c:537
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-task-table.c:538
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-task-table.c:539
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-task-table.c:623 ../calendar/gui/print.c:2006
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:359
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
+#: ../modules/calendar/e-task-shell-view.c:437
+#: ../plugins/caldav/caldav-browse-server.c:430
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "任务"
+
+#: ../calendar/gui/e-task-table.c:927
+#, fuzzy
+#| msgid "Cut selected text to the clipboard"
+msgid "Cut selected tasks to the clipboard"
+msgstr "将选中文字剪切到剪贴板"
+
+#: ../calendar/gui/e-task-table.c:933
+#, fuzzy
+#| msgid "Copy selected text to the clipboard"
+msgid "Copy selected tasks to the clipboard"
+msgstr "将选中文字复制到剪贴板"
+
+#: ../calendar/gui/e-task-table.c:939
+msgid "Paste tasks from the clipboard"
+msgstr "从剪贴板中粘贴任务"
+
+#: ../calendar/gui/e-task-table.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:701
+msgid "Delete selected tasks"
+msgstr "删除选中的任务"
+
+#: ../calendar/gui/e-task-table.c:951
+#, fuzzy
+#| msgid "Select all visible messages"
+msgid "Select all visible tasks"
+msgstr "选中所有可见的信件"
+
 #: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "选择时区"
@@ -5695,7 +5808,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:1687
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1679
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
@@ -5720,31 +5833,31 @@ msgstr "日历事件：摘要为 %s。"
 msgid "Calendar Event: It has no summary."
 msgstr "日历事件：无摘要。"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:525
+#: ../calendar/gui/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "获得焦点"
 
-#: ../calendar/gui/ea-cal-view.c:298
+#: ../calendar/gui/ea-cal-view.c:300
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/ea-cal-view.c:299
+#: ../calendar/gui/ea-cal-view.c:301
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:302
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:303
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "Go to Date"
 msgstr "转到日期"
 
@@ -5753,9 +5866,7 @@ msgstr "转到日期"
 msgid "a table to view and select the current time range"
 msgstr "可查看并选择当前时间范围的表"
 
-#. 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:147 ../calendar/gui/ea-week-view.c:146
+#: ../calendar/gui/ea-day-view.c:148 ../calendar/gui/ea-week-view.c:146
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -5763,14 +5874,14 @@ msgstr[0] "有 %d 个事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:148
 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:158
+#: ../calendar/gui/ea-day-view.c:160
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "工作日视图：%s。%s"
@@ -5778,55 +5889,55 @@ 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:164
+#: ../calendar/gui/ea-day-view.c:166
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图：%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:195
+#: ../calendar/gui/ea-day-view.c:197
 msgid "calendar view for a work week"
 msgstr "工作日的日历视图"
 
-#: ../calendar/gui/ea-day-view.c:197
+#: ../calendar/gui/ea-day-view.c:199
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
-#: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../calendar/gui/ea-gnome-calendar.c:46
+#: ../calendar/gui/ea-gnome-calendar.c:54
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome 日历"
+
+#: ../calendar/gui/ea-gnome-calendar.c:197
+#: ../modules/calendar/e-cal-shell-view-private.c:890
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:191
-#: ../calendar/gui/ea-gnome-calendar.c:196
-#: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:913
-#: ../modules/calendar/e-cal-shell-view-private.c:919
-#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:209
+#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../modules/calendar/e-cal-shell-view-private.c:903
+#: ../modules/calendar/e-cal-shell-view-private.c:906
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:215
-#: ../calendar/gui/ea-gnome-calendar.c:221
-#: ../calendar/gui/ea-gnome-calendar.c:227
-#: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:939
-#: ../modules/calendar/e-cal-shell-view-private.c:950
-#: ../modules/calendar/e-cal-shell-view-private.c:957
-#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../calendar/gui/ea-gnome-calendar.c:226
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:240
+#: ../modules/calendar/e-cal-shell-view-private.c:923
+#: ../modules/calendar/e-cal-shell-view-private.c:934
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:944
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
-#: ../calendar/gui/ea-gnome-calendar.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
-
-#: ../calendar/gui/ea-jump-button.c:146
+#: ../calendar/gui/ea-jump-button.c:147
 msgid "Jump button"
 msgstr "跳转按钮"
 
-#: ../calendar/gui/ea-jump-button.c:155
+#: ../calendar/gui/ea-jump-button.c:156
 msgid "Click here, you can find more events."
 msgstr "单击此处可查找更多事件。"
 
@@ -5848,12 +5959,7 @@ msgstr "月日历视图"
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../calendar/gui/gnome-cal.c:1946
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "装入位于 %s 的约会"
-
-#: ../calendar/gui/gnome-cal.c:2567
+#: ../calendar/gui/gnome-cal.c:2144
 msgid "Purging"
 msgstr "销毁"
 
@@ -5922,23 +6028,23 @@ msgstr "必须设定组织者。"
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:784
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:787
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:790
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:643 ../calendar/gui/itip-utils.c:808
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/itip-utils.c:642
+#: ../calendar/gui/itip-utils.c:646
 msgid "Calendar information"
 msgstr "日历信息"
 
@@ -5946,7 +6052,7 @@ msgstr "日历信息"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:676
+#: ../calendar/gui/itip-utils.c:680
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接受"
@@ -5955,7 +6061,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:683
+#: ../calendar/gui/itip-utils.c:687
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
@@ -5967,7 +6073,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:690 ../calendar/gui/itip-utils.c:738
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:742
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒绝"
@@ -5976,7 +6082,7 @@ msgstr "拒绝"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:701
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -5984,7 +6090,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:710
+#: ../calendar/gui/itip-utils.c:714
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
@@ -5992,7 +6098,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:717
+#: ../calendar/gui/itip-utils.c:721
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -6000,7 +6106,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:724
+#: ../calendar/gui/itip-utils.c:728
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -6008,29 +6114,29 @@ msgstr "刷新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:731
+#: ../calendar/gui/itip-utils.c:735
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:805
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:809
+#: ../calendar/gui/itip-utils.c:813
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:829
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:831
+#: ../calendar/gui/itip-utils.c:835
 msgid "Unable to book a resource, error: "
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:985
+#: ../calendar/gui/itip-utils.c:988
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
@@ -6186,49 +6292,49 @@ msgstr "五"
 msgid "Sa"
 msgstr "六"
 
-#: ../calendar/gui/print.c:2536
+#: ../calendar/gui/print.c:2525
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2538
+#: ../calendar/gui/print.c:2527
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2563
+#: ../calendar/gui/print.c:2552
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2586
+#: ../calendar/gui/print.c:2575
 msgid "Attendees: "
 msgstr "出席者："
 
-#: ../calendar/gui/print.c:2626
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2640
+#: ../calendar/gui/print.c:2629
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2644
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2666
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2679
+#: ../calendar/gui/print.c:2668
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2690
+#: ../calendar/gui/print.c:2679
 msgid "Contacts: "
 msgstr "联系人："
 
@@ -6259,7 +6365,7 @@ msgstr "约会和会议"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1821
+#: ../plugins/itip-formatter/itip-formatter.c:1820
 msgid "Opening calendar"
 msgstr "打开日历"
 
@@ -7854,7 +7960,7 @@ msgid "Attach a file"
 msgstr "添加附件"
 
 #: ../composer/e-composer-actions.c:286
-#: ../widgets/misc/e-signature-editor.c:200
+#: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -7890,7 +7996,7 @@ msgstr "另存为草稿(_D)"
 msgid "Save as draft"
 msgstr "另存为草稿"
 
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:202
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:264
 msgid "S_end"
 msgstr "发送(_E)"
 
@@ -7910,10 +8016,6 @@ msgstr "打开新建信件窗口"
 msgid "Character _Encoding"
 msgstr "字符编码(_E)"
 
-#: ../composer/e-composer-actions.c:351
-msgid "_Security"
-msgstr "安全(_S)"
-
 #: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
@@ -7998,66 +8100,76 @@ msgstr "是否显示回复域"
 msgid "Save Draft"
 msgstr "保存草稿"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header.c:129
+#, fuzzy
+#| msgid "Sho_w:"
+msgid "Show"
+msgstr "显示(_W)："
+
+#: ../composer/e-composer-header.c:137
+#, fuzzy
+#| msgid "_Hide"
+msgid "Hide"
+msgstr "隐藏(_H)"
+
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "输入信件的收件人"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:44
 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:47
 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:949
+#: ../composer/e-composer-header-table.c:959
 msgid "Fr_om:"
 msgstr "发件人(_O)："
 
-#: ../composer/e-composer-header-table.c:949
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../composer/e-composer-header-table.c:959
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
 #: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:77
 msgid "From"
 msgstr "发件人"
 
-#: ../composer/e-composer-header-table.c:958
+#: ../composer/e-composer-header-table.c:968
 msgid "_Reply-To:"
 msgstr "回复到(_R)："
 
-#: ../composer/e-composer-header-table.c:963
+#: ../composer/e-composer-header-table.c:973
 msgid "_To:"
 msgstr "收信人(_T)："
 
-#: ../composer/e-composer-header-table.c:969
+#: ../composer/e-composer-header-table.c:979
 msgid "_Cc:"
 msgstr "抄送(_C)："
 
-#: ../composer/e-composer-header-table.c:969
-#, fuzzy
-msgid "Show CC"
-msgstr "显示(_W)："
+#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
 
-#: ../composer/e-composer-header-table.c:975
+#: ../composer/e-composer-header-table.c:985
 msgid "_Bcc:"
 msgstr "暗送(_B)："
 
-#: ../composer/e-composer-header-table.c:975
-#, fuzzy
-msgid "Show BCC"
-msgstr "显示(_W)："
+#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
 
-#: ../composer/e-composer-header-table.c:980
+#: ../composer/e-composer-header-table.c:990
 msgid "_Post To:"
 msgstr "投递到(_P)："
 
-#: ../composer/e-composer-header-table.c:984
+#: ../composer/e-composer-header-table.c:994
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../composer/e-composer-header-table.c:993
+#: ../composer/e-composer-header-table.c:1003
 msgid "Si_gnature:"
 msgstr "签名(_G)："
 
@@ -8069,38 +8181,38 @@ msgstr "单击此处以使用地址簿"
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-composer-private.c:218
+#: ../composer/e-composer-private.c:284
 #, fuzzy
 msgid "Save draft"
 msgstr "保存草稿"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:193 ../mail/em-utils.c:180
+#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:150
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../composer/e-msg-composer.c:989
+#: ../composer/e-msg-composer.c:983
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签名：未对此账户设置签名证书"
 
-#: ../composer/e-msg-composer.c:996
+#: ../composer/e-msg-composer.c:990
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密证书"
 
-#: ../composer/e-msg-composer.c:1385
+#: ../composer/e-msg-composer.c:1379
 #, fuzzy
 msgid "Unable to reconstruct message from autosave file"
 msgstr "无法从编辑器获取信件"
 
-#: ../composer/e-msg-composer.c:1451 ../composer/e-msg-composer.c:2178
+#: ../composer/e-msg-composer.c:1445 ../composer/e-msg-composer.c:1641
 msgid "Compose Message"
 msgstr "撰写新信件"
 
-#: ../composer/e-msg-composer.c:3408
+#: ../composer/e-msg-composer.c:3310
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8160,40 +8272,28 @@ msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "无法保存到自动保存文件“{0}”。"
 
 #: ../composer/mail-composer.error.xml.h:12
-msgid "Directories can not be attached to Messages."
-msgstr "无法将目录作为信件的附件。"
-
-#: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "您是否想要恢复未完成的信件？"
 
-#: ../composer/mail-composer.error.xml.h:14
+#: ../composer/mail-composer.error.xml.h:13
 msgid "Download in progress. Do you want to send the mail?"
 msgstr "下载进行中。您想要发送邮件吗？"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:14
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "保存到自动保存出错，原因是“{1}”。"
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 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:17
+#: ../composer/mail-composer.error.xml.h:16
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "文件“{0}”不是普通文件，无法在邮件中发送。"
 
-#: ../composer/mail-composer.error.xml.h:18
-msgid ""
-"To attach the contents of this directory, either attach the files in this "
-"directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"要将此目录的内容作为附件，您需要逐一添加此目录中的文件，或者创建一个此目录的"
-"归档文件，然后将此归档作为附件。"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -8203,39 +8303,31 @@ msgstr ""
 "无法激活 HTML 编辑器组件。\n"
 "请确定您的 gtkhtml 和 libgtkhtml 所安装的版本正确。"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Unable to activate the address selector control."
 msgstr "无法激活地址选择控制。"
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "Unfinished messages found"
-msgstr "找到了未完成的信件"
-
-#: ../composer/mail-composer.error.xml.h:24
-msgid "Warning: Modified Message"
-msgstr "警告：已修改的信件"
-
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:21
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "您无法将文件“{0}”作为这封信的附件。"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:23
 msgid "_Continue Editing"
 msgstr "继续编辑(_C)"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:25
 msgid "_Do not Recover"
 msgstr "不恢复(_D)"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:26
 msgid "_Recover"
 msgstr "恢复(_R)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Save Draft"
 msgstr "保存草稿(_S)"
 
@@ -8248,9 +8340,8 @@ msgstr "日历信息"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution 提醒通知"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:715
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:209
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:786
+#: ../shell/e-shell-window-private.c:255
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8258,7 +8349,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 邮件及日历"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -8298,6 +8389,19 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Evolution 错误"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Evolution 警告"
+
+#: ../e-util/e-alert.c:634
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "内部错误，请求了未知的错误“%s”"
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "阿拉伯语"
@@ -8373,14 +8477,14 @@ msgstr "可视"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../plugins/itip-formatter/itip-view.c:194
-#: ../widgets/table/e-cell-date-edit.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../plugins/itip-formatter/itip-view.c:195
+#: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -8407,25 +8511,25 @@ msgstr "使用本地默认值"
 msgid "Format:"
 msgstr "格式："
 
-#: ../e-util/e-file-utils.c:135
+#: ../e-util/e-file-utils.c:136
 #, fuzzy
 msgid "(Unknown Filename)"
 msgstr "未知类型"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:139
+#: ../e-util/e-file-utils.c:140
 #, fuzzy, 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:144
+#: ../e-util/e-file-utils.c:145
 #, fuzzy, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "把“%s”复制到 %s"
 
-#: ../e-util/e-logger.c:172
+#: ../e-util/e-logger.c:175
 #, fuzzy
 msgid "Name of the logger"
 msgstr "记录日志的组件名称"
@@ -8439,35 +8543,35 @@ msgstr "文件名"
 msgid "The filename of the module"
 msgstr "更改此文件夹的名称"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:191
+#: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "调试日志"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:205
+#: ../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:223
+#: ../e-util/e-non-intrusive-error-dialog.c:226
 msgid "second(s)."
 msgstr "秒。"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:229
+#: ../e-util/e-non-intrusive-error-dialog.c:232
 msgid "Log Messages:"
 msgstr "日志消息："
 
-#: ../e-util/e-non-intrusive-error-dialog.c:274
+#: ../e-util/e-non-intrusive-error-dialog.c:279
 msgid "Log Level"
 msgstr "日志级别"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2696
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "信件"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1502
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:109
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -8491,17 +8595,23 @@ msgstr "调试"
 msgid "Error, Warnings and Debug messages"
 msgstr "错误，警告和调试信息"
 
-#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
+#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:716
+#: ../plugins/publish-calendar/publish-calendar.c:827
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../e-util/e-plugin.c:293
+#: ../e-util/e-plugin.c:296
 msgid "Whether the plugin is enabled"
 msgstr "插件是否已启用"
 
+#: ../e-util/e-plugin-util.c:424 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+msgid "weeks"
+msgstr "周"
+
 #: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "打印时发生了错误"
@@ -8515,7 +8625,7 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "打印系统未报告关于错误的任何额外细节。"
 
-#: ../e-util/e-signature.c:695
+#: ../e-util/e-signature.c:699
 msgid "Autogenerated"
 msgstr "自动生成的"
 
@@ -8539,11 +8649,7 @@ msgstr "您打算覆盖它吗？"
 msgid "File exists \"{0}\"."
 msgstr "文件已存在“{0}”。"
 
-#: ../e-util/e-system.error.xml.h:6
-msgid "Overwrite file?"
-msgstr "覆盖文件吗？"
-
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
@@ -8555,107 +8661,107 @@ msgstr "无法打开链接。"
 msgid "Could not display help for Evolution."
 msgstr "无法显示 Evolution 的帮助。"
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../e-util/gconf-bridge.c:1276
 #, c-format
 msgid "GConf error: %s"
 msgstr "GConf 错误：%s"
 
-#: ../e-util/gconf-bridge.c:1233
+#: ../e-util/gconf-bridge.c:1287
 msgid "All further errors shown only on terminal."
 msgstr "后续所有的错误都只显示在终端。"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
 #: ../modules/mail/em-mailer-prefs.c:78
 msgid "Reply-To"
 msgstr "回复至"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
-#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
+#: ../mail/em-format-html.c:2242 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2327 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "抄送"
 
-#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
-#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2243 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2330 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1112
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "主题"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
-#: ../modules/mail/em-mailer-prefs.c:1131
+#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2422
+#: ../modules/mail/em-mailer-prefs.c:1130
 msgid "Mailer"
 msgstr "邮件程序"
 
-#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1229
+#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的信件 --------"
 
-#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
-#: ../widgets/misc/e-dateedit.c:566
+#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
+#: ../widgets/misc/e-dateedit.c:567
 msgid "Date"
 msgstr "日期"
 
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
 msgid "Newsgroups"
 msgstr "新闻组"
 
-#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "头像"
 
-#: ../em-format/em-format.c:1320
+#: ../em-format/em-format.c:1319
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: ../em-format/em-format.c:1375
+#: ../em-format/em-format.c:1374
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "无法解析 S/MIME 信件：未知错误"
 
-#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 信件。显示源文本。"
 
-#: ../em-format/em-format.c:1521
+#: ../em-format/em-format.c:1520
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "不支持 multipart/encrypted 的加密类型"
 
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1532
 msgid "Could not parse PGP/MIME message"
 msgstr "无法解析 PGP/MIME 信件"
 
-#: ../em-format/em-format.c:1533
+#: ../em-format/em-format.c:1532
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "无法解析 PGP/MIME 信件：未知错误"
 
-#: ../em-format/em-format.c:1699
+#: ../em-format/em-format.c:1698
 msgid "Unsupported signature format"
 msgstr "不支持的签名格式"
 
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
 msgid "Error verifying signature"
 msgstr "校验签名错误"
 
-#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
-#: ../em-format/em-format.c:1848
+#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
+#: ../em-format/em-format.c:1847
 msgid "Unknown error verifying signature"
 msgstr "校验签名发生了未知错误"
 
-#: ../em-format/em-format.c:1925
+#: ../em-format/em-format.c:1924
 msgid "Could not parse PGP message"
 msgstr "无法分析 PGP 信件"
 
-#: ../em-format/em-format.c:1925
+#: ../em-format/em-format.c:1924
 msgid "Could not parse PGP message: Unknown error"
 msgstr "无法解析 PGP 信件：未知错误"
 
@@ -8766,56 +8872,56 @@ msgstr "选择用于比较的时间"
 msgid "Choose a File"
 msgstr "选择文件"
 
-#: ../filter/e-filter-rule.c:653
+#: ../filter/e-filter-rule.c:659
 msgid "R_ule name:"
 msgstr "规则名(_U)："
 
-#: ../filter/e-filter-rule.c:682
+#: ../filter/e-filter-rule.c:689
 msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
-#: ../filter/e-filter-rule.c:716
+#: ../filter/e-filter-rule.c:723
 msgid "A_dd Condition"
 msgstr "添加动作(_D)"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:732
 msgid "If all conditions are met"
 msgstr "如果满足所有条件"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:733
 msgid "If any conditions are met"
 msgstr "如果满足任一条件"
 
-#: ../filter/e-filter-rule.c:724
+#: ../filter/e-filter-rule.c:736
 msgid "_Find items:"
 msgstr "查找项目(_F)："
 
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:760
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "回复"
 
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:762
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/e-filter-rule.c:744
+#: ../filter/e-filter-rule.c:763
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../filter/e-filter-rule.c:746
+#: ../filter/e-filter-rule.c:766
 msgid "I_nclude threads"
 msgstr "包含线索(_N)"
 
-#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:331
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:301
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:332
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:302
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -8930,51 +9036,46 @@ msgstr "当前时间"
 msgid "the time you specify"
 msgstr "您指定的时间"
 
-#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:451
-#: ../plugins/calendar-file/calendar-file.c:296
-#: ../plugins/calendar-http/calendar-http.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:517
-#: ../plugins/google-account-setup/google-contacts-source.c:333
-#: ../plugins/google-account-setup/google-source.c:742
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-msgid "weeks"
-msgstr "周"
-
 #: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "年"
 
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
-#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:147
+#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
+#: ../mail/em-format-html-display.c:1025 ../mail/mail-config.ui.h:13
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
+#: ../widgets/misc/e-attachment-paned.c:153
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../mail/e-mail-attachment-bar.c:614
-#: ../widgets/misc/e-attachment-paned.c:607
+#: ../mail/e-mail-attachment-bar.c:617
+#: ../widgets/misc/e-attachment-paned.c:612
 msgid "Icon View"
 msgstr "图标视图"
 
-#: ../mail/e-mail-attachment-bar.c:615
-#: ../widgets/misc/e-attachment-paned.c:608
+#: ../mail/e-mail-attachment-bar.c:618
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "List View"
 msgstr "列表视图"
 
-#: ../mail/e-mail-browser.c:668
+#: ../mail/e-mail-browser.c:729 ../shell/e-shell-window.c:634
+msgid "Focus Tracker"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:739
 #, fuzzy
 msgid "Shell Module"
 msgstr "选择模式"
 
-#: ../mail/e-mail-browser.c:669 ../mail/message-list.c:2511
+#: ../mail/e-mail-browser.c:740 ../mail/message-list.c:2589
 msgid "The mail shell backend"
 msgstr ""
 
-#: ../mail/e-mail-browser.c:679
+#: ../mail/e-mail-browser.c:750
 msgid "Show Deleted"
 msgstr "显示删除的"
 
-#: ../mail/e-mail-browser.c:680
+#: ../mail/e-mail-browser.c:751
 msgid "Show deleted messages"
 msgstr "显示删除的信件"
 
@@ -9024,7 +9125,7 @@ msgid "_Later"
 msgstr "稍候(_L)"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:555
+#: ../modules/mail/e-mail-shell-view-actions.c:515
 msgid "Add Label"
 msgstr "添加标签"
 
@@ -9044,680 +9145,745 @@ msgid "Color"
 msgstr "颜色"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
-#: ../modules/mail/e-mail-shell-view-private.c:907
+#: ../mail/em-folder-tree-model.c:658 ../mail/em-folder-tree.c:2570
+#: ../modules/mail/e-mail-shell-view-private.c:908
 msgid "Inbox"
 msgstr "收件箱"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:651
 msgid "Drafts"
 msgstr "草稿"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:661
 msgid "Outbox"
 msgstr "发件箱"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:663
 msgid "Sent"
 msgstr "已发箱"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:654
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "模板"
 
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "重要"
+
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "待办"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "稍候"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "正在升迁..."
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "迁移"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "升迁“%s”："
+
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "无法创建新文件夹“%s”：%s"
+
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "无法将文件夹“%s”复制为“%s”：%s"
+
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "无法扫描位于“%s”的已有邮箱：%s"
+
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "迁移文件夹"
+
+#: ../mail/e-mail-migrate.c:1816
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”：%s"
+
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s"
+
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
+
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "创建本地邮件存储“%s”失败：%s"
+
+#: ../mail/e-mail-migrate.c:2913
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"自 Evolution 2.4 之后，Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2928 ../mail/e-mail-store.c:229
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1617
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "在此计算机中"
+
+#: ../mail/e-mail-migrate.c:3008
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "无法在“%s”创建本地邮件文件夹：%s"
+
+#: ../mail/e-mail-migrate.c:3026
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
+"坏。"
+
 #. 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:108
-#: ../modules/calendar/e-task-shell-view-actions.c:606
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:580
 msgid "Do not ask me again"
 msgstr "不要再次询问"
 
-#: ../mail/e-mail-reader.c:215 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:208 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:208 ../mail/em-folder-utils.c:385
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/e-mail-reader.c:621 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:582 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:621 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:582 ../mail/em-folder-utils.c:385
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:852
+#: ../mail/e-mail-reader.c:808
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "保存信息"
 
-#: ../mail/e-mail-reader.c:1144
+#. Translators: This is a part of a suggested file name
+#. * used when saving a message or multiple messages to an
+#. * mbox format, when the first message doesn't have a
+#. * 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:829 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:518
+#, fuzzy
+#| msgid "Message"
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "消息"
+
+#: ../mail/e-mail-reader.c:1087
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/e-mail-reader.c:1146
+#: ../mail/e-mail-reader.c:1089
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../mail/e-mail-reader.c:1151
+#: ../mail/e-mail-reader.c:1094
 msgid "Check for _Junk"
 msgstr "检查垃圾信(_J)"
 
-#: ../mail/e-mail-reader.c:1153
+#: ../mail/e-mail-reader.c:1096
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信件标记为垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1160
-msgid "Copy selected messages to the clipboard"
-msgstr "将选中信件复制到剪贴板"
-
-#: ../mail/e-mail-reader.c:1165
+#: ../mail/e-mail-reader.c:1101
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1167
+#: ../mail/e-mail-reader.c:1103
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信件复制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1172
+#: ../mail/e-mail-reader.c:1108
 msgid "_Delete Message"
 msgstr "删除信件(_D)"
 
-#: ../mail/e-mail-reader.c:1174
+#: ../mail/e-mail-reader.c:1110
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信件做删除标记"
 
-#: ../mail/e-mail-reader.c:1179
+#: ../mail/e-mail-reader.c:1115
 msgid "Filter on Mailing _List..."
 msgstr "根据邮件列表过滤(_L)..."
 
-#: ../mail/e-mail-reader.c:1181
+#: ../mail/e-mail-reader.c:1117
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信件的规则"
 
-#: ../mail/e-mail-reader.c:1186
+#: ../mail/e-mail-reader.c:1122
 msgid "Filter on _Recipients..."
 msgstr "根据收件人过滤(_R)..."
 
-#: ../mail/e-mail-reader.c:1188
+#: ../mail/e-mail-reader.c:1124
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信件的规则"
 
-#: ../mail/e-mail-reader.c:1193
+#: ../mail/e-mail-reader.c:1129
 msgid "Filter on Se_nder..."
 msgstr "根据发件人过滤(_N)..."
 
-#: ../mail/e-mail-reader.c:1195
+#: ../mail/e-mail-reader.c:1131
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信件的规则"
 
-#: ../mail/e-mail-reader.c:1200
+#: ../mail/e-mail-reader.c:1136
 msgid "Filter on _Subject..."
 msgstr "根据主题过滤(_S)..."
 
-#: ../mail/e-mail-reader.c:1202
+#: ../mail/e-mail-reader.c:1138
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信件的规则"
 
-#: ../mail/e-mail-reader.c:1207
+#: ../mail/e-mail-reader.c:1143
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:1209
+#: ../mail/e-mail-reader.c:1145
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信件"
 
-#: ../mail/e-mail-reader.c:1214
+#: ../mail/e-mail-reader.c:1150
 msgid "_Find in Message..."
 msgstr "在信件中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:1216
+#: ../mail/e-mail-reader.c:1152
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信件的主体中搜索文本"
 
-#: ../mail/e-mail-reader.c:1221
+#: ../mail/e-mail-reader.c:1157
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:1223
+#: ../mail/e-mail-reader.c:1159
 #, fuzzy
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "取消选中信件的删除"
 
-#: ../mail/e-mail-reader.c:1228
+#: ../mail/e-mail-reader.c:1164
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1230
+#: ../mail/e-mail-reader.c:1166
 #, fuzzy
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "把同一线索中的所有信件选择为选中信件"
 
-#: ../mail/e-mail-reader.c:1235
+#: ../mail/e-mail-reader.c:1171
 msgid "Follow _Up..."
 msgstr "跟随(_U)..."
 
-#: ../mail/e-mail-reader.c:1237
+#: ../mail/e-mail-reader.c:1173
 #, fuzzy
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信件做跟随标志"
 
-#: ../mail/e-mail-reader.c:1242
+#: ../mail/e-mail-reader.c:1178
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+#: ../mail/e-mail-reader.c:1180 ../mail/e-mail-reader.c:1187
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信件作为附件转发给某人"
 
-#: ../mail/e-mail-reader.c:1249
+#: ../mail/e-mail-reader.c:1185
 #, fuzzy
 msgid "Forward As _Attached"
 msgstr "作为 iCalendar 转发(_F)"
 
-#: ../mail/e-mail-reader.c:1256
+#: ../mail/e-mail-reader.c:1192
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+#: ../mail/e-mail-reader.c:1194 ../mail/e-mail-reader.c:1201
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信件"
 
-#: ../mail/e-mail-reader.c:1263
+#: ../mail/e-mail-reader.c:1199
 #, fuzzy
 msgid "Forward As _Inline"
 msgstr "转发方式(_F)："
 
-#: ../mail/e-mail-reader.c:1270
+#: ../mail/e-mail-reader.c:1206
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:1272 ../mail/e-mail-reader.c:1279
+#: ../mail/e-mail-reader.c:1208 ../mail/e-mail-reader.c:1215
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信件"
 
-#: ../mail/e-mail-reader.c:1277
+#: ../mail/e-mail-reader.c:1213
 #, fuzzy
 msgid "Forward As _Quoted"
 msgstr "转发方式(_F)："
 
-#: ../mail/e-mail-reader.c:1284
+#: ../mail/e-mail-reader.c:1220
 msgid "_Load Images"
 msgstr "装入图像(_L)"
 
-#: ../mail/e-mail-reader.c:1286
+#: ../mail/e-mail-reader.c:1222
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制装入 HTML 邮件中的图像"
 
-#: ../mail/e-mail-reader.c:1291
+#: ../mail/e-mail-reader.c:1227
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:1293
+#: ../mail/e-mail-reader.c:1229
 msgid "Mark the selected messages as important"
 msgstr "把选中信件标记为重要邮件"
 
-#: ../mail/e-mail-reader.c:1298
+#: ../mail/e-mail-reader.c:1234
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:1300
+#: ../mail/e-mail-reader.c:1236
 msgid "Mark the selected messages as junk"
 msgstr "把选中信件标记为垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1305
+#: ../mail/e-mail-reader.c:1241
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:1307
+#: ../mail/e-mail-reader.c:1243
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信件标记为非垃圾邮件"
 
-#: ../mail/e-mail-reader.c:1312
+#: ../mail/e-mail-reader.c:1248
 msgid "_Read"
 msgstr "读取(_R)"
 
-#: ../mail/e-mail-reader.c:1314
+#: ../mail/e-mail-reader.c:1250
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信件标记为已读"
 
-#: ../mail/e-mail-reader.c:1319
+#: ../mail/e-mail-reader.c:1255
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:1321
+#: ../mail/e-mail-reader.c:1257
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信件标记为不重要邮件"
 
-#: ../mail/e-mail-reader.c:1326
+#: ../mail/e-mail-reader.c:1262
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:1328
+#: ../mail/e-mail-reader.c:1264
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信件标记为未读"
 
-#: ../mail/e-mail-reader.c:1333
+#: ../mail/e-mail-reader.c:1269
 msgid "_Edit as New Message..."
 msgstr "作为新信件进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:1335
+#: ../mail/e-mail-reader.c:1271
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰写器中打开选中的信件以便编辑"
 
-#: ../mail/e-mail-reader.c:1340
+#: ../mail/e-mail-reader.c:1276
 msgid "Compose _New Message"
 msgstr "撰写新信件(_N)"
 
-#: ../mail/e-mail-reader.c:1342
+#: ../mail/e-mail-reader.c:1278
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信件"
 
-#: ../mail/e-mail-reader.c:1347
+#: ../mail/e-mail-reader.c:1283
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../mail/e-mail-reader.c:1349
+#: ../mail/e-mail-reader.c:1285
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信件"
 
-#: ../mail/e-mail-reader.c:1354
+#: ../mail/e-mail-reader.c:1290
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:1356
+#: ../mail/e-mail-reader.c:1292
 msgid "Move selected messages to another folder"
 msgstr "把选中的信件移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:1361
+#: ../mail/e-mail-reader.c:1297
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1299
 msgid "Display the next message"
 msgstr "显示下一封信件"
 
-#: ../mail/e-mail-reader.c:1368
+#: ../mail/e-mail-reader.c:1304
 msgid "Next _Important Message"
 msgstr "下一封重要信件(_I)"
 
-#: ../mail/e-mail-reader.c:1370
+#: ../mail/e-mail-reader.c:1306
 msgid "Display the next important message"
 msgstr "显示下一封重要信件"
 
-#: ../mail/e-mail-reader.c:1375
+#: ../mail/e-mail-reader.c:1311
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../mail/e-mail-reader.c:1377
+#: ../mail/e-mail-reader.c:1313
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1318
 msgid "Next _Unread Message"
 msgstr "下一封未读信件(_U)"
 
-#: ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1320
 msgid "Display the next unread message"
 msgstr "显示下一封未读信件"
 
-#: ../mail/e-mail-reader.c:1389
+#: ../mail/e-mail-reader.c:1325
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../mail/e-mail-reader.c:1391
+#: ../mail/e-mail-reader.c:1327
 msgid "Display the previous message"
 msgstr "显示上一封信件"
 
-#: ../mail/e-mail-reader.c:1396
+#: ../mail/e-mail-reader.c:1332
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信件(_E)"
 
-#: ../mail/e-mail-reader.c:1398
+#: ../mail/e-mail-reader.c:1334
 msgid "Display the previous important message"
 msgstr "显示上一封重要信件"
 
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1339
 msgid "P_revious Unread Message"
 msgstr "上一封未读信件(_R)"
 
-#: ../mail/e-mail-reader.c:1405
+#: ../mail/e-mail-reader.c:1341
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信件"
 
-#: ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1348
 msgid "Print this message"
 msgstr "打印该信件"
 
-#: ../mail/e-mail-reader.c:1419
+#: ../mail/e-mail-reader.c:1355
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信件"
 
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1360
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1362
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信件重发(退回)给某人"
 
-#: ../mail/e-mail-reader.c:1431
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../mail/e-mail-reader.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../mail/e-mail-reader.c:1433
+#: ../mail/e-mail-reader.c:1369
 #, fuzzy
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信件的所有收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:1438
+#: ../mail/e-mail-reader.c:1374
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:1440
+#: ../mail/e-mail-reader.c:1376
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信件的邮件列表撰写回复"
 
-#: ../mail/e-mail-reader.c:1445
+#: ../mail/e-mail-reader.c:1381
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/e-mail-reader.c:1447
+#: ../mail/e-mail-reader.c:1383
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信件的发件人撰写回复"
 
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:1388
 #, fuzzy
 msgid "_Save as mbox..."
 msgstr "另存为..."
 
-#: ../mail/e-mail-reader.c:1454
+#: ../mail/e-mail-reader.c:1390
 #, fuzzy
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信件另存为文本文件"
 
-#: ../mail/e-mail-reader.c:1459
+#: ../mail/e-mail-reader.c:1395
 msgid "Search Folder from Mailing _List..."
 msgstr "基于邮件列表的搜索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:1461
+#: ../mail/e-mail-reader.c:1397
 #, fuzzy
 msgid "Create a search folder for this mailing list"
 msgstr "为该邮件列表创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:1466
+#: ../mail/e-mail-reader.c:1402
 msgid "Search Folder from Recipien_ts..."
 msgstr "基于收件人的搜索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:1468
+#: ../mail/e-mail-reader.c:1404
 #, fuzzy
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:1473
+#: ../mail/e-mail-reader.c:1409
 msgid "Search Folder from Sen_der..."
 msgstr "基于发件人的搜索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:1475
+#: ../mail/e-mail-reader.c:1411
 #, fuzzy
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1416
 msgid "Search Folder from S_ubject..."
 msgstr "基于主题的搜索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:1482
+#: ../mail/e-mail-reader.c:1418
 #, fuzzy
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:1487
-msgid "Select _All Text"
-msgstr "选中所有文字(_A)"
-
-#: ../mail/e-mail-reader.c:1489
-msgid "Select all the text in a message"
-msgstr "选中信件中的全部文本"
-
-#: ../mail/e-mail-reader.c:1494
+#: ../mail/e-mail-reader.c:1423
 msgid "_Message Source"
 msgstr "信件源代码(_M)"
 
-#: ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1425
 msgid "Show the raw email source of the message"
 msgstr "显示信件的原始邮件源代码"
 
-#: ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1437
 msgid "_Undelete Message"
 msgstr "取消删除信件(_U)"
 
-#: ../mail/e-mail-reader.c:1510
+#: ../mail/e-mail-reader.c:1439
 msgid "Undelete the selected messages"
 msgstr "取消选中信件的删除"
 
-#: ../mail/e-mail-reader.c:1515
+#: ../mail/e-mail-reader.c:1444
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../mail/e-mail-reader.c:1517
+#: ../mail/e-mail-reader.c:1446
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../mail/e-mail-reader.c:1522
+#: ../mail/e-mail-reader.c:1451
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:1524
+#: ../mail/e-mail-reader.c:1453
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../mail/e-mail-reader.c:1529
+#: ../mail/e-mail-reader.c:1458
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: ../mail/e-mail-reader.c:1531
+#: ../mail/e-mail-reader.c:1460
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../mail/e-mail-reader.c:1538
+#: ../mail/e-mail-reader.c:1467
 msgid "Create R_ule"
 msgstr "创建规则(_U)"
 
-#: ../mail/e-mail-reader.c:1545
+#: ../mail/e-mail-reader.c:1474
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../mail/e-mail-reader.c:1552
+#: ../mail/e-mail-reader.c:1481
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../mail/e-mail-reader.c:1559
+#: ../mail/e-mail-reader.c:1488
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:1566
+#: ../mail/e-mail-reader.c:1495
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:1573
+#: ../mail/e-mail-reader.c:1502
 msgid "_Message"
 msgstr "信件(_M)"
 
-#: ../mail/e-mail-reader.c:1580
+#: ../mail/e-mail-reader.c:1509
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:1609
+#: ../mail/e-mail-reader.c:1534
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/e-mail-reader.c:1617
+#: ../mail/e-mail-reader.c:1542
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/e-mail-reader.c:1621
+#: ../mail/e-mail-reader.c:1546
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:1625
+#: ../mail/e-mail-reader.c:1550
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:1629
+#: ../mail/e-mail-reader.c:1554
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:1633
+#: ../mail/e-mail-reader.c:1558
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../mail/e-mail-reader.c:1637
+#: ../mail/e-mail-reader.c:1562
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:1673
+#: ../mail/e-mail-reader.c:1598
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../mail/e-mail-reader.c:1675
+#: ../mail/e-mail-reader.c:1600
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信件的信体中显示闪烁光标"
 
-#: ../mail/e-mail-reader.c:1681
+#: ../mail/e-mail-reader.c:1606
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:1683
+#: ../mail/e-mail-reader.c:1608
 msgid "Show messages with all email headers"
 msgstr "显示邮件时显示所有信头"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1831
 msgid "Unable to retrieve message"
 msgstr "无法获取信件"
 
+#: ../mail/e-mail-reader.c:1876 ../mail/mail-ops.c:1849
+#, fuzzy, 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:2402
-#: ../plugins/google-account-setup/google-source.c:303
-#: ../plugins/google-account-setup/google-source.c:612
-#: ../plugins/google-account-setup/google-source.c:783
+#: ../mail/e-mail-reader.c:2370
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:534
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2489
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/e-mail-reader.c:2519
+#: ../mail/e-mail-reader.c:2490
 msgid "Forward the selected message to someone"
 msgstr "把选中信件转发给某人"
 
-#: ../mail/e-mail-reader.c:2567 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:979
-#: ../modules/calendar/e-task-shell-view-actions.c:1178
-#: ../plugins/groupwise-features/share-folder.c:754
+#: ../mail/e-mail-reader.c:2534 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:2571
-#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../mail/e-mail-reader.c:2538
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:2575
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../mail/e-mail-reader.c:2542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:2579 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2546 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "回复"
 
-#: ../mail/e-mail-search-bar.c:77
-#, c-format
-msgid "Matches: %d"
-msgstr "匹配：%d"
-
-#: ../mail/e-mail-search-bar.c:552
-msgid "Close the find bar"
-msgstr "关闭查找栏"
-
-#: ../mail/e-mail-search-bar.c:560
-msgid "Fin_d:"
-msgstr "查找(_D)："
-
-#: ../mail/e-mail-search-bar.c:572
-msgid "Clear the search"
-msgstr "清除搜索"
-
-#: ../mail/e-mail-search-bar.c:595
-msgid "_Previous"
-msgstr "上一项(_P)"
-
-#: ../mail/e-mail-search-bar.c:601
-msgid "Find the previous occurrence of the phrase"
-msgstr "寻找该词句出现的前一个位置"
-
-#: ../mail/e-mail-search-bar.c:611
-msgid "_Next"
-msgstr "下一项(_N)"
-
-#: ../mail/e-mail-search-bar.c:617
-msgid "Find the next occurrence of the phrase"
-msgstr "寻找该词句出现的下一个位置"
-
-#: ../mail/e-mail-search-bar.c:627
-msgid "Mat_ch case"
-msgstr "大小写匹配(_C)"
-
-#: ../mail/e-mail-search-bar.c:655
-msgid "Reached bottom of page, continued from top"
-msgstr "到达页面底部，移到顶部继续"
-
-#: ../mail/e-mail-search-bar.c:677
-msgid "Reached top of page, continued from bottom"
-msgstr "到达页面顶部，移到底部继续"
-
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1563
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2932
-msgid "On This Computer"
-msgstr "在此计算机中"
-
 #: ../mail/e-mail-tag-editor.c:292
 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:484 ../mail/mail-config.ui.h:72
+#: ../mail/em-account-editor.c:500 ../mail/mail-config.ui.h:72
 #: ../modules/addressbook/ldap-config.ui.h:10
 msgid "No encryption"
 msgstr "不加密"
@@ -9725,25 +9891,25 @@ 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:488 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../mail/em-account-editor.c:504 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
-#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
-#: ../mail/em-account-editor.c:579
+#: ../mail/em-account-editor.c:595
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 许可协议"
 
-#: ../mail/em-account-editor.c:586
+#: ../mail/em-account-editor.c:602
 #, c-format
 msgid ""
 "\n"
@@ -9755,23 +9921,39 @@ msgstr ""
 "请仔细阅读下方显示的 %s 许可协议\n"
 "并选中复选框表明您接受该协议\n"
 
-#: ../mail/em-account-editor.c:948
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:882 ../widgets/misc/e-signature-combo-box.c:75
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-signature"
+msgid "None"
+msgstr "无"
+
+#: ../mail/em-account-editor.c:965
 msgid "Never"
 msgstr "从不"
 
-#: ../mail/em-account-editor.c:949
+#: ../mail/em-account-editor.c:966
 msgid "Always"
 msgstr "总是"
 
-#: ../mail/em-account-editor.c:950
+#: ../mail/em-account-editor.c:967
 msgid "Ask for each message"
 msgstr "每封信都询问"
 
-#: ../mail/em-account-editor.c:2025
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1699 ../widgets/misc/e-account-tree-view.c:124
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "无"
+
+#: ../mail/em-account-editor.c:2055
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: ../mail/em-account-editor.c:2026
+#: ../mail/em-account-editor.c:2056
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -9781,12 +9963,12 @@ msgstr ""
 "\n"
 "单击“前进”开始。"
 
-#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
+#: ../mail/em-account-editor.c:2058 ../mail/em-account-editor.c:2194
 #: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "标识"
 
-#: ../mail/em-account-editor.c:2029
+#: ../mail/em-account-editor.c:2059
 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 "
@@ -9795,20 +9977,20 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/em-account-editor.c:2031 ../mail/em-account-editor.c:2201
+#: ../mail/em-account-editor.c:2061 ../mail/em-account-editor.c:2231
 #: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: ../mail/em-account-editor.c:2032
+#: ../mail/em-account-editor.c:2062
 msgid "Please configure the following account settings."
 msgstr "请配置下列帐户设置。"
 
-#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
+#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2708
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: ../mail/em-account-editor.c:2035
+#: ../mail/em-account-editor.c:2065
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -9816,11 +9998,11 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: ../mail/em-account-editor.c:2037
+#: ../mail/em-account-editor.c:2067
 msgid "Account Management"
 msgstr "账户管理"
 
-#: ../mail/em-account-editor.c:2038
+#: ../mail/em-account-editor.c:2068
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -9828,11 +10010,11 @@ msgstr ""
 "请在下面的空白处输入此账户的描述性名称。\n"
 "此名称将只在显示时使用。"
 
-#: ../mail/em-account-editor.c:2042
+#: ../mail/em-account-editor.c:2072
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/em-account-editor.c:2043
+#: ../mail/em-account-editor.c:2073
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -9846,57 +10028,48 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: ../mail/em-account-editor.c:2473
+#: ../mail/em-account-editor.c:2518
 msgid "Check for _new messages every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2481
+#: ../mail/em-account-editor.c:2526
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:2715 ../mail/mail-config.ui.h:31
+#: ../mail/em-account-editor.c:2772 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "默认"
 
-#: ../mail/em-account-editor.c:2777 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2834 ../mail/mail-config.ui.h:100
 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:2814 ../mail/em-account-editor.c:2882
+#: ../mail/em-account-editor.c:2871 ../mail/em-account-editor.c:2939
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
+#: ../mail/em-account-editor.c:2872 ../mail/em-account-editor.c:2940
 msgid "Checking for New Messages"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:3346
+#: ../mail/em-account-editor.c:3408
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:3346
+#: ../mail/em-account-editor.c:3408
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
-#: ../mail/em-composer-utils.c:1687
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "缺少发送目标地址，邮件转发被取消。"
-
-#: ../mail/em-composer-utils.c:1693
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "无可用账户，邮件转发被取消。"
-
-#: ../mail/em-composer-utils.c:2136
+#: ../mail/em-composer-utils.c:1954
 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:2183
+#: ../mail/em-composer-utils.c:2001
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9904,15 +10077,15 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender}写道："
 
-#: ../mail/em-composer-utils.c:2327
+#: ../mail/em-composer-utils.c:2145
 msgid "-----Original Message-----"
 msgstr "-------- 原始信件 --------"
 
-#: ../mail/em-composer-utils.c:2507
+#: ../mail/em-composer-utils.c:2326
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:2508
+#: ../mail/em-composer-utils.c:2327
 msgid "Choose folders to post the message to."
 msgstr "选择要将信件投递到哪个文件夹。"
 
@@ -9933,18 +10106,10 @@ msgstr "分配颜色"
 msgid "Assign Score"
 msgstr "分配计分"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "响铃"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "完成于"
@@ -10005,10 +10170,6 @@ msgstr "跟随"
 msgid "Forward to"
 msgstr "转发至"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Important"
-msgstr "重要"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "之后"
@@ -10163,11 +10324,11 @@ msgid "Unset Status"
 msgstr "取消状态"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:521
+#: ../mail/em-filter-rule.c:530
 msgid "Then"
 msgstr "然后"
 
-#: ../mail/em-filter-rule.c:549
+#: ../mail/em-filter-rule.c:561
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
@@ -10203,17 +10364,17 @@ msgstr "文件夹属性"
 msgid "<click here to select a folder>"
 msgstr "<单击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:267
+#: ../mail/em-folder-selector.c:266
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:271
+#: ../mail/em-folder-selector.c:270
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "搜索文件夹"
 
@@ -10222,7 +10383,7 @@ msgstr "搜索文件夹"
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
+#: ../mail/em-folder-tree-model.c:726 ../mail/em-folder-tree-model.c:1063
 msgid "Loading..."
 msgstr "正在装入..."
 
@@ -10231,7 +10392,7 @@ msgstr "正在装入..."
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s”中扫描文件夹"
 
-#: ../mail/em-folder-tree.c:445
+#: ../mail/em-folder-tree.c:589
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹名不能含有字符“/”"
 
@@ -10253,75 +10414,70 @@ msgstr "文件夹名不能含有字符“/”"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:978
+#: ../mail/em-folder-tree.c:1071
 #, fuzzy, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:1309
+#: ../mail/em-folder-tree.c:1277
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:1476
+#: ../mail/em-folder-tree.c:1477 ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:1478
+#: ../mail/em-folder-tree.c:1479 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
+#: ../mail/em-folder-tree.c:1486 ../mail/message-list.c:2103
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
+#: ../mail/em-folder-tree.c:1488 ../mail/message-list.c:2105
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:1502
+#: ../mail/em-folder-tree.c:1503
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信件放到顶级文件夹存储"
 
-#: ../mail/em-folder-utils.c:98
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr "把“%s”复制到 %s"
-
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:386
 msgid "Move Folder To"
 msgstr "移动文件夹到"
 
-#: ../mail/em-folder-utils.c:382
+#: ../mail/em-folder-utils.c:386
 msgid "Copy Folder To"
 msgstr "复制文件夹到"
 
-#: ../mail/em-folder-utils.c:495
+#: ../mail/em-folder-utils.c:499
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../mail/em-folder-utils.c:657
+#: ../mail/em-folder-utils.c:662
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:658
+#: ../mail/em-folder-utils.c:663
 #: ../plugins/groupwise-features/install-shared.c:175
 #: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-utils.c:674
+#: ../mail/em-folder-utils.c:679
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "无法退订文件夹“%s”"
 
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1535
 msgid "Unsigned"
 msgstr "未签名"
 
@@ -10331,7 +10487,7 @@ msgid ""
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1536
 msgid "Valid signature"
 msgstr "有效签名"
 
@@ -10341,7 +10497,7 @@ msgid ""
 "message is authentic."
 msgstr "此信件已签名，而且签名是有效的。这意味着这封信应该是可信的。"
 
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1537
 msgid "Invalid signature"
 msgstr "无效签名"
 
@@ -10351,7 +10507,7 @@ msgid ""
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1538
 msgid "Valid signature, but cannot verify sender"
 msgstr "签名有效，但是无法校验发送者"
 
@@ -10361,7 +10517,7 @@ msgid ""
 "cannot be verified."
 msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
 
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1539
 msgid "Signature exists, but need public key"
 msgstr "签名已存在，但需要公钥"
 
@@ -10371,7 +10527,7 @@ msgid ""
 "public key."
 msgstr "这封信的签名有效，但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1545
 msgid "Unencrypted"
 msgstr "未加密"
 
@@ -10381,7 +10537,7 @@ msgid ""
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1546
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
@@ -10394,7 +10550,7 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1547
 msgid "Encrypted"
 msgstr "加密"
 
@@ -10404,7 +10560,7 @@ msgid ""
 "the content of this message."
 msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
 
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1548
 msgid "Encrypted, strong"
 msgstr "强加密"
 
@@ -10417,7 +10573,7 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
@@ -10433,28 +10589,28 @@ msgstr ""
 "Evolution 无法渲染此电子邮件，原因是该邮件太大。您可以以无格式方式查看该邮"
 "件，或者使用外部文本编辑器查看。"
 
-#: ../mail/em-format-html-display.c:730
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "完成于"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:746
 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:742
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:958 ../mail/em-format-html-display.c:997
 msgid "View _Unformatted"
 msgstr "无格式查看(_U)"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:960
 msgid "Hide _Unformatted"
 msgstr "无格式隐藏(_U)"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:1017
 msgid "O_pen With"
 msgstr "打开方式(_P)"
 
@@ -10471,40 +10627,40 @@ msgstr "格式化信件"
 msgid "Formatting Message..."
 msgstr "正在格式化信件..."
 
-#: ../mail/em-format-html.c:1387 ../mail/em-format-html.c:1396
+#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "收取“%s”"
 
-#: ../mail/em-format-html.c:1848
+#: ../mail/em-format-html.c:1854
 msgid "Unknown external-body part."
 msgstr "未知的 external-body 部分。"
 
-#: ../mail/em-format-html.c:1856
+#: ../mail/em-format-html.c:1862
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:1886
+#: ../mail/em-format-html.c:1892
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1903
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: ../mail/em-format-html.c:1899
+#: ../mail/em-format-html.c:1905
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: ../mail/em-format-html.c:1920
+#: ../mail/em-format-html.c:1926
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1937
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
@@ -10512,38 +10668,38 @@ 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:2589
+#: ../mail/em-format-html.c:2595
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
 
-#: ../mail/em-subscribe-editor.c:597
+#: ../mail/em-subscribe-editor.c:586
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储不支持订阅，或订阅未启用。"
 
-#: ../mail/em-subscribe-editor.c:630
+#: ../mail/em-subscribe-editor.c:619
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: ../mail/em-subscribe-editor.c:634
+#: ../mail/em-subscribe-editor.c:623
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:846
+#: ../mail/em-subscribe-editor.c:835
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: ../mail/em-subscribe-editor.c:882
+#: ../mail/em-subscribe-editor.c:871
 msgid "No server has been selected"
 msgstr "没有选中服务器"
 
-#: ../mail/em-utils.c:341
+#: ../mail/em-utils.c:311
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:845
+#: ../mail/em-utils.c:815
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信件"
@@ -10552,7 +10708,7 @@ msgstr "来自 %s 的信件"
 msgid "Search _Folders"
 msgstr "搜索文件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:521
+#: ../mail/em-vfolder-rule.c:522
 msgid "Add Folder"
 msgstr "添加文件夹"
 
@@ -11276,83 +11432,75 @@ msgid ""
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane"
-msgstr "显示“预览”面板"
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Show the \"Preview\" pane."
-msgstr "显示“预览”面板。"
-
-#: ../mail/evolution-mail.schemas.in.h:159
 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:160
+#: ../mail/evolution-mail.schemas.in.h:158
 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:161
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:160
 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:163
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在信件阅读面板中显示发件人照片。"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "内嵌拼写检查"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "拼写检查颜色"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "拼写检查语言"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "订阅对话框默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "订阅对话框默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "文本信件部分限制"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信件钩子插件"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "上次清空垃圾信件的时间，以自新纪元后的天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次清空回收站的时间，以新纪元后的天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
 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 "
@@ -11360,21 +11508,21 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
 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:178
+#: ../mail/evolution-mail.schemas.in.h:176
 #, fuzzy
 msgid ""
 "This decides the max size of the text part that can be formatted under "
@@ -11383,7 +11531,7 @@ msgstr ""
 "此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB，单位"
 "为 KB。"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
 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 "
@@ -11392,7 +11540,7 @@ msgstr ""
 "这是默认的垃圾邮件插件，即使启用了多个插件。如果默认列出的插件被禁用，它不会"
 "缺省到其它可用的插件。"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
 #, fuzzy
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
@@ -11401,7 +11549,7 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
 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;"
@@ -11411,30 +11559,30 @@ msgstr ""
 "此键应包含指定自定义邮件头的 XML 结构列表，以及是否显示这些邮件头。XML 结构的"
 "格式为：&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "此选项能帮助提高获取信件的速度"
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "设定默认信件视图中要显示的地址数，超过的部分显示为“...”。"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:183
 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:186
+#: ../mail/evolution-mail.schemas.in.h:184
 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 "
@@ -11443,99 +11591,91 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
 "启 Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Thread the message list."
-msgstr "按线索编排信件列表。"
-
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid "Thread the message-list"
-msgstr "按线索编排信件列表"
-
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "将信件标为已看的超时时长"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "将信件标为已看的超时时长。"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "默认账户的 UID 字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "使用垃圾克星守护程序和客户"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾邮件测试(无 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:196
 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:201
+#: ../mail/evolution-mail.schemas.in.h:197
 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:202
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "是否默认对所有信件添加阅读收条请求。"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:201
 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:206
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否以线索中的最新信件来排序线索"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "信件列表面板的高度。"
 
@@ -11543,17 +11683,17 @@ msgstr "信件列表面板的高度。"
 msgid "Importing Elm data"
 msgstr "导入 Elm 数据"
 
-#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
-#: ../modules/mail/e-mail-shell-view.c:592
+#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../modules/mail/e-mail-shell-view.c:603
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "邮件"
 
-#: ../mail/importers/elm-importer.c:363
+#: ../mail/importers/elm-importer.c:367
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: ../mail/importers/elm-importer.c:364
+#: ../mail/importers/elm-importer.c:368
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
@@ -11572,11 +11712,12 @@ msgstr "选择文件夹"
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:258
+#: ../mail/importers/evolution-mbox-importer.c:260
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:259
+#: ../mail/importers/evolution-mbox-importer.c:261
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入器 Berkeley 邮箱格式文件夹"
 
@@ -11597,44 +11738,44 @@ msgstr "导入“%s”"
 msgid "Scanning %s"
 msgstr "扫描 %s"
 
-#: ../mail/importers/pine-importer.c:224
+#: ../mail/importers/pine-importer.c:221
 msgid "Importing Pine data"
 msgstr "导入 Pine 数据"
 
-#: ../mail/importers/pine-importer.c:382
+#: ../mail/importers/pine-importer.c:379
 #: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../mail/importers/pine-importer.c:423
+#: ../mail/importers/pine-importer.c:420
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:421
 msgid "Import mail from Pine."
 msgstr "从 Pine 导入邮件。"
 
-#: ../mail/mail-autofilter.c:72
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
 
-#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:258
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
@@ -12093,10 +12234,10 @@ msgstr "用户名(_E)："
 msgid "Use Authe_ntication"
 msgstr "使用身份验证(_N)"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
 #: ../plugins/google-account-setup/google-contacts-source.c:280
-#: ../plugins/google-account-setup/google-source.c:700
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
+#: ../plugins/google-account-setup/google-source.c:620
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "User_name:"
 msgstr "用户名(_N)："
 
@@ -12188,7 +12329,7 @@ msgstr "脚本(_S)："
 msgid "_Secure HTTP Proxy:"
 msgstr "安全 HTTP 代理(_S)："
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "服务器(_S)："
@@ -12218,7 +12359,7 @@ msgstr "使用默认值(_U)"
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 #, fuzzy
 msgid "a"
 msgstr "上午"
@@ -12227,7 +12368,7 @@ msgstr "上午"
 msgid "addresses"
 msgstr "个地址"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr ""
 
@@ -12348,26 +12489,26 @@ msgstr "标志(_F)："
 msgid "_Tick this to accept the license agreement"
 msgstr "选中此处以表明您接受许可协议(_T)"
 
-#: ../mail/mail-folder-cache.c:890
+#: ../mail/mail-folder-cache.c:893
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
 
-#: ../mail/mail-ops.c:110
+#: ../mail/mail-ops.c:95
 msgid "Filtering Selected Messages"
 msgstr "过滤选中的信件"
 
-#: ../mail/mail-ops.c:269
+#: ../mail/mail-ops.c:254
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:600
+#: ../mail/mail-ops.c:585
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:639
+#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -12376,129 +12517,124 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: ../mail/mail-ops.c:656
+#: ../mail/mail-ops.c:641
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: ../mail/mail-ops.c:767 ../mail/mail-ops.c:848
+#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
 msgid "Sending message"
 msgstr "发送信件"
 
-#: ../mail/mail-ops.c:777
+#: ../mail/mail-ops.c:762
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第%d封信，共%d封"
 
-#: ../mail/mail-ops.c:804
+#: ../mail/mail-ops.c:789
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "在第%d封信失败，共%d封"
 
-#: ../mail/mail-ops.c:806 ../mail/mail-send-recv.c:761
+#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:808 ../mail/mail-send-recv.c:763
+#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:920
+#: ../mail/mail-ops.c:905
 #, fuzzy, c-format
 msgid "Saving message to folder '%s'"
 msgstr "把信件保存到文件夹中"
 
-#: ../mail/mail-ops.c:997
+#: ../mail/mail-ops.c:982
 #, fuzzy, c-format
 msgid "Moving messages to '%s'"
 msgstr "把信件移至 %s"
 
-#: ../mail/mail-ops.c:997
+#: ../mail/mail-ops.c:982
 #, fuzzy, c-format
 msgid "Copying messages to '%s'"
 msgstr "把信件复制到 %s"
 
-#: ../mail/mail-ops.c:1106
+#: ../mail/mail-ops.c:1091
 #, fuzzy, c-format
 msgid "Scanning folders in '%s'"
 msgstr "在“%s”中扫描文件夹"
 
-#: ../mail/mail-ops.c:1214
+#: ../mail/mail-ops.c:1199
 msgid "Forwarded messages"
 msgstr "转发的信件"
 
-#: ../mail/mail-ops.c:1255
+#: ../mail/mail-ops.c:1240
 #, fuzzy, c-format
 msgid "Opening folder '%s'"
 msgstr "打开文件夹 %s"
 
-#: ../mail/mail-ops.c:1321
+#: ../mail/mail-ops.c:1306
 #, fuzzy, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "正在获取文件加 %s 的配额信息"
 
-#: ../mail/mail-ops.c:1393
+#: ../mail/mail-ops.c:1378
 #, fuzzy, c-format
 msgid "Opening store '%s'"
 msgstr "打开存储 %s"
 
-#: ../mail/mail-ops.c:1464
+#: ../mail/mail-ops.c:1449
 #, fuzzy, c-format
 msgid "Removing folder '%s'"
 msgstr "删除文件夹 %s"
 
-#: ../mail/mail-ops.c:1582
+#: ../mail/mail-ops.c:1567
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../mail/mail-ops.c:1645
+#: ../mail/mail-ops.c:1630
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储账户“%s”"
 
-#: ../mail/mail-ops.c:1646
+#: ../mail/mail-ops.c:1631
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储账户“%s”"
 
-#: ../mail/mail-ops.c:1700
+#: ../mail/mail-ops.c:1685
 #, fuzzy, c-format
 msgid "Refreshing folder '%s'"
 msgstr "刷新文件夹"
 
-#: ../mail/mail-ops.c:1740
+#: ../mail/mail-ops.c:1725
 #, fuzzy, c-format
 msgid "Expunging folder '%s'"
 msgstr "销毁文件夹"
 
-#: ../mail/mail-ops.c:1785
+#: ../mail/mail-ops.c:1770
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的回收站"
 
-#: ../mail/mail-ops.c:1786
+#: ../mail/mail-ops.c:1771
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: ../mail/mail-ops.c:1864
-#, fuzzy, c-format
-msgid "Retrieving message '%s'"
-msgstr "收取信件 %s"
-
-#: ../mail/mail-ops.c:1982
+#: ../mail/mail-ops.c:1967
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收取 %d 封信"
 
-#: ../mail/mail-ops.c:2071
+#: ../mail/mail-ops.c:2056
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "保存 %d 封信"
 
-#: ../mail/mail-ops.c:2151
+#: ../mail/mail-ops.c:2136
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -12507,11 +12643,11 @@ msgstr ""
 "在将信件保存到 %s 时发生错误：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2223
+#: ../mail/mail-ops.c:2208
 msgid "Saving attachment"
 msgstr "保存附件"
 
-#: ../mail/mail-ops.c:2241 ../mail/mail-ops.c:2249
+#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -12520,121 +12656,130 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2264
+#: ../mail/mail-ops.c:2249
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: ../mail/mail-ops.c:2409
+#: ../mail/mail-ops.c:2394
 #, fuzzy, c-format
 msgid "Disconnecting from '%s'"
 msgstr "断开与 %s 的连接"
 
-#: ../mail/mail-ops.c:2409
+#: ../mail/mail-ops.c:2394
 #, fuzzy, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新连接到 %s"
 
-#: ../mail/mail-ops.c:2505
+#: ../mail/mail-ops.c:2490
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备脱机使用账户“%s”"
 
-#: ../mail/mail-ops.c:2591
+#: ../mail/mail-ops.c:2576
 msgid "Checking Service"
 msgstr "检查服务"
 
-#: ../mail/mail-send-recv.c:190
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:432
+#: ../mail/mail-send-recv.c:431
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:445
+#: ../mail/mail-send-recv.c:444
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:554
+#: ../mail/mail-send-recv.c:553
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
+#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:874
+#: ../mail/mail-send-recv.c:873
 #, c-format
 msgid "Checking for new mail"
 msgstr "检查新邮件"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "输入 %s 的密码"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: ../mail/mail-session.c:221
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:263
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
-#: ../mail/mail-tools.c:136
+#: ../mail/mail-session.c:663
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
+msgstr "缺少发送目标地址，邮件转发被取消。"
+
+#: ../mail/mail-session.c:669
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "无可用账户，邮件转发被取消。"
+
+#: ../mail/mail-tools.c:123
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "无法创建脱机目录“%s”：%s"
 
-#: ../mail/mail-tools.c:166
+#: ../mail/mail-tools.c:153
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "试图将邮件移至非 mbox 源“%s”"
 
-#: ../mail/mail-tools.c:272
+#: ../mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "转发的信件 - %s"
 
-#: ../mail/mail-tools.c:274
+#: ../mail/mail-tools.c:261
 msgid "Forwarded message"
 msgstr "转发的信件"
 
-#: ../mail/mail-tools.c:314
+#: ../mail/mail-tools.c:301
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "无效的文件夹：“%s”"
 
-#: ../mail/mail-vfolder.c:88
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "设置搜索文件夹：%s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新“%s:%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新“%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1075
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "编辑搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1168
+#: ../mail/mail-vfolder.c:1265
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
@@ -13215,7 +13360,7 @@ msgid "_Do not Synchronize"
 msgstr "不同步(_D)"
 
 #: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:930
 msgid "_Empty Trash"
 msgstr "清空回收站(_E)"
 
@@ -13227,94 +13372,98 @@ msgstr "销毁(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1122
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1123
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1070
+#: ../mail/message-list.c:1124
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1071
+#: ../mail/message-list.c:1125
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:1072
+#: ../mail/message-list.c:1126
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信件"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1127
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1077
+#: ../mail/message-list.c:1131
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1132
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1082
+#: ../mail/message-list.c:1136
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1083
+#: ../mail/message-list.c:1137
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1747 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1754 ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1728
+#: ../mail/message-list.c:1763
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1740
+#: ../mail/message-list.c:1775
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1748
+#: ../mail/message-list.c:1783
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1750
+#: ../mail/message-list.c:1785
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
+#: ../mail/message-list.c:2537
+msgid "Select all visible messages"
+msgstr "选中所有可见的信件"
+
+#: ../mail/message-list.c:2588 ../shell/e-shell-view.c:652
 msgid "Shell Backend"
 msgstr ""
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
+#: ../mail/message-list.c:4399 ../mail/message-list.c:4885
 msgid "Generating message list"
 msgstr "生成信件列表"
 
-#: ../mail/message-list.c:4578
+#: ../mail/message-list.c:4720
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4580
+#: ../mail/message-list.c:4722
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
 msgstr ""
 
-#: ../mail/message-list.c:4582
+#: ../mail/message-list.c:4724
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信件。"
 
@@ -13352,27 +13501,27 @@ msgid "Subject - Trimmed"
 msgstr "主题 - 被截断"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1418
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Body contains"
 msgstr "邮件体含有"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1425
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "Message contains"
 msgstr "信件含有"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "Recipients contain"
 msgstr "收件人含有"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "Sender contains"
 msgstr "发件人含有"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1369
 msgid "Subject contains"
 msgstr "主题含有"
 
@@ -13544,7 +13693,6 @@ msgid "Whether to show the preview pane."
 msgstr "是否显示预览面板。"
 
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1152
 msgid "Table column:"
 msgstr "表格栏："
 
@@ -13568,7 +13716,7 @@ msgid "_Contact"
 msgstr "联系人(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:763
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
@@ -13578,7 +13726,7 @@ msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:770
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
@@ -13588,22 +13736,22 @@ msgid "Address _Book"
 msgstr "地址簿(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:730
+#: ../modules/addressbook/e-book-shell-view-actions.c:693
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:396
-#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/addressbook/e-book-shell-view.c:394
+#: ../modules/calendar/e-cal-shell-backend.c:123
 #: ../modules/calendar/e-cal-shell-migrate.c:480
 msgid "Contacts"
 msgstr "联系人"
 
 #: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:759
-#: ../modules/calendar/e-memo-shell-backend.c:583
-#: ../modules/calendar/e-task-shell-backend.c:593
+#: ../modules/calendar/e-cal-shell-backend.c:777
+#: ../modules/calendar/e-memo-shell-backend.c:587
+#: ../modules/calendar/e-task-shell-backend.c:597
 msgid "Source List"
 msgstr "来源列表"
 
@@ -13612,55 +13760,40 @@ msgstr "来源列表"
 msgid "The registry of address books"
 msgstr "无法获得地址簿列表"
 
-#: ../modules/addressbook/e-book-shell-content.c:380
+#: ../modules/addressbook/e-book-shell-content.c:364
 msgid "Current View"
 msgstr "当前视图"
 
-#: ../modules/addressbook/e-book-shell-content.c:381
+#: ../modules/addressbook/e-book-shell-content.c:365
 msgid "The currently selected address book view"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-content.c:390
+#: ../modules/addressbook/e-book-shell-content.c:374
 #, fuzzy
 msgid "Previewed Contact"
 msgstr "新建联系人"
 
-#: ../modules/addressbook/e-book-shell-content.c:391
+#: ../modules/addressbook/e-book-shell-content.c:375
 #, fuzzy
 msgid "The contact being shown in the preview pane"
 msgstr "是否显示预览面板。"
 
-#: ../modules/addressbook/e-book-shell-content.c:400
-#: ../modules/calendar/e-memo-shell-content.c:611
-#: ../modules/calendar/e-task-shell-content.c:634
-#: ../modules/mail/e-mail-shell-content.c:726
+#: ../modules/addressbook/e-book-shell-content.c:384
+#: ../modules/calendar/e-memo-shell-content.c:613
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:688
 #, fuzzy
 msgid "Preview is Visible"
 msgstr "侧边栏可见"
 
-#: ../modules/addressbook/e-book-shell-content.c:401
-#: ../modules/calendar/e-memo-shell-content.c:612
-#: ../modules/calendar/e-task-shell-content.c:635
-#: ../modules/mail/e-mail-shell-content.c:727
+#: ../modules/addressbook/e-book-shell-content.c:385
+#: ../modules/calendar/e-memo-shell-content.c:614
+#: ../modules/calendar/e-task-shell-content.c:636
+#: ../modules/mail/e-mail-shell-content.c:689
 #, fuzzy
 msgid "Whether the preview pane is visible"
 msgstr "是否显示预览面板。"
 
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1106
-msgid "Migrating..."
-msgstr "正在升迁..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1179
-#, c-format
-msgid "Migrating '%s':"
-msgstr "升迁“%s”："
-
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
 msgstr "LDAP 服务器"
@@ -13711,9 +13844,9 @@ msgstr ""
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:608
-#: ../modules/calendar/e-memo-shell-sidebar.c:543
-#: ../modules/calendar/e-task-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
+#: ../modules/calendar/e-memo-shell-sidebar.c:687
+#: ../modules/calendar/e-task-shell-sidebar.c:687
 #, fuzzy
 msgid "Source Selector Widget"
 msgstr "备忘来源选择器"
@@ -13724,278 +13857,271 @@ msgid "This widget displays groups of address books"
 msgstr "无法获得地址簿列表"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:563
+#: ../modules/addressbook/e-book-shell-view-actions.c:539
 msgid "Save as vCard"
 msgstr "另存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:707
+#: ../modules/addressbook/e-book-shell-view-actions.c:670
 msgid "Co_py All Contacts To..."
 msgstr "将全部联系人复制到(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:709
+#: ../modules/addressbook/e-book-shell-view-actions.c:672
 #, fuzzy
 msgid "Copy the contacts of the selected address book to another"
 msgstr "把选中文件夹中的联系人复制到其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:714
-msgid "Del_ete Address Book"
+#: ../modules/addressbook/e-book-shell-view-actions.c:677
+#, fuzzy
+#| msgid "Del_ete Address Book"
+msgid "D_elete Address Book"
 msgstr "删除地址簿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:716
+#: ../modules/addressbook/e-book-shell-view-actions.c:679
 #, fuzzy
 msgid "Delete the selected address book"
 msgstr "删除选中的文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:721
+#: ../modules/addressbook/e-book-shell-view-actions.c:684
 msgid "Mo_ve All Contacts To..."
 msgstr "将全部联系人移至(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:723
+#: ../modules/addressbook/e-book-shell-view-actions.c:686
 #, fuzzy
 msgid "Move the contacts of the selected address book to another"
 msgstr "把选中文件夹中的联系人移至其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:728
+#: ../modules/addressbook/e-book-shell-view-actions.c:691
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:735
+#: ../modules/addressbook/e-book-shell-view-actions.c:698
 msgid "Address _Book Properties"
 msgstr "地址簿属性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:700
 #, fuzzy
 msgid "Show properties of the selected address book"
 msgstr "更改选中文件夹的属性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:742
-#: ../modules/calendar/e-cal-shell-view-actions.c:1306
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
-#: ../modules/calendar/e-task-shell-view-actions.c:790
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:705
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:744
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
 #, fuzzy
 msgid "Rename the selected address book"
 msgstr "重命名选中文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:749
+#: ../modules/addressbook/e-book-shell-view-actions.c:712
 msgid "S_ave Address Book as vCard"
 msgstr "保存地址簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:751
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
 #, fuzzy
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "把选中文件夹中的的联系人保存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:758
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
 msgid "Stop loading"
 msgstr "停止载入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:765
-#: ../modules/calendar/e-cal-shell-view-actions.c:1322
-msgid "Copy the selection"
-msgstr "复制选中内容"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
-#: ../modules/calendar/e-cal-shell-view-actions.c:1329
-msgid "Cut the selection"
-msgstr "剪切选中内容"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:779
-#: ../modules/calendar/e-cal-shell-view-actions.c:1336
-msgid "Paste the clipboard"
-msgstr "粘贴剪贴板"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#: ../modules/addressbook/e-book-shell-view-actions.c:726
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "将联系人复制到(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:786
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
 #, fuzzy
 msgid "Copy selected contacts to another address book"
 msgstr "把选中的联系人复制到其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/addressbook/e-book-shell-view-actions.c:733
 msgid "_Delete Contact"
 msgstr "删除联系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:793
-msgid "Delete selected contacts"
-msgstr "删除选中的联系人"
+#: ../modules/addressbook/e-book-shell-view-actions.c:740
+#, fuzzy
+#| msgid "_Forward Contact..."
+msgid "_Find in Contact..."
+msgstr "转发联系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed contact"
+msgstr "在显示信件的主体中搜索文本"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:747
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:800
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
 msgid "Send selected contacts to another person"
 msgstr "把选中的联系人发送给其他人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#: ../modules/addressbook/e-book-shell-view-actions.c:754
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "将联系人移至(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/addressbook/e-book-shell-view-actions.c:756
 #, fuzzy
 msgid "Move selected contacts to another address book"
 msgstr "把选中的联系人移至其它文件夹"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:761
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:768
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
+#: ../modules/addressbook/e-book-shell-view-actions.c:775
 msgid "_Open Contact"
 msgstr "打开联系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:777
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
-msgid "Select all contacts"
-msgstr "选中全部联系人"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:782
 msgid "_Send Message to Contact..."
 msgstr "给联系人发信件(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
 msgid "Send a message to the selected contacts"
 msgstr "给选中的联系人发信件"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-#: ../modules/calendar/e-task-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "_Actions"
 msgstr "操作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
-#: ../modules/calendar/e-memo-shell-view-actions.c:703
-#: ../modules/calendar/e-task-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:865
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-task-shell-view-actions.c:833
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:811
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "_Save as vCard..."
 msgstr "另存为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
 msgid "Contact _Preview"
 msgstr "联系人预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
 msgid "Show contact preview window"
 msgstr "显示联系人预览窗口"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:953
-#: ../modules/mail/e-mail-shell-view-actions.c:1328
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/calendar/e-memo-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/mail/e-mail-shell-view-actions.c:1251
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 #, fuzzy
 msgid "Show contact preview below the contact list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-#: ../modules/mail/e-mail-shell-view-actions.c:1335
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid "_Vertical View"
 msgstr "垂直视图(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 #, fuzzy
 msgid "Show contact preview alongside the contact list"
 msgstr "显示联系人预览窗口"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:959
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:977
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Any Category"
 msgstr "任何类别"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:966
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../modules/calendar/e-memo-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
-#: ../modules/mail/e-mail-shell-view-actions.c:1411
-msgid "Advanced search"
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../shell/e-shell-content.c:516
+msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:935
 #, fuzzy
 msgid "Print all shown contacts"
 msgstr "打印选中的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
 #, fuzzy
 msgid "Preview the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
 msgid "Save as vCard..."
 msgstr "另存为 VCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1040
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 #, fuzzy
 msgid "Save selected contacts as a vCard"
 msgstr "把选中的联系人保存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:336
+#: ../modules/addressbook/e-book-shell-view.c:338
 msgid "_Forward Contacts"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:340
 msgid "_Forward Contact"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:371
 #, fuzzy
 msgid "_Send Message to Contacts"
 msgstr "给联系人发信件(_M)"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:373
 #, fuzzy
 msgid "_Send Message to List"
 msgstr "给列表发信件(_M)"
 
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:375
 #, fuzzy
 msgid "_Send Message to Contact"
 msgstr "给联系人发信件(_M)"
@@ -14053,23 +14179,24 @@ msgstr "浏览此地址簿直到达到极限(_R)"
 msgid "Lo_gin:"
 msgstr "登录(_G)："
 
-#: ../modules/addressbook/ldap-config.ui.h:11
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "One"
 msgstr "一次"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
 msgstr "搜索过滤器"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _base:"
 msgstr "搜索基础(_B)："
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid "Search _filter:"
 msgstr "搜索过滤器(_F)："
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:17
 #, fuzzy
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
@@ -14078,51 +14205,52 @@ msgstr ""
 "搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话，默认情况下搜索"
 "将会在“个人”类型的对象类型。"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Sub"
 msgstr "子"
 
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr "支持的搜索起点"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名(DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Download limit:"
 msgstr "下载限制(_D)："
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Find Possible Search Bases"
 msgstr "查找可能的搜索基础(_F)"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Login method:"
 msgstr "登录方式(_L)："
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Port:"
 msgstr "端口(_P)："
 
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Search scope:"
 msgstr "搜索范围(_S)："
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "超时(_T)："
 
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "_Use secure connection:"
 msgstr "使用安全连接(_U)："
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:33
 msgid "cards"
 msgstr "名片"
 
@@ -14147,69 +14275,69 @@ msgid "I_mport to Tasks"
 msgstr "导入到任务(_M)"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:125
 #: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-backend.c:110
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-backend.c:113
 #: ../modules/calendar/e-task-shell-migrate.c:535
 msgid "On The Web"
 msgstr "网上"
 
-#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../modules/calendar/e-cal-shell-backend.c:127
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "天气"
 
-#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-backend.c:242
 #: ../modules/calendar/e-cal-shell-migrate.c:483
 msgid "Birthdays & Anniversaries"
 msgstr "生日和纪念日"
 
-#: ../modules/calendar/e-cal-shell-backend.c:424
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:431
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:433
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:438
+#: ../modules/calendar/e-cal-shell-backend.c:460
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:440
+#: ../modules/calendar/e-cal-shell-backend.c:462
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:470
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+#: ../modules/calendar/e-cal-shell-backend.c:472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2645
+#: ../modules/calendar/e-cal-shell-backend.c:507
+#: ../plugins/itip-formatter/itip-formatter.c:2644
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-#: ../modules/calendar/e-cal-shell-backend.c:760
+#: ../modules/calendar/e-cal-shell-backend.c:778
 msgid "The registry of calendars"
 msgstr ""
 
@@ -14237,9 +14365,9 @@ msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
 msgid "Unable to migrate calendar `%s'"
 msgstr "无法升迁日历“%s”"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:152
-#: ../modules/calendar/e-memo-shell-sidebar.c:149
-#: ../modules/calendar/e-task-shell-sidebar.c:147
+#: ../modules/calendar/e-cal-shell-sidebar.c:162
+#: ../modules/calendar/e-memo-shell-sidebar.c:157
+#: ../modules/calendar/e-task-shell-sidebar.c:157
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14248,37 +14376,47 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:188
+#: ../modules/calendar/e-cal-shell-sidebar.c:221
 msgid "Loading calendars"
 msgstr "装入日历"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:428
+#: ../modules/calendar/e-cal-shell-sidebar.c:527
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:598
+#: ../modules/calendar/e-cal-shell-sidebar.c:741
 msgid "Date Navigator Widget"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:599
+#: ../modules/calendar/e-cal-shell-sidebar.c:742
 msgid "This widget displays a miniature calendar"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:609
+#: ../modules/calendar/e-cal-shell-sidebar.c:751
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Calendar Client"
+msgstr "默认邮件客户端"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:752
+msgid "Default client for calendar operations"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:762
 msgid "This widget displays groups of calendars"
 msgstr ""
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#: ../modules/calendar/e-cal-shell-sidebar.c:949
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "在 %s 打开日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view-actions.c:218
+#: ../modules/calendar/e-cal-shell-view-actions.c:247
 msgid "Print"
 msgstr "打印"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:305
+#: ../modules/calendar/e-cal-shell-view-actions.c:306
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -14288,567 +14426,589 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:323
 msgid "Purge events older than"
 msgstr "销毁较早的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:558
+#: ../modules/calendar/e-cal-shell-view-actions.c:540
 msgid "Copying Items"
 msgstr "复制项目"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-actions.c:795
 msgid "Moving Items"
 msgstr "移动项目"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1109
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-memo-shell-view-actions.c:530
-#: ../modules/calendar/e-task-shell-view-actions.c:655
+#. 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:1097
+#, fuzzy
+#| msgid "Sent"
+msgid "event"
+msgstr "已发箱"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1099
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:507
+#: ../modules/calendar/e-task-shell-view-actions.c:632
 msgid "Save as iCalendar"
 msgstr "保存为 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#, fuzzy
+#| msgid "Select a Calendar"
+msgid "D_elete Calendar"
+msgstr "选择一个日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#, fuzzy
+#| msgid "Rename the selected calendar"
+msgid "Delete the selected calendar"
+msgstr "重命名选中的日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1253
 msgid "Go Back"
 msgstr "后退"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+#: ../modules/calendar/e-cal-shell-view-actions.c:1260
 msgid "Go Forward"
 msgstr "前进"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+#: ../modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "Select today"
 msgstr "选择今天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Select _Date"
 msgstr "选择日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+#: ../modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Select a specific date"
 msgstr "选择特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
-#: ../modules/calendar/e-task-shell-view-actions.c:839
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Purg_e"
 msgstr "销毁(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+#: ../modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Purge old appointments and meetings"
 msgstr "销毁旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Re_fresh"
 msgstr "刷新(_F)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#: ../modules/calendar/e-cal-shell-view-actions.c:1302
 #, fuzzy
 msgid "Refresh the selected calendar"
 msgstr "重命名选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "Rename the selected calendar"
 msgstr "重命名选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Show _Only This Calendar"
 msgstr "只显示此日历(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "_Delegate Meeting..."
 msgstr "代理会议(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
-msgid "Delete the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "_Delete Appointment"
+msgstr "删除约会"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#, fuzzy
+#| msgid "Delete the appointment"
+msgid "Delete selected appointments"
 msgstr "删除约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Delete This _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete this occurrence"
 msgstr "删除此次发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
-msgid "Delete _All Occurrences"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#, fuzzy
+#| msgid "Delete _All Occurrences"
+msgid "Delete All Occ_urrences"
 msgstr "删除所有出现(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Delete all occurrences"
 msgstr "删除全部发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "New All Day _Event..."
 msgstr "新建全天事件(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Create a new all day event"
 msgstr "创建一个新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
-#: ../modules/calendar/e-cal-shell-view-memopad.c:322
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "New _Meeting..."
 msgstr "新建会议(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Create a new meeting"
 msgstr "创建一个新的会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Make this Occurrence _Movable"
 msgstr "将此次发生变为可移动(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "View the current appointment"
 msgstr "查看当前约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
-#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
 msgid "Save as iCalendar..."
 msgstr "保存为 iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 #, fuzzy
 msgid "Converts an appointment to a meeting"
 msgstr "销毁旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Conv_ert to Appointment..."
 msgstr "转换到约会(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 #, fuzzy
 msgid "Converts a meeting to an appointment"
 msgstr "在约会结束时 %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1589
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "Show one day"
 msgstr "显示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1596
+#: ../modules/calendar/e-cal-shell-view-actions.c:1564
 msgid "List"
 msgstr "列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Show as list"
 msgstr "显示为列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-cal-shell-view-actions.c:1571
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 msgid "Show one month"
 msgstr "显示一个月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+#: ../modules/calendar/e-cal-shell-view-actions.c:1578
 msgid "Week"
 msgstr "周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Show one week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 #, fuzzy
 msgid "Show one work week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
-#: ../modules/calendar/e-memo-shell-view-actions.c:837
-#: ../modules/calendar/e-task-shell-view-actions.c:1036
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
+#: ../modules/calendar/e-memo-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-#: ../modules/calendar/e-memo-shell-view-actions.c:844
-#: ../modules/calendar/e-task-shell-view-actions.c:1043
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:793
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Print this calendar"
 msgstr "打印此日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 #, fuzzy
 msgid "Preview the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1766
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 msgid "Go To"
 msgstr "转到"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:97
-msgid "Deleting selected memos..."
-msgstr "删除选中的备忘..."
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:598
-msgid "Copy selected memo"
-msgstr "复制选中的备忘"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:303
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
-msgid "Cut selected memo"
-msgstr "剪切选中的备忘"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
-msgid "Paste memo from the clipboard"
-msgstr "从剪贴板中粘贴备忘"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
-msgid "_Delete Memo"
-msgstr "删除备忘(_D)"
-
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:619
-msgid "Delete selected memos"
-msgstr "删除选中的备忘"
+#. Translators: Default filename part saving a memo to a file when
+#. * no summary is filed, the '.ics' extension is concatenated to it.
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:505
+#, fuzzy
+#| msgid "Memo"
+msgid "memo"
+msgstr "备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:329
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "New _Memo"
 msgstr "新建备忘(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:331
-#: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:336
-#: ../modules/calendar/e-memo-shell-view-actions.c:687
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:652
 msgid "_Open Memo"
 msgstr "打开备忘(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:689
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "View the selected memo"
 msgstr "查看选中的备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:343
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
-#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:870
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
 msgid "Print the selected memo"
 msgstr "打印选中的备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:444
-#: ../modules/calendar/e-memo-shell-view.c:232
-msgid "Delete Memo"
-msgid_plural "Delete Memos"
-msgstr[0] "删除备忘"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:128
-msgid "Deleting selected tasks..."
-msgstr "删除选中的任务..."
+#. Translators: Default filename part saving a task to a file when
+#. * 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:630
+#, fuzzy
+#| msgid "Task"
+msgid "task"
+msgstr "任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:692
 msgid "_Assign Task"
 msgstr "分配任务(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:722
-msgid "Copy selected tasks"
-msgstr "复制选中的任务"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:729
-msgid "Cut selected tasks"
-msgstr "剪切选中的任务"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:736
-msgid "Paste tasks from the clipboard"
-msgstr "从剪贴板中粘贴任务"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-#: ../modules/calendar/e-task-shell-view-actions.c:741
-msgid "_Delete Task"
-msgstr "删除任务(_D)"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:743
-msgid "Delete selected tasks"
-msgstr "删除选中的任务"
-
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:806
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Mark selected tasks as complete"
 msgstr "把选中任务标记为完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "标记为未完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
-#: ../modules/calendar/e-task-shell-view-actions.c:813
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 #, fuzzy
 msgid "Mark selected tasks as incomplete"
 msgstr "把选中任务标记为完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
-#: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:820
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "_Open Task"
 msgstr "打开任务(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
-#: ../modules/calendar/e-task-shell-view-actions.c:827
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "View the selected task"
 msgstr "查看选中的任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
-#: ../modules/calendar/e-memo-shell-view-actions.c:885
-#: ../modules/calendar/e-task-shell-view-actions.c:1084
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
+#: ../modules/calendar/e-memo-shell-view-actions.c:834
+#: ../modules/calendar/e-task-shell-view-actions.c:1033
 msgid "_Save as iCalendar..."
 msgstr "保存为 iCalendar(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
-#: ../modules/calendar/e-task-shell-view-actions.c:1069
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Print the selected task"
 msgstr "打印选中的任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
-#: ../modules/calendar/e-task-shell-view.c:359
-msgid "Delete Task"
-msgid_plural "Delete Tasks"
-msgstr[0] "删除任务"
-
-#: ../modules/calendar/e-memo-shell-backend.c:316
+#: ../modules/calendar/e-memo-shell-backend.c:318
 msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:323
+#: ../modules/calendar/e-memo-shell-backend.c:325
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共享的备忘(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
 msgid "Create a new shared memo"
 msgstr "创建一个新的共享备忘"
 
-#: ../modules/calendar/e-memo-shell-backend.c:333
+#: ../modules/calendar/e-memo-shell-backend.c:335
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "备忘列表(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
+#: ../modules/calendar/e-memo-shell-backend.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../modules/calendar/e-memo-shell-backend.c:584
+#: ../modules/calendar/e-memo-shell-backend.c:588
 #, fuzzy
 msgid "The registry of memo lists"
 msgstr "打印备忘列表"
 
-#: ../modules/calendar/e-memo-shell-content.c:602
+#: ../modules/calendar/e-memo-shell-content.c:604
 #, fuzzy
 msgid "The memo table model"
 msgstr "表格模型"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:185
+#: ../modules/calendar/e-memo-shell-sidebar.c:216
 msgid "Loading memos"
 msgstr "装入备忘"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:399
+#: ../modules/calendar/e-memo-shell-sidebar.c:492
 msgid "Memo List Selector"
 msgstr "备忘列表选择器"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:544
+#: ../modules/calendar/e-memo-shell-sidebar.c:677
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Memo Client"
+msgstr "默认邮件客户端"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:678
+msgid "Default client for memo operations"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:688
 msgid "This widget displays groups of memo lists"
 msgstr ""
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#: ../modules/calendar/e-memo-shell-sidebar.c:867
 #, c-format
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:254
-#: ../modules/calendar/e-memo-shell-view-actions.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:233
 msgid "Print Memos"
 msgstr "打印备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:575
+msgid "_Delete Memo"
+msgstr "删除备忘(_D)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Memo..."
+msgstr "在信件中查找(_F)..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed memo"
+msgstr "在显示信件的主体中搜索文本"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:603
+#, fuzzy
+#| msgid "Delete Memos"
+msgid "D_elete Memo List"
+msgstr "删除备忘"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+msgid "Delete the selected memo list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "_New Memo List"
 msgstr "新建备忘列表(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#: ../modules/calendar/e-memo-shell-view-actions.c:626
 #, fuzzy
 msgid "Refresh the selected memo list"
 msgstr "重命名选中文件夹"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
 #, fuzzy
 msgid "Rename the selected memo list"
 msgstr "重命名选中文件夹"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 #, fuzzy
 msgid "Show _Only This Memo List"
 msgstr "只显示此备忘列表(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-memo-shell-view-actions.c:717
 msgid "Memo _Preview"
 msgstr "备忘预览(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#: ../modules/calendar/e-memo-shell-view-actions.c:719
 #, fuzzy
 msgid "Show memo preview pane"
 msgstr "显示预览面板"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
 #, fuzzy
 msgid "Show memo preview below the memo list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
 #, fuzzy
 msgid "Show memo preview alongside the memo list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
 msgid "Print the list of memos"
 msgstr "打印备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
 #, fuzzy
 msgid "Preview the list of memos to be printed"
 msgstr "预览要打印的备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-memo-shell-view-private.c:414
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:421
-#: ../modules/calendar/e-task-shell-view-private.c:572
+#: ../modules/calendar/e-memo-shell-view-private.c:418
+#: ../modules/calendar/e-task-shell-view-private.c:567
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "，已选中 %d 个"
 
-#: ../modules/calendar/e-memo-shell-view.c:230
+#: ../modules/calendar/e-memo-shell-view.c:223
 msgid "Delete Memos"
 msgstr "删除备忘"
 
-#: ../modules/calendar/e-task-shell-backend.c:320
+#: ../modules/calendar/e-memo-shell-view.c:225
+#, fuzzy
+#| msgid "Delete Memo"
+#| msgid_plural "Delete Memos"
+msgid "Delete Memo"
+msgstr "删除备忘"
+
+#: ../modules/calendar/e-task-shell-backend.c:322
 msgctxt "New"
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:327
+#: ../modules/calendar/e-task-shell-backend.c:329
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分配的任务(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:331
 msgid "Create a new assigned task"
 msgstr "创建新分配的任务"
 
-#: ../modules/calendar/e-task-shell-backend.c:337
+#: ../modules/calendar/e-task-shell-backend.c:339
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "任务列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-backend.c:341
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../modules/calendar/e-task-shell-backend.c:594
+#: ../modules/calendar/e-task-shell-backend.c:598
 #, fuzzy
 msgid "The registry of task lists"
 msgstr "打印任务列表"
 
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../modules/calendar/e-task-shell-content.c:626
 #, fuzzy
 msgid "The task table model"
 msgstr "表格模型"
@@ -14870,30 +15030,42 @@ msgstr ""
 msgid "Unable to migrate tasks `%s'"
 msgstr "无法升迁任务“%s”"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:183
+#: ../modules/calendar/e-task-shell-sidebar.c:216
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:397
+#: ../modules/calendar/e-task-shell-sidebar.c:492
 #, fuzzy
 msgid "Task List Selector"
 msgstr "任务来源选择器"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:542
+#: ../modules/calendar/e-task-shell-sidebar.c:677
+#, fuzzy
+#| msgid "Default Mail Client"
+msgid "Default Task Client"
+msgstr "默认邮件客户端"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:678
+#, fuzzy
+#| msgid "Default value for thread expand state"
+msgid "Default client for task operations"
+msgstr "话题的默认展开状态"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:688
 msgid "This widget displays groups of task lists"
 msgstr ""
 
-#: ../modules/calendar/e-task-shell-sidebar.c:695
+#: ../modules/calendar/e-task-shell-sidebar.c:867
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:302
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:264
 msgid "Print Tasks"
 msgstr "打印任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:574
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -14904,586 +15076,544 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:699
+msgid "_Delete Task"
+msgstr "删除任务(_D)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:706
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Task..."
+msgstr "在信件中查找(_F)..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:708
+#, fuzzy
+#| msgid "Search for text in the body of the displayed message"
+msgid "Search for text in the displayed task"
+msgstr "在显示信件的主体中搜索文本"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Copy..."
 msgstr "复制..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:727
+#, fuzzy
+#| msgid "Delete Tasks"
+msgid "D_elete Task List"
+msgstr "删除任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+#, fuzzy
+msgid "Delete the selected task list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:750
 #, fuzzy
 msgid "Refresh the selected task list"
 msgstr "重命名选中文件夹"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 #, fuzzy
 msgid "Rename the selected task list"
 msgstr "重命名选中文件夹"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Show _Only This Task List"
 msgstr "只显示此任务列表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-task-shell-view-actions.c:776
 msgid "Mar_k as Incomplete"
 msgstr "标记为未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:841
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Delete completed tasks"
 msgstr "删除已完成的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:932
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Task _Preview"
 msgstr "任务预览(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:934
+#: ../modules/calendar/e-task-shell-view-actions.c:883
 #, fuzzy
 msgid "Show task preview pane"
 msgstr "显示预览面板"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:955
+#: ../modules/calendar/e-task-shell-view-actions.c:904
 #, fuzzy
 msgid "Show task preview below the task list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:962
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 #, fuzzy
 msgid "Show task preview alongside the task list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:970
+#: ../modules/calendar/e-task-shell-view-actions.c:919
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:984
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Completed Tasks"
 msgstr "已完成任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:991
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:998
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1055
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Print the list of tasks"
 msgstr "打印任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1062
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 #, fuzzy
 msgid "Preview the list of tasks to be printed"
 msgstr "预览要打印的任务列表"
 
-#: ../modules/calendar/e-task-shell-view-private.c:464
+#: ../modules/calendar/e-task-shell-view-private.c:461
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../modules/calendar/e-task-shell-view-private.c:568
+#: ../modules/calendar/e-task-shell-view-private.c:563
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: ../modules/calendar/e-task-shell-view.c:357
+#: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
 msgstr "删除任务"
 
+#: ../modules/calendar/e-task-shell-view.c:353
+#, fuzzy
+#| msgid "Delete Task"
+#| msgid_plural "Delete Tasks"
+msgid "Delete Task"
+msgstr "删除任务"
+
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:335
 #, c-format
 msgid "%d attached messages"
 msgstr "%d 个附加的信息"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#. Translators: "None" for a junk hook name,
+#. * when the junk plugin is not enabled.
+#: ../modules/mail/e-mail-junk-hook.c:90
+#, fuzzy
+#| msgid "None"
+msgctxt "mail-junk-hook"
+msgid "None"
+msgstr "无"
+
+#: ../modules/mail/e-mail-shell-backend.c:168
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "信件(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
 msgstr "撰写一封新信"
 
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:178
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgid "Mail Accounts"
 msgstr "邮件账户"
 
-#: ../modules/mail/e-mail-shell-backend.c:213
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:215
 msgid "Composer Preferences"
 msgstr "编写器首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Network Preferences"
 msgstr "网络首选项"
 
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "To Do"
-msgstr "待办"
-
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:960
-msgid "Later"
-msgstr "稍候"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1139
-msgid "Migration"
-msgstr "迁移"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1589
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "无法创建新文件夹“%s”：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1617
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "无法将文件夹“%s”复制为“%s”：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1812
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "无法扫描位于“%s”的已有邮箱：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid "Migrating Folders"
-msgstr "迁移文件夹"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1819
-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 正在升迁您的文件夹..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:2022
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2038
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2070
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2541
-#: ../modules/mail/e-mail-shell-migrate.c:2555
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "创建本地邮件存储“%s”失败：%s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2916
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"自 Evolution 2.4 之后，Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../modules/mail/e-mail-shell-migrate.c:3013
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "无法在“%s”创建本地邮件文件夹：%s"
+#: ../modules/mail/e-mail-shell-content.c:678
+#, fuzzy
+#| msgid "_Group By Threads"
+msgid "Group by Threads"
+msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-migrate.c:3031
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
+#: ../modules/mail/e-mail-shell-content.c:679
+msgid "Whether to group messages by threads"
 msgstr ""
-"无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
-"坏。"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:993
-#: ../modules/mail/e-mail-shell-view.c:511
+#: ../modules/mail/e-mail-shell-view-actions.c:923
+#: ../modules/mail/e-mail-shell-view.c:526
 msgid "_Disable Account"
 msgstr "禁用账户(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:995
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Disable this account"
 msgstr "禁用这个账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#: ../modules/mail/e-mail-shell-view-actions.c:932
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "永久删除所有文件夹中的所有已删除的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:937
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1007
+#: ../modules/mail/e-mail-shell-view-actions.c:944
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信件以离线使用(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 #, fuzzy
-msgid "Download messages of accounts and folders marked for offline"
+msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "为标记为脱机的帐户/文件夹下载信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1014
-msgid "Empty _Trash"
-msgstr "清空回收站(_T)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1016
-#: ../modules/mail/e-mail-shell-view-actions.c:1023
-#, fuzzy
-msgid "Permanently remove all the deleted messages from all folders"
-msgstr "永久删除所有文件夹中的所有已删除的信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:951
 msgid "Fl_ush Outbox"
 msgstr "清空发件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1035
+#: ../modules/mail/e-mail-shell-view-actions.c:958
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1037
+#: ../modules/mail/e-mail-shell-view-actions.c:960
 msgid "Copy the selected folder into another folder"
 msgstr "把选中的文件夹复制到其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#: ../modules/mail/e-mail-shell-view-actions.c:967
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:972
 msgid "E_xpunge"
 msgstr "销毁(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1051
+#: ../modules/mail/e-mail-shell-view-actions.c:974
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "从该文件夹永久删除所有已删除的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:979
 msgid "Mar_k All Messages as Read"
 msgstr "把全部信件标记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1058
+#: ../modules/mail/e-mail-shell-view-actions.c:981
 msgid "Mark all messages in the folder as read"
 msgstr "将此文件夹中的所有信件标记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1063
+#: ../modules/mail/e-mail-shell-view-actions.c:986
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1065
+#: ../modules/mail/e-mail-shell-view-actions.c:988
 msgid "Move the selected folder into another folder"
 msgstr "把选中的文件夹移至其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:993
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1072
+#: ../modules/mail/e-mail-shell-view-actions.c:995
 msgid "Create a new folder for storing mail"
 msgstr "创建存储邮件的新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1079
+#: ../modules/mail/e-mail-shell-view-actions.c:1002
 msgid "Change the properties of this folder"
 msgstr "更改此文件夹的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1086
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1093
+#: ../modules/mail/e-mail-shell-view-actions.c:1016
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的名称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
-msgid "Select _All Messages"
-msgstr "选中全部信件(_A)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1100
-msgid "Select all visible messages"
-msgstr "选中所有可见的信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
 msgid "Select Message _Thread"
 msgstr "选择信件线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1107
+#: ../modules/mail/e-mail-shell-view-actions.c:1023
 msgid "Select all messages in the same thread as the selected message"
 msgstr "把同一线索中的所有信件选择为选中信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "Select Message S_ubthread"
 msgstr "选择信件子线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1114
+#: ../modules/mail/e-mail-shell-view-actions.c:1030
 msgid "Select all replies to the currently selected message"
 msgstr "选择当前选中信件的所有回复"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
 #, fuzzy
 msgid "Unsubscribe from the selected folder"
 msgstr "重命名选中文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "Empty _Trash"
+msgstr "清空回收站(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all accounts"
+msgstr "永久删除所有文件夹中的所有已删除的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
 msgid "Hide _Read Messages"
 msgstr "隐藏已读的信件(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1142
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
 msgid "Temporarily hide all messages that have already been read"
 msgstr "暂时隐藏所有已读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
 msgid "Hide S_elected Messages"
 msgstr "隐藏选中的信件(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
 msgid "Temporarily hide the selected messages"
 msgstr "暂时隐藏选中信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1077
 msgid "Show Hidde_n Messages"
 msgstr "显示隐藏的信件(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
 msgid "Show messages that have been temporarily hidden"
 msgstr "显示暂时被隐藏的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1177
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
 msgid "Cancel the current mail operation"
 msgstr "取消当前邮件操作"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 msgid "Collapse All _Threads"
 msgstr "折叠全部线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1184
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Collapse all message threads"
 msgstr "折叠全部信件线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "E_xpand All Threads"
 msgstr "展开全部线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
 msgid "Expand all message threads"
 msgstr "展开全部信件线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "_Message Filters"
 msgstr "信件过滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Search F_olders"
 msgstr "搜索文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 #, fuzzy
 msgid "Create or edit search folder definitions"
 msgstr "创建或编辑搜索文件夹定义"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Subscriptions..."
 msgstr "订阅(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1212
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程服务器上的文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1219
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
 msgid "F_older"
 msgstr "文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Hide _Deleted Messages"
 msgstr "隐藏已删除的信件(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "隐藏已删除的信件而不是在上面显示一条线"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "Show Message _Preview"
 msgstr "显示信件预览(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 #, fuzzy
 msgid "Show message preview pane"
 msgstr "显示信件预览窗口"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1230
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 #, fuzzy
 msgid "Threaded message list"
 msgstr "按线索编排的信件列表"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1330
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Show message preview below the message list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#: ../modules/mail/e-mail-shell-view-actions.c:1260
 #, fuzzy
 msgid "Show message preview alongside the message list"
 msgstr "在信件列表下方显示信件预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "All Messages"
 msgstr "全部信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Important Messages"
 msgstr "重要信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1282
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1366
+#: ../modules/mail/e-mail-shell-view-actions.c:1289
 msgid "Messages Not Junk"
 msgstr "不是垃圾邮件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 msgid "Messages with Attachments"
 msgstr "有附件的信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "Read Messages"
 msgstr "已读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "Recent Messages"
 msgstr "最近信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "Unread Messages"
 msgstr "未读信件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1376
 #, fuzzy
 msgid "Subject or Addresses contain"
 msgstr "主题或发送者含有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1463
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "All Accounts"
 msgstr "全部账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1470
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
 msgid "Current Account"
 msgstr "当前账户"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1477
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "Current Folder"
 msgstr "当前文件夹"
 
-#: ../modules/mail/e-mail-shell-view-private.c:835
+#: ../modules/mail/e-mail-shell-view-private.c:836
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:846
+#: ../modules/mail/e-mail-shell-view-private.c:847
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:852
-#: ../modules/mail/e-mail-shell-view-private.c:859
+#: ../modules/mail/e-mail-shell-view-private.c:853
+#: ../modules/mail/e-mail-shell-view-private.c:860
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:865
+#: ../modules/mail/e-mail-shell-view-private.c:866
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 封草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:871
+#: ../modules/mail/e-mail-shell-view-private.c:872
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:877
+#: ../modules/mail/e-mail-shell-view-private.c:878
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:889
+#: ../modules/mail/e-mail-shell-view-private.c:890
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "，%d 封未读，"
 
-#: ../modules/mail/e-mail-shell-view-private.c:892
+#: ../modules/mail/e-mail-shell-view-private.c:893
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view.c:509
+#: ../modules/mail/e-mail-shell-view.c:524
 msgid "Proxy _Logout"
 msgstr "代理服务器注销(_L)"
 
-#: ../modules/mail/em-composer-prefs.c:477
+#: ../modules/mail/em-composer-prefs.c:473
 msgid "Language(s)"
 msgstr "语言"
 
@@ -15515,41 +15645,49 @@ msgstr "信头名称："
 msgid "Header Value Contains:"
 msgstr "信头值含有："
 
-#: ../modules/mail/em-mailer-prefs.c:326
-#: ../widgets/table/e-table-click-to-add.c:498
+#: ../modules/mail/em-mailer-prefs.c:325
+#: ../widgets/table/e-table-click-to-add.c:504
 #: ../widgets/table/e-table-selection-model.c:309
 msgid "Header"
 msgstr "页眉"
 
-#: ../modules/mail/em-mailer-prefs.c:330
+#: ../modules/mail/em-mailer-prefs.c:329
 msgid "Contains Value"
 msgstr "包含值"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
+#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
 #, 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:731 ../modules/mail/em-mailer-prefs.c:803
+#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid ""
 "%s plugin is not available. Please check whether the package is installed."
 msgstr "%s 插件不可用。请检查软件包是否已安装。"
 
-#: ../modules/mail/em-mailer-prefs.c:767
+#: ../modules/mail/em-mailer-prefs.c:766
 #, fuzzy
 msgid "No junk plugin available"
 msgstr "没有可用的垃圾邮件插件"
 
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/mail/em-mailer-prefs.c:1151
 #, fuzzy
-msgid "Date header:"
-msgstr "表头"
+#| msgid "Table column:"
+msgid "_Table column:"
+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:1153
 #, fuzzy
+msgid "_Date header:"
+msgstr "表头"
+
+#: ../modules/mail/em-mailer-prefs.c:1154
+#, fuzzy
 msgid "Show _original header value"
 msgstr "显示原始大小(_O)"
 
@@ -15596,28 +15734,27 @@ msgid "Keywords"
 msgstr "关键字"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
-msgid "Attachment Reminder"
-msgstr "附件提醒"
-
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
 "contain an attachment, but cannot find one."
 msgstr "Evolution 找到一些关键字表明此信件应当包含附件，但却没发现附件。"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
 msgstr "信件无附件"
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
 msgstr "编辑信件(_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+msgid "Attachment Reminder"
+msgstr "附件提醒"
+
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
@@ -15755,42 +15892,42 @@ msgstr "删除临时备份文件"
 msgid "Ensuring local sources"
 msgstr "确保本地源"
 
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:427
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:432
 #, 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:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Backup"
 msgstr "Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:452
 msgid "Evolution Restore"
 msgstr "Evolution 恢复"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:487
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:488
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请稍候，Evolution 正在备份您的数据。"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:490
 msgid "Restoring Evolution Data"
 msgstr "正在恢复 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:491
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请稍候，Evolution 正在恢复您的数据。"
 
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:509
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这可能要花一点时间，取决于您帐户中的数据总量。"
 
@@ -15853,36 +15990,36 @@ msgstr ""
 "复只能在 Evolution 未运行时启动。请确保在开始之前您保存和关闭了您的所有的未保"
 "存的窗口。如果您想让 Evolution 在恢复后自动重启动，请启用切换按钮。"
 
-#: ../plugins/bbdb/bbdb.c:670 ../plugins/bbdb/bbdb.c:679
+#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:694
+#: ../plugins/bbdb/bbdb.c:710
 #, fuzzy
 msgid "Create _address book entries when sending mails"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:700
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:715
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:730
+#: ../plugins/bbdb/bbdb.c:746
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
 
-#: ../plugins/bbdb/bbdb.c:736
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:747
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -15957,27 +16094,159 @@ msgstr "Bogofilter 选项"
 msgid "Filter junk messages using Bogofilter."
 msgstr "使用 Bogofilter 过滤垃圾信件。"
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:198
+msgid "Authentication failed. Server requires correct login."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:200
+msgid "Given URL cannot be found."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#, c-format
+msgid ""
+"Server returned unexpected data.\n"
+"%d - %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "未知的错误"
+
+#: ../plugins/caldav/caldav-browse-server.c:334
+#: ../plugins/caldav/caldav-browse-server.c:585
+msgid "Failed to parse server response."
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:428
+#, fuzzy
+#| msgid "Ends"
+msgid "Events"
+msgstr "结束"
+
+#: ../plugins/caldav/caldav-browse-server.c:450
+#, fuzzy
+#| msgid "New calendar"
+msgid "User's calendars"
+msgstr "新建日历"
+
+#: ../plugins/caldav/caldav-browse-server.c:558
+#: ../plugins/caldav/caldav-browse-server.c:629
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "认证到 IMAP 服务器失败。"
+
+#: ../plugins/caldav/caldav-browse-server.c:627
+#: ../plugins/caldav/caldav-browse-server.c:668
+#: ../plugins/caldav/caldav-browse-server.c:1272
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr ""
+"\n"
+"\n"
+"正在搜索联系人..."
+
+#: ../plugins/caldav/caldav-browse-server.c:666
+#, fuzzy
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "无法找到任何日历"
+
+#: ../plugins/caldav/caldav-browse-server.c:794
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:796
+#, c-format
+msgid "Previous attempt failed with code %d"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:799
+#, fuzzy, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr "输入 %s 的密码(用户 %s)"
+
+#: ../plugins/caldav/caldav-browse-server.c:856
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"无法创建输出文件：%s：\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1091
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"正在搜索联系人..."
+
+#: ../plugins/caldav/caldav-browse-server.c:1134
+#, fuzzy
+#| msgid "Loading calendars"
+msgid "List of available calendars:"
+msgstr "装入日历"
+
+#: ../plugins/caldav/caldav-browse-server.c:1171
+#, fuzzy
+#| msgid "Hula Support"
+msgid "Supports"
+msgstr "Hula 支持"
+
+#: ../plugins/caldav/caldav-browse-server.c:1249
+#, fuzzy, c-format
+msgid "Failed to create thread: %s"
+msgstr "创建本地邮件存储“%s”失败：%s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1357
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1363
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
-#: ../plugins/calendar-http/calendar-http.c:171
+#: ../plugins/caldav/caldav-source.c:215
+#: ../plugins/calendar-http/calendar-http.c:92
 msgid "_URL:"
 msgstr "_URL："
 
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:219
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
-#. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-file/calendar-file.c:274
-#: ../plugins/calendar-http/calendar-http.c:308
-#: ../plugins/calendar-weather/calendar-weather.c:499
+#: ../plugins/caldav/caldav-source.c:228
+msgid "Brows_e server for a calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/calendar-file/calendar-file.c:178
+#: ../plugins/calendar-http/calendar-http.c:111
+#: ../plugins/calendar-weather/calendar-weather.c:393
 #: ../plugins/google-account-setup/google-contacts-source.c:322
-#: ../plugins/google-account-setup/google-source.c:717
+#: ../plugins/google-account-setup/google-source.c:627
 msgid "Re_fresh:"
 msgstr "刷新(_F)："
 
@@ -15990,35 +16259,35 @@ msgstr ""
 msgid "CalDAV Support"
 msgstr "CalDAV 源"
 
-#: ../plugins/calendar-file/calendar-file.c:208
+#: ../plugins/calendar-file/calendar-file.c:112
 #, fuzzy
 msgid "_Customize options"
 msgstr "自定义"
 
-#: ../plugins/calendar-file/calendar-file.c:227
+#: ../plugins/calendar-file/calendar-file.c:131
 msgid "File _name:"
 msgstr "文件名(_N)："
 
-#: ../plugins/calendar-file/calendar-file.c:231
+#: ../plugins/calendar-file/calendar-file.c:135
 #, fuzzy
 msgid "Choose calendar file"
 msgstr "选择文件"
 
-#: ../plugins/calendar-file/calendar-file.c:279
+#: ../plugins/calendar-file/calendar-file.c:183
 #, fuzzy
 msgid "On open"
 msgstr "打开"
 
-#: ../plugins/calendar-file/calendar-file.c:280
+#: ../plugins/calendar-file/calendar-file.c:184
 msgid "On file change"
 msgstr "在文件改变时"
 
-#: ../plugins/calendar-file/calendar-file.c:281
+#: ../plugins/calendar-file/calendar-file.c:185
 #, fuzzy
 msgid "Periodically"
 msgstr "个人"
 
-#: ../plugins/calendar-file/calendar-file.c:308
+#: ../plugins/calendar-file/calendar-file.c:200
 msgid "Force read _only"
 msgstr "强制只读(_O)"
 
@@ -16030,11 +16299,11 @@ msgstr "添加本地日历到 Evolution。"
 msgid "Local Calendars"
 msgstr "装入日历"
 
-#: ../plugins/calendar-http/calendar-http.c:369
+#: ../plugins/calendar-http/calendar-http.c:126
 msgid "_Secure connection"
 msgstr "安全连接(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:455
+#: ../plugins/calendar-http/calendar-http.c:186
 msgid "Userna_me:"
 msgstr "用户名(_M)："
 
@@ -16086,15 +16355,24 @@ msgstr "天气：暴风雨"
 msgid "Select a location"
 msgstr "选择一个位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:597
+#. Translators: "None" location for a weather calendar
+#: ../plugins/calendar-weather/calendar-weather.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:371
+#, fuzzy
+#| msgid "None"
+msgctxt "weather-cal-location"
+msgid "None"
+msgstr "无"
+
+#: ../plugins/calendar-weather/calendar-weather.c:446
 msgid "_Units:"
 msgstr "单位(_U)："
 
-#: ../plugins/calendar-weather/calendar-weather.c:604
+#: ../plugins/calendar-weather/calendar-weather.c:453
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(摄氏、厘米等等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:605
+#: ../plugins/calendar-weather/calendar-weather.c:454
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(华氏、英寸等等)"
 
@@ -16106,13 +16384,13 @@ msgstr "添加天气日历到 Evolution。"
 msgid "Weather Calendars"
 msgstr "天气月历"
 
-#: ../plugins/contacts-map/contacts-map.c:59
-#: ../plugins/contacts-map/contacts-map.c:193
+#: ../plugins/contacts-map/contacts-map.c:55
+#: ../plugins/contacts-map/contacts-map.c:201
 #, fuzzy
 msgid "Contacts map"
 msgstr "联系人："
 
-#: ../plugins/contacts-map/contacts-map.c:60
+#: ../plugins/contacts-map/contacts-map.c:56
 #, fuzzy
 msgid "Show a map of all the contacts"
 msgstr "在信件列表下方显示信件预览"
@@ -16147,24 +16425,24 @@ msgstr "默认邮件客户端"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端？"
 
-#: ../plugins/default-source/default-source.c:94
+#: ../plugins/default-source/default-source.c:75
 msgid "Mark as _default address book"
 msgstr "标为默认地址簿(_D)"
 
-#: ../plugins/default-source/default-source.c:119
+#: ../plugins/default-source/default-source.c:88
 #, fuzzy
 msgid "A_utocomplete with this address book"
 msgstr "在地址簿中查阅"
 
-#: ../plugins/default-source/default-source.c:138
+#: ../plugins/default-source/default-source.c:97
 msgid "Mark as _default calendar"
 msgstr "标为默认日历(_D)"
 
-#: ../plugins/default-source/default-source.c:139
+#: ../plugins/default-source/default-source.c:98
 msgid "Mark as _default task list"
 msgstr "标为默认任务列表(_D)"
 
-#: ../plugins/default-source/default-source.c:140
+#: ../plugins/default-source/default-source.c:99
 msgid "Mark as _default memo list"
 msgstr "标为默认备忘列表(_D)"
 
@@ -16187,27 +16465,36 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
-#: ../plugins/email-custom-header/email-custom-header.c:318
+#: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
 msgstr "安全："
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:321
 msgid "Unclassified"
 msgstr "未分类"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Protected"
 msgstr "受保护的"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
-#: ../widgets/misc/e-send-options.ui.h:17
+#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Secret"
 msgstr "机密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:325
 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
+#, fuzzy
+#| msgid "None"
+msgctxt "email-custom-header"
+msgid "None"
+msgstr "无"
+
 #: ../plugins/email-custom-header/email-custom-header.c:569
 msgid "_Custom Header"
 msgstr "自定义信头(_C)"
@@ -16324,10 +16611,6 @@ msgid ""
 "should be set before checking this, otherwise nothing happens."
 msgstr ""
 
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "未知的错误"
-
 #: ../plugins/face/face.c:286
 #, fuzzy
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
@@ -16382,21 +16665,21 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 
 #: ../plugins/google-account-setup/google-contacts-source.c:51
-#: ../plugins/google-account-setup/google-source.c:81
+#: ../plugins/google-account-setup/google-source.c:82
 msgid "Google"
 msgstr "Google"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:270
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
 msgid "<b>Server</b>"
 msgstr "<b>服务器</b>"
 
-#: ../plugins/google-account-setup/google-source.c:517
+#: ../plugins/google-account-setup/google-source.c:439
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16405,17 +16688,17 @@ msgstr ""
 "无法从 Google 服务器上读取数据。\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/google-account-setup/google-source.c:545
 #: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:941
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../plugins/google-account-setup/google-source.c:758
+#: ../plugins/google-account-setup/google-source.c:631
 msgid "Cal_endar:"
 msgstr "日历(_E)："
 
-#: ../plugins/google-account-setup/google-source.c:793
+#: ../plugins/google-account-setup/google-source.c:666
 msgid "Retrieve _list"
 msgstr "获取列表(_L)"
 
@@ -16427,35 +16710,35 @@ msgstr ""
 msgid "Google Calendars"
 msgstr "Google 日历"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:451
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
 msgid "Checklist"
 msgstr "待办清单"
 
-#: ../plugins/groupwise-features/gw-ui.c:111
+#: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
 msgstr "新建共享文件夹(_S)..."
 
-#: ../plugins/groupwise-features/gw-ui.c:118
+#: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
 msgstr "代理服务器登录(_P)..."
 
-#: ../plugins/groupwise-features/gw-ui.c:169
+#: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
 msgstr "垃圾邮件设置..."
 
-#: ../plugins/groupwise-features/gw-ui.c:176
+#: ../plugins/groupwise-features/gw-ui.c:177
 msgid "Track Message Status..."
 msgstr "跟踪信件状态..."
 
-#: ../plugins/groupwise-features/gw-ui.c:182
+#: ../plugins/groupwise-features/gw-ui.c:183
 msgid "Retract Mail"
 msgstr "收回邮件"
 
-#: ../plugins/groupwise-features/gw-ui.c:339
+#: ../plugins/groupwise-features/gw-ui.c:338
 msgid "Accept Tentatively"
 msgstr "暂时接受"
 
-#: ../plugins/groupwise-features/gw-ui.c:353
+#: ../plugins/groupwise-features/gw-ui.c:352
 msgid "Rese_nd Meeting..."
 msgstr "重新发送会议(_N)..."
 
@@ -16497,11 +16780,11 @@ msgstr "安装共享文件夹"
 msgid "Shared Folder Installation"
 msgstr "共享文件夹安装"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:82
+#: ../plugins/groupwise-features/junk-mail-settings.c:81
 msgid "Junk Settings"
 msgstr "垃圾邮件设置"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:95
+#: ../plugins/groupwise-features/junk-mail-settings.c:94
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "垃圾邮件设置"
@@ -16515,7 +16798,7 @@ msgid "Junk List:"
 msgstr "垃圾邮件列表："
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "禁用(_D)"
 
@@ -16533,17 +16816,17 @@ msgstr "垃圾测试(_J)"
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../plugins/groupwise-features/mail-retract.c:83
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "信息收回"
 
-#: ../plugins/groupwise-features/mail-retract.c:88
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:109
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "邮件成功收回"
 
@@ -16683,11 +16966,6 @@ msgstr "自定义通知消息(_U)"
 msgid "Con_tacts..."
 msgstr "联系人(_T)..."
 
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:512
-msgid "Message"
-msgstr "消息"
-
 #: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "共享文件夹通知"
@@ -16779,7 +17057,7 @@ msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理服务器标签仅当账户启用时才可用。"
 
 #: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:702
+#: ../plugins/groupwise-features/share-folder.c:701
 msgid "Add User"
 msgstr "添加用户"
 
@@ -16788,7 +17066,7 @@ msgid "Advanced send options"
 msgstr "高级发送选项"
 
 #: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:737
+#: ../plugins/groupwise-features/share-folder.c:736
 msgid "Users"
 msgstr "用户"
 
@@ -16800,64 +17078,64 @@ msgstr "输入用户及设定权限"
 msgid "Sharing"
 msgstr "共享"
 
-#: ../plugins/groupwise-features/share-folder.c:530
+#: ../plugins/groupwise-features/share-folder.c:529
 msgid "Custom Notification"
 msgstr "自定义通知"
 
-#: ../plugins/groupwise-features/share-folder.c:742
+#: ../plugins/groupwise-features/share-folder.c:741
 msgid "Add   "
 msgstr "添加"
 
-#: ../plugins/groupwise-features/share-folder.c:748
+#: ../plugins/groupwise-features/share-folder.c:747
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "信件状态"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:139
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "主题："
 
-#: ../plugins/groupwise-features/status-track.c:153
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "发件人："
 
-#: ../plugins/groupwise-features/status-track.c:168
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "创建日期："
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Recipient: "
 msgstr "收件人："
 
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:211
 msgid "Delivered: "
 msgstr "已投递："
 
-#: ../plugins/groupwise-features/status-track.c:220
+#: ../plugins/groupwise-features/status-track.c:217
 msgid "Opened: "
 msgstr "已打开："
 
-#: ../plugins/groupwise-features/status-track.c:225
+#: ../plugins/groupwise-features/status-track.c:222
 msgid "Accepted: "
 msgstr "已接受："
 
-#: ../plugins/groupwise-features/status-track.c:230
+#: ../plugins/groupwise-features/status-track.c:227
 msgid "Deleted: "
 msgstr "已删除："
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:232
 msgid "Declined: "
 msgstr "已拒绝："
 
-#: ../plugins/groupwise-features/status-track.c:240
+#: ../plugins/groupwise-features/status-track.c:237
 msgid "Completed: "
 msgstr "已完成："
 
-#: ../plugins/groupwise-features/status-track.c:245
+#: ../plugins/groupwise-features/status-track.c:242
 msgid "Undelivered: "
 msgstr "未投递："
 
@@ -16971,125 +17249,125 @@ msgstr "打开日历"
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1045
+#: ../plugins/itip-formatter/itip-formatter.c:1044
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1132
+#: ../plugins/itip-formatter/itip-formatter.c:1131
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1144
+#: ../plugins/itip-formatter/itip-formatter.c:1143
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1147
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1153
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1158
+#: ../plugins/itip-formatter/itip-formatter.c:1157
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1252
+#: ../plugins/itip-formatter/itip-formatter.c:1251
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1259
+#: ../plugins/itip-formatter/itip-formatter.c:1258
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1261
+#: ../plugins/itip-formatter/itip-formatter.c:1260
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1372
+#: ../plugins/itip-formatter/itip-formatter.c:1371
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1400
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1405
+#: ../plugins/itip-formatter/itip-formatter.c:1404
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1430
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1437
+#: ../plugins/itip-formatter/itip-formatter.c:1436
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1445
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息，会议不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息，任务不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1452
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 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:1517
+#: ../plugins/itip-formatter/itip-formatter.c:1516
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1522
+#: ../plugins/itip-formatter/itip-formatter.c:1521
 msgid "Save Calendar"
 msgstr "保存日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1575
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1574
+#: ../plugins/itip-formatter/itip-formatter.c:1585
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1576
-#: ../plugins/itip-formatter/itip-formatter.c:1587
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../plugins/itip-formatter/itip-formatter.c:1655
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1654
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1628
-#: ../plugins/itip-formatter/itip-formatter.c:1656
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 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:1669
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1670
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17109,341 +17387,341 @@ msgstr "此备忘重现"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2670
+#: ../plugins/itip-formatter/itip-formatter.c:2669
 msgid "_Delete message after acting"
 msgstr "操作后删除消息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2680
-#: ../plugins/itip-formatter/itip-formatter.c:2713
+#: ../plugins/itip-formatter/itip-formatter.c:2679
+#: ../plugins/itip-formatter/itip-formatter.c:2712
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2695
+#: ../plugins/itip-formatter/itip-formatter.c:2694
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:213
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p%l:%M:%S"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:241
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:260
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M %p"
 msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:287
 msgid "%A, %B %e"
 msgstr "%-m月%-d日%A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M"
 msgstr "%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:306
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%-m月%-d日%A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:330
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:354
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:443
 #: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "请以 <b>%s</b> 的身份回应"
 
-#: ../plugins/itip-formatter/itip-view.c:356
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:445
 #: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "以 <b>%s</b> 的身份接收"
 
-#: ../plugins/itip-formatter/itip-view.c:361
+#: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 通过 %s 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代理了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 通过 %s 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:373
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:382
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:392
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:393
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s 取消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:404
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:410
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更："
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:449
+#: ../plugins/itip-formatter/itip-view.c:450
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:452
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 请求给 %s 分配下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:460
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您分配了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:461
+#: ../plugins/itip-formatter/itip-view.c:462
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您分配了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:468
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:470
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:473
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:480
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:481
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:486
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 取消了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 取消分配的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:498
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒绝了分配的下列任务："
@@ -17587,11 +17865,11 @@ msgstr "保留我的提醒(_P)"
 msgid "_Inherit reminder"
 msgstr "继承提示(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1930
+#: ../plugins/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "任务(_T)："
 
-#: ../plugins/itip-formatter/itip-view.c:1932
+#: ../plugins/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
 msgstr "备忘(_M)："
 
@@ -17730,48 +18008,48 @@ msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:544
-#: ../plugins/mail-notification/mail-notification.c:549
+#: ../plugins/mail-notification/mail-notification.c:545
+#: ../plugins/mail-notification/mail-notification.c:550
 msgid "New email"
 msgstr "新电子邮件"
 
-#: ../plugins/mail-notification/mail-notification.c:602
+#: ../plugins/mail-notification/mail-notification.c:604
 msgid "Show icon in _notification area"
 msgstr "在通知区显示图标(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:630
+#: ../plugins/mail-notification/mail-notification.c:632
 msgid "B_link icon in notification area"
 msgstr "闪烁通知区图标(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:640
+#: ../plugins/mail-notification/mail-notification.c:642
 msgid "Popup _message together with the icon"
 msgstr "同时弹出图标和消息(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:825
+#: ../plugins/mail-notification/mail-notification.c:827
 msgid "_Play sound when new messages arrive"
 msgstr "新邮件到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:854
+#: ../plugins/mail-notification/mail-notification.c:856
 msgid "_Beep"
 msgstr "响铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:867
+#: ../plugins/mail-notification/mail-notification.c:869
 msgid "Use sound _theme"
 msgstr "使用声音主题(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:886
+#: ../plugins/mail-notification/mail-notification.c:888
 msgid "Play _file:"
 msgstr "播放文件(_F)："
 
-#: ../plugins/mail-notification/mail-notification.c:897
+#: ../plugins/mail-notification/mail-notification.c:899
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:955
+#: ../plugins/mail-notification/mail-notification.c:957
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件箱中的新信件(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:964
+#: ../plugins/mail-notification/mail-notification.c:966
 msgid "Generate a _D-Bus message"
 msgstr "生成 _D-Bus 消息"
 
@@ -17893,40 +18171,40 @@ msgid ""
 "source, please."
 msgstr "选中的源是只读的，因此不能在此创建任务。请选择其它的源。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:943
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "能获取源列表。 %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "创建一个事件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1064
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 msgid "Create a new event from the selected message"
 msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1071
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 msgid "Create a new memo from the selected message"
 msgstr "用所选邮件创建新备忘"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
 msgstr "创建一个任务(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1078
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 msgid "Create a new task from the selected message"
 msgstr "用所选邮件创建新任务"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a _Meeting"
 msgstr "创建一个会议(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1088
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a new meeting from the selected message"
 msgstr "用所选邮件创建新会议"
 
@@ -17934,56 +18212,56 @@ msgstr "用所选邮件创建新会议"
 msgid "Convert a mail message to a task."
 msgstr "转换一个邮件信息成为一个任务。"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:277
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
 msgid "Get List _Archive"
 msgstr "获得列表存档(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
 msgid "Get an archive of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的存档"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
 msgid "Get List _Usage Information"
 msgstr "获得列表用法信息(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的用法信息"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
 msgid "Contact List _Owner"
 msgstr "联系列表所有者(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "联系这封信所属邮件列表的所有者"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
 msgid "_Post Message to List"
 msgstr "投递到列表(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "给这封信所属的邮件列表投递"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
 msgid "_Subscribe to List"
 msgstr "订阅列表(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
 msgid "Subscribe to 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:318
 msgid "_Unsubscribe from List"
 msgstr "退订列表(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
 #, fuzzy
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "退订这封信所属的邮件列表"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
 msgid "Mailing _List"
 msgstr "邮件列表(_L)"
 
@@ -18080,15 +18358,15 @@ msgid ""
 "current folder as well as all subfolders?"
 msgstr "您是想要只标记当前文件夹中的信件，还是也包括子文件夹中的信件？"
 
-#: ../plugins/mark-all-read/mark-all-read.c:171
+#: ../plugins/mark-all-read/mark-all-read.c:168
 msgid "In Current Folder and _Subfolders"
 msgstr "在当前文件夹和子文件夹(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:182
 msgid "In Current _Folder Only"
 msgstr "只在当前文件夹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:342
+#: ../plugins/mark-all-read/mark-all-read.c:349
 msgid "Mark Me_ssages as Read"
 msgstr "把信件标记为已读(_S)"
 
@@ -18237,6 +18515,8 @@ msgid "Importing Outlook data"
 msgstr "导入 Elm 数据"
 
 #: ../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
 msgid "Calendar Publishing"
 msgstr "日历发布"
 
@@ -18249,47 +18529,50 @@ msgstr "位置"
 msgid "Publish calendars to the web."
 msgstr "允许将日历发布到 Web"
 
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "无法打开 %s："
 
-#: ../plugins/publish-calendar/publish-calendar.c:96
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "无法打开 %s：未知错误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:116
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:118
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:163
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "加载 %s 失败："
 
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:629
+#: ../plugins/publish-calendar/publish-calendar.c:739
 msgid "Are you sure you want to remove this location?"
 msgstr "您确定您想要删除此位置吗？"
 
-#: ../plugins/publish-calendar/publish-calendar.c:939
+#. 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
 #, fuzzy
 msgid "Could not create publish thread."
 msgstr "无法创建信件。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:946
+#: ../plugins/publish-calendar/publish-calendar.c:1059
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
@@ -18567,17 +18850,17 @@ msgstr "格式(_F)："
 msgid "Select destination file"
 msgstr "选择目的文件"
 
-#: ../plugins/save-calendar/save-calendar.c:323
+#: ../plugins/save-calendar/save-calendar.c:325
 #, fuzzy
 msgid "Save the selected calendar to disk"
 msgstr "把选中的日历或任务列表保存到磁盘。"
 
-#: ../plugins/save-calendar/save-calendar.c:358
+#: ../plugins/save-calendar/save-calendar.c:356
 #, fuzzy
 msgid "Save the selected memo list to disk"
 msgstr "把选中的日历或任务列表保存到磁盘。"
 
-#: ../plugins/save-calendar/save-calendar.c:393
+#: ../plugins/save-calendar/save-calendar.c:387
 #, fuzzy
 msgid "Save the selected task list to disk"
 msgstr "把选中的日历或任务列表保存到磁盘。"
@@ -18611,12 +18894,12 @@ msgstr ""
 "请单击“前进”按钮继续。"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../widgets/misc/e-import-assistant.c:386
+#: ../widgets/misc/e-import-assistant.c:385
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
 #: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../widgets/misc/e-import-assistant.c:543
+#: ../widgets/misc/e-import-assistant.c:542
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
@@ -18725,11 +19008,11 @@ msgstr "WebDAV 联系人"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "URL:"
 msgstr "URL："
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
@@ -18875,7 +19158,7 @@ msgstr "侧边栏可见"
 msgid "Skip development warning dialog"
 msgstr "跳过开发警告对话框"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:322
 msgid "Start in offline mode"
 msgstr "以脱机模式启动"
 
@@ -19018,126 +19301,154 @@ msgstr "窗口按钮样式"
 msgid "Window buttons are visible"
 msgstr "窗口按钮可见"
 
+#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+msgid "Searches"
+msgstr "搜索"
+
+#: ../shell/e-shell-content.c:619
+msgid "Save Search"
+msgstr "保存搜索"
+
+#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-content.c:931
+#: ../shell/e-shell-searchbar.c:687
 msgid "Sho_w:"
 msgstr "显示(_W)："
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:956
+#: ../shell/e-shell-searchbar.c:714
 msgid "Sear_ch:"
 msgstr "搜索(_C)："
 
-#. Scope Combo Widgets
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:998
+#: ../shell/e-shell-searchbar.c:769
 msgid "i_n"
 msgstr "在(_N) "
 
-#: ../shell/e-shell-content.c:1495
-msgid "Advanced Search"
-msgstr "高级搜索"
-
-#: ../shell/e-shell-content.c:1557 ../shell/e-shell-content.c:1558
-msgid "Searches"
-msgstr "搜索"
-
-#: ../shell/e-shell-content.c:1604
-msgid "Save Search"
-msgstr "保存搜索"
-
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: ../shell/e-shell-switcher.c:446
+#: ../shell/e-shell-switcher.c:448
 msgid "Toolbar Style"
 msgstr "工具栏样式"
 
-#: ../shell/e-shell-switcher.c:447
+#: ../shell/e-shell-switcher.c:449
 msgid "The switcher's toolbar style"
 msgstr ""
 
-#: ../shell/e-shell-switcher.c:463
+#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:743
 msgid "Toolbar Visible"
 msgstr "工具栏可见"
 
-#: ../shell/e-shell-switcher.c:464
+#: ../shell/e-shell-switcher.c:466
 msgid "Whether the switcher is visible"
 msgstr "切换器是否可见"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-utils.c:220
+#, fuzzy
+#| msgid "vCard (.vcf, .gcrd)"
+msgid "vCard (.vcf)"
+msgstr "vCard (.vfg, .gcrd)"
+
+#: ../shell/e-shell-utils.c:222
+#, fuzzy
+#| msgid "iCalendar files (.ics)"
+msgid "iCalendar (.ics)"
+msgstr "iCalendar 文件(.ics)"
+
+#: ../shell/e-shell-utils.c:243
+#, fuzzy
+#| msgid "All files"
+msgid "All Files (*)"
+msgstr "全部文件"
+
+#: ../shell/e-shell-view.c:604
 #, fuzzy
 msgid "Switcher Action"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell-view.c:487
+#: ../shell/e-shell-view.c:605
 msgid "The switcher action for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:620
 msgid "Page Number"
 msgstr "页码"
 
-#: ../shell/e-shell-view.c:503
+#: ../shell/e-shell-view.c:621
 msgid "The notebook page number of the shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:521
-msgid "The title of the shell view"
-msgstr ""
+#: ../shell/e-shell-view.c:637
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Rule"
+msgstr "搜索过滤器"
+
+#: ../shell/e-shell-view.c:638
+#, fuzzy
+msgid "Criteria for the current search results"
+msgstr "取消当前邮件操作"
 
-#: ../shell/e-shell-view.c:536
+#: ../shell/e-shell-view.c:653
 msgid "The EShellBackend for this shell view"
 msgstr ""
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:668
 msgid "Shell Content Widget"
 msgstr ""
 
-#: ../shell/e-shell-view.c:552
+#: ../shell/e-shell-view.c:669
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:685
 #, fuzzy
 msgid "Shell Sidebar Widget"
 msgstr "默认侧边栏宽度"
 
-#: ../shell/e-shell-view.c:569
+#: ../shell/e-shell-view.c:686
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:701
 #, fuzzy
 msgid "Shell Taskbar Widget"
 msgstr "选择任务列表"
 
-#: ../shell/e-shell-view.c:585
+#: ../shell/e-shell-view.c:702
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:717
 #, fuzzy
 msgid "Shell Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell-view.c:601
+#: ../shell/e-shell-view.c:718
 msgid "The window to which the shell view belongs"
 msgstr ""
 
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:734
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:749
+msgid "The title of the shell view"
+msgstr ""
+
+#: ../shell/e-shell-view.c:763
 #, fuzzy
 msgid "Current View ID"
 msgstr "当前视图(_C)"
 
-#: ../shell/e-shell-view.c:617
+#: ../shell/e-shell-view.c:764
 #, fuzzy
 msgid "The current GAL view ID"
 msgstr "当前时间"
@@ -19145,388 +19456,450 @@ 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:643
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "开源软件国际化之简体中文组\n"
 "http://i18n.linux.net.cn"
 
-#: ../shell/e-shell-window-actions.c:654
+#: ../shell/e-shell-window-actions.c:655
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-actions.c:1295
+#: ../shell/e-shell-window-actions.c:1223
 #, fuzzy
 msgid "Bug Buddy is not installed."
 msgstr "未安装 Bug buddy。"
 
-#: ../shell/e-shell-window-actions.c:1297
+#: ../shell/e-shell-window-actions.c:1225
 #, fuzzy
 msgid "Bug Buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1327
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot 没有安装。"
 
-#: ../shell/e-shell-window-actions.c:1401
+#: ../shell/e-shell-window-actions.c:1329
 msgid "GNOME Pilot could not be run."
 msgstr "GNOME Pilot 不能运行。"
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1423
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1428
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1435
 #, fuzzy
 msgid "_Contents"
 msgstr "联系人"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1437
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指南"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1463
 msgid "Evolution _FAQ"
 msgstr "Evolution _FAQ"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1465
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "打开 FAQ 网页"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1470
 msgid "_Forget Passwords"
 msgstr "丢弃密码(_F)"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Forget all remembered passwords"
 msgstr "忘记所有记住的密码"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1477
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1484
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗口来显示这个视图"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1500
 msgid "Configure Evolution"
 msgstr "配置 Evolution"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1505
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1507
 #, fuzzy
 msgid "Show Evolution's shortcut keys"
 msgstr "更改 Evolution 的设置"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1514
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1519
 msgid "_Advanced Search..."
 msgstr "高级搜索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1521
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1528
 #, fuzzy
 msgid "Clear the current search parameters"
 msgstr "取消当前邮件操作"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1533
 msgid "_Edit Saved Searches..."
 msgstr "编辑保存的搜索(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1535
 msgid "Manage your saved searches"
 msgstr "管理您保存的搜索"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1542
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1547
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1549
 #, fuzzy
 msgid "Execute the current search parameters"
 msgstr "取消当前邮件操作"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1554
 msgid "_Save Search..."
 msgstr "保存搜索(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1556
 #, fuzzy
 msgid "Save the current search parameters"
 msgstr "保存当前文件"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1568
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1570
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1575
 #, fuzzy
 msgid "Submit _Bug Report..."
 msgstr "提交错误报告(_B)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1577
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../shell/e-shell-window-actions.c:1619
-msgid "_Synchronization Options..."
+#: ../shell/e-shell-window-actions.c:1582
+#, fuzzy
+#| msgid "_Synchronization Options..."
+msgid "GNOME Pilot _Synchronization..."
 msgstr "同步选项(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1621
-msgid "Set up Pilot configuration"
+#: ../shell/e-shell-window-actions.c:1584
+#, fuzzy
+#| msgid "Set up Pilot configuration"
+msgid "Set up GNOME Pilot configuration"
 msgstr "配置 Pilot"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1589
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1591
 #, fuzzy
 msgid "Put Evolution into offline mode"
 msgstr "以脱机模式启动"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1596
 msgid "_Work Online"
 msgstr "联机工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1598
 #, fuzzy
 msgid "Put Evolution into online mode"
 msgstr "以联机模式启动"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1626
 msgid "Lay_out"
 msgstr "布局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1633
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1640
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1647
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1661
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1690
 msgid "Show Side _Bar"
 msgstr "显示侧边栏(_B)"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show the side bar"
 msgstr "显示侧边栏"
 
-#: ../shell/e-shell-window-actions.c:1716
-msgid "Show _Status Bar"
-msgstr "显示状态栏(_S)"
-
-#: ../shell/e-shell-window-actions.c:1718
-msgid "Show the status bar"
-msgstr "显示状态栏"
-
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1698
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1700
 msgid "Show the switcher buttons"
 msgstr "显示切换器按钮"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1706
+msgid "Show _Status Bar"
+msgstr "显示状态栏(_S)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show the status bar"
+msgstr "显示状态栏"
+
+#: ../shell/e-shell-window-actions.c:1714
 msgid "Show _Tool Bar"
 msgstr "显示工具栏(_T)"
 
-#: ../shell/e-shell-window-actions.c:1734
-msgid "Show the toolbar"
+#: ../shell/e-shell-window-actions.c:1716
+#, fuzzy
+#| msgid "Show the toolbar"
+msgid "Show the tool bar"
 msgstr "显示工具栏"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1738
 msgid "_Icons Only"
 msgstr "只有图标(_I)"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1740
 msgid "Display window buttons with icons only"
 msgstr "显示只有图标的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1745
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Display window buttons with text only"
 msgstr "显示只有文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1752
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1759
 msgid "Tool_bar Style"
 msgstr "工具栏样式(_B)"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1761
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具栏设置显示窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1769
 msgid "Define Views..."
 msgstr "定义视图..."
 
-#: ../shell/e-shell-window-actions.c:1789
+#: ../shell/e-shell-window-actions.c:1771
 msgid "Create or edit views"
 msgstr "创建或编辑视图"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1776
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1778
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1803
+#: ../shell/e-shell-window-actions.c:1785
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1795
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1797
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1807
 #, fuzzy
 msgid "Change the page settings for your current printer"
 msgstr "设定您当前打印机的页面设置"
 
-#: ../shell/e-shell-window-actions.c:2097
+#: ../shell/e-shell-window-actions.c:2127
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell-window-actions.c:2300
+#: ../shell/e-shell-window-actions.c:2337
 msgid "Execute these search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window-private.c:254
-msgid "New"
-msgstr "新建"
-
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:588
+#: ../shell/e-shell-window-private.c:552
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:308
+#: ../shell/e-shell-window.c:366
+msgid "New"
+msgstr "新建"
+
+#: ../shell/e-shell-window.c:619
 msgid "Active Shell View"
 msgstr ""
 
-#: ../shell/e-shell-window.c:309
+#: ../shell/e-shell-window.c:620
 #, fuzzy
 msgid "Name of the active shell view"
 msgstr "新视图的名称："
 
-#: ../shell/e-shell-window.c:323 ../shell/e-shell.c:743
+#: ../shell/e-shell-window.c:635
+msgid "The shell window's EFocusTracker"
+msgstr ""
+
+#: ../shell/e-shell-window.c:649 ../shell/e-shell.c:772
 msgid "Geometry"
 msgstr ""
 
-#: ../shell/e-shell-window.c:324 ../shell/e-shell.c:744
+#: ../shell/e-shell-window.c:650 ../shell/e-shell.c:773
 msgid "Initial window geometry string"
 msgstr ""
 
-#: ../shell/e-shell-window.c:339
+#: ../shell/e-shell-window.c:665
 msgid "Safe Mode"
 msgstr "安全模式"
 
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:666
 #, fuzzy
 msgid "Whether the shell window is in safe mode"
 msgstr "插件是否已启用"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:697
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Sidebar Visible"
+msgstr "侧边栏可见"
+
+#: ../shell/e-shell-window.c:698
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's side bar is visible"
+msgstr "切换器是否可见"
+
+#: ../shell/e-shell-window.c:712
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Switcher Visible"
+msgstr "侧边栏可见"
+
+#: ../shell/e-shell-window.c:713
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "窗口按钮是否可见。"
+
+#: ../shell/e-shell-window.c:728
+#, fuzzy
+#| msgid "Toolbar Visible"
+msgid "Taskbar Visible"
+msgstr "工具栏可见"
+
+#: ../shell/e-shell-window.c:729
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's task bar is visible"
+msgstr "切换器是否可见"
+
+#: ../shell/e-shell-window.c:744
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's tool bar is visible"
+msgstr "切换器是否可见"
+
+#: ../shell/e-shell-window.c:758
 msgid "UI Manager"
 msgstr "UI 管理器"
 
-#: ../shell/e-shell-window.c:372
+#: ../shell/e-shell-window.c:759
 msgid "The shell window's GtkUIManager"
 msgstr ""
 
-#: ../shell/e-shell.c:211
+#: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
 msgstr "正在准备离线..."
 
-#: ../shell/e-shell.c:265
+#: ../shell/e-shell.c:267
 msgid "Preparing to go online..."
 msgstr "正在准备上线..."
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:339
 msgid "Preparing to quit..."
 msgstr ""
 
-#: ../shell/e-shell.c:759
+#: ../shell/e-shell.c:788
+#, fuzzy
+#| msgid "Save directory"
+msgid "Module Directory"
+msgstr "保存目录"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:804
 msgid "Network Available"
 msgstr "网络可用"
 
-#: ../shell/e-shell.c:760
+#: ../shell/e-shell.c:805
 msgid "Whether the network is available"
 msgstr "网络是否可用"
 
-#: ../shell/e-shell.c:775 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
 msgid "Online"
 msgstr "在线"
 
-#: ../shell/e-shell.c:776
+#: ../shell/e-shell.c:821
 #, fuzzy
 msgid "Whether the shell is online"
 msgstr "插件是否已启用"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:162
+#: ../shell/main.c:167
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19558,7 +19931,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: ../shell/main.c:186
+#: ../shell/main.c:191
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19566,57 +19939,57 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:193
+#: ../shell/main.c:198
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:318
 msgid "Start Evolution activating the specified component"
 msgstr "启动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:320
 msgid "Apply the given geometry to the main window"
 msgstr ""
 
-#: ../shell/main.c:319
+#: ../shell/main.c:324
 msgid "Start in online mode"
 msgstr "以联机模式启动"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 #, fuzzy
 msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:331
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 重新升迁"
 
-#: ../shell/main.c:329
+#: ../shell/main.c:334
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:336
 msgid "Disable loading of any plugins."
 msgstr "禁止装入任何插件。"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:337
+#: ../shell/main.c:342
 msgid "Import URIs or file names given as rest of arguments."
 msgstr ""
 
-#: ../shell/main.c:339
+#: ../shell/main.c:344
 #, fuzzy
 msgid "Request a running Evolution process to quit"
 msgstr "重新启动 Evolution"
 
-#: ../shell/main.c:496
+#: ../shell/main.c:498
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:521
+#: ../shell/main.c:524
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19778,33 +20151,33 @@ msgstr ""
 msgid "Not a launchable item"
 msgstr "不是一个可加载的条目"
 
-#: ../smclient/eggsmclient.c:225
+#: ../smclient/eggsmclient.c:227
 #, fuzzy
 msgid "Disable connection to session manager"
 msgstr "直接连接到 Internet(_D)"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 #, fuzzy
 msgid "Specify file containing saved configuration"
 msgstr "配置 Pilot"
 
-#: ../smclient/eggsmclient.c:228
+#: ../smclient/eggsmclient.c:230
 msgid "FILE"
 msgstr "文件"
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "Specify session management ID"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:231
+#: ../smclient/eggsmclient.c:233
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:252
+#: ../smclient/eggsmclient.c:254
 msgid "Session management options:"
 msgstr ""
 
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:255
 #, fuzzy
 msgid "Show session management options"
 msgstr "显示图像动画(_S)"
@@ -19861,8 +20234,8 @@ msgstr "证书名称"
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "序列号"
 
@@ -19882,7 +20255,7 @@ msgstr "电子邮件地址"
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1050
 msgid "Certificates"
 msgstr "证书"
 
@@ -19950,7 +20323,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
 
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "证书"
 
@@ -19989,304 +20362,300 @@ msgid "Do not trust the authenticity of this certificate"
 msgstr "不信任此证书的颁发机构"
 
 #: ../smime/gui/smime-ui.ui.h:16
-msgid "Dummy window only"
-msgstr "只对哑窗口"
-
-#: ../smime/gui/smime-ui.ui.h:17
 msgid "Edit"
 msgstr "编辑"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "电子邮件证书信任设置"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "电子邮件收件人证书"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "电子邮件签名者证书"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "到期"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:21
 #, fuzzy
 msgid "Field Value"
 msgstr "域名"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Fingerprints"
 msgstr "指纹"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "导入"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued By"
 msgstr "颁发者"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "发行日期"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Issued To"
 msgstr "颁发给"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "组织(O)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "组织单元(OU)"
 
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
 msgid "SSL Client Certificate"
 msgstr "SSL 客户证书"
 
-#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
 msgid "SSL Server Certificate"
 msgstr "SSL 服务器证书"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "This certificate has been verified for the following uses:"
 msgstr "此证书已经被下列用户所验证："
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此证书的颁发机构"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "信任此颁发机构标识的电子邮件用户。"
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "信任此颁发机构标识的软件开发者。"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "信任此颁发机构标识的网站。"
 
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "Validity"
 msgstr "有效性"
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "查看"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "您拥有这些组织证明您身份的证书："
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "您拥有证明这些颁发机构的文件型证书："
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "您拥有证明这些人的文件型证书："
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:711
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:527
 msgid "Version"
 msgstr "版本"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:542
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:545
 msgid "Version 2"
 msgstr "版本 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:548
 msgid "Version 3"
 msgstr "版本 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:663
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:666
 msgid "Certificate Key Usage"
 msgstr "证书密钥用途"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:669
 msgid "Netscape Certificate Type"
 msgstr "Netscape 证书类型"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:672
 msgid "Certificate Authority Key Identifier"
 msgstr "证书颁发密钥身份"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:684
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "对象标识符(%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:735
 msgid "Algorithm Identifier"
 msgstr "算法标识符"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:743
 msgid "Algorithm Parameters"
 msgstr "算法参数"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:765
 msgid "Subject Public Key Info"
 msgstr "主题公钥信息"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:770
 msgid "Subject Public Key Algorithm"
 msgstr "主题公钥算法"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:785
 msgid "Subject's Public Key"
 msgstr "主题公钥"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
 msgid "Error: Unable to process extension"
 msgstr "错误：无法处理扩展"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
 msgid "Object Signer"
 msgstr "对象签名者"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:831
 msgid "SSL Certificate Authority"
 msgstr "SSL 证书颁发机构"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:835
 msgid "Email Certificate Authority"
 msgstr "电子邮件证书颁发机构"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:863
 msgid "Signing"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:867
 msgid "Non-repudiation"
 msgstr "不可抵赖"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:871
 msgid "Key Encipherment"
 msgstr "密钥编码器"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:875
 msgid "Data Encipherment"
 msgstr "数据编码器"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:879
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:883
 msgid "Certificate Signer"
 msgstr "证书签名者"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:887
 msgid "CRL Signer"
 msgstr "CRL 签名者"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:935
 msgid "Critical"
 msgstr "关键"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
 msgid "Not Critical"
 msgstr "非关键"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:961
 msgid "Extensions"
 msgstr "扩展"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1149
 msgid "Issuer Unique ID"
 msgstr "发行者唯一 ID"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1168
 msgid "Subject Unique ID"
 msgstr "主题唯一 ID"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1214
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:250
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:251
 msgid "Enter password for PKCS12 file:"
 msgstr "输入 PKCS12 文件的密码："
 
-#: ../smime/lib/e-pkcs12.c:348
+#: ../smime/lib/e-pkcs12.c:353
 msgid "Imported Certificate"
 msgstr "导入的证书"
 
@@ -20364,10 +20733,10 @@ msgstr "状态(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
 msgid "UTC"
 msgstr "UTC"
 
@@ -20401,14 +20770,14 @@ msgstr "选择(_S)"
 msgid "Collection"
 msgstr "收藏"
 
-#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:327
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定义 %s 的视图"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -20418,8 +20787,6 @@ msgid "Define Views for \"%s\""
 msgstr "定义“%s”的视图"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "表格"
 
@@ -20439,11 +20806,11 @@ msgstr "创建新视图(_C)"
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "工厂"
 
-#: ../widgets/menus/gal-view-new-dialog.c:99
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "定义新视图"
 
@@ -20492,7 +20859,7 @@ msgid "MIME Type:"
 msgstr "MIME  类型："
 
 #: ../widgets/misc/e-attachment-dialog.c:371
-#: ../widgets/misc/e-attachment-store.c:553
+#: ../widgets/misc/e-attachment-store.c:550
 msgid "_Suggest automatic display of attachment"
 msgstr "建议自动显示附件(_S)"
 
@@ -20529,30 +20896,33 @@ msgid "Saving"
 msgstr "保存"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
-msgstr "隐藏附件栏(_A)"
+msgid "Hide Attachment _Bar"
+msgstr "隐藏附件栏(_B)"
 
 #: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr "显示附件栏(_B)"
+
+#: ../widgets/misc/e-attachment-paned.c:631
 msgid "Show _Attachment Bar"
 msgstr "显示附件栏(_A)"
 
-#: ../widgets/misc/e-attachment-store.c:541
+#: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "添加附件"
 
-#: ../widgets/misc/e-attachment-store.c:544
+#: ../widgets/misc/e-attachment-store.c:541
 msgid "A_ttach"
 msgstr "附件(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:607
+#: ../widgets/misc/e-attachment-store.c:604
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "保存附件"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:636
-#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
+#: ../widgets/misc/e-attachment-store.c:633
+#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2317
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20582,49 +20952,53 @@ msgstr "使用“%s”打开"
 msgid "Open this attachment in %s"
 msgstr "在 %s 中打开附件"
 
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:1002
 msgid "Attached message"
 msgstr "附加的信息"
 
-#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
+#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2619
 msgid "A load operation is already in progress"
 msgstr "一个已经加载的操作正在进行"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
+#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2627
 msgid "A save operation is already in progress"
 msgstr "个已经保存的操作正在进行"
 
-#: ../widgets/misc/e-attachment.c:1914
+#: ../widgets/misc/e-attachment.c:1920
 #, c-format
 msgid "Could not load '%s'"
 msgstr "不能加载“%s”"
 
-#: ../widgets/misc/e-attachment.c:1917
+#: ../widgets/misc/e-attachment.c:1923
 #, c-format
 msgid "Could not load the attachment"
 msgstr "不能加载附件"
 
-#: ../widgets/misc/e-attachment.c:2174
+#: ../widgets/misc/e-attachment.c:2197
 #, c-format
 msgid "Could not open '%s'"
 msgstr "不能打开“%s”"
 
-#: ../widgets/misc/e-attachment.c:2177
+#: ../widgets/misc/e-attachment.c:2200
 #, c-format
 msgid "Could not open the attachment"
 msgstr "不能打开附件"
 
-#: ../widgets/misc/e-attachment.c:2612
+#: ../widgets/misc/e-attachment.c:2635
 #, fuzzy
 msgid "Attachment contents not loaded"
 msgstr "附件提醒"
 
-#: ../widgets/misc/e-attachment.c:2688
+#: ../widgets/misc/e-attachment.c:2711
 #, c-format
 msgid "Could not save '%s'"
 msgstr "不能保存“%s”"
 
-#: ../widgets/misc/e-attachment.c:2691
+#: ../widgets/misc/e-attachment.c:2714
 #, fuzzy, c-format
 msgid "Could not save the attachment"
 msgstr "选择保存全部附件的文件夹..."
@@ -20635,7 +21009,7 @@ 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:1253
+#: ../widgets/misc/e-calendar-item.c:1249
 msgid "%B %Y"
 msgstr "%Y年%B"
 
@@ -20643,58 +21017,58 @@ msgstr "%Y年%B"
 msgid "Month Calendar"
 msgstr "月历"
 
-#: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
-#: ../widgets/text/e-text.c:3633
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3387
+#: ../widgets/text/e-text.c:3388
 msgid "Fill color"
 msgstr "填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:461
-#: ../widgets/misc/e-canvas-background.c:462
-#: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
-#: ../widgets/text/e-text.c:3647
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482 ../widgets/text/e-text.c:3394
+#: ../widgets/text/e-text.c:3395 ../widgets/text/e-text.c:3401
+#: ../widgets/text/e-text.c:3402
 msgid "GDK fill color"
 msgstr "GDK 填充颜色"
 
-#: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
-#: ../widgets/text/e-text.c:3654
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489 ../widgets/text/e-text.c:3408
+#: ../widgets/text/e-text.c:3409
 msgid "Fill stipple"
 msgstr "点绘填充"
 
-#: ../widgets/misc/e-canvas-background.c:482
-#: ../widgets/misc/e-canvas-background.c:483
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:489
-#: ../widgets/misc/e-canvas-background.c:490
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:496
-#: ../widgets/misc/e-canvas-background.c:497
+#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:510
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:503
-#: ../widgets/misc/e-canvas-background.c:504
+#: ../widgets/misc/e-canvas-background.c:516
+#: ../widgets/misc/e-canvas-background.c:517
 msgid "Y2"
 msgstr "Y2"
 
 #: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-container.c:1009
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:2872
 msgid "Minimum width"
 msgstr "最小宽度"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-container.c:1010
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:2873
 msgid "Minimum Width"
 msgstr "最小宽度"
 
@@ -20718,80 +21092,89 @@ msgstr "其它..."
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../widgets/misc/e-dateedit.c:543
+#: ../widgets/misc/e-dateedit.c:544
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../widgets/misc/e-dateedit.c:565
+#: ../widgets/misc/e-dateedit.c:566
 msgid "Click this button to show a calendar"
 msgstr "单击此按钮可显示日历"
 
-#: ../widgets/misc/e-dateedit.c:607
+#: ../widgets/misc/e-dateedit.c:612
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../widgets/misc/e-dateedit.c:683
+#: ../widgets/misc/e-dateedit.c:684
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:689
+#: ../widgets/misc/e-dateedit.c:690
 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:697
+#: ../widgets/misc/e-dateedit.c:698
 msgid "_None"
 msgstr "无(_N)"
 
-#: ../widgets/misc/e-dateedit.c:1797
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1935
+#, fuzzy
+#| msgid "None"
+msgctxt "date"
+msgid "None"
+msgstr "无"
+
+#: ../widgets/misc/e-dateedit.c:1830
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1833
+#: ../widgets/misc/e-dateedit.c:1874
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
-#: ../widgets/misc/e-import-assistant.c:239
+#: ../widgets/misc/e-import-assistant.c:238
 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:256
+#: ../widgets/misc/e-import-assistant.c:255
 msgid "F_ilename:"
 msgstr "文件名(_I)："
 
-#: ../widgets/misc/e-import-assistant.c:266
+#: ../widgets/misc/e-import-assistant.c:265
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: ../widgets/misc/e-import-assistant.c:280
-#: ../widgets/misc/e-import-assistant.c:456
+#: ../widgets/misc/e-import-assistant.c:279
+#: ../widgets/misc/e-import-assistant.c:455
 msgid "File _type:"
 msgstr "文件类型(_T)："
 
-#: ../widgets/misc/e-import-assistant.c:323
+#: ../widgets/misc/e-import-assistant.c:322
 msgid "Choose the destination for this import"
 msgstr "选择此导入的目的位置"
 
-#: ../widgets/misc/e-import-assistant.c:348
+#: ../widgets/misc/e-import-assistant.c:347
 msgid "Choose the type of importer to run:"
 msgstr "选择要运行的导入器类型："
 
-#: ../widgets/misc/e-import-assistant.c:356
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Import data and settings from _older programs"
 msgstr "从旧版程序中导入数据和设置(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:364
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:440
+#: ../widgets/misc/e-import-assistant.c:439
 msgid "Select what type of file you want to import from the list."
 msgstr ""
 
-#: ../widgets/misc/e-import-assistant.c:517
+#: ../widgets/misc/e-import-assistant.c:516
 #, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following applications: "
@@ -20802,17 +21185,17 @@ msgstr ""
 "iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n"
 "“上一步”按钮。\n"
 
-#: ../widgets/misc/e-import-assistant.c:1181
-#: ../widgets/misc/e-import-assistant.c:1208
+#: ../widgets/misc/e-import-assistant.c:1187
+#: ../widgets/misc/e-import-assistant.c:1214
 msgid "Evolution Import Assistant"
 msgstr "Evolution 导入助手"
 
-#: ../widgets/misc/e-import-assistant.c:1190
-#: ../widgets/misc/e-import-assistant.c:1242
+#: ../widgets/misc/e-import-assistant.c:1196
+#: ../widgets/misc/e-import-assistant.c:1248
 msgid "Import Location"
 msgstr "导入位置"
 
-#: ../widgets/misc/e-import-assistant.c:1201
+#: ../widgets/misc/e-import-assistant.c:1207
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -20822,33 +21205,33 @@ msgstr ""
 "欢迎使用 Evolution 导入助手。\n"
 "本助手将全程指导您将外部文件导入 Evolution。"
 
-#: ../widgets/misc/e-import-assistant.c:1217
+#: ../widgets/misc/e-import-assistant.c:1223
 msgid "Importer Type"
 msgstr "导入器类型"
 
-#: ../widgets/misc/e-import-assistant.c:1226
+#: ../widgets/misc/e-import-assistant.c:1232
 msgid "Select Information to Import"
 msgstr "选择要导入的信息"
 
-#: ../widgets/misc/e-import-assistant.c:1234
+#: ../widgets/misc/e-import-assistant.c:1240
 msgid "Select a File"
 msgstr "选择一个文件"
 
-#: ../widgets/misc/e-import-assistant.c:1249
+#: ../widgets/misc/e-import-assistant.c:1255
 #, fuzzy
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "单击“导入”以便开始将文件导入到 Evolution。"
 
-#: ../widgets/misc/e-import-assistant.c:1255
-#: ../widgets/misc/e-import-assistant.c:1265
+#: ../widgets/misc/e-import-assistant.c:1261
+#: ../widgets/misc/e-import-assistant.c:1271
 msgid "Import Data"
 msgstr "导入数据"
 
-#: ../widgets/misc/e-map.c:605
+#: ../widgets/misc/e-map.c:621
 msgid "World Map"
 msgstr "世界地图"
 
-#: ../widgets/misc/e-map.c:607
+#: ../widgets/misc/e-map.c:623
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20872,33 +21255,53 @@ msgstr "因为网络不可用，所以 Evolution 目前脱机。"
 msgid "The button state is online"
 msgstr "按钮状态为在线"
 
-#: ../widgets/misc/e-paned.c:244
+#: ../widgets/misc/e-paned.c:306
 #, fuzzy
 msgid "Horizontal Position"
 msgstr "水平面板位置"
 
-#: ../widgets/misc/e-paned.c:245
+#: ../widgets/misc/e-paned.c:307
 msgid "Pane position when oriented horizontally"
 msgstr ""
 
-#: ../widgets/misc/e-paned.c:256
+#: ../widgets/misc/e-paned.c:318
 #, fuzzy
 msgid "Vertical Position"
 msgstr "垂直面板的位置"
 
-#: ../widgets/misc/e-paned.c:257
+#: ../widgets/misc/e-paned.c:319
 msgid "Pane position when oriented vertically"
 msgstr ""
 
-#: ../widgets/misc/e-pilot-settings.c:99
+#: ../widgets/misc/e-paned.c:330
+#, fuzzy
+#| msgid "Position"
+msgid "Proportion"
+msgstr "位置"
+
+#: ../widgets/misc/e-paned.c:331
+msgid "Proportion of the 2nd pane size"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:342
+#, fuzzy
+#| msgid "_Resize"
+msgid "Fixed Resize"
+msgstr "缩放(_R)"
+
+#: ../widgets/misc/e-paned.c:343
+msgid "Keep the 2nd pane fixed during resize"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:95
 msgid "Sync with:"
 msgstr "同步对象："
 
-#: ../widgets/misc/e-pilot-settings.c:107
+#: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync Private Records:"
 msgstr "同步私有记录："
 
-#: ../widgets/misc/e-pilot-settings.c:116
+#: ../widgets/misc/e-pilot-settings.c:112
 msgid "Sync Categories:"
 msgstr "同步类别："
 
@@ -20906,6 +21309,51 @@ msgstr "同步类别："
 msgid "Evolution Preferences"
 msgstr "Evolution 首选项"
 
+#: ../widgets/misc/e-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "匹配：%d"
+
+#: ../widgets/misc/e-search-bar.c:554
+msgid "Close the find bar"
+msgstr "关闭查找栏"
+
+#: ../widgets/misc/e-search-bar.c:562
+msgid "Fin_d:"
+msgstr "查找(_D)："
+
+#: ../widgets/misc/e-search-bar.c:574
+msgid "Clear the search"
+msgstr "清除搜索"
+
+#: ../widgets/misc/e-search-bar.c:597
+msgid "_Previous"
+msgstr "上一项(_P)"
+
+#: ../widgets/misc/e-search-bar.c:603
+msgid "Find the previous occurrence of the phrase"
+msgstr "寻找该词句出现的前一个位置"
+
+#: ../widgets/misc/e-search-bar.c:613
+msgid "_Next"
+msgstr "下一项(_N)"
+
+#: ../widgets/misc/e-search-bar.c:619
+msgid "Find the next occurrence of the phrase"
+msgstr "寻找该词句出现的下一个位置"
+
+#: ../widgets/misc/e-search-bar.c:629
+msgid "Mat_ch case"
+msgstr "大小写匹配(_C)"
+
+#: ../widgets/misc/e-search-bar.c:657
+msgid "Reached bottom of page, continued from top"
+msgstr "到达页面底部，移到顶部继续"
+
+#: ../widgets/misc/e-search-bar.c:679
+msgid "Reached top of page, continued from bottom"
+msgstr "到达页面顶部，移到底部继续"
+
 #: ../widgets/misc/e-selection-model-array.c:593
 #: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
@@ -20916,15 +21364,15 @@ msgstr "光标行"
 msgid "Cursor Column"
 msgstr "光标列"
 
-#: ../widgets/misc/e-selection-model.c:208
+#: ../widgets/misc/e-selection-model.c:216
 msgid "Sorter"
 msgstr "排序"
 
-#: ../widgets/misc/e-selection-model.c:215
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Selection Mode"
 msgstr "选择模式"
 
-#: ../widgets/misc/e-selection-model.c:223
+#: ../widgets/misc/e-selection-model.c:231
 msgid "Cursor Mode"
 msgstr "光标模式"
 
@@ -20964,106 +21412,106 @@ msgstr ""
 "无\n"
 "阅读收条"
 
-#: ../widgets/misc/e-send-options.ui.h:13
+#: ../widgets/misc/e-send-options.ui.h:14
 #, fuzzy
 msgid "Proprietary"
 msgstr "优先级"
 
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "请求回复(_E)"
 
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../widgets/misc/e-send-options.ui.h:17
 #, fuzzy
 msgid "Return Notification"
 msgstr "<b>返回通知</b>"
 
-#: ../widgets/misc/e-send-options.ui.h:19
+#: ../widgets/misc/e-send-options.ui.h:20
 msgid "Sta_tus Tracking"
 msgstr "状态跟踪(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:20
+#: ../widgets/misc/e-send-options.ui.h:21
 msgid "Standard"
 msgstr "标准"
 
-#: ../widgets/misc/e-send-options.ui.h:21
+#: ../widgets/misc/e-send-options.ui.h:22
 #, fuzzy
 msgid "Status Tracking"
 msgstr "状态跟踪(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Top Secret"
 msgstr "绝密"
 
-#: ../widgets/misc/e-send-options.ui.h:24
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When acce_pted:"
 msgstr "接受时(_P)："
 
-#: ../widgets/misc/e-send-options.ui.h:25
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When co_mpleted:"
 msgstr "完成时(_M)："
 
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "When decli_ned:"
 msgstr "拒绝时(_N)："
 
-#: ../widgets/misc/e-send-options.ui.h:27
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "Wi_thin"
 msgstr "少于(_T)"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_After:"
 msgstr "之后(_A)："
 
-#: ../widgets/misc/e-send-options.ui.h:29
+#: ../widgets/misc/e-send-options.ui.h:30
 msgid "_All information"
 msgstr "全部信息(_A)"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:31
 #, fuzzy
 msgid "_Classification:"
 msgstr "分类(_C)"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delay message delivery"
 msgstr "推迟信件投递(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Delivered"
 msgstr "已投递(_D)"
 
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Set expiration date"
 msgstr "设置过期时间(_S)"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Until:"
 msgstr "直到(_U)："
 
-#: ../widgets/misc/e-send-options.ui.h:36
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
 msgstr "方便时(_W)"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
 msgstr "打开时(_W)："
 
-#: ../widgets/misc/e-signature-editor.c:130
-#: ../widgets/misc/e-signature-editor.c:489
+#: ../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
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../widgets/misc/e-signature-editor.c:210
 msgid "_Save and Close"
 msgstr "保存并关闭(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:361
+#: ../widgets/misc/e-signature-editor.c:389
 msgid "Edit Signature"
 msgstr "编辑签名"
 
-#: ../widgets/misc/e-signature-editor.c:376
+#: ../widgets/misc/e-signature-editor.c:404
 msgid "_Signature Name:"
 msgstr "签名(_S)："
 
@@ -21101,66 +21549,62 @@ msgstr "脚本(_S)："
 msgid "Script file must be executable."
 msgstr "脚本文件必须存在且可执行。"
 
-#: ../widgets/misc/e-url-entry.c:103
+#: ../widgets/misc/e-url-entry.c:105
 msgid "Click here to go to URL"
 msgstr "单击此处转到 URL"
 
-#: ../widgets/misc/e-web-view.c:340
+#: ../widgets/misc/e-web-view.c:348
 msgid "_Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: ../widgets/misc/e-web-view.c:342
+#: ../widgets/misc/e-web-view.c:350
 #, fuzzy
 msgid "Copy the link to the clipboard"
 msgstr "将选中文字复制到剪贴板"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:358
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: ../widgets/misc/e-web-view.c:352
+#: ../widgets/misc/e-web-view.c:360
 #, fuzzy
 msgid "Open the link in a web browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:368
 msgid "_Copy Email Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: ../widgets/misc/e-web-view.c:379
-msgid "Copy the selection to the clipboard"
-msgstr "复制选择到剪贴板"
-
-#: ../widgets/misc/e-web-view.c:389
+#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
 msgid "Select all text and images"
 msgstr "选中全部文本和图像"
 
-#: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
-#: ../widgets/misc/e-web-view.c:714
+#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
+#: ../widgets/misc/e-web-view.c:756
 #, c-format
 msgid "Click to call %s"
 msgstr "单击以呼叫 %s"
 
-#: ../widgets/misc/e-web-view.c:716
+#: ../widgets/misc/e-web-view.c:758
 msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
-#: ../widgets/misc/e-web-view.c:718
+#: ../widgets/misc/e-web-view.c:760
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../widgets/misc/ea-calendar-item.c:295
-#: ../widgets/misc/ea-calendar-item.c:301
+#: ../widgets/misc/ea-calendar-item.c:299
+#: ../widgets/misc/ea-calendar-item.c:308
 msgid "%d %B %Y"
 msgstr "%Y年%-m月%-d日"
 
-#: ../widgets/misc/ea-calendar-item.c:303
+#: ../widgets/misc/ea-calendar-item.c:311
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "日历：从 %s 到 %s"
 
-#: ../widgets/misc/ea-calendar-item.c:338
+#: ../widgets/misc/ea-calendar-item.c:347
 msgid "evolution calendar item"
 msgstr "Evolution 日历项目"
 
@@ -21168,15 +21612,23 @@ msgstr "Evolution 日历项目"
 msgid "popup list"
 msgstr "弹出列表"
 
-#: ../widgets/table/e-cell-date-edit.c:296
+#: ../widgets/table/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "现在"
 
+#. Translators: "None" as a label of a button to unset date in a date table cell
 #: ../widgets/table/e-cell-date-edit.c:320
+#, fuzzy
+#| msgid "None"
+msgctxt "table-date"
+msgid "None"
+msgstr "无"
+
+#: ../widgets/table/e-cell-date-edit.c:328
 msgid "OK"
 msgstr "确定"
 
-#: ../widgets/table/e-cell-date-edit.c:846
+#: ../widgets/table/e-cell-date-edit.c:862
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "时间必须采用格式：%s"
@@ -21185,61 +21637,61 @@ msgstr "时间必须采用格式：%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "百分比值必需在 0 到 100 之间，含 0 和 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:360
+#: ../widgets/table/e-cell-pixbuf.c:357
 msgid "Selected Column"
 msgstr "选中列"
 
-#: ../widgets/table/e-cell-pixbuf.c:367
+#: ../widgets/table/e-cell-pixbuf.c:364
 msgid "Focused Column"
 msgstr "聚焦列"
 
-#: ../widgets/table/e-cell-pixbuf.c:374
+#: ../widgets/table/e-cell-pixbuf.c:371
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1627
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1634
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1641
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1822
+#: ../widgets/table/e-cell-text.c:1648
 msgid "Color Column"
 msgstr "给列着色"
 
-#: ../widgets/table/e-cell-text.c:1836
+#: ../widgets/table/e-cell-text.c:1662
 msgid "BG Color Column"
 msgstr "给列着背景色"
 
-#: ../widgets/table/e-table-click-to-add.c:576
+#: ../widgets/table/e-table-click-to-add.c:582
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
 msgid "click to add"
 msgstr "单击可添加"
 
-#: ../widgets/table/e-table-config.c:151
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "状态"
 
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(升序)"
 
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(降序)"
 
-#: ../widgets/table/e-table-config.c:389
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "未排序"
 
-#: ../widgets/table/e-table-config.c:430
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "未分组"
 
@@ -21248,7 +21700,7 @@ msgstr "未分组"
 msgid "Show Fields"
 msgstr "显示域"
 
-#: ../widgets/table/e-table-config.c:657
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "可用域"
 
@@ -21257,7 +21709,7 @@ msgid "A_vailable Fields:"
 msgstr "可用域(_V)："
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Ascending"
 msgstr "升序"
 
@@ -21270,7 +21722,7 @@ msgid "Clear _All"
 msgstr "全部清除(_A)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1580
+#: ../widgets/table/e-table-header-item.c:1577
 msgid "Descending"
 msgstr "降序"
 
@@ -21331,8 +21783,10 @@ msgid "_Sort..."
 msgstr "排序(_S)..."
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "添加一列..."
+#, fuzzy
+#| msgid "Add a C_olumn..."
+msgid "Add a Column"
+msgstr "添加一列(_O)..."
 
 #: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
@@ -21340,209 +21794,204 @@ msgid ""
 "the location in which you want it to appear."
 msgstr "要在您的表格中添加列，请将其拖曳到您想要其出现的位置。"
 
-#: ../widgets/table/e-table-group-container.c:341
+#: ../widgets/table/e-table-group-container.c:342
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s：%s (%d 项)"
 
-#: ../widgets/table/e-table-group-container.c:347
+#: ../widgets/table/e-table-group-container.c:348
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../widgets/table/e-table-group-container.c:924
-#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2830 ../widgets/table/e-table-item.c:2831
 msgid "Alternating Row Colors"
 msgstr "交替行色"
 
-#: ../widgets/table/e-table-group-container.c:931
-#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-table-item.c:2837 ../widgets/table/e-table-item.c:2838
+#: ../widgets/table/e-tree.c:3342 ../widgets/table/e-tree.c:3343
 msgid "Horizontal Draw Grid"
 msgstr "水平绘制网格"
 
-#: ../widgets/table/e-table-group-container.c:938
-#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
-#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
+#: ../widgets/table/e-table-item.c:2844 ../widgets/table/e-table-item.c:2845
+#: ../widgets/table/e-tree.c:3348 ../widgets/table/e-tree.c:3349
 msgid "Vertical Draw Grid"
 msgstr "垂直绘制网格"
 
-#: ../widgets/table/e-table-group-container.c:945
-#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
+#: ../widgets/table/e-table-item.c:2851 ../widgets/table/e-table-item.c:2852
+#: ../widgets/table/e-tree.c:3354 ../widgets/table/e-tree.c:3355
 msgid "Draw focus"
 msgstr "绘制焦点"
 
-#: ../widgets/table/e-table-group-container.c:952
-#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2858 ../widgets/table/e-table-item.c:2859
 msgid "Cursor mode"
 msgstr "光标模式"
 
-#: ../widgets/table/e-table-group-container.c:959
-#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2823 ../widgets/table/e-table-item.c:2824
 msgid "Selection model"
 msgstr "选择模型"
 
-#: ../widgets/table/e-table-group-container.c:966
-#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:2865 ../widgets/table/e-table-item.c:2866
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3336
+#: ../widgets/table/e-tree.c:3337
 msgid "Length Threshold"
 msgstr "长度阀值"
 
-#: ../widgets/table/e-table-group-container.c:973
-#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:982
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
-#: ../widgets/table/e-tree.c:3366
+#: ../widgets/table/e-table-item.c:2899 ../widgets/table/e-table-item.c:2900
+#: ../widgets/table/e-table.c:3328 ../widgets/table/e-tree.c:3368
+#: ../widgets/table/e-tree.c:3369
 msgid "Uniform row height"
 msgstr "统一行高"
 
-#: ../widgets/table/e-table-group-container.c:980
-#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-container.c:989
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1450
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../widgets/table/e-table-header-item.c:1470
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1471
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1475
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1540
+#: ../widgets/table/e-table-header-item.c:1537
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1558
+#: ../widgets/table/e-table-header-item.c:1555
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2809 ../widgets/table/e-table-item.c:2810
 msgid "Table header"
 msgstr "表头"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2816 ../widgets/table/e-table-item.c:2817
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:2892 ../widgets/table/e-table-item.c:2893
 msgid "Cursor row"
 msgstr "光标行"
 
-#: ../widgets/table/e-table-sorter.c:172
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "排序信息"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
-#: ../widgets/table/e-tree.c:3373
+#: ../widgets/table/e-table.c:3335 ../widgets/table/e-tree.c:3375
+#: ../widgets/table/e-tree.c:3376
 msgid "Always search"
 msgstr "总是搜索"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3342
 msgid "Use click to add"
 msgstr "单击可添加"
 
-#: ../widgets/table/e-table.c:3351
+#: ../widgets/table/e-table.c:3356
 #, fuzzy
 msgid "Vertical Row Spacing"
 msgstr "标识器间距"
 
-#: ../widgets/table/e-table.c:3352
+#: ../widgets/table/e-table.c:3357
 msgid "Vertical space between rows. It is added to top and to bottom of a row"
 msgstr ""
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "树"
-
-#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
+#: ../widgets/table/e-tree.c:3361 ../widgets/table/e-tree.c:3362
 msgid "ETree table adapter"
 msgstr "ETree 表格适配器"
 
-#: ../widgets/table/e-tree.c:3379
+#: ../widgets/table/e-tree.c:3382
 msgid "Retro Look"
 msgstr "火箭外观"
 
-#: ../widgets/table/e-tree.c:3380
+#: ../widgets/table/e-tree.c:3383
 msgid "Draw lines and +/- expanders."
 msgstr "绘制行和 +/- 扩展柄。"
 
-#: ../widgets/table/e-tree.c:3386
+#: ../widgets/table/e-tree.c:3389
 msgid "Expander Size"
 msgstr "扩展器大小"
 
-#: ../widgets/table/e-tree.c:3387
+#: ../widgets/table/e-tree.c:3390
 msgid "Size of the expander arrow"
 msgstr "扩展器箭头的大小"
 
@@ -21588,7 +22037,7 @@ msgstr "折叠"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "在包含此单元格的 ETree 中折叠行"
 
-#: ../widgets/table/gal-a11y-e-cell.c:120
+#: ../widgets/table/gal-a11y-e-cell.c:119
 msgid "Table Cell"
 msgstr "表格单元格"
 
@@ -21600,127 +22049,231 @@ msgstr "单击"
 msgid "sort"
 msgstr "排序"
 
-#: ../widgets/text/e-text.c:2719
+#: ../widgets/text/e-text.c:2474
 msgid "Select All"
 msgstr "全选"
 
-#: ../widgets/text/e-text.c:2731
+#: ../widgets/text/e-text.c:2486
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
+#: ../widgets/text/e-text.c:3303 ../widgets/text/e-text.c:3304
 msgid "Event Processor"
 msgstr "事件处理器"
 
-#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-text.c:3310 ../widgets/text/e-text.c:3311
 msgid "Text"
 msgstr "文字"
 
-#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3317 ../widgets/text/e-text.c:3318
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3324 ../widgets/text/e-text.c:3325
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3331 ../widgets/text/e-text.c:3332
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-text.c:3338 ../widgets/text/e-text.c:3339
 msgid "Justification"
 msgstr "两端对齐"
 
-#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
+#: ../widgets/text/e-text.c:3345 ../widgets/text/e-text.c:3346
 msgid "Clip Width"
 msgstr "裁剪宽度"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3352 ../widgets/text/e-text.c:3353
 msgid "Clip Height"
 msgstr "裁剪高度"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3359 ../widgets/text/e-text.c:3360
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
+#: ../widgets/text/e-text.c:3366 ../widgets/text/e-text.c:3367
 msgid "Fill clip rectangle"
 msgstr "填充裁剪矩形"
 
-#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
+#: ../widgets/text/e-text.c:3373 ../widgets/text/e-text.c:3374
 msgid "X Offset"
 msgstr "水平偏移"
 
-#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
+#: ../widgets/text/e-text.c:3380 ../widgets/text/e-text.c:3381
 msgid "Y Offset"
 msgstr "垂直偏移"
 
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3415 ../widgets/text/e-text.c:3416
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/text/e-text.c:3422 ../widgets/text/e-text.c:3423
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
+#: ../widgets/text/e-text.c:3436 ../widgets/text/e-text.c:3437
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3443 ../widgets/text/e-text.c:3444
 msgid "Ellipsis"
 msgstr "椭圆"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3450 ../widgets/text/e-text.c:3451
 msgid "Line wrap"
 msgstr "换行"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3457 ../widgets/text/e-text.c:3458
 msgid "Break characters"
 msgstr "换行字符"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3464 ../widgets/text/e-text.c:3465
 msgid "Max lines"
 msgstr "最多行数"
 
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/text/e-text.c:3485 ../widgets/text/e-text.c:3486
 msgid "Draw borders"
 msgstr "绘制边框"
 
-#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Allow newlines"
 msgstr "允许新行"
 
-#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Draw button"
 msgstr "绘制按钮"
 
-#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
+#: ../widgets/text/e-text.c:3513 ../widgets/text/e-text.c:3514
 msgid "Cursor position"
 msgstr "光标位置"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3523
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
+#: ../widgets/text/e-text.c:3529 ../widgets/text/e-text.c:3530
 msgid "Handle Popup"
 msgstr "处理弹出"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution 错误"
+#~ msgid "Loading appointments at %s"
+#~ msgstr "装入位于 %s 的约会"
+
+#~ msgid "_Security"
+#~ msgstr "安全(_S)"
+
+#~ msgid "Copying `%s' to `%s'"
+#~ msgstr "把“%s”复制到 %s"
+
+#~ msgid "Deleting selected memos..."
+#~ msgstr "删除选中的备忘..."
+
+#~ msgid "Deleting selected tasks..."
+#~ msgstr "删除选中的任务..."
+
+#~ msgid "Error loading address book."
+#~ msgstr "装入地址簿错误。"
+
+#~ msgid "Server Version"
+#~ msgstr "服务器版本"
+
+#~ msgid "Save Appointment"
+#~ msgstr "保存约会"
+
+#, fuzzy
+#~ msgid "Save Meeting"
+#~ msgstr "新会议"
+
+#~ msgid "Save Memo"
+#~ msgstr "保存备忘"
+
+#~ msgid "Save Task"
+#~ msgstr "保存任务"
 
-#~ msgid "Evolution Warning"
-#~ msgstr "Evolution 警告"
+#, fuzzy
+#~ msgid "Show CC"
+#~ msgstr "显示(_W)："
+
+#, fuzzy
+#~ msgid "Show BCC"
+#~ msgstr "显示(_W)："
+
+#~ msgid "Directories can not be attached to Messages."
+#~ msgstr "无法将目录作为信件的附件。"
+
+#~ msgid ""
+#~ "To attach the contents of this directory, either attach the files in this "
+#~ "directory individually, or create an archive of the directory and attach "
+#~ "it."
+#~ msgstr ""
+#~ "要将此目录的内容作为附件，您需要逐一添加此目录中的文件，或者创建一个此目录"
+#~ "的归档文件，然后将此归档作为附件。"
+
+#~ msgid "Unfinished messages found"
+#~ msgstr "找到了未完成的信件"
+
+#~ msgid "Warning: Modified Message"
+#~ msgstr "警告：已修改的信件"
+
+#~ msgid "Overwrite file?"
+#~ msgstr "覆盖文件吗？"
+
+#~ msgid "Select _All Text"
+#~ msgstr "选中所有文字(_A)"
+
+#~ msgid "Select all the text in a message"
+#~ msgstr "选中信件中的全部文本"
+
+#~ msgid "Show the \"Preview\" pane"
+#~ msgstr "显示“预览”面板"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "显示“预览”面板。"
+
+#~ msgid "Thread the message list."
+#~ msgstr "按线索编排信件列表。"
 
-#~ msgid "Internal error, unknown error '%s' requested"
-#~ msgstr "内部错误，请求了未知的错误“%s”"
+#~ msgid "Thread the message-list"
+#~ msgstr "按线索编排信件列表"
+
+#~ msgid "Advanced search"
+#~ msgstr "高级搜索"
+
+#~ msgid "Copy selected memo"
+#~ msgstr "复制选中的备忘"
+
+#~ msgid "Cut selected memo"
+#~ msgstr "剪切选中的备忘"
+
+#~ msgid "Copy selected tasks"
+#~ msgstr "复制选中的任务"
+
+#~ msgid "Cut selected tasks"
+#~ msgstr "剪切选中的任务"
+
+#~ msgid "Select _All Messages"
+#~ msgstr "选中全部信件(_A)"
+
+#~ msgid "Dummy window only"
+#~ msgstr "只对哑窗口"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "隐藏附件栏(_A)"
+
+#~ msgid "Copy the selection to the clipboard"
+#~ msgstr "复制选择到剪贴板"
+
+#~ msgid "Add a column..."
+#~ msgstr "添加一列..."
+
+#~ msgid "Tree"
+#~ msgstr "树"
 
 #~ msgid "search bar"
 #~ msgstr "搜索栏"
@@ -22885,9 +23438,6 @@ msgstr "处理弹出"
 #~ msgid "New all day appointment"
 #~ msgstr "新建全天约会"
 
-#~ msgid "New calendar"
-#~ msgstr "新建日历"
-
 #~ msgid "Error while opening the calendar"
 #~ msgstr "打开日历时出错"
 
@@ -22973,12 +23523,6 @@ msgstr "处理弹出"
 #~ msgid_plural "<b>%d</b> Attachments"
 #~ msgstr[0] "<b>%d</b> 个附件"
 
-#~ msgid "Hide Attachment _Bar"
-#~ msgstr "隐藏附件栏(_B)"
-
-#~ msgid "Show Attachment _Bar"
-#~ msgstr "显示附件栏(_B)"
-
 #~ msgid "Show Attachments"
 #~ msgstr "显示附件"