[evolution/gnome-3-4] Update Chinese simplified translation



commit 646bb34a3ff1d1f1d3b1fef082500b2ab5a23f69
Author: Wylmer Wang <wantinghard gmail com>
Date:   Fri Aug 2 23:01:45 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po |19322 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 10423 insertions(+), 8899 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca5da42..eac4c6d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,535 +13,537 @@
 # du baodao <centerpoint 139 com>, 2010.
 # Tao Wang <dancefire gmail com>, 2010.
 # 李炜 <lw124124 gmail com>, 2011.
-# Wylmer Wang <wantinghard gmail com>, 2011.
+# Wylmer Wang <wantinghard gmail com>, 2011, 2012
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:578
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-09-19 01:13+0000\n"
+"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2012-08-10 16:35+0000\n"
 "PO-Revision-Date: 2011-09-19 17:04+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:1
+msgid "This address book could not be opened."
+msgstr "无法打开此地址簿。"
+
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
-"'{0}' is a read-only address book and cannot be modified. Please select a "
-"different address book from the side bar in the Contacts view."
-msgstr ""
-"“{0}”是只读的地址簿,无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
+"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:3
-msgid ""
-"A contact already exists with this address. Would you like to add a new card "
-"with the same address anyway?"
-msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗?"
+msgid "Failed to authenticate with LDAP server."
+msgstr "认证到 IMAP 服务器失败。"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
-msgstr "一条名为“{0}”的联系人记录已经在此联系人列表中了。您仍要添加它吗?"
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"选中此处以确保您的密码拼写正确,并确保您使用了支持的登录方式。请记住,很多密"
+"码都是区分大小写的;您的 Caps Lock 灯可能为开。"
 
 #: ../addressbook/addressbook.error.xml.h:5
-msgid "Add with duplicates"
-msgstr "重复添加"
+msgid "This address book server does not have any suggested search bases."
+msgstr "此地址簿服务器不支持任何建议的搜索基础。"
 
 #: ../addressbook/addressbook.error.xml.h:6
-msgid "Address '{0}' already exists."
-msgstr "地址“{0}”已经存在。"
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
+"询问您的管理员有关支持的搜索基础一事。"
 
 #: ../addressbook/addressbook.error.xml.h:7
-msgid "Cannot add new contact"
-msgstr "无法添加新联系人"
+msgid "This server does not support LDAPv3 schema information."
+msgstr "此服务器不支持 LDAPv3 大纲信息。"
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Cannot move contact."
-msgstr "无法移动联系人。"
+msgid "Could not get schema information for LDAP server."
+msgstr "无法从 LDAP 服务器获取大纲信息。"
 
 #: ../addressbook/addressbook.error.xml.h:9
-msgid "Category editor not available."
-msgstr "类别编辑器不可用。"
+msgid "LDAP server did not respond with valid schema information."
+msgstr "LDAP 服务器无法响应有效的大纲信息。"
 
 #: ../addressbook/addressbook.error.xml.h:10
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"选中此处以确保您的密码拼写正确,并确保您使用了支持的登录方式。请记住,很多密"
-"码都是区分大小写的;您的 Caps Lock 灯可能为开。"
+msgid "Could not remove address book."
+msgstr "无法删除地址簿。"
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "Could not get schema information for LDAP server."
-msgstr "无法从 LDAP 服务器获取大纲信息。"
+msgid "Delete address book '{0}'?"
+msgstr "删除地址簿“{0}”吗?"
 
 #: ../addressbook/addressbook.error.xml.h:12
-msgid "Could not remove address book."
-msgstr "无法删除地址簿。"
+msgid "This address book will be removed permanently."
+msgstr "此地址簿即将被永久删除。"
 
 #: ../addressbook/addressbook.error.xml.h:13
-msgid ""
-"Currently you can only access the GroupWise System Address Book from "
-"Evolution. Please use some other GroupWise mail client once to get your "
-"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
-"目前您只能从 Evolution 中访问 GroupWise 系统地址簿。请使用其它 GroupWise 邮件"
-"客户程序获得 GroupWise 中您最常联系的联系人以及 GroupWise 个人联系人文件夹。"
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:63
+msgid "Do _Not Delete"
+msgstr "不删除(_N)"
 
 #: ../addressbook/addressbook.error.xml.h:14
-msgid "Delete address book '{0}'?"
-msgstr "删除地址簿“{0}”吗?"
+msgid "Category editor not available."
+msgstr "类别编辑器不可用。"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
-msgid "Do _Not Delete"
-msgstr "不删除(_N)"
+msgid "Unable to open address book"
+msgstr "无法打开地址簿"
 
 #: ../addressbook/addressbook.error.xml.h:16
-msgid "Error saving {0} to {1}: {2}"
-msgstr "将{0}保存到 {1} 出错:{2}"
+msgid "Unable to perform search."
+msgstr "无法执行搜索。"
 
 #: ../addressbook/addressbook.error.xml.h:17
-msgid "Failed to authenticate with LDAP server."
-msgstr "认证到 IMAP 服务器失败。"
+msgid "Would you like to save your changes?"
+msgstr "您希望保存更改吗?"
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
-msgid "Failed to delete contact"
-msgstr "删除联系人失败"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr "您已对此联系人作出了修改。您想要保存这些更改吗?"
 
 #: ../addressbook/addressbook.error.xml.h:19
-msgid "GroupWise Address book creation:"
-msgstr "GroupWise 地址簿创建:"
+msgid "_Discard"
+msgstr "丢弃(_D)"
 
 #: ../addressbook/addressbook.error.xml.h:20
-msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP 服务器无法响应有效的大纲信息。"
+msgid "Cannot move contact."
+msgstr "无法移动联系人。"
 
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "List '{0}' is already in this contact list."
-msgstr "列表“{0}”已在联系人列表中。"
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"您即将把联系人从一个地址簿移至另外一个地址簿,但是无法从源地址簿删除该联系"
+"人。您想要换作复制联系人吗?"
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid "Skip duplicates"
-msgstr "跳过重复"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr "您所选择的图像太大。您是否想要缩放并存储?"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "Some addresses already exist in this contact list."
-msgstr "有些地址已经在此联系人列表中。"
+msgid "_Resize"
+msgstr "缩放(_R)"
 
 #: ../addressbook/addressbook.error.xml.h:24
-msgid "Some features may not work properly with your current server"
-msgstr "某些特性可能无法在您目前的服务器下工作"
+msgid "_Use as it is"
+msgstr "原样使用(_U)"
 
 #: ../addressbook/addressbook.error.xml.h:25
-msgid "The Evolution address book has quit unexpectedly."
-msgstr "Evolution 地址簿异常退出。"
+msgid "_Do not save"
+msgstr "不保存(_D)"
 
 #: ../addressbook/addressbook.error.xml.h:26
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr "您所选择的图像太大。您是否想要缩放并存储?"
+msgid "Unable to save {0}."
+msgstr "无法保存 {0}。"
 
 #: ../addressbook/addressbook.error.xml.h:27
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
-"询问您的管理员有关支持的搜索基础一事。"
+msgid "Error saving {0} to {1}: {2}"
+msgstr "将{0}保存到 {1} 出错:{2}"
 
 #: ../addressbook/addressbook.error.xml.h:28
-msgid "This address book could not be opened."
-msgstr "无法打开此地址簿。"
-
-#: ../addressbook/addressbook.error.xml.h:29
-msgid "This address book server does not have any suggested search bases."
-msgstr "此地址簿服务器不支持任何建议的搜索基础。"
+msgid "The Evolution address book has quit unexpectedly."
+msgstr "Evolution 地址簿异常退出。"
 
+#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr "此地址簿服务器不可达,或者服务器名称拼错,又或者您的网络连接已断。"
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "This address book will be removed permanently."
-msgstr "此地址簿即将被永久删除。"
+msgid "Address '{0}' already exists."
+msgstr "地址“{0}”已经存在。"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "This server does not support LDAPv3 schema information."
-msgstr "此服务器不支持 LDAPv3 大纲信息。"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-msgid "Unable to open address book"
-msgstr "无法打开地址簿"
+#: ../mail/em-vfolder-editor-rule.c:340 ../widgets/table/e-table-config.ui.h:6
+msgid "_Add"
+msgstr "添加(_A)"
 
 #: ../addressbook/addressbook.error.xml.h:34
-msgid "Unable to perform search."
-msgstr "无法执行搜索。"
+msgid "Some addresses already exist in this contact list."
+msgstr "有些地址已经在此联系人列表中。"
 
 #: ../addressbook/addressbook.error.xml.h:35
-msgid "Unable to save {0}."
-msgstr "无法保存 {0}。"
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr "您正在试图添加已经属于此列表的地址。您仍要添加它们吗?"
 
 #: ../addressbook/addressbook.error.xml.h:36
-msgid "Would you like to save your changes?"
-msgstr "您希望保存更改吗?"
+msgid "Skip duplicates"
+msgstr "跳过重复"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"You are attempting to move a contact from one address book to another but it "
-"cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"您即将把联系人从一个地址簿移至另外一个地址簿,但是无法从源地址簿删除该联系"
-"人。您想要换作复制联系人吗?"
+msgid "Add with duplicates"
+msgstr "重复添加"
 
 #: ../addressbook/addressbook.error.xml.h:38
-msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results the server should be upgraded to "
-"a supported version"
-msgstr ""
-"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
-"得到最佳效果,服务器应该升级到 Evolution 支持的版本"
+msgid "List '{0}' is already in this contact list."
+msgstr "列表“{0}”已在联系人列表中。"
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
-msgstr "您正在试图添加已经属于此列表的地址。您仍要添加它们吗?"
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr "一条名为“{0}”的联系人记录已经在此联系人列表中了。您仍要添加它吗?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-msgid "You do not have permission to delete contacts in this address book."
-msgstr "您没有足够的权限从地址簿中删除联系人。"
+msgid "Some features may not work properly with your current server"
+msgstr "某些特性可能无法在您目前的服务器下工作"
 
 #: ../addressbook/addressbook.error.xml.h:41
 msgid ""
-"You have made modifications to this contact. Do you want to save these "
-"changes?"
-msgstr "您已对此联系人作出了修改。您想要保存这些更改吗?"
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
+"得到最佳效果,服务器应该升级到 Evolution 支持的版本"
+
+#: ../addressbook/addressbook.error.xml.h:42
+msgid "GroupWise Address book creation:"
+msgstr "GroupWise 地址簿创建:"
 
-#. Translators: {0} is replaced with an address book name which will not be available
 #: ../addressbook/addressbook.error.xml.h:43
 msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"目前您只能从 Evolution 中访问 GroupWise 系统地址簿。请使用其它 GroupWise 邮件"
+"客户程序获得 GroupWise 中您最常联系的联系人以及 GroupWise 个人联系人文件夹。"
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "_Add"
-msgstr "添加(_A)"
+#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
+msgid "Failed to delete contact"
+msgstr "删除联系人失败"
 
 #: ../addressbook/addressbook.error.xml.h:45
-msgid "_Discard"
-msgstr "丢弃(_D)"
+msgid "You do not have permission to delete contacts in this address book."
+msgstr "您没有足够的权限从地址簿中删除联系人。"
 
 #: ../addressbook/addressbook.error.xml.h:46
-msgid "_Do not save"
-msgstr "不保存(_D)"
-
-#: ../addressbook/addressbook.error.xml.h:47
-msgid "_Resize"
-msgstr "缩放(_R)"
+msgid "Cannot add new contact"
+msgstr "无法添加新联系人"
 
+#. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:48
-msgid "_Use as it is"
-msgstr "原样使用(_U)"
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"“{0}”是只读的地址簿,无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2104
-msgid "Anniversary"
-msgstr "纪念日"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:628
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2926
+msgid "Contact Editor"
+msgstr "联系人编辑器"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
-msgid "Birthday"
-msgstr "生日"
+msgid "Image"
+msgstr "图像"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+msgid "Nic_kname:"
+msgstr "昵称(_K):"
 
-#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
-msgid "Blog:"
-msgstr "博客:"
+msgid "_File under:"
+msgstr "存档为(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+msgid "_Where:"
+msgstr "何处(_W):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-msgid "Calendar:"
-msgstr "日历:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
-msgid "Contact"
-msgstr "联系人"
+msgid "Full _Name..."
+msgstr "全名(_N)..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
-msgid "Contact Editor"
-msgstr "联系人编辑器"
+msgid "_Wants to receive HTML mail"
+msgstr "愿意接收 HTML 邮件(_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:386
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:633
-#: ../addressbook/gui/widgets/eab-contact-display.c:641
-#: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../addressbook/gui/merging/eab-contact-merging.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: ../smime/lib/e-cert.c:811
 msgid "Email"
 msgstr "电子邮件"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-msgid "Free/Busy:"
-msgstr "闲/忙:"
+msgid "Telephone"
+msgstr "电话"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-msgid "Full _Name..."
-msgstr "全名(_N)..."
+msgid "Instant Messaging"
+msgstr "即时通讯"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1323
-#: ../widgets/misc/e-contact-map.c:295
-msgid "Home"
-msgstr "家庭"
+#: ../addressbook/importers/evolution-vcard-importer.c:990
+msgid "Contact"
+msgstr "联系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-msgid "Home Page:"
-msgstr "主页:"
+msgid "_Home Page:"
+msgstr "主页(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-msgid "Image"
-msgstr "图像"
+#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../plugins/itip-formatter/itip-view.c:1980
+msgid "_Calendar:"
+msgstr "日历(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-msgid "Instant Messaging"
-msgstr "即时通讯"
+msgid "_Free/Busy:"
+msgstr "忙/闲(_F):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-msgid "Job"
-msgstr "工作"
+msgid "_Video Chat:"
+msgstr "视频聊天(_V):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
-msgid "Mailing Address"
-msgstr "邮政地址"
+msgid "Home Page:"
+msgstr "主页:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
-msgid "Miscellaneous"
-msgstr "杂项"
+msgid "Calendar:"
+msgstr "日历:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-msgid "Nic_kname:"
-msgstr "昵称(_K):"
+msgid "Free/Busy:"
+msgstr "闲/忙:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-msgid "Notes"
-msgstr "笔记"
+msgid "Video Chat:"
+msgstr "视频聊天:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-calendar-view.c:1806
-msgid "Other"
-msgstr "其它"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
-msgid "Personal Information"
-msgstr "个人信息"
+msgid "_Blog:"
+msgstr "博客(_N):"
 
+#. Translators: an accessibility name
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
-msgid "Telephone"
-msgstr "电话"
+msgid "Blog:"
+msgstr "博客:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Video Chat:"
-msgstr "视频聊天:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "网络地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web addresses"
 msgstr "网络地址"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "_Profession:"
+msgstr "职业(_P):"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
-#: ../addressbook/gui/widgets/eab-contact-display.c:1320
-#: ../widgets/misc/e-contact-map.c:303
-msgid "Work"
-msgstr "工作"
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgid "_Title:"
+msgstr "头衔(_T):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
-msgid "_Address:"
-msgstr "地址(_A):"
+msgid "_Company:"
+msgstr "公司(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
-msgid "_Anniversary:"
-msgstr "周年(_A):"
+msgid "_Department:"
+msgstr "部门(_D):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-msgid "_Assistant:"
-msgstr "助手(_A):"
+msgid "_Manager:"
+msgstr "经理(_M):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
-msgid "_Birthday:"
-msgstr "生日(_B):"
+msgid "_Assistant:"
+msgstr "助手(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
-msgid "_Blog:"
-msgstr "博客(_N):"
+msgid "Job"
+msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1963
-msgid "_Calendar:"
-msgstr "日历(_C):"
+msgid "_Office:"
+msgstr "办公室(_O):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
-msgid "_City:"
-msgstr "城市(_C):"
+msgid "_Spouse:"
+msgstr "配偶(_S):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
-msgid "_Company:"
-msgstr "公司(_C):"
+msgid "_Birthday:"
+msgstr "生日(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
-msgid "_Country:"
-msgstr "国家/地区(_C):"
+msgid "_Anniversary:"
+msgstr "周年(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-msgid "_Department:"
-msgstr "部门(_D):"
+#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../calendar/gui/e-calendar-view.c:2131
+msgid "Anniversary"
+msgstr "纪念日"
 
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-msgid "_File under:"
-msgstr "存档为(_F):"
+#: ../addressbook/gui/widgets/eab-contact-display.c:728
+#: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
+#: ../shell/main.c:138
+msgid "Birthday"
+msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-msgid "_Free/Busy:"
-msgstr "忙/闲(_F):"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
+msgid "Miscellaneous"
+msgstr "杂项"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
-msgid "_Home Page:"
-msgstr "主页(_H):"
+msgid "Personal Information"
+msgstr "个人信息"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
-msgid "_Manager:"
-msgstr "经理(_M):"
+msgid "_City:"
+msgstr "城市(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
-msgid "_Office:"
-msgstr "办公室(_O):"
+msgid "_Zip/Postal Code:"
+msgstr "邮政编码(_Z):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
-msgid "_PO Box:"
-msgstr "邮政邮箱(_P):"
+msgid "_State/Province:"
+msgstr "州/省(_S):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
-msgid "_Profession:"
-msgstr "职业(_P):"
+msgid "_Country:"
+msgstr "国家/地区(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
-msgid "_Spouse:"
-msgstr "配偶(_S):"
+msgid "_PO Box:"
+msgstr "邮政邮箱(_P):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
-msgid "_State/Province:"
-msgstr "州/省(_S):"
+msgid "_Address:"
+msgstr "地址(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
-msgid "_Title:"
-msgstr "头衔(_T):"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/widgets/eab-contact-display.c:82
+#: ../addressbook/gui/widgets/eab-contact-display.c:1360
+#: ../widgets/misc/e-contact-map.c:300
+msgid "Home"
+msgstr "家庭"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-msgid "_Video Chat:"
-msgstr "视频聊天(_V):"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
+#: ../addressbook/gui/widgets/eab-contact-display.c:81
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:1357
+#: ../widgets/misc/e-contact-map.c:308
+msgid "Work"
+msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-msgid "_Wants to receive HTML mail"
-msgstr "愿意接收 HTML 邮件(_W)"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/widgets/eab-contact-display.c:83
+#: ../addressbook/gui/widgets/eab-contact-display.c:421
+#: ../calendar/gui/e-cal-model.c:3472
+msgid "Other"
+msgstr "其它"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
-msgid "_Where:"
-msgstr "何处(_W):"
+msgid "Mailing Address"
+msgstr "邮政地址"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
-msgid "_Zip/Postal Code:"
-msgstr "邮政编码(_Z):"
+msgid "Notes"
+msgstr "笔记"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:669
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:672
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:674
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:675
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
+#: ../addressbook/gui/widgets/eab-contact-display.c:673
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/widgets/eab-contact-display.c:671
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
+#: ../addressbook/gui/widgets/eab-contact-display.c:670
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:469
+#: ../addressbook/gui/widgets/eab-gui-util.c:488
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
@@ -553,21 +555,21 @@ msgstr "修改联系人出错"
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:644
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2920
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3401
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3402
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3729
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -580,181 +582,183 @@ msgstr ""
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3742
+#, c-format
+msgid "'%s' cannot be a future date"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3750
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3763
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3792
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:492
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:503
 msgid "E_mail"
 msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
 msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
-msgid "Dr."
-msgstr "博士"
+msgid "Mr."
+msgstr "先生"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:2
-msgid "Esq."
-msgstr "先生"
+msgid "Mrs."
+msgstr "夫人"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Full Name"
-msgstr "全名"
+msgid "Ms."
+msgstr "女士"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:4
-msgid "I"
-msgstr "I"
+msgid "Miss"
+msgstr "小姐"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:5
-msgid "II"
-msgstr "II"
+msgid "Dr."
+msgstr "博士"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:6
-msgid "III"
-msgstr "III"
+msgid "Sr."
+msgstr "长辈"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "晚辈"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:8
-msgid "Miss"
-msgstr "小姐"
+msgid "I"
+msgstr "I"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:9
-msgid "Mr."
-msgstr "先生"
+msgid "II"
+msgstr "II"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:10
-msgid "Mrs."
-msgstr "夫人"
+msgid "III"
+msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:11
-msgid "Ms."
-msgstr "女士"
+msgid "Esq."
+msgstr "先生"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:12
-msgid "Sr."
-msgstr "长辈"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Full Name"
+msgstr "全名"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "姓(_F):"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
-msgid "_Last:"
-msgstr "名(_L):"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "中间名(_M):"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
+msgid "_Last:"
+msgstr "名(_L):"
+
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 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:742
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:768
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "_List name:"
+msgstr "列表名称(_L):"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "Members"
 msgstr "成员"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Hide addresses when sending mail to this list"
 msgstr "在往该列表发送邮件时隐藏地址(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
-msgid "_List name:"
-msgstr "列表名称(_L):"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
+#: ../mail/mail-config.ui.h:156
 msgid "_Select..."
 msgstr "选择(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
-msgid "_Type an email address or drag a contact into the list below:"
-msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:891
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1409
+msgid "_Members"
+msgstr "成员(_M)"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1523
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1538
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1553
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
-msgid "_Members"
-msgstr "成员(_M)"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-msgid "Changed Contact:"
-msgstr "更改了的联系人:"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
-msgid "Conflicting Contact:"
-msgstr "冲突的联系人:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "复制检测到的联系人"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr "此联系人的姓名或邮箱地址已经在本文件夹中了。您仍要保存更改吗?"
 
+#. Translators: Heading of the contact which has same name or email address in this folder already.
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
+msgid "Conflicting Contact:"
+msgstr "冲突的联系人:"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+msgid "Changed Contact:"
+msgstr "更改了的联系人:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-msgid "New Contact:"
-msgstr "新联系人:"
+#: ../addressbook/gui/merging/eab-contact-merging.c:338
+msgid "_Merge"
+msgstr "合并(_M)"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
-msgid "Original Contact:"
-msgstr "原联系人:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -762,106 +766,379 @@ msgstr ""
 "此联系人的姓名或地址已经在本文件夹中存在了。\n"
 "您一定要添加吗?"
 
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+msgid "Original Contact:"
+msgstr "原联系人:"
+
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:332
-msgid "_Merge"
-msgstr "合并(_M)"
+msgid "New Contact:"
+msgstr "新联系人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:315
+#: ../addressbook/gui/merging/eab-contact-merging.c:320
 msgid "Merge Contact"
 msgstr "合并联系人"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:987
-msgid "Any field contains"
-msgstr "任何域含有"
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+msgid "Name contains"
+msgstr "姓名含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:1073
-msgid "Name contains"
-msgstr "姓名含有"
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
+msgid "Any field contains"
+msgstr "任何域含有"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
+msgid "evolution address book"
+msgstr "evolution 地址簿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+msgid "Copy _Email Address"
+msgstr "复制电子邮件地址(_E)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:193
+#: ../widgets/misc/e-web-view.c:432
+msgid "Copy the email address to the clipboard"
+msgstr "复制电子邮件地址到剪贴板"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../widgets/misc/e-web-view.c:437
+msgid "_Send New Message To..."
+msgstr "把新信息发送到(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:200
+#: ../widgets/misc/e-web-view.c:439
+msgid "Send a mail message to this address"
+msgstr "发送一个邮件信息到这个地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:227
+msgid "Open map"
+msgstr "打开地图"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
+#: ../addressbook/gui/widgets/eab-contact-display.c:570
+msgid "List Members:"
+msgstr "列出成员:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "昵称"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "公司"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:695
+msgid "Department"
+msgstr "部门"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:696
+msgid "Profession"
+msgstr "职业"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:697
+msgid "Position"
+msgstr "位置"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "经理"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "助手"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:700
+msgid "Video Chat"
+msgstr "视频聊天"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:701
+#: ../calendar/gui/dialogs/calendar-setup.c:469
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:528
+#: ../modules/online-accounts/e-online-accounts-google.c:309
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+#: ../widgets/misc/e-send-options.c:546
+msgid "Calendar"
+msgstr "日历"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../calendar/gui/dialogs/event-editor.c:127
+#: ../calendar/gui/dialogs/event-editor.c:354
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "忙/闲"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:725
+msgid "Phone"
+msgstr "电话"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
+msgid "Fax"
+msgstr "传真"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:705
+#: ../addressbook/gui/widgets/eab-contact-display.c:727
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:722
+msgid "Home Page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:723
+msgid "Web Log"
+msgstr "Web 日志"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "移动电话"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "配偶"
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#: ../addressbook/gui/widgets/eab-contact-display.c:732
+#: ../capplet/settings/mail-capplet-shell.c:385
+#: ../modules/addressbook/e-book-shell-backend.c:126
+#: ../modules/addressbook/e-book-shell-migrate.c:144
+#: ../modules/calendar/e-cal-shell-backend.c:144
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-memo-shell-backend.c:132
+#: ../modules/calendar/e-memo-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-backend.c:128
+#: ../modules/calendar/e-task-shell-migrate.c:132
+msgid "Personal"
+msgstr "个人"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "注释"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+msgid "List Members"
+msgstr "列出成员"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+msgid "Job Title"
+msgstr "职称"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+msgid "Home page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:1285
+#: ../widgets/misc/e-web-view.c:1000
+#, c-format
+msgid "Click to mail %s"
+msgstr "单击以给 %s 发送邮件"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
+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:148
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr "无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
+"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经关"
+"闭。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
+msgid "Detailed error message:"
+msgstr "详细错误信息:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"匹配此查询的名片数超过了服务器配置的返回数目,或者超过了\n"
+"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
+"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:223
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"执行此查询的时间超过了服务器限制,或者超过了为此地址簿配置的限制。\n"
+"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
+"中将时间限制调高。"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "此地址簿的后端无法解析此查询。%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "此地址簿的后端拒绝执行此查询。%s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:242
+#: ../addressbook/gui/widgets/eab-gui-util.c:248
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "此查询未成功完成。%s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:270
+msgid "card.vcf"
+msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "选择地址簿"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:390
+msgid "list"
+msgstr "列表"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:575
+msgid "Move contact to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:577
+msgid "Copy contact to"
+msgstr "将联系人复制到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:580
+msgid "Move contacts to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:582
+msgid "Copy contacts to"
+msgstr "将联系人复制到"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "无联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:161
+#: ../addressbook/gui/widgets/e-addressbook-model.c:167
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 个联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:357
+#: ../addressbook/gui/widgets/e-addressbook-model.c:363
 msgid "Error getting book view"
 msgstr "获取名簿视图出错"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+#: ../addressbook/gui/widgets/e-addressbook-model.c:752
 msgid "Search Interrupted"
 msgstr "搜索中断了"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:624
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
 msgid "Cut selected contacts to the clipboard"
 msgstr "将选联系人剪切到剪贴板"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:630
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
 msgid "Copy selected contacts to the clipboard"
 msgstr "将选中联系人复制到剪贴板"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:636
+#: ../addressbook/gui/widgets/e-addressbook-view.c:652
 msgid "Paste contacts from the clipboard"
 msgstr "从剪贴板中粘贴联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:642
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
+#: ../addressbook/gui/widgets/e-addressbook-view.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:664
 msgid "Select all visible contacts"
 msgstr "选中全部可见联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您确定要删除这些联系人列表吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您确定要删除这些联系人列表吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您确定要删除联系人列表(%s)吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您确定要删除这些联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
 msgid "Are you sure you want to delete this contact?"
 msgstr "您确定要删除这些联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您确定要删除联系人(%s)吗?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -873,154 +1150,101 @@ msgstr[0] ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
 msgid "_Don't Display"
 msgstr "不显示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
 msgid "Display _All Contacts"
 msgstr "显示全部联系人(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
-msgid "Assistant"
-msgstr "助手"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "助手电话"
+msgid "File As"
+msgstr "存档为"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "商务传真"
+msgid "Given Name"
+msgstr "名"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "商务电话"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "商务电话 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "回拨电话"
+msgid "Family Name"
+msgstr "姓"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "车载电话"
+msgid "Email 2"
+msgstr "电子邮件 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:1
-msgid "Categories"
-msgstr "类别"
+msgid "Email 3"
+msgstr "电子邮件 3"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
-msgid "Company"
-msgstr "公司"
+msgid "Assistant Phone"
+msgstr "助手电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-msgid "Company Phone"
-msgstr "公司电话"
+msgid "Business Phone"
+msgstr "商务电话"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Business Phone 2"
+msgstr "商务电话 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 2"
-msgstr "电子邮件 2"
+msgid "Business Fax"
+msgstr "商务传真"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 3"
-msgstr "电子邮件 3"
+msgid "Callback Phone"
+msgstr "回拨电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Family Name"
-msgstr "姓"
+msgid "Car Phone"
+msgstr "车载电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "存档为"
+msgid "Company Phone"
+msgstr "公司电话"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Home Phone"
+msgstr "家庭电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Given Name"
-msgstr "名"
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "家庭传真"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone"
-msgstr "家庭电话"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Home Phone 2"
-msgstr "家庭电话 2"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN 电话"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Journal"
-msgstr "日记"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
-msgid "Manager"
-msgstr "经理"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:712
-msgid "Mobile Phone"
-msgstr "移动电话"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-msgid "Nickname"
-msgstr "昵称"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:739
-msgid "Note"
-msgstr "注释"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "办公室"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Other Phone"
+msgstr "其它电话"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Other Fax"
 msgstr "其它传真"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "其它电话"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Pager"
 msgstr "寻呼机"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Primary Phone"
 msgstr "主要电话"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Radio"
 msgstr "收音机"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:610
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:716
-msgid "Spouse"
-msgstr "配偶"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Telex"
+msgstr "电传"
 
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
@@ -1028,27 +1252,88 @@ msgstr "配偶"
 #. Device for Deaf". However, you probably want to leave this
 #. abbreviation unchanged unless you know that there is actually a
 #. different and established translation for this in your language.
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
-msgid "Telex"
-msgstr "电传"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "Unit"
+msgstr "单位"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "办公室"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "头衔"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Unit"
-msgstr "单位"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#: ../calendar/gui/e-meeting-list-view.c:653
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Role"
+msgstr "角色"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "网站"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:192
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Journal"
+msgstr "日记"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Categories"
+msgstr "类别"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "打开"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:156
+msgid "Contact List: "
+msgstr "联系人列表:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:157
+msgid "Contact: "
+msgstr "联系人:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:183
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "新建联系人"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:172
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
+
+#: ../addressbook/gui/widgets/e-minicard.c:98
+msgid "Work Email"
+msgstr "工作电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:99
+msgid "Home Email"
+msgstr "家庭电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:795
+msgid "Other Email"
+msgstr "其它电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1058,7 +1343,7 @@ msgstr ""
 "\n"
 "正在搜索联系人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:195
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1072,7 +1357,7 @@ msgstr ""
 "\n"
 "或在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:199
 msgid ""
 "\n"
 "\n"
@@ -1086,7 +1371,7 @@ msgstr ""
 "\n"
 "请在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1096,7 +1381,7 @@ msgstr ""
 "\n"
 "搜索联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:204
+#: ../addressbook/gui/widgets/e-minicard-view.c:205
 msgid ""
 "\n"
 "\n"
@@ -1106,284 +1391,6 @@ msgstr ""
 "\n"
 "本视图中没有可显示的项。"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
-msgid "Work Email"
-msgstr "工作电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:101
-msgid "Home Email"
-msgstr "家庭电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:819
-msgid "Other Email"
-msgstr "其它电子邮件"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:97
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
-msgid "evolution address book"
-msgstr "evolution 地址簿"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "新建联系人"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "打开"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "联系人列表:"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "联系人:"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:182
-msgid "Copy _Email Address"
-msgstr "复制电子邮件地址(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:432
-msgid "Copy the email address to the clipboard"
-msgstr "复制电子邮件地址到剪贴板"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:437
-msgid "_Send New Message To..."
-msgstr "把新信息发送到(_S)..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:439
-msgid "Send a mail message to this address"
-msgstr "发送一个邮件信息到这个地址"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:215
-msgid "Open map"
-msgstr "打开地图"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:528
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
-msgid "List Members:"
-msgstr "列出成员:"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
-msgid "Department"
-msgstr "部门"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
-msgid "Profession"
-msgstr "职业"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-msgid "Position"
-msgstr "位置"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
-msgid "Video Chat"
-msgstr "视频聊天"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:513
-#: ../modules/online-accounts/e-online-accounts-google.c:294
-#: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:528
-msgid "Calendar"
-msgstr "日历"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:688
-#: ../calendar/gui/dialogs/event-editor.c:123
-#: ../calendar/gui/dialogs/event-editor.c:350
-#: ../plugins/publish-calendar/publish-calendar.ui.h:6
-msgid "Free/Busy"
-msgstr "忙/闲"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:689
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
-msgid "Phone"
-msgstr "电话"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
-msgid "Fax"
-msgstr "传真"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:691
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
-msgid "Address"
-msgstr "地址"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-msgid "Home Page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-msgid "Web Log"
-msgstr "Web 日志"
-
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person memo list
-#. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
-#: ../capplet/settings/mail-capplet-shell.c:385
-#: ../modules/addressbook/e-book-shell-backend.c:120
-#: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:138
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:122
-#: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:122
-#: ../modules/calendar/e-task-shell-migrate.c:132
-msgid "Personal"
-msgstr "个人"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:986
-msgid "List Members"
-msgstr "列出成员"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
-msgid "Job Title"
-msgstr "职称"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1041
-msgid "Home page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1050
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:1248
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "单击以给 %s 发送邮件"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:120
-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:148
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr "无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:161
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
-"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经关"
-"闭。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
-msgid "Detailed error message:"
-msgstr "详细错误信息:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:209
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"匹配此查询的名片数超过了服务器配置的返回数目,或者超过了\n"
-"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
-"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:216
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"执行此查询的时间超过了服务器限制,或者超过了为此地址簿配置的限制。\n"
-"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
-"中将时间限制调高。"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:224
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "此地址簿的后端无法解析此查询。%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:229
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "此地址簿的后端拒绝执行此查询。%s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:235
-#: ../addressbook/gui/widgets/eab-gui-util.c:241
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "此查询未成功完成。%s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:263
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:308
-msgid "Select Address Book"
-msgstr "选择地址簿"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
-msgid "list"
-msgstr "列表"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:552
-msgid "Move contact to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:554
-msgid "Copy contact to"
-msgstr "将联系人复制到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:557
-msgid "Move contacts to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
-msgid "Copy contacts to"
-msgstr "将联系人复制到"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "名片视图"
@@ -1391,35 +1398,35 @@ msgstr "名片视图"
 #: ../addressbook/importers/evolution-csv-importer.c:748
 #: ../addressbook/importers/evolution-ldif-importer.c:546
 #: ../addressbook/importers/evolution-vcard-importer.c:280
-#: ../calendar/importers/icalendar-importer.c:413
-#: ../calendar/importers/icalendar-importer.c:902
-#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:415
+#: ../calendar/importers/icalendar-importer.c:905
+#: ../calendar/importers/icalendar-importer.c:944 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1072
-msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV 或 Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1075
+msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
+msgstr "Outlook 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1073
-msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV 和 Tab 导入器"
+#: ../addressbook/importers/evolution-csv-importer.c:1076
+msgid "Outlook Contacts CSV and Tab Importer"
+msgstr "Outlook 联系人 CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
-msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1084
+msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
+msgstr "Mozilla 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
-msgid "Mozilla CSV and Tab Importer"
-msgstr "Mozilla CSV 和 Tab 导入器"
+#: ../addressbook/importers/evolution-csv-importer.c:1085
+msgid "Mozilla Contacts CSV and Tab Importer"
+msgstr "Mozilla 联系人 CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
-msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "Evolution CSV 或 Tab (.csv, .tab)"
+#: ../addressbook/importers/evolution-csv-importer.c:1093
+msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
+msgstr "Evolution 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
-msgid "Evolution CSV and Tab Importer"
-msgstr "Evolution CSV 和 Tab 导入器"
+#: ../addressbook/importers/evolution-csv-importer.c:1094
+msgid "Evolution Contacts CSV and Tab Importer"
+msgstr "Evolution 联系人 CSV 和 Tab 导入器"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
@@ -1429,49 +1436,21 @@ msgstr "LDAP 数据交换格式(.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 导入器"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:719
+#: ../addressbook/printing/e-contact-print.c:723
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 页"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
-msgid "Can not open file"
-msgstr "无法打开文件"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, c-format
-msgid "Couldn't get list of address books: %s"
-msgstr "无法获得地址簿列表:%s"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2923
-#: ../calendar/gui/dialogs/memo-page.c:938
-#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
-#: ../plugins/caldav/caldav-browse-server.c:220
-#: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, c-format
-msgid "Failed to open client '%s': %s"
-msgstr "打开客户端“%s”失败:%s"
-
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
@@ -1527,219 +1506,427 @@ msgstr "在普通模式中,不应该有大小选项。"
 msgid "Unhandled error"
 msgstr "未处理的错误"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:2
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
+msgid "Can not open file"
+msgstr "无法打开文件"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#, c-format
+msgid "Couldn't get list of address books: %s"
+msgstr "无法获得地址簿列表:%s"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#: ../calendar/gui/dialogs/memo-page.c:952 ../em-format/em-format.c:2336
+#: ../libemail-engine/mail-ops.c:682 ../mail/em-folder-tree.c:678
+#: ../plugins/caldav/caldav-browse-server.c:221
+#: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
+#: ../plugins/itip-formatter/itip-formatter.c:1485
+#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../smime/gui/certificate-manager.c:317
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
+#, c-format
+msgid "Failed to open client '%s': %s"
+msgstr "打开客户端“%s”失败:%s"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:109
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分钟"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:122
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "小时"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:135
+#: ../calendar/gui/dialogs/recurrence-page.c:1197
+msgid "day"
+msgid_plural "days"
+msgstr[0] "天"
+
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:331
+msgid "Start time"
+msgstr "开始时间"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+msgid "Appointments"
+msgstr "约会"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "全部错过(_A)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:3
+msgid "_Snooze"
+msgstr "午睡(_S)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../libevolution-utils/e-alert-dialog.c:162
+msgid "_Dismiss"
+msgstr "错过(_D)"
+
+#. Location
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1759
+#: ../calendar/alarm-notify/alarm-queue.c:1769
+#: ../plugins/itip-formatter/itip-view.c:1051
+msgid "Location:"
+msgstr "位置:"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+msgid "location of appointment"
+msgstr "约会位置"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+msgid "Snooze _time:"
+msgstr "午睡时间(_T):"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/e-plugin-util.c:454
+#: ../filter/filter.ui.h:8 ../modules/calendar/e-cal-shell-view-actions.c:350
+#: ../plugins/google-account-setup/google-contacts-source.c:390
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
+msgid "days"
+msgstr "天"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/e-plugin-util.c:453
+#: ../filter/filter.ui.h:7
+#: ../plugins/google-account-setup/google-contacts-source.c:388
+msgid "hours"
+msgstr "小时"
+
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/e-plugin-util.c:452
+#: ../filter/filter.ui.h:6 ../modules/addressbook/ldap-config.ui.h:29
+#: ../plugins/google-account-setup/google-contacts-source.c:386
+msgid "minutes"
+msgstr "分钟"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1608
+#: ../calendar/alarm-notify/alarm-queue.c:1740
+msgid "No summary available."
+msgstr "没有可用的摘要。"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1617
+#: ../calendar/alarm-notify/alarm-queue.c:1619
+msgid "No description available."
+msgstr "没有描述。"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1627
+msgid "No location information available."
+msgstr "没有可用的位置信息。"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1673
+#, c-format
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "您有 %d 条提醒"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1873
+#: ../calendar/alarm-notify/alarm-queue.c:1908
+msgid "Warning"
+msgstr "警告"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1877
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
 msgstr ""
-"“{0}“是一个只读日历,不能被编辑。请从日历列表的侧边栏里选择一个不同的日历。"
+"Evolution 尚不支持带电子邮件通知\n"
+"的日历提醒,但此提醒被配置为\n"
+"发送电子邮件。Evolution 将以\n"
+"显示普通提醒对话框代替。"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#, c-format
 msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar that can accept appointments."
-msgstr "“{0}”是只读日历,无法修改。请另选一个可接受约会的日历。"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+"Evolution 日历提醒将要触发。该提醒被配置为运行以下程序:\n"
+"\n"
+"        %s\n"
+"\n"
+"您确信您要运行该程序吗?"
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/alarm-notify/alarm-queue.c:1929
+msgid "Do not ask me about this program again."
+msgstr "不要再次询问此问题。"
+
+#: ../calendar/alarm-notify/util.c:45
+msgid "invalid time"
+msgstr "无效时间"
+
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:371
+#: ../calendar/gui/misc.c:116
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:377
+#: ../calendar/gui/misc.c:122
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:383
+#: ../calendar/gui/misc.c:126
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+
+#: ../calendar/calendar.error.xml.h:1
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "您是否想要给全部出席者发送取消通知?"
+
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
-msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
+
+#: ../calendar/calendar.error.xml.h:3
+msgid "Do _not Send"
+msgstr "不发送(_N)"
+
+#: ../calendar/calendar.error.xml.h:4
+msgid "_Send Notice"
+msgstr "发送通知(_S)"
+
+#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this meeting?"
+msgstr "您确信您要删除该会议吗?"
 
 #: ../calendar/calendar.error.xml.h:6
 msgid ""
-"Adding a meaningful summary to your task will give you an idea of what your "
-"task is about."
-msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
-
-#: ../calendar/calendar.error.xml.h:7
-msgid "All information in these memos will be deleted and can not be restored."
-msgstr "这些备忘的全部信息将被删除,且无法恢复。"
+"All information on this meeting will be deleted and can not be restored."
+msgstr "此会议的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:8
-msgid "All information in this memo will be deleted and can not be restored."
-msgstr "此备忘的全部信息将被删除,且无法恢复。"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
-msgstr "这些约会的全部信息将被删除,且无法恢复。"
+#: ../calendar/gui/dialogs/delete-comp.c:192
+#, c-format
+msgid "Are you sure you want to delete this task?"
+msgstr "您确定要删除此任务吗?"
 
 #: ../calendar/calendar.error.xml.h:10
-msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "这些任务的全部信息将被删除,且无法恢复。"
+msgid "All information on this task will be deleted and can not be restored."
+msgstr "此任务的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
-msgstr "此约会的全部信息将被删除,且无法恢复。"
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "您是否想要为此备忘发送取消通知?"
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
-"All information on this meeting will be deleted and can not be restored."
-msgstr "此会议的全部信息将被删除,且无法恢复。"
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
 
 #: ../calendar/calendar.error.xml.h:13
-msgid "All information on this memo will be deleted and can not be restored."
-msgstr "此备忘的全部信息将被删除,且无法恢复。"
+#: ../calendar/gui/dialogs/delete-comp.c:195
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "您确信您要删除该备忘吗?"
 
 #: ../calendar/calendar.error.xml.h:14
-msgid "All information on this task will be deleted and can not be restored."
-msgstr "此任务的全部信息将被删除,且无法恢复。"
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "此备忘的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "您确定要删除“{0}”任务吗?"
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "您确信您要删除标题为“{0}”的会议吗?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "您确信您要删除标题为“{0}”的约会吗?"
 
 #: ../calendar/calendar.error.xml.h:17
-msgid "Are you sure you want to delete the meeting titled '{0}'?"
-msgstr "您确信您要删除标题为“{0}”的会议吗?"
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr "此约会的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:18
-msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "您确定要删除“{0}”备忘吗?"
+msgid "Are you sure you want to delete this appointment?"
+msgstr "您确信您要删除该约会吗?"
 
 #: ../calendar/calendar.error.xml.h:19
-msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "您确定要删除这 {0} 个约会吗?"
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "您确定要删除“{0}”任务吗?"
 
 #: ../calendar/calendar.error.xml.h:20
-msgid "Are you sure you want to delete these {0} memos?"
-msgstr "您确定要删除这 {0} 个备忘吗?"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "您确定要删除“{0}”备忘吗?"
 
 #: ../calendar/calendar.error.xml.h:21
-msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "您确定要删除这 {0} 个任务吗?"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "此备忘的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:22
-msgid "Are you sure you want to delete this appointment?"
-msgstr "您确信您要删除该约会吗?"
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "您确定要删除这 {0} 个约会吗?"
 
 #: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
-#, c-format
-msgid "Are you sure you want to delete this meeting?"
-msgstr "您确信您要删除该会议吗?"
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr "这些约会的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
-#, c-format
-msgid "Are you sure you want to delete this memo?"
-msgstr "您确信您要删除该备忘吗?"
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "您确定要删除这 {0} 个任务吗?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
-#, c-format
-msgid "Are you sure you want to delete this task?"
-msgstr "您确定要删除此任务吗?"
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr "这些任务的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "您确定想要发送没有摘要的约会吗?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "您确定要删除这 {0} 个备忘吗?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "您确定想要保存没有摘要的备忘吗?"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "这些备忘的全部信息将被删除,且无法恢复。"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to save the task without a summary?"
-msgstr "您确定想要发送没有摘要的任务吗?"
+msgid "Would you like to save your changes to this meeting?"
+msgstr "您想要保存对此会议的更改吗?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Cannot create a new event"
-msgstr "无法创建新事件"
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "您已经对此会议做出了更改,但尚未保存。"
 
 #: ../calendar/calendar.error.xml.h:30
-msgid "Cannot save event"
-msgstr "无法保存事件"
+#: ../composer/mail-composer.error.xml.h:16
+msgid "_Discard Changes"
+msgstr "丢弃更改(_D)"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Delete calendar '{0}'?"
-msgstr "删除日历“{0}”吗?"
+msgid "_Save Changes"
+msgstr "保存更改(_S)"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Delete memo list '{0}'?"
-msgstr "删除备忘列表“{0}”吗?"
+msgid "Would you like to save your changes to this appointment?"
+msgstr "您想要保存对约会的更改吗?"
 
 #: ../calendar/calendar.error.xml.h:33
-msgid "Delete task list '{0}'?"
-msgstr "删除任务列表“{0}”吗?"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "您已经更改了此约会,但尚未保存。"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Would you like to save your changes to this task?"
+msgstr "您想要保存对此任务的更改吗?"
 
 #: ../calendar/calendar.error.xml.h:35
-msgid "Do _not Send"
-msgstr "不发送(_N)"
+msgid "You have changed this task, but not yet saved it."
+msgstr "您已经对此任务做出了更改,但尚未保存。"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "Download in progress. Do you want to save the appointment?"
-msgstr "下载进行中。您想要保存约会吗?"
+msgid "Would you like to save your changes to this memo?"
+msgstr "您想要保存对此备忘的更改吗?"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid "Download in progress. Do you want to save the task?"
-msgstr "下载进行中。您想要保存任务吗?"
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "您已经对此备忘做出了更改,但尚未保存。"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "Editor could not be loaded."
-msgstr "无法载入编辑器。"
+msgid "Would you like to send meeting invitations to participants?"
+msgstr "您是否想要给出席者发送会议邀请?"
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
-msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-
-#: ../calendar/calendar.error.xml.h:40
-msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
 
+#: ../calendar/calendar.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
+msgid "_Send"
+msgstr "发送(_S)"
+
 #: ../calendar/calendar.error.xml.h:41
-msgid "Error loading calendar"
-msgstr "载入日历时出错"
+msgid "Would you like to send updated meeting information to participants?"
+msgstr "您是否想要给出席者发送更新的会议信息?"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid "Error loading memo list"
-msgstr "载入备忘列表出错"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
 
 #: ../calendar/calendar.error.xml.h:43
-msgid "Error loading task list"
-msgstr "载入任务列表出错"
+msgid "Would you like to send this task to participants?"
+msgstr "您是否想要将此任务发送给出席者?"
 
-#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
-#. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:46
-msgid "Error on {0}: {1}"
-msgstr "{0} 出错:{1}"
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
+
+#: ../calendar/calendar.error.xml.h:45
+msgid "Download in progress. Do you want to save the task?"
+msgstr "下载进行中。您想要保存任务吗?"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
+
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
+msgid "_Save"
+msgstr "保存(_S)"
 
 #: ../calendar/calendar.error.xml.h:48
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
-msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr "下载进行中。您想要保存约会吗?"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
-msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
 
 #: ../calendar/calendar.error.xml.h:50
-msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
-msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
+msgid "Would you like to send updated task information to participants?"
+msgstr "您是否想要给出席者发送更新的任务信息?"
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
@@ -1748,1191 +1935,1030 @@ msgid ""
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
-msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr "Evolution 任务异常退出。"
 
 #: ../calendar/calendar.error.xml.h:53
-msgid ""
-"Some attachments are being downloaded. Saving the task would result in the "
-"loss of these attachments."
-msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
 
 #: ../calendar/calendar.error.xml.h:54
-msgid "Some features may not work properly with your current server."
-msgstr "某些特性可能无法在您目前的服务器下工作。"
-
-#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "The Evolution calendars have quit unexpectedly."
-msgstr "Evolution 日历异常退出。"
+#: ../calendar/calendar.error.xml.h:55
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:56
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 备忘异常退出。"
 
+#: ../calendar/calendar.error.xml.h:57
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
+
 #: ../calendar/calendar.error.xml.h:58
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution 任务异常退出。"
+msgid "The Evolution calendars have quit unexpectedly."
+msgstr "Evolution 日历异常退出。"
 
 #: ../calendar/calendar.error.xml.h:59
-msgid "The calendar is not marked for offline usage."
-msgstr "日历未标为离线使用。"
+msgid "Editor could not be loaded."
+msgstr "无法载入编辑器。"
 
 #: ../calendar/calendar.error.xml.h:60
-msgid "The memo list is not marked for offline usage."
-msgstr "备忘列表未标为离线使用。"
+msgid "Delete calendar '{0}'?"
+msgstr "删除日历“{0}”吗?"
 
 #: ../calendar/calendar.error.xml.h:61
-msgid "The task list is not marked for offline usage."
-msgstr "任务列表未标为离线使用。"
-
-#: ../calendar/calendar.error.xml.h:62
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:63
-msgid "This memo list will be removed permanently."
-msgstr "此备忘列表将被永久删除。"
+#: ../calendar/calendar.error.xml.h:62
+msgid "Delete task list '{0}'?"
+msgstr "删除任务列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:63
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
+#: ../calendar/calendar.error.xml.h:64
+msgid "Delete memo list '{0}'?"
+msgstr "删除备忘列表“{0}”吗?"
+
 #: ../calendar/calendar.error.xml.h:65
-msgid "Would you like to save your changes to this appointment?"
-msgstr "您想要保存对约会的更改吗?"
+msgid "This memo list will be removed permanently."
+msgstr "此备忘列表将被永久删除。"
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "Would you like to save your changes to this meeting?"
-msgstr "您想要保存对此会议的更改吗?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "您确定想要发送没有摘要的约会吗?"
 
 #: ../calendar/calendar.error.xml.h:67
-msgid "Would you like to save your changes to this memo?"
-msgstr "您想要保存对此备忘的更改吗?"
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
 
 #: ../calendar/calendar.error.xml.h:68
-msgid "Would you like to save your changes to this task?"
-msgstr "您想要保存对此任务的更改吗?"
+msgid "Are you sure you want to save the task without a summary?"
+msgstr "您确定想要发送没有摘要的任务吗?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Would you like to send a cancelation notice for this memo?"
-msgstr "您是否想要为此备忘发送取消通知?"
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
 
 #: ../calendar/calendar.error.xml.h:70
-msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "您是否想要给全部出席者发送取消通知?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "您确定想要保存没有摘要的备忘吗?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Would you like to send meeting invitations to participants?"
-msgstr "您是否想要给出席者发送会议邀请?"
+msgid "Error loading calendar"
+msgstr "载入日历时出错"
 
 #: ../calendar/calendar.error.xml.h:72
-msgid "Would you like to send this task to participants?"
-msgstr "您是否想要将此任务发送给出席者?"
+msgid "The calendar is not marked for offline usage."
+msgstr "日历未标为离线使用。"
 
 #: ../calendar/calendar.error.xml.h:73
-msgid "Would you like to send updated meeting information to participants?"
-msgstr "您是否想要给出席者发送更新的会议信息?"
-
-#: ../calendar/calendar.error.xml.h:74
-msgid "Would you like to send updated task information to participants?"
-msgstr "您是否想要给出席者发送更新的任务信息?"
+msgid "Cannot create a new event"
+msgstr "无法创建新事件"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:75
 msgid ""
-"You are connecting to an unsupported GroupWise server and may encounter "
-"problems using Evolution. For best results, the server should be upgraded to "
-"a supported version."
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
 msgstr ""
-"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
-"得到最佳效果,服务器应该升级到支持的版本。"
+"“{0}“是一个只读日历,不能被编辑。请从日历列表的侧边栏里选择一个不同的日历。"
 
 #: ../calendar/calendar.error.xml.h:76
-msgid "You have changed this appointment, but not yet saved it."
-msgstr "您已经更改了此约会,但尚未保存。"
-
-#: ../calendar/calendar.error.xml.h:77
-msgid "You have changed this meeting, but not yet saved it."
-msgstr "您已经对此会议做出了更改,但尚未保存。"
+msgid "Cannot save event"
+msgstr "无法保存事件"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:78
-msgid "You have changed this task, but not yet saved it."
-msgstr "您已经对此任务做出了更改,但尚未保存。"
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr "“{0}”是只读日历,无法修改。请另选一个可接受约会的日历。"
 
 #: ../calendar/calendar.error.xml.h:79
-msgid "You have made changes to this memo, but not yet saved them."
-msgstr "您已经对此备忘做出了更改,但尚未保存。"
-
-#: ../calendar/calendar.error.xml.h:80
-msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
+msgid "Cannot save task"
+msgstr "无法保存任务"
 
+#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:81
-msgid "Your memos will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
+msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr "“{0}”不支持分配的列表,请另选一个任务列表。"
 
 #: ../calendar/calendar.error.xml.h:82
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
+msgid "Error loading task list"
+msgstr "载入任务列表出错"
 
 #: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "丢弃更改(_D)"
+msgid "The task list is not marked for offline usage."
+msgstr "任务列表未标为离线使用。"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
-msgid "_Save"
-msgstr "保存(_S)"
+#: ../calendar/calendar.error.xml.h:84
+msgid "Error loading memo list"
+msgstr "载入备忘列表出错"
 
 #: ../calendar/calendar.error.xml.h:85
-msgid "_Save Changes"
-msgstr "保存更改(_S)"
-
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
-msgid "_Send"
-msgstr "发送(_S)"
-
-#: ../calendar/calendar.error.xml.h:87
-msgid "_Send Notice"
-msgstr "发送通知(_S)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分钟"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小时"
-
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
-msgid "day"
-msgid_plural "days"
-msgstr[0] "天"
-
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
-msgid "Start time"
-msgstr "开始时间"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
-msgid "Appointments"
-msgstr "约会"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "全部错过(_A)"
-
-#. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
-#: ../plugins/itip-formatter/itip-view.c:1052
-msgid "Location:"
-msgstr "位置:"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
-msgid "Snooze _time:"
-msgstr "午睡时间(_T):"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5 ../e-util/e-alert.c:919
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
-msgid "_Dismiss"
-msgstr "错过(_D)"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-msgid "_Snooze"
-msgstr "午睡(_S)"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:454
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:387
-#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "days"
-msgstr "天"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-#: ../calendar/gui/dialogs/event-page.ui.h:26 ../e-util/e-plugin-util.c:453
-#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:386
-msgid "hours"
-msgstr "小时"
-
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
-msgid "location of appointment"
-msgstr "约会位置"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
-#: ../calendar/gui/dialogs/event-page.ui.h:27 ../e-util/e-plugin-util.c:452
-#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:385
-msgid "minutes"
-msgstr "分钟"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-msgid "No summary available."
-msgstr "没有可用的摘要。"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
-msgid "No description available."
-msgstr "没有描述。"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
-msgid "No location information available."
-msgstr "没有可用的位置信息。"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "您有 %d 条提醒"
+msgid "The memo list is not marked for offline usage."
+msgstr "备忘列表未标为离线使用。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
-msgid "Warning"
-msgstr "警告"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:88
+msgid "Error on {0}: {1}"
+msgstr "{0} 出错:{1}"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
-msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
-msgstr ""
-"Evolution 尚不支持带电子邮件通知\n"
-"的日历提醒,但此提醒被配置为\n"
-"发送电子邮件。Evolution 将以\n"
-"显示普通提醒对话框代替。"
+#: ../calendar/calendar.error.xml.h:89
+msgid "Some features may not work properly with your current server."
+msgstr "某些特性可能无法在您目前的服务器下工作。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
-#, c-format
+#: ../calendar/calendar.error.xml.h:90
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 msgstr ""
-"Evolution 日历提醒将要触发。该提醒被配置为运行以下程序:\n"
-"\n"
-"        %s\n"
-"\n"
-"您确信您要运行该程序吗?"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
-msgid "Do not ask me about this program again."
-msgstr "不要再次询问此问题。"
-
-#: ../calendar/gui/alarm-notify/util.c:45
-msgid "invalid time"
-msgstr "无效时间"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 小时"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分钟"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
+"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
+"得到最佳效果,服务器应该升级到支持的版本。"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "日视图"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:91
 msgid "Work Week View"
 msgstr "工作日视图"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:94
 msgid "Week View"
 msgstr "周视图"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:97
 msgid "Month View"
 msgstr "月视图"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Any Field"
-msgstr "任何域"
+#: ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:383
+msgid "Summary"
+msgstr "概要"
+
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+msgid "contains"
+msgstr "含有"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
-msgid "Attachments"
-msgstr "附件"
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+msgid "does not contain"
+msgstr "不含有"
 
-#: ../calendar/gui/caltypes.xml.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-#: ../calendar/gui/tasktypes.xml.h:6
-msgid "Attendee"
-msgstr "出席者"
+#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../widgets/misc/e-attachment-tree-view.c:528
+#: ../widgets/table/e-table-config.ui.h:24
+msgid "Description"
+msgstr "描述"
 
-#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
-#: ../calendar/gui/tasktypes.xml.h:8
-msgid "Category"
-msgstr "类别"
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/tasktypes.xml.h:7
+msgid "Any Field"
+msgstr "任何域"
 
-#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:7
 msgid "Classification"
 msgstr "分类"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
-#: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
-msgid "Confidential"
-msgstr "机密"
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+msgid "is"
+msgstr "是"
 
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:71
-#: ../widgets/misc/e-attachment-tree-view.c:526
-#: ../widgets/table/e-table-config.ui.h:6
-msgid "Description"
-msgstr "描述"
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+msgid "is not"
+msgstr "不是"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:11
-msgid "Description Contains"
-msgstr "描述含有"
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:800 ../calendar/gui/e-cal-model.c:807
+#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:10
+msgid "Public"
+msgstr "公开"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
-msgid "Do Not Exist"
-msgstr "不存在"
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:809 ../calendar/gui/e-task-table.c:559
+#: ../calendar/gui/memotypes.xml.h:11
+msgid "Private"
+msgstr "保密"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
-msgid "Exist"
-msgstr "存在"
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:811 ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+msgid "Confidential"
+msgstr "机密"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:863
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:6
+#: ../calendar/gui/tasktypes.xml.h:5
+msgid "Organizer"
+msgstr "组织者"
+
+#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/tasktypes.xml.h:6
+msgid "Attendee"
+msgstr "出席者"
+
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../plugins/publish-calendar/publish-calendar.c:861
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "位置"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
-#: ../calendar/gui/tasktypes.xml.h:19
-msgid "Organizer"
-msgstr "组织者"
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/tasktypes.xml.h:23
+msgid "Category"
+msgstr "类别"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
-#: ../calendar/gui/memotypes.xml.h:12
-msgid "Private"
-msgstr "保密"
+#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "附件"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
-#: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
-msgid "Public"
-msgstr "公开"
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+msgid "Exist"
+msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:317
-#: ../calendar/gui/dialogs/event-editor.c:338
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+msgid "Do Not Exist"
+msgstr "不存在"
+
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/dialogs/event-editor.c:321
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "再现"
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
-msgid "Summary"
-msgstr "概要"
+#: ../calendar/gui/caltypes.xml.h:20
+msgid "Occurs"
+msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:23
-msgid "Summary Contains"
-msgstr "概要含有"
+#: ../calendar/gui/caltypes.xml.h:21
+msgid "Less Than"
+msgstr "小于"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
-msgid "contains"
-msgstr "含有"
+#: ../calendar/gui/caltypes.xml.h:22
+msgid "Exactly"
+msgstr ""
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
-msgid "does not contain"
-msgstr "不含有"
+#: ../calendar/gui/caltypes.xml.h:23
+msgid "More Than"
+msgstr "多于"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
-msgid "is"
-msgstr "是"
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:28
+msgid "Summary Contains"
+msgstr "概要含有"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
-msgid "is not"
-msgstr "不是"
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:29
+msgid "Description Contains"
+msgstr "描述含有"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:632
 msgid "Edit Reminder"
 msgstr "编辑提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/e-alarm-list.c:413
 msgid "Pop up an alert"
 msgstr "弹出警告"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
-#: ../calendar/gui/e-alarm-list.c:443
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/e-alarm-list.c:409
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
-#: ../calendar/gui/e-alarm-list.c:455
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/e-alarm-list.c:421
 msgid "Run a program"
 msgstr "运行程序"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
-#: ../calendar/gui/e-alarm-list.c:451
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/e-alarm-list.c:417
 msgid "Send an email"
 msgstr "发送电子邮件"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Reminder"
-msgstr "添加提醒"
+msgid "minute(s)"
+msgstr "分钟"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "Custom _message"
-msgstr "自定义信息(_M)"
+msgid "hour(s)"
+msgstr "小时"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom reminder sound"
-msgstr "自定义提醒声音"
+msgid "day(s)"
+msgstr "天"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Mes_sage:"
-msgstr "信息(_S):"
+msgid "before"
+msgstr "之前"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
-msgid "Options"
-msgstr "选项"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+msgid "after"
+msgstr "之后"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Reminder"
-msgstr "提醒"
+msgid "start of appointment"
+msgstr "约会开始"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Repeat"
-msgstr "重复"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-msgid "Select A File"
-msgstr "选择一个文件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-msgid "Send To:"
-msgstr "发送至:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-msgid "_Arguments:"
-msgstr "参数(_A):"
+msgid "end of appointment"
+msgstr "约会结束"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "_Program:"
-msgstr "程序(_P):"
+msgid "Add Reminder"
+msgstr "添加提醒"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "重复提醒(_R)"
+#: ../calendar/gui/dialogs/event-editor.c:364
+msgid "Reminder"
+msgstr "提醒"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
-msgid "_Sound:"
-msgstr "声音(_S):"
+msgid "Repeat"
+msgstr "重复"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "after"
-msgstr "之后"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
-msgid "before"
-msgstr "之前"
+msgid "_Repeat the reminder"
+msgstr "重复提醒(_R)"
 
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "day(s)"
-msgstr "天"
+msgid "extra times every"
+msgstr "每个额外时间"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:32
+msgid "Options"
+msgstr "选项"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "end of appointment"
-msgstr "约会结束"
+msgid "Custom _message"
+msgstr "自定义信息(_M)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+msgid "Mes_sage:"
+msgstr "信息(_S):"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "extra times every"
-msgstr "每个额外时间"
+msgid "Custom reminder sound"
+msgstr "自定义提醒声音"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "hour(s)"
-msgstr "小时"
+msgid "_Sound:"
+msgstr "声音(_S):"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+msgid "Select A File"
+msgstr "选择一个文件"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "minute(s)"
-msgstr "分钟"
+msgid "_Program:"
+msgstr "程序(_P):"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+msgid "_Arguments:"
+msgstr "参数(_A):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
-msgid "start of appointment"
-msgstr "约会开始"
+msgid "Send To:"
+msgstr "发送至:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "动作/触发器"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-msgid "A_dd"
-msgstr "添加(_D)"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "提醒"
 
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+msgid "A_dd"
+msgstr "添加(_D)"
+
 #: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "类型:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
+#: ../modules/addressbook/addressbook-config.c:529
 msgid "_Type:"
 msgstr "类型(_T):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../calendar/gui/dialogs/calendar-setup.c:264 ../mail/mail-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-signature-script-dialog.c:284
+#: ../widgets/misc/e-signature-script-dialog.c:286
 msgid "_Name:"
 msgstr "名称(_N):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:300
+#: ../calendar/gui/dialogs/calendar-setup.c:316
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "将日历内容复制到本地以进行离线操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:302
+#: ../calendar/gui/dialogs/calendar-setup.c:318
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "将任务列表内容复制到本地以进行离线操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:304
+#: ../calendar/gui/dialogs/calendar-setup.c:320
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "将备忘列表内容复制到本地以进行离线操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:350
+#: ../calendar/gui/dialogs/calendar-setup.c:368
 msgid "Sh_ow reminder notifications"
 msgstr "显示提醒通知(_O)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:425
+#: ../calendar/gui/dialogs/calendar-setup.c:445
 msgid "Colo_r:"
 msgstr "颜色(_R):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:448
-#: ../calendar/gui/dialogs/calendar-setup.c:460
-#: ../calendar/gui/dialogs/calendar-setup.c:471
-#: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
-#: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
-#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../calendar/gui/dialogs/calendar-setup.c:468
+#: ../calendar/gui/dialogs/calendar-setup.c:480
+#: ../calendar/gui/dialogs/calendar-setup.c:491
+#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:25
+#: ../modules/addressbook/addressbook-config.c:1114
+#: ../modules/addressbook/autocompletion-config.c:240
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../plugins/itip-formatter/itip-formatter.c:3240
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "常规"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:461
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Task List"
 msgstr "任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:472
+#: ../calendar/gui/dialogs/calendar-setup.c:492
 msgid "Memo List"
 msgstr "备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:584
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:584
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:624
+#: ../calendar/gui/dialogs/calendar-setup.c:644
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:624
+#: ../calendar/gui/dialogs/calendar-setup.c:644
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:684
+#: ../calendar/gui/dialogs/calendar-setup.c:704
 msgid "Memo List Properties"
 msgstr "备忘列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:684
+#: ../calendar/gui/dialogs/calendar-setup.c:704
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "此事件已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "此任务已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This memo has been deleted."
 msgstr "此备注已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改,关闭编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "此事件已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "此任务已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "此备注已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改,更新编辑器吗?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:461
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误:%s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:273
+#: ../calendar/gui/dialogs/comp-editor.c:279
 msgid "Could not save attachments"
 msgstr "不能保存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:741
+#: ../calendar/gui/dialogs/comp-editor.c:753
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:760
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:762
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:756
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分配的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:758
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:779
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "No Summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:900
+#: ../calendar/gui/dialogs/comp-editor.c:912
 msgid "Keep original item?"
 msgstr "保留原始条目?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1129
 msgid "Close the current window"
 msgstr "关闭当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
-#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:1469
+#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1326
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
-#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1143 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:1476
+#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
+#: ../widgets/misc/e-web-view.c:1320
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../shell/e-shell-window-actions.c:1469
-#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1150
+#: ../shell/e-shell-window-actions.c:1483
+#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "删除选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1157
 msgid "View help"
 msgstr "查看帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
-#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:151
+#: ../shell/e-shell-window-actions.c:1511
+#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
+#: ../widgets/misc/e-web-view.c:1332
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1185
 msgid "Save current changes"
 msgstr "保存当前更改"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
-#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1588
+#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1199
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:176
-#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1602
+#: ../calendar/gui/dialogs/comp-editor.c:1206
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
+#: ../mail/e-mail-browser.c:172
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../shell/e-shell-window-actions.c:1616
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1609
-#: ../widgets/misc/e-signature-editor.c:221
+#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:165
+#: ../shell/e-shell-window-actions.c:1623
+#: ../widgets/misc/e-signature-editor.c:225
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
-#: ../shell/e-shell-window-actions.c:1616
+#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1227
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1241 ../mail/e-mail-browser.c:179
+#: ../shell/e-shell-window-actions.c:1665 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1251
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1253
+#: ../composer/e-composer-actions.c:290
+#: ../widgets/misc/e-attachment-view.c:414
 msgid "Attach a file"
 msgstr "添加附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1261
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1263
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1269
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1271
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1289
 msgid "Classify as private"
 msgstr "分类为私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1294
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1304
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1312
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1320
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1322
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1328
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1330
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../composer/e-composer-private.c:77
-msgid "Recent _Documents"
-msgstr "最近文档(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2059
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2051
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "附件"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2397
 #: ../calendar/gui/dialogs/comp-editor.c:2560
-#: ../calendar/gui/dialogs/comp-editor.c:3549
+#: ../calendar/gui/dialogs/comp-editor.c:3552
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话,对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3513
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3516
+#: ../plugins/prefer-plain/prefer-plain.c:66
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3581
+#: ../calendar/gui/dialogs/comp-editor.c:3584
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本!"
 
+#: ../calendar/gui/dialogs/comp-editor-page.c:438
+#, c-format
+msgid "Validation error: %s"
+msgstr "校验错误:%s"
+
 #: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "无法打开目的"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:126
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:164
+#: ../calendar/gui/dialogs/copy-source-dialog.c:160
 msgid "Cannot create object"
 msgstr "无法创建对象"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:193
+#: ../calendar/gui/dialogs/copy-source-dialog.c:189
 msgid "Could not open source"
 msgstr "无法打开源"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:212
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Retract comment"
 msgstr "撤销评论(_R):"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:55
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "由于 dbus 错误 %s,无法删除该事件。"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:59
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "由于 dbus 错误 %s,无法该删除任务。"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:63
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "由于 dbus 错误 %s,无法该删除备忘。"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:67
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "由于 dbus 错误 %s,无法删除该项目。"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:74
 msgid "The event could not be deleted because permission was denied"
 msgstr "无法删除事件,原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:77
 msgid "The task could not be deleted because permission was denied"
 msgstr "无法删除任务,原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
+#: ../calendar/gui/dialogs/delete-error.c:80
 msgid "The memo could not be deleted because permission was denied"
 msgstr "无法删除备忘,原因是权限被禁止"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:83
 msgid "The item could not be deleted because permission was denied"
 msgstr "无法删除项目,原因是权限被禁止"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:91
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "由于错误,无法删除事件:%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:95
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "由于错误,无法删除任务:%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:99
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "由于错误,无法删除备忘:%s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:103
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "由于错误,无法删除项目:%s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Contacts..."
-msgstr "联系人..."
+msgid "Enter Delegate"
+msgstr "输入代表"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "授权给:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-msgid "Enter Delegate"
-msgstr "输入代表"
+msgid "Contacts..."
+msgstr "联系人..."
 
-#: ../calendar/gui/dialogs/event-editor.c:212
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
+#: ../calendar/gui/dialogs/event-editor.c:218
 msgid "Set or unset reminders for this event"
 msgstr "设置或取消此事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:222
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "Show Time as _Busy"
 msgstr "将时间显示为忙(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:224
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Toggles whether to show time as busy"
 msgstr "切换是否将时间显示为忙"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
+#: ../calendar/gui/dialogs/event-editor.c:237
 msgid "_Recurrence"
 msgstr "再现(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/event-editor.c:239
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../calendar/gui/dialogs/event-editor.c:240
-#: ../widgets/misc/e-send-options.ui.h:22
+#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
+#: ../calendar/gui/dialogs/event-editor.c:246
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
 msgstr "插入高级发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:250
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:252
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Toggles whether to have All Day Event"
 msgstr "切换是否有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:261
+#: ../calendar/gui/dialogs/event-editor.c:265
 msgid "_Free/Busy"
 msgstr "忙/闲(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:263
+#: ../calendar/gui/dialogs/event-editor.c:267
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3327
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/e-meeting-list-view.c:162
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/gui/dialogs/event-editor.c:582
+#: ../calendar/gui/dialogs/event-editor.c:585
 msgid "Print this event"
 msgstr "打印此事件"
 
-#: ../calendar/gui/dialogs/event-page.c:558
+#: ../calendar/gui/dialogs/event-page.c:566
 msgid "Event's start time is in the past"
 msgstr "事件开始时间在过去"
 
-#: ../calendar/gui/dialogs/event-page.c:635
+#: ../calendar/gui/dialogs/event-page.c:643
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "因所选的日程为只读,您无法编辑该事件。"
 
-#: ../calendar/gui/dialogs/event-page.c:639
+#: ../calendar/gui/dialogs/event-page.c:647
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者,因此无法编辑全部事件。"
 
-#: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:659
+#: ../calendar/gui/dialogs/event-page.c:3131
 msgid "This event has reminders"
 msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:718
-#: ../calendar/gui/dialogs/event-page.ui.h:7
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.c:726
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "组织者(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1263
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1266
+#: ../calendar/gui/dialogs/event-page.c:1293
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1439
-#: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/event-page.c:1466
+#: ../calendar/gui/dialogs/memo-page.c:723
+#: ../calendar/gui/dialogs/task-page.c:840
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1476
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
+#: ../calendar/gui/dialogs/event-page.c:1499
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
+#: ../calendar/gui/dialogs/event-page.c:1506
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1644
-#: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1669
+#: ../calendar/gui/dialogs/memo-page.c:762
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1703
+#: ../calendar/gui/dialogs/task-page.c:927
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1885
+#: ../calendar/gui/dialogs/event-page.c:1910
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1887
+#: ../calendar/gui/dialogs/event-page.c:1912
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2972
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "无法打开日历“%s”:%s"
@@ -2943,274 +2969,280 @@ msgstr "无法打开日历“%s”:%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:2998
-#: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1838
+#: ../calendar/gui/dialogs/event-page.c:3049
+#: ../calendar/gui/dialogs/memo-page.c:1025
+#: ../calendar/gui/dialogs/task-page.c:1858
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:3325
+#: ../calendar/gui/dialogs/event-page.c:3404
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3410
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3416
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3435
 msgid "Customize"
 msgstr "自定义"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3362
+#: ../calendar/gui/dialogs/event-page.c:3441
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:564
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#: ../calendar/gui/dialogs/event-page.ui.h:2
+msgctxt "eventpage"
+msgid "for"
+msgstr "持续时间"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Custom Reminder:"
-msgstr "自定义提醒:"
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#: ../calendar/gui/dialogs/event-page.ui.h:4
+msgctxt "eventpage"
+msgid "until"
+msgstr "直到"
 
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Event Description"
-msgstr "事件描述"
+msgctxt "eventpage"
+msgid "15 minutes before appointment"
+msgstr "约会前 15 分钟"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Time _zone:"
-msgstr "时区(_Z):"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+msgctxt "eventpage"
+msgid "1 hour before appointment"
+msgstr "约会前 1 小时"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../widgets/misc/e-attachment-dialog.c:347
-msgid "_Description:"
-msgstr "描述(_D):"
+#. TRANSLATORS: Predefined reminder's description
+#: ../calendar/gui/dialogs/event-page.ui.h:10
+msgctxt "eventpage"
+msgid "1 day before appointment"
+msgstr "约会前 1 天"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "位置(_L):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "_Reminder"
-msgstr "提醒(_R)"
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../widgets/misc/e-attachment-dialog.c:350
+msgid "_Description:"
+msgstr "描述(_D):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Summary:"
-msgstr "概要(_S):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "_Time:"
 msgstr "时间(_T):"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "约会前 1 天"
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
+msgid "Time _zone:"
+msgstr "时区(_Z):"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "约会前 1 小时"
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+msgid "_Summary:"
+msgstr "概要(_S):"
 
-#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "约会前 15 分钟"
+msgid "Event Description"
+msgstr "事件描述"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-msgctxt "eventpage"
-msgid "for"
-msgstr "持续时间"
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-meeting-time-sel.c:579
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-msgctxt "eventpage"
-msgid "until"
-msgstr "直到"
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+msgid "_Reminder"
+msgstr "提醒(_R)"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+msgid "Custom Reminder:"
+msgstr "自定义提醒:"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "April"
-msgstr "四月"
+msgid "January"
+msgstr "一月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "August"
-msgstr "八月"
+msgid "February"
+msgstr "二月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "December"
-msgstr "十二月"
+msgid "March"
+msgstr "三月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "February"
-msgstr "二月"
+msgid "April"
+msgstr "四月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "January"
-msgstr "一月"
+msgid "May"
+msgstr "五月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "July"
-msgstr "七月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
 msgid "June"
 msgstr "六月"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
+msgid "July"
+msgstr "七月"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "March"
-msgstr "三月"
+msgid "August"
+msgstr "八月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "May"
-msgstr "五月"
+msgid "September"
+msgstr "九月"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "November"
-msgstr "十一月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
 msgid "October"
 msgstr "十月"
 
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
+msgid "November"
+msgstr "十一月"
+
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:12
+msgid "December"
+msgstr "十二月"
+
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
 msgid "Select Date"
 msgstr "选择日期"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-msgid "September"
-msgstr "九月"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3331
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:159
 msgid "Print this memo"
 msgstr "打印此备忘录"
 
-#: ../calendar/gui/dialogs/memo-page.c:405
+#: ../calendar/gui/dialogs/memo-page.c:423
 msgid "Memo's start date is in the past"
 msgstr "备忘录开始时间在过去"
 
-#: ../calendar/gui/dialogs/memo-page.c:442
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:446
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者,因此无法编辑全部备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:936
+#: ../calendar/gui/dialogs/memo-page.c:950
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "无法打开“%s”中的备忘:%s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
-#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
+#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
+#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2701
+#: ../mail/em-format-html.c:2766 ../mail/em-format-html.c:2790
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "收件人"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.ui.h:5
-msgid "Sta_rt date:"
-msgstr "开始日期(_R):"
+#: ../calendar/gui/dialogs/task-page.c:342
+#: ../calendar/gui/dialogs/task-page.ui.h:9
+msgid "_List:"
+msgstr "列表(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "概要(_M):"
+#: ../calendar/gui/dialogs/task-page.c:350
+#: ../calendar/gui/dialogs/task-page.ui.h:2
+msgid "Organi_zer:"
+msgstr "组织者(_Z):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "到(_O):"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:4
+msgid "Sta_rt date:"
+msgstr "开始日期(_R):"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:333
-#: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_List:"
-msgstr "列表(_L):"
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+msgid "Su_mmary:"
+msgstr "概要(_M):"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:53
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "您即将修改重复事件。您想要修改何内容?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:55
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "您即将代理重复事件。您想要代理何内容?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:59
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "您即将修改重复任务。您想要修改何内容?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:65
+#: ../calendar/gui/dialogs/recur-comp.c:63
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "您即将修改重复备忘。您想要修改何内容?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:89
 msgid "This Instance Only"
 msgstr "只是本次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:93
 msgid "This and Prior Instances"
 msgstr "本次和以前各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:99
 msgid "This and Future Instances"
 msgstr "本次和以后各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:104
 msgid "All Instances"
 msgstr "所有各次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:576
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的再现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:971
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1011
 msgid "End time of the recurrence was before event's start"
 msgstr "重复事件条目的结束时间小于开始时间"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "on"
 msgstr "在"
 
@@ -3218,7 +3250,7 @@ msgstr "在"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1104
 msgid "first"
 msgstr "第一个"
 
@@ -3227,7 +3259,7 @@ msgstr "第一个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
 msgid "second"
 msgstr "第二"
 
@@ -3235,7 +3267,7 @@ msgstr "第二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 msgid "third"
 msgstr "第三个"
 
@@ -3243,7 +3275,7 @@ msgstr "第三个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1120
 msgid "fourth"
 msgstr "第四个"
 
@@ -3251,7 +3283,7 @@ msgstr "第四个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "fifth"
 msgstr "第五个"
 
@@ -3259,13 +3291,13 @@ msgstr "第五个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 msgid "last"
 msgstr "最后一个"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1154
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -3273,7 +3305,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -3281,7 +3313,7 @@ msgstr "上旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -3289,97 +3321,99 @@ msgstr "中旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
 msgid "21st to 31st"
 msgstr "下旬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1203
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "星期日"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1328
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1507
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2223
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2264
 msgid "Could not get a selection to modify."
 msgstr "无法获得要修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2270
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2314
 msgid "Could not get a selection to delete."
 msgstr "无法获得要删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2453
 msgid "Date/Time"
 msgstr "日期/时间"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
-msgid "Every"
-msgstr "每"
-
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgid "Exceptions"
-msgstr "例外"
+msgctxt "recurrpage"
+msgid "day(s)"
+msgstr "天"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:82
-msgid "Preview"
-msgstr "预览"
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
+msgctxt "recurrpage"
+msgid "week(s)"
+msgstr "周"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
-msgid "This appointment rec_urs"
-msgstr "此约会重现(_U)"
+#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
+msgctxt "recurrpage"
+msgid "month(s)"
+msgstr "月"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "天"
+msgid "year(s)"
+msgstr "年"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:10
@@ -3390,157 +3424,156 @@ msgstr "持续时间"
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgctxt "recurrpage"
-msgid "forever"
-msgstr "永远"
+msgid "until"
+msgstr "直到"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "月"
+msgid "forever"
+msgstr "永远"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgctxt "recurrpage"
-msgid "until"
-msgstr "直到"
+msgid "This appointment rec_urs"
+msgstr "此约会重现(_U)"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
+msgid "Every"
+msgstr "每"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "周"
+msgid "Exceptions"
+msgstr "例外"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "年"
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20 ../mail/mail-config.ui.h:27
+msgid "Preview"
+msgstr "预览"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:196
 msgid "Send my reminders with this event"
 msgstr "发送我有关此事件的提醒"
 
 # #####
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:198
 msgid "Notify new attendees _only"
 msgstr "只通知新的出席者(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:351
-#: ../calendar/gui/dialogs/task-details-page.c:373
+#: ../calendar/gui/dialogs/task-details-page.c:355
+#: ../calendar/gui/dialogs/task-details-page.c:377
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
-#: ../calendar/gui/dialogs/task-details-page.c:488
+#: ../calendar/gui/dialogs/task-details-page.c:489
 msgid "Web Page"
 msgstr "网页"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:440
-#: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
-msgid "Canceled"
-msgstr "已取消"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:438
-#: ../calendar/gui/e-cal-model-tasks.c:723
-#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
-msgid "Completed"
-msgstr "已完成"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1274 ../widgets/misc/e-send-options.ui.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
+#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
 msgstr "高"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:436
-#: ../calendar/gui/e-cal-model-tasks.c:721
-#: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
-msgid "In Progress"
-msgstr "进行中"
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:328
+#: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
+#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
+#: ../widgets/misc/e-send-options.ui.h:5
+msgid "Normal"
+msgstr "中"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:528 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1272 ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
+#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
-#: ../widgets/misc/e-send-options.ui.h:16
-msgid "Normal"
-msgstr "中"
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-task-table.c:585 ../calendar/gui/tasktypes.xml.h:22
+#: ../widgets/misc/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "未定义"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:434
-#: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:490
+#: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3408 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "尚未开始"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:16
-msgid "P_ercent complete:"
-msgstr "完成百分比(_E):"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-model-tasks.c:492
+#: ../calendar/gui/e-cal-model-tasks.c:777
+#: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:247 ../calendar/gui/e-task-table.c:660
+#: ../calendar/gui/print.c:3411
+msgid "In Progress"
+msgstr "进行中"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:17
-msgid "Stat_us:"
-msgstr "状态(_U):"
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-model-tasks.c:494
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:249
+#: ../calendar/gui/e-task-table.c:661 ../calendar/gui/print.c:3414
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Completed"
+msgstr "已完成"
+
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-model-tasks.c:496
+#: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
+#: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
+#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
+#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
+#, c-format
+msgid "Canceled"
+msgstr "已取消"
 
 #. To Translators: '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:18
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1854
-#: ../calendar/gui/e-meeting-list-view.c:635
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
-#: ../mail/message-list.etspec.h:17
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:3523
+#: ../calendar/gui/e-meeting-list-view.c:680
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "状态"
 
-#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
+msgid "Stat_us:"
+msgstr "状态(_U):"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:19
+msgid "P_ercent complete:"
+msgstr "完成百分比(_E):"
+
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:529 ../calendar/gui/tasktypes.xml.h:24
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "Undefined"
-msgstr "未定义"
+#: ../widgets/misc/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "优先级(_P):"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "完成日期(_D):"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_Priority:"
-msgstr "优先级(_P):"
-
 #: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "网页(_W):"
@@ -3557,8 +3590,8 @@ msgstr "单击可更改或查看任务的状态细节"
 msgid "_Send Options"
 msgstr "发送选项(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
-#: ../widgets/misc/e-send-options.c:535
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3329
+#: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "任务"
 
@@ -3566,352 +3599,420 @@ msgstr "任务"
 msgid "Task Details"
 msgstr "任务细节"
 
-#: ../calendar/gui/dialogs/task-editor.c:366
+#: ../calendar/gui/dialogs/task-editor.c:368
 msgid "Print this task"
 msgstr "打印此任务"
 
-#: ../calendar/gui/dialogs/task-page.c:251
+#: ../calendar/gui/dialogs/task-page.c:254
 msgid "Task's start date is in the past"
 msgstr "任务的开始日期是在过去"
 
-#: ../calendar/gui/dialogs/task-page.c:252
+#: ../calendar/gui/dialogs/task-page.c:255
 msgid "Task's due date is in the past"
 msgstr "任务的到期时间是在过去"
 
-#: ../calendar/gui/dialogs/task-page.c:286
+#: ../calendar/gui/dialogs/task-page.c:289
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "任务不能被编辑,因为选择的任务列表是只读的"
 
-#: ../calendar/gui/dialogs/task-page.c:290
+#: ../calendar/gui/dialogs/task-page.c:293
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "无法完全编辑任务,因为您不是组织者"
 
-#: ../calendar/gui/dialogs/task-page.c:341
-#: ../calendar/gui/dialogs/task-page.ui.h:4
-msgid "Organi_zer:"
-msgstr "组织者(_Z):"
+#: ../calendar/gui/dialogs/task-page.c:297
+#, fuzzy
+#| msgid "Task cannot be edited, because the selected task list is read only"
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr "任务无法编辑,因为选择的任务列表不支持分配的任务"
 
-#: ../calendar/gui/dialogs/task-page.c:801
+#: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: ../calendar/gui/dialogs/task-page.c:1757
+#: ../calendar/gui/dialogs/task-page.c:1778
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "无法打开“%s”中的任务:%s"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:2
-msgid "Categor_ies..."
-msgstr "类别(_I)..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "到期日期(_U):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Time zone:"
 msgstr "时区:"
 
+#: ../calendar/gui/ea-cal-view.c:320
+msgid "New Appointment"
+msgstr "新建约会"
+
+#: ../calendar/gui/ea-cal-view.c:321
+msgid "New All Day Event"
+msgstr "新建全天事件"
+
+#: ../calendar/gui/ea-cal-view.c:322
+msgid "New Meeting"
+msgstr "新会议"
+
+#: ../calendar/gui/ea-cal-view.c:323
+msgid "Go to Today"
+msgstr "转到今天"
+
+#: ../calendar/gui/ea-cal-view.c:324
+msgid "Go to Date"
+msgstr "转到日期"
+
+#: ../calendar/gui/ea-cal-view-event.c:291
+msgid "It has reminders."
+msgstr "有提醒。"
+
+#: ../calendar/gui/ea-cal-view-event.c:294
+msgid "It has recurrences."
+msgstr "有再现。"
+
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "It is a meeting."
+msgstr "为会议。"
+
+#: ../calendar/gui/ea-cal-view-event.c:304
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "日历事件:摘要为 %s。"
+
+#: ../calendar/gui/ea-cal-view-event.c:307
+msgid "Calendar Event: It has no summary."
+msgstr "日历事件:无摘要。"
+
+#: ../calendar/gui/ea-cal-view-event.c:329
+msgid "calendar view event"
+msgstr "日历视图事件"
+
+#: ../calendar/gui/ea-cal-view-event.c:558
+msgid "Grab Focus"
+msgstr "获得焦点"
+
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+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:156 ../calendar/gui/ea-week-view.c:154
+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:163
+#, c-format
+msgid "Work Week View: %s. %s"
+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:169
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "日视图:%s。%s"
+
+#: ../calendar/gui/ea-day-view.c:203
+msgid "calendar view for a work week"
+msgstr "工作日的日历视图"
+
+#: ../calendar/gui/ea-day-view.c:205
+msgid "calendar view for one or more days"
+msgstr "一天或多天的日历视图"
+
+#: ../calendar/gui/ea-day-view-main-item.c:319
+#: ../calendar/gui/ea-week-view-main-item.c:345
+msgid "a table to view and select the current time range"
+msgstr "可查看并选择当前时间范围的表"
+
+#: ../calendar/gui/ea-gnome-calendar.c:50
+#: ../calendar/gui/ea-gnome-calendar.c:58
+#: ../calendar/importers/icalendar-importer.c:1084
+msgid "Gnome Calendar"
+msgstr "Gnome 日历"
+
+#: ../calendar/gui/ea-gnome-calendar.c:201
+#: ../modules/calendar/e-cal-shell-view-private.c:1073
+msgid "%A %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
+#: ../calendar/gui/e-day-view-top-item.c:837
+#: ../calendar/gui/e-week-view-main-item.c:231
+#: ../modules/calendar/e-cal-shell-view-private.c:1077
+msgid "%a %d %b"
+msgstr "%-m月%-d日%A"
+
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../modules/calendar/e-cal-shell-view-private.c:1080
+#: ../modules/calendar/e-cal-shell-view-private.c:1086
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
+msgid "%a %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
+
+#: ../calendar/gui/ea-gnome-calendar.c:230
+#: ../calendar/gui/ea-gnome-calendar.c:236
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../calendar/gui/ea-gnome-calendar.c:244
+#: ../modules/calendar/e-cal-shell-view-private.c:1106
+#: ../modules/calendar/e-cal-shell-view-private.c:1117
+#: ../modules/calendar/e-cal-shell-view-private.c:1124
+#: ../modules/calendar/e-cal-shell-view-private.c:1127
+msgid "%d %b %Y"
+msgstr "%Y年%-m月%-d日"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
+#: ../calendar/gui/e-day-view-top-item.c:841
+#: ../calendar/gui/e-week-view-main-item.c:245
+#: ../modules/calendar/e-cal-shell-view-private.c:1113
+msgid "%d %b"
+msgstr "%B%-d日"
+
+#: ../calendar/gui/ea-jump-button.c:151
+msgid "Jump button"
+msgstr "跳转按钮"
+
+#: ../calendar/gui/ea-jump-button.c:160
+msgid "Click here, you can find more events."
+msgstr "单击此处可查找更多事件。"
+
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:393
+#: ../calendar/gui/e-alarm-list.c:359
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:399
+#: ../calendar/gui/e-alarm-list.c:365
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 周"
 
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:427
 msgid "Unknown action to be performed"
 msgstr "执行未知的动作"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "在约会开始之前 %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:480
+#: ../calendar/gui/e-alarm-list.c:446
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "在约会开始之后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:487
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "在约会开始时 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:498
+#: ../calendar/gui/e-alarm-list.c:464
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "在约会结束之前 %s %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:503
+#: ../calendar/gui/e-alarm-list.c:469
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "在约会结束之后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:476
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "在约会结束时 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:534
+#: ../calendar/gui/e-alarm-list.c:500
 #, c-format
 msgid "%s at %s"
 msgstr "在 %2$s 时 %1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:542
+#: ../calendar/gui/e-alarm-list.c:508
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:671
+#: ../calendar/gui/ea-week-view.c:159
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "月视图:%s。%s"
+
+#: ../calendar/gui/ea-week-view.c:163
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "周视图:%s。%s"
+
+#: ../calendar/gui/ea-week-view.c:197
+msgid "calendar view for a month"
+msgstr "月日历视图"
+
+#: ../calendar/gui/ea-week-view.c:199
+msgid "calendar view for one or more weeks"
+msgstr "一周或多周的日历视图"
+
+#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:207
 msgid "Categories:"
 msgstr "类别:"
 
-#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-component-preview.c:246
 msgid "Summary:"
 msgstr "概要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:249
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:256
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Start Date:"
 msgstr "开始日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:277
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "Due Date:"
 msgstr "到期日期:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1083
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../plugins/itip-formatter/itip-view.c:1082
 msgid "Status:"
 msgstr "状态:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:324
 msgid "Priority:"
 msgstr "优先级:"
 
-#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-preview.c:373
+#: ../calendar/gui/e-cal-component-preview.c:380
 msgid "Web Page:"
 msgstr "网页:"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:388
-msgid "Created"
-msgstr "创建时间"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
-msgid "End Date"
-msgstr "结束日期"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#: ../calendar/gui/e-memo-table.etspec.h:4
-msgid "Last modified"
-msgstr "上次修改"
-
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "开始日期"
-
-#: ../calendar/gui/e-cal-model-calendar.c:188
-#: ../calendar/gui/e-task-table.c:580
-msgid "Free"
-msgstr "空闲"
-
-#: ../calendar/gui/e-cal-model-calendar.c:191
-#: ../calendar/gui/e-meeting-time-sel.c:547 ../calendar/gui/e-task-table.c:581
-msgid "Busy"
-msgstr "繁忙"
-
-#: ../calendar/gui/e-cal-model-tasks.c:665
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理位置必须以此格式输入:\n"
-"\n"
-"45.436845,125.862501"
-
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:717
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "无"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1053
-msgid "Yes"
-msgstr "是"
-
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:190
-msgid "No"
-msgstr "否"
-
-#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:102
-#: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
-msgid "Unknown"
-msgstr "未知"
-
-#: ../calendar/gui/e-cal-model.c:1580
-msgid "Recurring"
-msgstr "重复"
-
-#: ../calendar/gui/e-cal-model.c:1582
-msgid "Assigned"
-msgstr "已分配"
-
-#: ../calendar/gui/e-cal-model.c:2937
-#, c-format
-msgid "Opening %s"
-msgstr "打开 %s"
+#: ../calendar/gui/e-calendar-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "单击以添加任务"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% 完成"
+msgid "Start date"
+msgstr "开始日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "单击以添加任务"
+#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-meeting-list-view.c:640
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../mail/e-mail-account-tree-view.c:139
+#: ../widgets/misc/e-attachment-tree-view.c:586
+msgid "Type"
+msgstr "类型"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Complete"
-msgstr "完成"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Complete"
+msgstr "完成"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "到期日期"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% 完成"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
+#: ../calendar/gui/tasktypes.xml.h:18
 #: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "优先级"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-msgid "Start date"
-msgstr "开始日期"
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Created"
+msgstr "创建时间"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:598
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:584
-msgid "Type"
-msgstr "类型"
+msgid "Last modified"
+msgstr "上次修改"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "将选中事件剪切到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "将选中事件复制到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "从剪贴板中粘贴事件"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "删除选中的事件"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
+#: ../calendar/gui/e-task-table.c:286
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
-msgid "Accepted"
-msgstr "接受"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
-msgid "Declined"
-msgstr "拒绝"
-
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:546
-msgid "Tentative"
-msgstr "暂时的"
-
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
-msgid "Delegated"
-msgstr "被委任的"
-
-#: ../calendar/gui/e-calendar-view.c:1805
-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:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/e-memo-table.c:555
+#: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者:%s <%s>"
@@ -3919,35 +4020,139 @@ msgstr "组织者:%s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/e-memo-table.c:560
+#: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:2024
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间:%s %s"
 
+#: ../calendar/gui/e-cal-list-view.etspec.h:1
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Start Date"
+msgstr "开始日期"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "结束日期"
+
+#: ../calendar/gui/e-cal-model.c:813 ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
+#: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../plugins/itip-formatter/itip-formatter.c:475
+#: ../plugins/itip-formatter/itip-formatter.c:2885
+msgid "Unknown"
+msgstr "未知"
+
+#: ../calendar/gui/e-cal-model.c:1625
+msgid "Recurring"
+msgstr "重复"
+
+#: ../calendar/gui/e-cal-model.c:1627
+msgid "Assigned"
+msgstr "已分配"
+
+#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:196
+#: ../calendar/gui/e-meeting-store.c:1062
+msgid "Yes"
+msgstr "是"
+
+#: ../calendar/gui/e-cal-model.c:1629 ../calendar/gui/e-cal-model-tasks.c:1146
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:198
+msgid "No"
+msgstr "否"
+
+#: ../calendar/gui/e-cal-model.c:3022
+#, c-format
+msgid "Opening %s"
+msgstr "打开 %s"
+
+#: ../calendar/gui/e-cal-model.c:3467
+#: ../calendar/gui/e-meeting-list-view.c:218
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../plugins/itip-formatter/itip-formatter.c:2873
+msgid "Accepted"
+msgstr "接受"
+
+#: ../calendar/gui/e-cal-model.c:3468
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../plugins/itip-formatter/itip-formatter.c:2879
+msgid "Declined"
+msgstr "拒绝"
+
+#: ../calendar/gui/e-cal-model.c:3469
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
+#: ../calendar/gui/e-meeting-time-sel.c:561
+msgid "Tentative"
+msgstr "暂时的"
+
+#: ../calendar/gui/e-cal-model.c:3470
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
+#: ../plugins/itip-formatter/itip-formatter.c:2882
+msgid "Delegated"
+msgstr "被委任的"
+
+#: ../calendar/gui/e-cal-model.c:3471
+msgid "Needs action"
+msgstr "需要动作"
+
+#: ../calendar/gui/e-cal-model-calendar.c:157
+#: ../calendar/gui/e-task-table.c:636
+msgid "Free"
+msgstr "空闲"
+
+#: ../calendar/gui/e-cal-model-calendar.c:160
+#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:637
+msgid "Busy"
+msgstr "繁忙"
+
+#: ../calendar/gui/e-cal-model-tasks.c:721
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理位置必须以此格式输入:\n"
+"\n"
+"45.436845,125.862501"
+
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:773
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "无"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:156
+#: ../calendar/gui/e-cell-date-edit-text.c:163
 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:159
+#: ../calendar/gui/e-cell-date-edit-text.c:166
 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:167
+#: ../calendar/gui/e-cell-date-edit-text.c:174
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -3956,344 +4161,299 @@ msgstr ""
 "日期必须按照以下格式输入:\n"
 "%s"
 
-#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
-#. * 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:809
+#. String to use in 12-hour time format for times in the morning.
+#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:774
+#: ../calendar/gui/print.c:988 ../calendar/gui/print.c:1007
+#: ../calendar/gui/print.c:2498 ../calendar/gui/print.c:2518
+msgid "am"
+msgstr "上午"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:1025 ../calendar/gui/e-week-view.c:777
+#: ../calendar/gui/print.c:993 ../calendar/gui/print.c:1009
+#: ../calendar/gui/print.c:2503 ../calendar/gui/print.c:2520
+msgid "pm"
+msgstr "下午"
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. * %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. * month, %B = full month name. You can change the
+#. * order but don't change the specifiers or add
+#. * anything.
+#: ../calendar/gui/e-day-view.c:1833 ../calendar/gui/e-day-view-top-item.c:833
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1982
+msgid "%A %d %B"
+msgstr "%B%d日%A"
+
+#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
+#: ../calendar/gui/e-day-view.c:2650
+#, c-format
+msgid "Week %d"
+msgstr "第%d周"
+
+#. Translators: %02i is the number of minutes;
+#. * this is a context menu entry 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:791
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: ../calendar/gui/e-day-view-time-item.c:830
+#: ../calendar/gui/e-day-view-time-item.c:816
 msgid "Show the second time zone"
 msgstr "显示第二时区"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:847
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../calendar/gui/e-day-view-time-item.c:833
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:231
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/e-day-view-time-item.c:879
-#: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:258
+#: ../calendar/gui/e-day-view-time-item.c:867
+#: ../calendar/gui/e-timezone-entry.c:322
+#: ../modules/calendar/e-calendar-preferences.c:262
 msgid "Select..."
 msgstr "选择..."
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. * %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. * month, %B = full month name. You can change the
-#. * order but don't change the specifiers or add
-#. * anything.
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
-msgid "%A %d %B"
-msgstr "%B%d日%A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
-#: ../calendar/gui/e-week-view-main-item.c:224
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
-msgid "%a %d %b"
-msgstr "%-m月%-d日%A"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
-#: ../calendar/gui/e-week-view-main-item.c:238
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
-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:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
-msgid "am"
-msgstr "上午"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
-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:2636
-#, c-format
-msgid "Week %d"
-msgstr "第%d周"
-
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:68
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:69
 msgid "Optional Participants"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Resources"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/e-meeting-store.c:1056 ../calendar/gui/print.c:1158
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/print.c:1159 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:1160
 msgid "Resource"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:1161
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:192
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/print.c:1175
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
-#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:1059 ../calendar/gui/print.c:1176
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:158 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/print.c:1177
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:160 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/print.c:1178
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1060
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-meeting-store.c:1069
 msgid "Needs Action"
 msgstr "需要动作"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:615
 msgid "Attendee                          "
 msgstr "出席者                            "
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:623
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#: ../calendar/gui/e-meeting-list-view.c:667
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "请回复"
 
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-meeting-store.c:216 ../calendar/gui/e-meeting-store.c:239
 msgid "In Process"
 msgstr "处理中"
 
-#: ../calendar/gui/e-meeting-store.c:1876
+#: ../calendar/gui/e-meeting-store.c:1887
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "输入密码来作为用户 %2$s 访问服务器 %1$s 上的忙/闲信息"
 
-#: ../calendar/gui/e-meeting-store.c:1886
+#: ../calendar/gui/e-meeting-store.c:1897
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失败原因:%s"
 
-#: ../calendar/gui/e-meeting-store.c:1891
-#: ../plugins/caldav/caldav-browse-server.c:957
-#: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
-#: ../smime/gui/component.c:53
+#: ../calendar/gui/e-meeting-store.c:1902
+#: ../plugins/caldav/caldav-browse-server.c:958
+#: ../plugins/google-account-setup/google-source.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:339
+#: ../smime/gui/component.c:54
 msgid "Enter password"
 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:445
-#: ../calendar/gui/e-meeting-time-sel.c:2379
-msgid "%A, %B %d, %Y"
-msgstr "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. * name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. * %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:449
-#: ../calendar/gui/e-meeting-time-sel.c:2410
-msgid "%a %m/%d/%Y"
-msgstr "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %m = month number,
-#. * %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:453
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:549
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:585
+#: ../calendar/gui/e-meeting-time-sel.c:602
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:620
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:632
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:630
+#: ../calendar/gui/e-meeting-time-sel.c:649
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:665
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:663
+#: ../calendar/gui/e-meeting-time-sel.c:684
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:678
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:719
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:716
+#: ../calendar/gui/e-meeting-time-sel.c:741
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:725
+#: ../calendar/gui/e-meeting-time-sel.c:751
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:774
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_Start time:"
 msgstr "开始时间(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:814
+#: ../calendar/gui/e-meeting-time-sel.c:843
 msgid "_End time:"
 msgstr "结束时间(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "单击此处添加出席者"
 
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "通用名"
+msgid "Member"
+msgstr "成员"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Delegated To"
+msgstr "授权于"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "Delegated From"
 msgstr "来自...的代表"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "授权于"
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+msgid "Common Name"
+msgstr "通用名"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Language"
 msgstr "语言"
 
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "成员"
-
-#: ../calendar/gui/e-memo-table.c:420
-#: ../modules/calendar/e-cal-shell-content.c:473
+#: ../calendar/gui/e-memo-table.c:436
+#: ../modules/calendar/e-cal-shell-content.c:474
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
 #: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:458
+#: ../plugins/caldav/caldav-browse-server.c:459
 msgid "Memos"
 msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:517 ../calendar/gui/e-task-table.c:790
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:604 ../calendar/gui/e-task-table.c:874
 msgid "Start: "
 msgstr "开始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:623 ../calendar/gui/e-task-table.c:892
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:726
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "将选中备忘剪切到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:732
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "将选中备忘复制到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:738
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "从剪贴板中粘贴备忘"
 
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-memo-table.c:760
 #: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "删除选中的备忘"
 
-#: ../calendar/gui/e-memo-table.c:750
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "选中所有可见的备忘"
 
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
@@ -4301,232 +4461,85 @@ msgstr "单击以添加备忘"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:555
+#: ../calendar/gui/e-task-table.c:611
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2287
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1043
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
-#: ../modules/calendar/e-cal-shell-content.c:434
+#: ../calendar/importers/icalendar-importer.c:1048
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-cal-shell-content.c:435
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:456
+#: ../plugins/caldav/caldav-browse-server.c:457
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/e-task-table.c:968
+#: ../calendar/gui/e-task-table.c:1025
 msgid "Cut selected tasks to the clipboard"
 msgstr "将选中任务剪切到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:974
+#: ../calendar/gui/e-task-table.c:1031
 msgid "Copy selected tasks to the clipboard"
 msgstr "将选中任务复制到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:980
+#: ../calendar/gui/e-task-table.c:1037
 msgid "Paste tasks from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-#: ../calendar/gui/e-task-table.c:986
+#: ../calendar/gui/e-task-table.c:1043
 #: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
-#: ../calendar/gui/e-task-table.c:992
+#: ../calendar/gui/e-task-table.c:1049
 msgid "Select all visible tasks"
 msgstr "选中所有可见的任务"
 
-#: ../calendar/gui/e-timezone-entry.c:330
+#: ../calendar/gui/e-timezone-entry.c:333
 msgid "Select Timezone"
 msgstr "选择时区"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1963
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has reminders."
-msgstr "有提醒。"
-
-#: ../calendar/gui/ea-cal-view-event.c:293
-msgid "It has recurrences."
-msgstr "有再现。"
-
-#: ../calendar/gui/ea-cal-view-event.c:296
-msgid "It is a meeting."
-msgstr "为会议。"
-
-#: ../calendar/gui/ea-cal-view-event.c:303
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "日历事件:摘要为 %s。"
-
-#: ../calendar/gui/ea-cal-view-event.c:306
-msgid "Calendar Event: It has no summary."
-msgstr "日历事件:无摘要。"
-
-#: ../calendar/gui/ea-cal-view-event.c:328
-msgid "calendar view event"
-msgstr "日历视图事件"
-
-#: ../calendar/gui/ea-cal-view-event.c:557
-msgid "Grab Focus"
-msgstr "获得焦点"
-
-#: ../calendar/gui/ea-cal-view.c:315
-msgid "New Appointment"
-msgstr "新建约会"
-
-#: ../calendar/gui/ea-cal-view.c:316
-msgid "New All Day Event"
-msgstr "新建全天事件"
-
-#: ../calendar/gui/ea-cal-view.c:317
-msgid "New Meeting"
-msgstr "新会议"
-
-#: ../calendar/gui/ea-cal-view.c:318
-msgid "Go to Today"
-msgstr "转到今天"
-
-#: ../calendar/gui/ea-cal-view.c:319
-msgid "Go to Date"
-msgstr "转到日期"
-
-#: ../calendar/gui/ea-day-view-main-item.c:318
-#: ../calendar/gui/ea-week-view-main-item.c:344
-msgid "a table to view and select the current time range"
-msgstr "可查看并选择当前时间范围的表"
-
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-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:156 ../calendar/gui/ea-week-view.c:154
-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:163
-#, c-format
-msgid "Work Week View: %s. %s"
-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:169
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "日视图:%s。%s"
-
-#: ../calendar/gui/ea-day-view.c:203
-msgid "calendar view for a work week"
-msgstr "工作日的日历视图"
-
-#: ../calendar/gui/ea-day-view.c:205
-msgid "calendar view for one or more days"
-msgstr "一天或多天的日历视图"
-
-#: ../calendar/gui/ea-gnome-calendar.c:50
-#: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1077
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
-
-#: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
-msgid "%A %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
-msgid "%a %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../calendar/gui/ea-gnome-calendar.c:236
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
-msgid "%d %b %Y"
-msgstr "%Y年%-m月%-d日"
-
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr "跳转按钮"
-
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr "单击此处可查找更多事件。"
-
-#: ../calendar/gui/ea-week-view.c:159
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "月视图:%s。%s"
-
-#: ../calendar/gui/ea-week-view.c:163
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "周视图:%s。%s"
-
-#: ../calendar/gui/ea-week-view.c:197
-msgid "calendar view for a month"
-msgstr "月日历视图"
-
-#: ../calendar/gui/ea-week-view.c:199
-msgid "calendar view for one or more weeks"
-msgstr "一周或多周的日历视图"
-
-#: ../calendar/gui/gnome-cal.c:2250
+#: ../calendar/gui/gnome-cal.c:2253
 msgid "Purging"
 msgstr "销毁"
 
-#: ../calendar/gui/itip-utils.c:511 ../calendar/gui/itip-utils.c:566
-#: ../calendar/gui/itip-utils.c:669
+#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:571
+#: ../calendar/gui/itip-utils.c:684
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
-#: ../calendar/gui/itip-utils.c:558
+#: ../calendar/gui/itip-utils.c:563
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:755 ../calendar/gui/itip-utils.c:916
+#: ../calendar/gui/itip-utils.c:770 ../calendar/gui/itip-utils.c:931
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:758 ../calendar/gui/itip-utils.c:919
+#: ../calendar/gui/itip-utils.c:773 ../calendar/gui/itip-utils.c:934
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:761 ../calendar/gui/itip-utils.c:922
+#: ../calendar/gui/itip-utils.c:776 ../calendar/gui/itip-utils.c:937
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:764 ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:779 ../calendar/gui/itip-utils.c:955
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/itip-utils.c:767
+#: ../calendar/gui/itip-utils.c:782
 msgid "Calendar information"
 msgstr "日历信息"
 
@@ -4534,7 +4547,7 @@ msgstr "日历信息"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:819
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接受"
@@ -4543,7 +4556,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:811
+#: ../calendar/gui/itip-utils.c:826
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
@@ -4555,7 +4568,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:818 ../calendar/gui/itip-utils.c:866
+#: ../calendar/gui/itip-utils.c:833 ../calendar/gui/itip-utils.c:881
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒绝"
@@ -4564,7 +4577,7 @@ msgstr "拒绝"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:825
+#: ../calendar/gui/itip-utils.c:840
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -4572,7 +4585,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:838
+#: ../calendar/gui/itip-utils.c:853
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
@@ -4580,7 +4593,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:845
+#: ../calendar/gui/itip-utils.c:860
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -4588,7 +4601,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:852
+#: ../calendar/gui/itip-utils.c:867
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -4596,273 +4609,273 @@ 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:859
+#: ../calendar/gui/itip-utils.c:874
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:952
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:945
+#: ../calendar/gui/itip-utils.c:960
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:970
+#: ../calendar/gui/itip-utils.c:987
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "无法预约资源,新事件与其它事件冲突。"
 
-#: ../calendar/gui/itip-utils.c:974
+#: ../calendar/gui/itip-utils.c:991
 msgid "Unable to book a resource, error: "
 msgstr "无法预约资源,错误:"
 
-#: ../calendar/gui/itip-utils.c:1137
+#: ../calendar/gui/itip-utils.c:1156
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:592
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:593
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:594
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:595
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:596
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:597
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:598
 msgid "31st"
 msgstr "31日"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "六"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3156
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3149
+#: ../calendar/gui/print.c:3166
 msgid " (Completed "
-msgstr " (完成 "
+msgstr " (已完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3172
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3182
 msgid " (Due "
 msgstr " (预定 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3189
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3354
 #, c-format
 msgid "Summary: %s"
 msgstr "概要:%s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3381
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3424
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3439
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级:%s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3457
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率:%i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3468
 #, c-format
 msgid "URL: %s"
 msgstr "URL:%s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3481
 #, c-format
 msgid "Categories: %s"
 msgstr "类别:%s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3492
 msgid "Contacts: "
 msgstr "联系人:"
 
-#: ../calendar/gui/tasktypes.xml.h:2
-#, no-c-format
-msgid "% Completed"
-msgstr "% 完成"
+#: ../calendar/gui/tasktypes.xml.h:12
+msgid "In progress"
+msgstr "进行中"
 
-#: ../calendar/gui/tasktypes.xml.h:7
+#: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../calendar/gui/tasktypes.xml.h:15
-msgid "In progress"
-msgstr "进行中"
+#: ../calendar/gui/tasktypes.xml.h:25
+#, no-c-format
+msgid "% Completed"
+msgstr "% 完成"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
 msgid "is greater than"
 msgstr "大于"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
 msgid "is less than"
 msgstr "小于"
 
@@ -4870,181 +4883,181 @@ msgstr "小于"
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:435
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../plugins/itip-formatter/itip-formatter.c:2170
+#: ../calendar/importers/icalendar-importer.c:437
+#: ../calendar/importers/icalendar-importer.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:2499
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:583
+#: ../calendar/importers/icalendar-importer.c:585
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:586
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:674
+#: ../calendar/importers/icalendar-importer.c:676
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:758
+#: ../calendar/importers/icalendar-importer.c:760
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 文件(.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:759
+#: ../calendar/importers/icalendar-importer.c:761
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1041
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1085
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1471
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会议"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1471
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1149
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1156
+#: ../calendar/importers/icalendar-importer.c:1472
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1473
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/importers/icalendar-importer.c:1161
+#: ../calendar/importers/icalendar-importer.c:1168
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "有再现"
 
-#: ../calendar/importers/icalendar-importer.c:1166
+#: ../calendar/importers/icalendar-importer.c:1173
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "本次和以前各次"
 
-#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1178
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1183
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公开"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "保密"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1202
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "机密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1206
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "分类"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1204
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1512
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "概要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1217
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1218
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1508
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "开始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1236
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1241
+#: ../calendar/importers/icalendar-importer.c:1248
 msgctxt "iCalImp"
 msgid "End"
 msgstr "结束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1258
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "类别"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1282
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1290
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1294
-#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1301
+#: ../calendar/importers/icalendar-importer.c:1304
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "组织者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1317
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1324
+#: ../calendar/importers/icalendar-importer.c:1327
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1341
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1497
+#: ../calendar/importers/icalendar-importer.c:1504
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "类型"
@@ -5598,7 +5611,6 @@ msgid "America/Nassau"
 msgstr "美洲/拿骚"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "美洲/纽约"
 
@@ -6598,300 +6610,615 @@ msgstr "太平洋/沃利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
+#. TRANSLATORS: don't translate the terms in brackets
+#: ../capplet/anjal-settings-main.c:161
+msgid "ID of the socket to embed in"
+msgstr "要内嵌的端口 ID"
+
+#: ../capplet/anjal-settings-main.c:162
+msgid "socket"
+msgstr "套接字"
+
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your full name."
+msgstr "请输入您的全名。"
+
+#: ../capplet/settings/mail-account-view.c:78
+msgid "Please enter your email address."
+msgstr "请输入您的电子邮件地址"
+
+#: ../capplet/settings/mail-account-view.c:79
+msgid "The email address you have entered is invalid."
+msgstr "您输入的电子邮件地址无效。"
+
+#: ../capplet/settings/mail-account-view.c:80
+msgid "Please enter your password."
+msgstr "请输入您的密码。"
+
+#: ../capplet/settings/mail-account-view.c:282
+#: ../mail/em-account-editor.c:5472 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:376
+#: ../capplet/settings/mail-account-view.c:421
+#: ../mail/em-account-editor.c:5343 ../mail/em-account-editor.c:5400
+#: ../modules/online-accounts/e-online-accounts-google.c:302
+#: ../modules/online-accounts/e-online-accounts-google.c:378
+#: ../plugins/google-account-setup/google-contacts-source.c:55
+#: ../plugins/google-account-setup/google-source.c:83
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:497
+#: ../capplet/settings/mail-account-view.c:601
+#: ../mail/em-account-editor.c:4870 ../mail/em-account-editor.c:4905
+msgid "Always (SSL)"
+msgstr "总是(SSL)"
+
+#: ../capplet/settings/mail-account-view.c:500
+#: ../capplet/settings/mail-account-view.c:604
+#: ../mail/em-account-editor.c:4873 ../mail/em-account-editor.c:4908
+msgid "When possible (TLS)"
+msgstr "可用时(TLS)"
+
+#: ../capplet/settings/mail-account-view.c:503
+#: ../capplet/settings/mail-account-view.c:607
+#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4876
+#: ../mail/em-account-editor.c:4911
+msgid "Never"
+msgstr "从不"
+
+#: ../capplet/settings/mail-account-view.c:511
+msgid "Personal details:"
+msgstr "个人详细信息:"
+
+#: ../capplet/settings/mail-account-view.c:518 ../mail/mail-config.ui.h:180
+msgid "Name:"
+msgstr "名称:"
+
+#: ../capplet/settings/mail-account-view.c:527 ../mail/mail-config.ui.h:181
+msgid "Email address:"
+msgstr "电子邮件地址:"
+
+#: ../capplet/settings/mail-account-view.c:537 ../mail/mail-config.ui.h:182
+msgid "Details:"
+msgstr "细节:"
+
+#: ../capplet/settings/mail-account-view.c:545 ../mail/mail-config.ui.h:183
+msgid "Receiving"
+msgstr "接收"
+
+#: ../capplet/settings/mail-account-view.c:552 ../mail/mail-config.ui.h:185
+msgid "Server type:"
+msgstr "服务器类型:"
+
+#: ../capplet/settings/mail-account-view.c:561 ../mail/mail-config.ui.h:186
+msgid "Server address:"
+msgstr "服务器地址:"
+
+#: ../capplet/settings/mail-account-view.c:570 ../mail/mail-config.ui.h:187
+msgid "Username:"
+msgstr "用户名:"
+
+#: ../capplet/settings/mail-account-view.c:579
+msgid "Use encryption:"
+msgstr "使用加密:"
+
+#: ../capplet/settings/mail-account-view.c:612 ../mail/mail-config.ui.h:184
+msgid "Sending"
+msgstr "发送"
+
+#: ../capplet/settings/mail-account-view.c:655
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"您必须设定一个帐号才能使用这个电子邮件程序。在下面填入您的电子邮件地址和密"
+"码,我会尝试并且完成所有设定。如果我不能自动设定所有细节,您还需要提供您的电"
+"子邮件服务器的详细信息。"
+
+#: ../capplet/settings/mail-account-view.c:657
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"对不起,我们不能自动完成设置来获取您的电子邮件。请完成下面的设置。我们尝试根"
+"据您刚才输入的信息工作但是或许您需要更改它们。"
+
+#: ../capplet/settings/mail-account-view.c:659
+msgid "You can specify more options to configure the account."
+msgstr "您可以指定更多选项以配置此帐号。"
+
+#: ../capplet/settings/mail-account-view.c:661
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"现在我们需要您设置发送邮件,我们会尽量自动完成,但是您需要检查设置来确保正"
+"确。"
+
+#: ../capplet/settings/mail-account-view.c:662
+msgid "You can specify your default settings for your account."
+msgstr "您可以为您的帐号指定默认设置。"
+
+#: ../capplet/settings/mail-account-view.c:663
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr "在我们尝试连接服务器并获取您的电子邮件之前,请检查一遍您的配置信息。"
+
+#: ../capplet/settings/mail-account-view.c:678
+#: ../mail/em-account-editor.c:2985 ../mail/em-account-editor.c:3124
+msgid "Identity"
+msgstr "标识"
+
+#: ../capplet/settings/mail-account-view.c:678
+msgid "Next - Receiving mail"
+msgstr "前进 - 接收电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Receiving mail"
+msgstr "接收电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:679
+#: ../capplet/settings/mail-account-view.c:680
+msgid "Next - Sending mail"
+msgstr "前进 - 发送电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Back - Identity"
+msgstr "后退 - 标识"
+
+#: ../capplet/settings/mail-account-view.c:679
+msgid "Next - Receiving options"
+msgstr "前进 - 接收选项"
+
+#: ../capplet/settings/mail-account-view.c:680
+msgid "Receiving options"
+msgstr "接收选项"
+
+#: ../capplet/settings/mail-account-view.c:680
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Back - Receiving mail"
+msgstr "后退 - 接收电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Sending mail"
+msgstr "发送电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:682
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Next - Review account"
+msgstr "前进 - 检查帐号"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Next - Defaults"
+msgstr "前进 - 默认值"
+
+#: ../capplet/settings/mail-account-view.c:682
+msgid "Back - Receiving options"
+msgstr "后退 - 接收选项"
+
+#: ../capplet/settings/mail-account-view.c:683
+#: ../mail/em-account-editor.c:4137
+msgid "Defaults"
+msgstr "默认值"
+
+#: ../capplet/settings/mail-account-view.c:683
+msgid "Back - Sending mail"
+msgstr "后退 - 发送电子邮件"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Review account"
+msgstr "检查帐号"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Finish"
+msgstr "完成"
+
+#: ../capplet/settings/mail-account-view.c:685
+msgid "Back - Sending"
+msgstr "后退 - 发送"
+
+#: ../capplet/settings/mail-account-view.c:855
+msgid "Setup Google contacts with Evolution"
+msgstr "设置 Google 联系人到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:856
+msgid "Setup Google calendar with Evolution"
+msgstr "添加 Google 日历到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:861
+#: ../mail/em-account-editor.c:4971
+msgid "You may need to enable IMAP access."
+msgstr "您可能需要启用 IMAP 访问。"
+
+#: ../capplet/settings/mail-account-view.c:869
+#: ../mail/em-account-editor.c:4948
+msgid "Google account settings:"
+msgstr "Google 账户设置:"
+
+#: ../capplet/settings/mail-account-view.c:895
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "添加 Yahoo 日历到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:899
+#: ../mail/em-account-editor.c:5018
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo 日历命名为 名字_姓氏。我们尝试着生成这种日历名称。请确认名字是否正确,"
+"如果不正确,请重新输入日历名称。"
+
+#: ../capplet/settings/mail-account-view.c:908
+#: ../mail/em-account-editor.c:5003
+msgid "Yahoo account settings:"
+msgstr "Yahoo 账户设置:"
+
+#: ../capplet/settings/mail-account-view.c:922
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo 日历名称:"
+
+#: ../capplet/settings/mail-account-view.c:1119
+msgid "Password:"
+msgstr "密码:"
+
+#: ../capplet/settings/mail-account-view.c:1173
+#: ../capplet/settings/mail-settings-view.c:262
+msgid "Close Tab"
+msgstr "关闭标签"
+
+#: ../capplet/settings/mail-account-view.c:1185
+msgid "Account Wizard"
+msgstr "帐号向导"
+
+#: ../capplet/settings/mail-capplet-shell.c:212
+msgid "Evolution account assistant"
+msgstr "Evolution 帐号助手"
+
+#. create the local source group
+#: ../capplet/settings/mail-capplet-shell.c:377
+#: ../libemail-engine/e-mail-session.c:536
+#: ../modules/addressbook/e-book-shell-backend.c:106
+#: ../modules/addressbook/e-book-shell-migrate.c:136
+#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../modules/calendar/e-cal-shell-migrate.c:154
+#: ../modules/calendar/e-memo-shell-backend.c:112
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:108
+#: ../modules/calendar/e-task-shell-migrate.c:121
+msgid "On This Computer"
+msgstr "在此计算机中"
+
+#: ../capplet/settings/mail-settings-view.c:152
+#, c-format
+msgid "Modify %s..."
+msgstr "修改 %s..."
+
+#: ../capplet/settings/mail-settings-view.c:154
+msgid "Add a new account"
+msgstr "添加新帐号"
+
+#: ../capplet/settings/mail-settings-view.c:194
+msgid "Account management"
+msgstr "帐号管理"
+
+#: ../capplet/settings/mail-settings-view.c:274
+msgid "Settings"
+msgstr "设置"
+
 #: ../composer/e-composer-actions.c:208
 msgid "Save as..."
 msgstr "另存为..."
 
-#: ../composer/e-composer-actions.c:296
-#: ../widgets/misc/e-signature-editor.c:207
+#: ../composer/e-composer-actions.c:295
+#: ../widgets/misc/e-signature-editor.c:211
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "关闭当前文件"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "新建信息(_M)"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr "打开新建信息窗口"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1525
 msgid "Configure Evolution"
 msgstr "配置 Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "保存当前文件"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "用不同的文件名保存当前文件"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr "字符编码(_E)"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "另存为草稿(_D)"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "另存为草稿"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:317
 msgid "S_end"
 msgstr "发送(_E)"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
 msgstr "发送这条信息"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr "用 PGP 加密该信息"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr "PGP 签名(_S)"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该信息"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr "图片画廊(_P)"
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:398
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "显示一组图片,您可以将它们拖放到您的信息中"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr "标为优先(_P)"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr "将信息设定为高优先级"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr "请求已读回执(_Q)"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr "当您的信息被阅读时得到投递通知"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 加密(_C)"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "用您的 S/MIME 加密证书加密该信息"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 签名(_N)"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该信息"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "密件抄送域(_B)"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "是否显示密件抄送域"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "抄送域(_C)"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "是否显示抄送域"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "回复至域(_R)"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "保存草稿"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:42
 msgid "Enter the recipients of the message"
 msgstr "输入信息的收件人"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../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:45
+#: ../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:1021
+#: ../composer/e-composer-header-table.c:779
 msgid "Fr_om:"
 msgstr "发件人(_O):"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:788
 msgid "_Reply-To:"
 msgstr "回复到(_R):"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:792
 msgid "_To:"
 msgstr "收件人(_T):"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:797
 msgid "_Cc:"
 msgstr "抄送(_C):"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:802
 msgid "_Bcc:"
 msgstr "密件抄送(_B):"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:807
 msgid "_Post To:"
 msgstr "投递到(_P):"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:811
 msgid "S_ubject:"
 msgstr "主题(_U):"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:820
 msgid "Si_gnature:"
 msgstr "签名(_G):"
 
-#: ../composer/e-composer-name-header.c:141
+#: ../composer/e-composer-name-header.c:145
 msgid "Click here for the address book"
 msgstr "单击此处以使用地址簿"
 
-#: ../composer/e-composer-post-header.c:131
+#: ../composer/e-composer-post-header.c:135
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:215
 msgid "Undo the last action"
 msgstr "撤消上次操作"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:219
 msgid "Redo the last undone action"
 msgstr "重做上次操作"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:223
 msgid "Search for text"
 msgstr "搜索文本"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:227
 msgid "Search for and replace text"
 msgstr "搜索和替换文本"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:337
 msgid "Save draft"
 msgstr "保存草稿"
 
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:813
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:822
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
 
-#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
 msgid "Compose Message"
 msgstr "新建消息"
 
-#: ../composer/e-msg-composer.c:4228
+#: ../composer/e-msg-composer.c:4216
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "编写器含有不可编辑的非文本信体。"
 
-#: ../composer/e-msg-composer.c:4933
+#: ../composer/e-msg-composer.c:4925
 msgid "Untitled Message"
 msgstr "无标题信息"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr "附件正在下载中。发送邮件将使得邮件发送时无法包含后续的附件"
+msgid "You cannot attach the file &quot;{0}&quot; to this message."
+msgstr "您无法将文件“{0}”作为这条信息的附件。"
 
 #: ../composer/mail-composer.error.xml.h:2
-msgid "All accounts have been removed."
-msgstr "已经删除了全部帐号。"
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
+msgstr "文件“{0}”不是普通文件,无法在信息中发送。"
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "An error occurred while saving to your Drafts folder."
-msgstr "在保存到您的草稿文件夹时出现了一个错误。"
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "无法从 {0} 获取要附加的信息。"
 
 #: ../composer/mail-composer.error.xml.h:4
-msgid "An error occurred while saving to your Outbox folder."
-msgstr "在保存到您的发件箱文件夹时出现了一个错误。"
+msgid "Because &quot;{1}&quot;."
+msgstr "原因是“{1}”。"
 
 #: ../composer/mail-composer.error.xml.h:5
-msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "在发送时出错了错误。您想继续吗?"
+msgid "Do you want to recover unfinished messages?"
+msgstr "您是否想要恢复未完成的信息?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信息吗?"
+"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:7
-msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "由于“{0}”,您可能要选择不同的邮件选项。"
+msgid "_Do not Recover"
+msgstr "不恢复(_D)"
 
 #: ../composer/mail-composer.error.xml.h:8
-msgid "Because &quot;{1}&quot;."
-msgstr "原因是“{1}”。"
+msgid "_Recover"
+msgstr "恢复(_R)"
 
 #: ../composer/mail-composer.error.xml.h:9
-msgid ""
-"Because you are working offline, the message will be saved to your local "
-"Outbox folder. When you are back online you can send the message by clicking "
-"the Send/Receive button in Evolution's toolbar."
-msgstr ""
-"由于您现在是离线工作,信息将保存到您的本地发件箱文件夹。在上线后,您可以通过"
-"点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr "无法保存到自动保存文件“{0}”。"
 
 #: ../composer/mail-composer.error.xml.h:10
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr "保存到自动保存出错,原因是“{1}”。"
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Download in progress. Do you want to send the mail?"
+msgstr "下载进行中。您想要发送邮件吗?"
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr "附件正在下载中。发送邮件将使得邮件发送时无法包含后续的附件"
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信息吗?"
+
+#: ../composer/mail-composer.error.xml.h:15
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -6900,450 +7227,2889 @@ msgstr ""
 "关闭此编写窗口将会永久丢弃信息,除非您选择在草稿文件夹中保存这条信息。这允许"
 "您在稍后继续编写信息。"
 
-#: ../composer/mail-composer.error.xml.h:11
+#. Response codes were chosen somewhat arbitrarily.
+#: ../composer/mail-composer.error.xml.h:18
+msgid "_Continue Editing"
+msgstr "继续编辑(_C)"
+
+#: ../composer/mail-composer.error.xml.h:19
+msgid "_Save Draft"
+msgstr "保存草稿(_S)"
+
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not create message."
 msgstr "无法创建信息。"
 
-#: ../composer/mail-composer.error.xml.h:12
+#: ../composer/mail-composer.error.xml.h:21
+msgid "Because &quot;{0}&quot;, you may need to select different mail options."
+msgstr "由于“{0}”,您可能要选择不同的邮件选项。"
+
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "无法读取签名文件“{0}”。"
 
-#: ../composer/mail-composer.error.xml.h:13
-msgid "Could not retrieve messages to attach from {0}."
-msgstr "无法从 {0} 获取要附加的信息。"
+#: ../composer/mail-composer.error.xml.h:23
+msgid "All accounts have been removed."
+msgstr "已经删除了全部帐号。"
 
-#: ../composer/mail-composer.error.xml.h:14
-msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "无法保存到自动保存文件“{0}”。"
+#: ../composer/mail-composer.error.xml.h:24
+msgid "You need to configure an account before you can compose mail."
+msgstr "在您可以撰写邮件之前您需要配置一个帐号。"
 
-#: ../composer/mail-composer.error.xml.h:15
-msgid "Do you want to recover unfinished messages?"
-msgstr "您是否想要恢复未完成的信息?"
+#: ../composer/mail-composer.error.xml.h:25
+msgid "An error occurred while saving to your Outbox folder."
+msgstr "在保存到您的发件箱文件夹时出现了一个错误。"
 
-#: ../composer/mail-composer.error.xml.h:16
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "下载进行中。您想要发送邮件吗?"
+#: ../composer/mail-composer.error.xml.h:26
+msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
+msgstr "报告的错误为“{0}”。信息很可能没有发送。"
 
-#: ../composer/mail-composer.error.xml.h:17
-msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "保存到自动保存出错,原因是“{1}”。"
+#: ../composer/mail-composer.error.xml.h:27
+msgid "An error occurred while saving to your Drafts folder."
+msgstr "在保存到您的草稿文件夹时出现了一个错误。"
 
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:28
 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 意外退出。恢复邮件将允许您继续完成。"
+"The reported error was &quot;{0}&quot;. The message has most likely not been "
+"saved."
+msgstr "报告的错误为“{0}”。信息很可能没有保存。"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:29
+msgid "An error occurred while sending. How do you want to proceed?"
+msgstr "在发送时出错了错误。您想继续吗?"
+
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+msgid "The reported error was &quot;{0}&quot;."
+msgstr "报告的错误为“{0}”。"
+
+#: ../composer/mail-composer.error.xml.h:31
+msgid "_Save to Outbox"
+msgstr "保存到发件箱(_S)"
+
+#: ../composer/mail-composer.error.xml.h:32
+msgid "_Try Again"
+msgstr "重试(_T)"
+
+#: ../composer/mail-composer.error.xml.h:33
+msgid "Your message was sent, but an error occurred during post-processing."
+msgstr "您的消息已发送,但在处理时出现了一个错误。"
+
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Saving message to Outbox."
 msgstr "把信息保存到发件箱中。"
 
-#: ../composer/mail-composer.error.xml.h:20
-msgid "The file '{0}' is not a regular file and cannot be sent in a message."
-msgstr "文件“{0}”不是普通文件,无法在信息中发送。"
+#: ../composer/mail-composer.error.xml.h:35
+msgid ""
+"Because you are working offline, the message will be saved to your local "
+"Outbox folder. When you are back online you can send the message by clicking "
+"the Send/Receive button in Evolution's toolbar."
+msgstr ""
+"由于您现在是离线工作,信息将保存到您的本地发件箱文件夹。在上线后,您可以通过"
+"点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
-msgid "The reported error was &quot;{0}&quot;."
-msgstr "报告的错误为“{0}”。"
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+msgid "Evolution Alarm Notify"
+msgstr "Evolution 提醒通知"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Calendar event notifications"
+msgstr "日历事件信息"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:941
+#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../shell/e-shell-window-private.c:243
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:654
+msgid "Groupware Suite"
+msgstr "Groupwise 套件"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 邮件及日历"
+
+#: ../data/evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "配置您的电子邮件,联系人和日程表"
+
+#: ../data/evolution-settings.desktop.in.in.h:1
+msgid "Email Settings"
+msgstr "电子邮件设置"
+
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Configure email accounts"
+msgstr "配置电子邮件帐号"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
+msgid "Enable address formatting"
+msgstr "启用地址格式化"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
 msgid ""
-"The reported error was &quot;{0}&quot;. The message has most likely not been "
-"saved."
-msgstr "报告的错误为“{0}”。信息很可能没有保存。"
+"Whether addresses should be formatted according to standard in their "
+"destination country"
+msgstr "是否以目的地国家的标准来格式化地址"
 
-#: ../composer/mail-composer.error.xml.h:23
-msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr "报告的错误为“{0}”。信息很可能没有发送。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Autocomplete length"
+msgstr "自动补全长度"
 
-#: ../composer/mail-composer.error.xml.h:24
-msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "您无法将文件“{0}”作为这条信息的附件。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:4
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
 
-#: ../composer/mail-composer.error.xml.h:25
-msgid "You need to configure an account before you can compose mail."
-msgstr "在您可以撰写邮件之前您需要配置一个帐号。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:5
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "Show autocompleted name with an address"
+msgstr "显示自动完成的名称和地址"
 
-#: ../composer/mail-composer.error.xml.h:26
-msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "您的消息已发送,但在处理时出现了一个错误。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr "在条目里是否强制显示自动完成的联系人的邮件地址和自动完成的名称"
 
-#. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:28
-msgid "_Continue Editing"
-msgstr "继续编辑(_C)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr "选择名称对话框中上次使用的文件夹 URI"
 
-#: ../composer/mail-composer.error.xml.h:30
-msgid "_Do not Recover"
-msgstr "不恢复(_D)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "URI for the folder last used in the select names dialog."
+msgstr "选择名称对话框中上次使用的文件夹 URI。"
 
-#: ../composer/mail-composer.error.xml.h:31
-msgid "_Recover"
-msgstr "恢复(_R)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Contact layout style"
+msgstr "联系人布局风格"
 
-#: ../composer/mail-composer.error.xml.h:32
-msgid "_Save Draft"
-msgstr "保存草稿(_S)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"布局样式决定了在哪里放置联系人列表的预览面板。“0”(经典视图)会把预览面板放置在"
+"联系人列表下面。“1”(竖直视图)会把预览面板放置在联系人列表旁边。"
 
-#: ../composer/mail-composer.error.xml.h:33
-msgid "_Save to Outbox"
-msgstr "保存到发件箱(_S)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "Contact preview pane position (horizontal)"
+msgstr "联系人预览面板位置(水平)"
 
-#: ../composer/mail-composer.error.xml.h:35
-msgid "_Try Again"
-msgstr "重试(_T)"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr "设为水平时联系人预览窗口的位置"
 
-#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:154
-msgid "ID of the socket to embed in"
-msgstr "要内嵌的端口 ID"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid "Contact preview pane position (vertical)"
+msgstr "联系人预览面板位置(竖直)"
 
-#: ../capplet/anjal-settings-main.c:155
-msgid "socket"
-msgstr "套接字"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr "设为竖直时联系人预览窗口的位置"
 
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your full name."
-msgstr "请输入您的全名。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Show maps"
+msgstr "显示地图"
 
-#: ../capplet/settings/mail-account-view.c:78
-msgid "Please enter your email address."
-msgstr "请输入您的电子邮件地址"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
+msgid "Whether to show maps in preview pane"
+msgstr "是否在预览面板中显示地图"
 
-#: ../capplet/settings/mail-account-view.c:79
-msgid "The email address you have entered is invalid."
-msgstr "您输入的电子邮件地址无效。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid "Primary address book"
+msgstr "主地址薄"
 
-#: ../capplet/settings/mail-account-view.c:80
-msgid "Please enter your password."
-msgstr "请输入您的密码。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
+#, fuzzy
+msgid ""
+"The UID of the selected (or \"primary\") address book in the sidebar of the "
+"\"Contacts\" view"
+msgstr "“联系人”视图中侧边栏中选择的(或“主”)地址薄的 UID。"
 
-#: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:67
-msgid "CalDAV"
-msgstr "CalDAV"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+msgid "Show preview pane"
+msgstr "显示预览面板"
 
-#: ../capplet/settings/mail-account-view.c:361
-#: ../capplet/settings/mail-account-view.c:413
-#: ../modules/online-accounts/e-online-accounts-google.c:287
-#: ../modules/online-accounts/e-online-accounts-google.c:359
-#: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:87
-msgid "Google"
-msgstr "Google"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+msgid "Whether to show the preview pane."
+msgstr "是否显示预览面板。"
 
-#: ../capplet/settings/mail-account-view.c:480
-msgid "Personal details:"
-msgstr "个人详细信息:"
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "将邮件信息转换为 Unicode"
 
-#: ../capplet/settings/mail-account-view.c:487
-msgid "Name:"
-msgstr "名称:"
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:2
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"将信息文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信息特征。"
 
-#: ../capplet/settings/mail-account-view.c:496
-msgid "Email address:"
-msgstr "电子邮件地址:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
+msgid "Save directory for reminder audio"
+msgstr "保存提醒音频的目录"
 
-#: ../capplet/settings/mail-account-view.c:506
-msgid "Details:"
-msgstr "细节:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
+msgid "Directory for saving reminder audio files"
+msgstr "保存提醒音频文件的目录"
 
-#: ../capplet/settings/mail-account-view.c:514
-msgid "Receiving"
-msgstr "接收"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
+msgid "Birthday and anniversary reminder value"
+msgstr "生日和纪念日提醒值"
 
-#: ../capplet/settings/mail-account-view.c:521
-msgid "Server type:"
-msgstr "服务器类型:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
+#, fuzzy
+#| msgid "Number of units for determining a birthday or anniversary reminder."
+msgid "Number of units for determining a birthday or anniversary reminder"
+msgstr "决定生日或周年纪念日提醒的单位数量。"
 
-#: ../capplet/settings/mail-account-view.c:530
-msgid "Server address:"
-msgstr "服务器地址:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
+msgid "Birthday and anniversary reminder units"
+msgstr "生日和纪念日提醒单位"
 
-#: ../capplet/settings/mail-account-view.c:539
-msgid "Username:"
-msgstr "用户名:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
+#, fuzzy
+#| msgid ""
+#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+#| "\"days\"."
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\""
+msgstr "生日或周年纪念日提醒的单位,可为“minutes”,“hours”或“days”。"
 
-#: ../capplet/settings/mail-account-view.c:548
-msgid "Use encryption:"
-msgstr "使用加密:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Compress weekends in month view"
+msgstr "在月视图中压缩周末"
 
-#: ../capplet/settings/mail-account-view.c:553
-#: ../capplet/settings/mail-account-view.c:588
-msgid "never"
-msgstr "从不"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:8
+#, fuzzy
+#| msgid ""
+#| "Whether to compress weekends in the month view, which puts Saturday and "
+#| "Sunday in the space of one weekday."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday"
+msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
 
-#: ../capplet/settings/mail-account-view.c:565
-msgid "Sending"
-msgstr "发送"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
+msgid "Ask for confirmation when deleting items"
+msgstr "删除项时要求确认"
 
-#: ../capplet/settings/mail-account-view.c:607
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
+msgid "Whether to ask for confirmation when deleting an appointment or task"
+msgstr "删除约会或任务时是否要求确认"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
+msgid "Confirm expunge"
+msgstr "确认销毁"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
+#, fuzzy
+#| msgid ""
+#| "Whether to ask for confirmation when expunging appointments and tasks."
+msgid "Whether to ask for confirmation when expunging appointments and tasks"
+msgstr "销毁约会和任务时是否要求确认"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+msgid "Month view vertical pane position"
+msgstr "月视图中竖直面板的位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:14
+#, fuzzy
+#| msgid ""
+#| "Position of the vertical pane, between the calendar lists and the date "
+#| "navigator calendar."
 msgid ""
-"To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar"
+msgstr "日历列表和日期导航器日历之间竖直面板的位置。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+msgid "Workday end hour"
+msgstr "工作日结束小时"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:16
+#, fuzzy
+#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
+msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
+msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+msgid "Workday end minute"
+msgstr "工作日结束分钟"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:18
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+msgid "Minute the workday ends on, 0 to 59."
+msgstr "工作日结束的分钟,0 到 59。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Workday start hour"
+msgstr "工作日开始小时"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
+msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
+msgstr "工作日开始的小时,以 24 小时格式表示,0 到 23。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+msgid "Workday start minute"
+msgstr "工作日开始分钟"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+msgid "Minute the workday starts on, 0 to 59."
+msgstr "工作日开始的分钟,0 到 59。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+msgid "The second timezone for a Day View"
+msgstr "日视图的第二时区"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#, fuzzy
+#| msgid ""
+#| "Shows the second time zone in a Day View, if set. Value is similar to one "
+#| "used in a 'timezone' key."
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key"
+msgstr "如果被设定,在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
+msgid "Recently used second time zones in a Day View"
+msgstr "日视图中最近是用过的第二时区"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#, fuzzy
+#| msgid "List of recently used second time zones in a Day View."
+msgid "List of recently used second time zones in a Day View"
+msgstr "列出在日视图中最近使用过的第二时区。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#, fuzzy
+#| msgid "Maximum number of recently used timezones to remember."
+msgid "Maximum number of recently used timezones to remember"
+msgstr "最近使用过的时区最大记忆数目"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#, fuzzy
+#| msgid ""
+#| "Maximum number of recently used timezones to remember in a "
+#| "'day_second_zones' list."
+msgid ""
+"Maximum number of recently used timezones to remember in a 'day-second-"
+"zones' list"
+msgstr "在 'day_second_zones' 列表中,最近使用过的时区最大记忆数目"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
+msgid "Default reminder value"
+msgstr "默认提醒值"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#, fuzzy
+#| msgid "Number of units for determining a default reminder."
+msgid "Number of units for determining a default reminder"
+msgstr "确定默认提醒的单位数量。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
+msgid "Default reminder units"
+msgstr "默认提醒单位"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#, fuzzy
+#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
+msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "在事件/会议/任务编辑器中显示分类域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "是否在事件/会议编辑器中显示分类域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "在事件/任务/会议编辑器中显示角色域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "是否在事件/任务/会议中显示角色域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "在事件/任务/会议编辑器中显示请回复域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "是否在事件/任务/会议编辑器中显示请回复域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Show status field in the event/task/meeting editor"
+msgstr "在事件/任务/会议编辑器中显示状态域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "是否在事件/任务/会议编辑器中显示状态域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+msgid "Show timezone field in the event/meeting editor"
+msgstr "在事件/会议编辑器中显示时区域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "是否在事件/会议编辑器中显示时区域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+msgid "Show type field in the event/task/meeting editor"
+msgstr "在事件/任务/会议编辑器中显示类型域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "是否在事件/任务/会议编辑器中显示类型域"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
+msgid "Hide completed tasks"
+msgstr "隐藏已完成的任务"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#, fuzzy
+#| msgid "Whether to hide completed tasks in the tasks view."
+msgid "Whether to hide completed tasks in the tasks view"
+msgstr "是否在任务视图中隐藏已完成的任务。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
+msgid "Hide task units"
+msgstr "隐藏任务单位"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#, fuzzy
+#| msgid ""
+#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
+#| "\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
+msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+msgid "Hide task value"
+msgstr "隐藏任务值"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#, fuzzy
+#| msgid "Number of units for determining when to hide tasks."
+msgid "Number of units for determining when to hide tasks"
+msgstr "决定何时隐藏任务的数字单位。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+msgid "Horizontal pane position"
+msgstr "水平面板位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#, fuzzy
+#| msgid ""
+#| "Position of the horizontal pane, between the date navigator calendar and "
+#| "the task list when not in the month view, in pixels."
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels"
+msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
+msgid "Last reminder time"
+msgstr "上次提醒时间"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+msgid "Time the last reminder ran, in time_t"
+msgstr "提醒上次运行的时间,time_t 格式。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
+msgid "Marcus Bains Line Color - Day View"
+msgstr "Marcus Bains 线颜色 - 日视图"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#, fuzzy
+#| msgid "Color to draw the Marcus Bains line in the Day View."
+msgid "Color to draw the Marcus Bains line in the Day View"
+msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
+msgid "Marcus Bains Line Color - Time bar"
+msgstr "Marcus Bains 线颜色 - 日期栏"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#, fuzzy
+#| msgid ""
+#| "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
+msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
+msgid "Marcus Bains Line"
+msgstr "Marcus Bains 线"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#, fuzzy
+#| msgid ""
+#| "Whether to draw the Marcus Bains Line (line at current time) in the "
+#| "calendar."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
+msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+msgid "Memo preview pane position (horizontal)"
+msgstr "备忘预览面板的水平位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#, fuzzy
+#| msgid "Position of the task preview pane when oriented horizontally."
+msgid "Position of the task preview pane when oriented horizontally"
+msgstr "当水平定向时,任务预览面板的位置。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+msgid "Memo layout style"
+msgstr "备忘外观风格"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#, fuzzy
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the memo list. \"0\" (Classic View) places the preview pane below the "
+#| "memo list. \"1\" (Vertical View) places the preview pane next to the memo "
+#| "list."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
-"您必须设定一个帐号才能使用这个电子邮件程序。在下面填入您的电子邮件地址和密"
-"码,我会尝试并且完成所有设定。如果我不能自动设定所有细节,您还需要提供您的电"
-"子邮件服务器的详细信息。"
+"布局样式决定了在哪里放置备忘列表的预览面板。“0”(经典视图)会把预览面板放置在备"
+"忘列表下面。“1”(竖直视图)会把预览面板放置在备忘列表旁边。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+msgid "Memo preview pane position (vertical)"
+msgstr "备忘预览面板的竖直位置"
 
-#: ../capplet/settings/mail-account-view.c:609
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#, fuzzy
+#| msgid "Position of the memo preview pane when oriented vertically."
+msgid "Position of the memo preview pane when oriented vertically"
+msgstr "当竖直定向时,备忘预览面板的位置。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+msgid "Month view horizontal pane position"
+msgstr "月视图水平面板的位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#, fuzzy
+#| msgid ""
+#| "Position of the horizontal pane, between the view and the date navigator "
+#| "calendar and task list in the month view, in pixels."
 msgid ""
-"Sorry, we can't work out the settings to get your mail automatically. Please "
-"enter them below. We've tried to make a start with the details you just "
-"entered but you may need to change them."
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels"
+msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#, fuzzy
+#| msgid "Whether to scroll a Month View by a week, not by a month."
+msgid "Scroll Month View by a week, not by a month"
+msgstr "是否按星期滚动一个月,而不是按照月份滚动。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#, fuzzy
+#| msgid "Whether to scroll a Month View by a week, not by a month."
+msgid "Whether to scroll a Month View by a week, not by a month"
+msgstr "是否按星期滚动一个月,而不是按照月份滚动。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
+msgid "Reminder programs"
+msgstr "提醒程序"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#, fuzzy
+#| msgid "Programs that are allowed to be run by reminders."
+msgid "Programs that are allowed to be run by reminders"
+msgstr "允许提醒运行的程序。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
+msgid "Show display reminders in notification tray"
+msgstr "在通知托盘中显示提醒"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display reminders."
+msgid "Whether or not to use the notification tray for display reminders"
+msgstr "是否使用通知托盘来显示提醒。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#, fuzzy
+msgid "Preferred New button item"
+msgstr "首选的“新建”按钮项目"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#, fuzzy
+msgid "Name of the preferred New toolbar button item"
+msgstr "首选的“新建”工具栏按钮项目的名称"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
+msgid "Primary calendar"
+msgstr "首选日历"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
+#| "\"Calendar\" view."
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view"
+msgstr "在“日历”视图侧边栏中选择的(或“主”)日历的 UID。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
+msgid "Primary memo list"
+msgstr "首选备忘列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
+#| "\"Memos\" view."
+msgid ""
+"The UID of the selected (or \"primary\") memo list in the sidebar of the "
+"\"Memos\" view"
+msgstr "在“备忘”视图侧边栏中选择的(或“主”)备忘列表的 UID。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
+msgid "Primary task list"
+msgstr "首选任务列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#, fuzzy
+#| msgid ""
+#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
+#| "\"Tasks\" view."
+msgid ""
+"The UID of the selected (or \"primary\") task list in the sidebar of the "
+"\"Tasks\" view"
+msgstr "在“任务”视图侧边栏中选择的(或“主”)任务列表的 UID。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
+msgid "Free/busy template URL"
+msgstr "忙/闲模板 URL"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The URL template to use as a free/busy data fallback, %u is replaced by "
+#| "the user part of the mail address and %d is replaced by the domain."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain"
 msgstr ""
-"对不起,我们不能自动完成设置来获取您的电子邮件。请完成下面的设置。我们尝试根"
-"据您刚才输入的信息工作但是或许您需要更改它们。"
+"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
+"名。"
 
-#: ../capplet/settings/mail-account-view.c:611
-msgid "You can specify more options to configure the account."
-msgstr "您可以指定更多选项以配置此帐号。"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
+msgid "Recurrent Events in Italic"
+msgstr "以斜体显示重复事件"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#, fuzzy
+#| msgid ""
+#| "Show days with recurrent events in italic font in bottom left calendar."
+msgid "Show days with recurrent events in italic font in bottom left calendar"
+msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#, fuzzy
+#| msgid "Delete the selected calendar"
+msgid "List of selected calendars"
+msgstr "删除选中的日历"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#, fuzzy
+#| msgid "List of available calendars:"
+msgid "List of calendars to load"
+msgstr "可用日历列表:"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#, fuzzy
+#| msgid "Delete the selected memo list"
+msgid "List of selected memo lists"
+msgstr "重命名选中备忘列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#, fuzzy
+msgid "List of memo lists to load"
+msgstr "打印备忘列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#, fuzzy
+#| msgid "Delete the selected task list"
+msgid "List of selected task lists"
+msgstr "重命名选中任务列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#, fuzzy
+msgid "List of task lists to load"
+msgstr "打印任务列表"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
+msgid "Show appointment end times in week and month views"
+msgstr "在周视图和月视图中显示约会结束时间"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#, fuzzy
+#| msgid ""
+#| "Whether to display the end time of events in the week and month views."
+msgid "Whether to display the end time of events in the week and month views"
+msgstr "是否在周视图和月视图中显示事件的结束时间。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+msgid "Show the memo preview pane"
+msgstr "显示“备忘预览”面板"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window."
+msgid "If \"true\", show the memo preview pane in the main window"
+msgstr "如果 “true”,在主窗口中显示备忘预览面板。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+msgid "Show the task preview pane"
+msgstr "显示“任务预览”面板"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#, fuzzy
+#| msgid "If \"true\", show the task preview pane in the main window."
+msgid "If \"true\", show the task preview pane in the main window"
+msgstr "如果 “true”,在主窗口中显示任务预览面板。"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "在日视图、工作日视图和日期导航中显示周数"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#, fuzzy
+#| msgid "Whether to show week numbers in various places in the Calendar."
+msgid "Whether to show week numbers in various places in the Calendar"
+msgstr "是否在日历中显示周数。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+msgid "Vertical position for the tag pane"
+msgstr "标签面板的竖直位置"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#, fuzzy
+#| msgid "T_asks due today:"
+msgid "Highlight tasks due today"
+msgstr "高亮今天到期的任务"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid ""
-"Now we need your settings for sending mail. We've tried to make some guesses "
-"but you should check them over to make sure."
+"Whether highlight tasks due today with a special color (task-due-today-color)"
+msgstr "是否以特殊颜色高亮显示今天到期的任务(task-due-today-color)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
+msgid "Tasks due today color"
+msgstr "今天到期的任务颜色"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+msgid ""
+"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
+"together with task-due-today-highlight"
 msgstr ""
-"现在我们需要您设置发送邮件,我们会尽量自动完成,但是您需要检查设置来确保正"
-"确。"
+"今天到期任务的背景颜色,“#rrggbb”格式;与 task-due-today-highlight 一起使用"
 
-#: ../capplet/settings/mail-account-view.c:614
-msgid "You can specify your default settings for your account."
-msgstr "您可以为您的帐号指定默认设置。"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Task preview pane position (horizontal)"
+msgstr "任务预览面板的水平位置"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+msgid "Task layout style"
+msgstr "任务外观风格"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#, fuzzy
+#| msgid ""
+#| "The layout style determines where to place the preview pane in relation "
+#| "to the task list. \"0\" (Classic View) places the preview pane below the "
+#| "task list. \"1\" (Vertical View) places the preview pane next to the task "
+#| "list."
 msgid ""
-"Time to check things over before we try and connect to the server and fetch "
-"your mail."
-msgstr "在我们尝试连接服务器并获取您的电子邮件之前,请检查一遍您的配置信息。"
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list"
+msgstr ""
+"布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
+"务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
 
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
-msgid "Identity"
-msgstr "标识"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
+msgid "Task preview pane position (vertical)"
+msgstr "任务预览面板的竖直位置"
 
-#: ../capplet/settings/mail-account-view.c:630
-msgid "Next - Receiving mail"
-msgstr "前进 - 接收电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#, fuzzy
+#| msgid "Position of the task preview pane when oriented vertically."
+msgid "Position of the task preview pane when oriented vertically"
+msgstr "当竖直定向时,任务预览面板的位置。"
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Receiving mail"
-msgstr "接收电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+msgid "Highlight overdue tasks"
+msgstr "高亮延期任务"
 
-#: ../capplet/settings/mail-account-view.c:631
-#: ../capplet/settings/mail-account-view.c:632
-msgid "Next - Sending mail"
-msgstr "前进 - 发送电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+msgid ""
+"Whether highlight overdue tasks with a special color (task-overdue-color)"
+msgstr "是否用特殊颜色高亮显示延期任务(task-overdue-color)"
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Back - Identity"
-msgstr "后退 - 标识"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
+msgid "Overdue tasks color"
+msgstr "延期任务的颜色"
 
-#: ../capplet/settings/mail-account-view.c:631
-msgid "Next - Receiving options"
-msgstr "前进 - 接收选项"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#, fuzzy
+#| msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgid ""
+"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
+"together with task-overdue-highlight."
+msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
 
-#: ../capplet/settings/mail-account-view.c:632
-msgid "Receiving options"
-msgstr "接收选项"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+msgid "Time divisions"
+msgstr "时间分割"
 
-#: ../capplet/settings/mail-account-view.c:632
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Back - Receiving mail"
-msgstr "后退 - 接收电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#, fuzzy
+#| msgid "Intervals shown in Day and Work Week views, in minutes."
+msgid "Intervals shown in Day and Work Week views, in minutes"
+msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Sending mail"
-msgstr "发送电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+msgid "Timezone"
+msgstr "时区"
 
-#: ../capplet/settings/mail-account-view.c:634
-#: ../capplet/settings/mail-account-view.c:635
-msgid "Next - Review account"
-msgstr "前进 - 检查帐号"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#, fuzzy
+#| msgid ""
+#| "The default timezone to use for dates and times in the calendar, as an "
+#| "untranslated Olsen timezone database location like \"America/New York\"."
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olson timezone database location like \"America/New York\""
+msgstr ""
+"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
+"Shanghai”。"
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Next - Defaults"
-msgstr "前进 - 默认值"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+msgid "Twenty four hour time format"
+msgstr "二十四小时时间格式"
 
-#: ../capplet/settings/mail-account-view.c:634
-msgid "Back - Receiving options"
-msgstr "后退 - 接收选项"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+msgid "Whether to show times in twenty four hour format instead of using am/pm"
+msgstr "是以 24 小时格式还是以上午/下午格式显示时间"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
-msgid "Defaults"
-msgstr "默认值"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
+msgid "Birthday and anniversary reminder"
+msgstr "生日和纪念日提醒"
 
-#: ../capplet/settings/mail-account-view.c:635
-msgid "Back - Sending mail"
-msgstr "后退 - 发送电子邮件"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#, fuzzy
+#| msgid "Whether to set a reminder for birthdays and anniversaries."
+msgid "Whether to set a reminder for birthdays and anniversaries"
+msgstr "是否为生日或周年纪念日设置提醒。"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Review account"
-msgstr "检查帐号"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
+msgid "Default appointment reminder"
+msgstr "默认约会提醒"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Finish"
-msgstr "完成"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#, fuzzy
+#| msgid "Whether to set a default reminder for appointments."
+msgid "Whether to set a default reminder for appointments"
+msgstr "是否为约会设置默认提醒。"
 
-#: ../capplet/settings/mail-account-view.c:637
-msgid "Back - Sending"
-msgstr "后退 - 发送"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+msgid "Use system timezone"
+msgstr "使用系统时区"
 
-#: ../capplet/settings/mail-account-view.c:760
-msgid "Setup Google contacts with Evolution"
-msgstr "设置 Google 联系人到 Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#, fuzzy
+#| msgid ""
+#| "Use the system timezone instead of the timezone selected in Evolution."
+msgid "Use the system timezone instead of the timezone selected in Evolution"
+msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
 
-#: ../capplet/settings/mail-account-view.c:761
-msgid "Setup Google calendar with Evolution"
-msgstr "添加 Google 日历到 Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+msgid "Week start"
+msgstr "一周开始"
 
-#: ../capplet/settings/mail-account-view.c:766
-msgid "You may need to enable IMAP access."
-msgstr "您可能需要启用 IMAP 访问。"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#, fuzzy
+#| msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
+msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
 
-#: ../capplet/settings/mail-account-view.c:774
-msgid "Google account settings:"
-msgstr "Google 账户设置:"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
+msgid "Work days"
+msgstr "工作日"
 
-#: ../capplet/settings/mail-account-view.c:800
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "添加 Yahoo 日历到 Evolution"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Days on which the start and end of work hours should be indicated"
+msgstr "应标出工作时段的日子"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "Configuration version"
+msgstr "配置版本"
 
-#: ../capplet/settings/mail-account-view.c:804
+#: ../data/org.gnome.evolution.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid ""
-"Yahoo calendars are named as firstname_lastname. We have tried to form the "
-"calendar name. So please confirm and re-enter the calendar name if it is not "
-"correct."
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr "Evolution 的配置版本,带主/次/配置级别(如“2.6.0”)。"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Last upgraded configuration version"
+msgstr "上次升级的配置版本"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:4
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr "上次升级的 Evolution 配置版本,带主/次/配置级别(如“2.6.0”)。"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:5
+#, fuzzy
+#| msgid "Enable and disable plugins"
+msgid "List of disabled plugins"
+msgstr "启用和禁用插件"
+
+#: ../data/org.gnome.evolution.gschema.xml.in.h:6
+msgid "The list of disabled plugins in Evolution"
 msgstr ""
-"Yahoo 日历命名为 名字_姓氏。我们尝试着生成这种日历名称。请确认名字是否正确,"
-"如果不正确,请重新输入日历名称。"
 
-#: ../capplet/settings/mail-account-view.c:813
-msgid "Yahoo account settings:"
-msgstr "Yahoo 账户设置:"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "Default window X coordinate"
+msgid "The window's X coordinate"
+msgstr "默认窗口横坐标"
 
-#: ../capplet/settings/mail-account-view.c:827
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo 日历名称:"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:8
+#, fuzzy
+#| msgid "Default window Y coordinate"
+msgid "The window's Y coordinate"
+msgstr "默认窗口纵坐标"
 
-#: ../capplet/settings/mail-account-view.c:1098
-msgid "Password:"
-msgstr "密码:"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:9
+msgid "The window's width in pixels"
+msgstr ""
 
-#: ../capplet/settings/mail-account-view.c:1150
-#: ../capplet/settings/mail-settings-view.c:254
-msgid "Close Tab"
-msgstr "关闭标签"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:10
+#, fuzzy
+#| msgid "Default window height"
+msgid "The window's height in pixels"
+msgstr "默认窗口高度"
 
-#: ../capplet/settings/mail-account-view.c:1160
-msgid "Account Wizard"
-msgstr "帐号向导"
+#: ../data/org.gnome.evolution.gschema.xml.in.h:11
+#, fuzzy
+#| msgid "Whether or not the window should be maximized."
+msgid "Whether the window is maximized"
+msgstr "窗口是否为最大化"
 
-#: ../capplet/settings/mail-capplet-shell.c:215
-msgid "Evolution account assistant"
-msgstr "Evolution 帐号助手"
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
+msgid "Gnome Calendar's calendar import done"
+msgstr "Gnome 日历的日历导入完成"
 
-#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
-#: ../mail/em-folder-tree-model.c:170
-#: ../modules/addressbook/e-book-shell-backend.c:100
-#: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:113
-#: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:102
-#: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:102
-#: ../modules/calendar/e-task-shell-migrate.c:121
-msgid "On This Computer"
-msgstr "在此计算机中"
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
+msgid "Whether calendar from Gnome Calendar has been imported or not"
+msgstr "Gnome 日历中的日历是否已被导入"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
+msgid "Gnome Calendar's tasks import done"
+msgstr "Gnome 日历中的任务导入完毕"
+
+#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
+msgid "Whether tasks from Gnome Calendar have been imported or not"
+msgstr "Gnome 日历中的任务是否已被导入"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:1
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "检查 Evolution 是否是默认邮件程序"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:2
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "每次启动 Evolution 的时候,检查它是否是默认邮件程序。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:1
+msgid "Default charset in which to compose messages"
+msgstr "编写信息的默认字符集"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Default charset in which to compose messages."
+msgstr "编写信息的默认字符集。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:51
+msgid "Path where picture gallery should search for its content"
+msgstr "图像库搜索内容的路径"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
+msgid ""
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder"
+msgstr ""
+"这个值可以是空字符串,表示将使用系统图片文件夹,通常设为 ~/图片。在设置的路径"
+"指向的文件夹不存在时也将使用该文件夹"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Spell check inline"
+msgstr "内嵌拼写检查"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Draw spelling error indicators on words as you type."
+msgstr "在您打字的时候就显示拼写错误标识。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "自动识别链接"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "Recognize links in text and replace them."
+msgstr "识别文本中的链接并进行替换。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:7
+msgid "Automatic emoticon recognition"
+msgstr "自动识别表情图标"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:8
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "识别文本中的表情,并将其替换为图像。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Attribute message"
+msgstr "附属的信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#, fuzzy
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author"
+msgstr "在回复信息时插入的文本,附在回复来信的信息上"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+msgid "Forward message"
+msgstr "转发信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows"
+msgstr "在转发信息时插入的文本,写着下面是转发的信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+msgid "Original message"
+msgstr "原始信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#, fuzzy
+msgid ""
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows"
+msgstr "在回复一封信时插入的文本(信息顶部),写着下面是原始信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:9
+msgid "Group Reply replies to list"
+msgstr "“组回复”是回复到邮件列表"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:10
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+"与普通的“回复全部”行为不同,这个选项使“组回复”工具按钮通过您正在回复的刚收到"
+"的信息只回复给邮件列表。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:13
+msgid "Put the cursor at the bottom of replies"
+msgstr "将光标置于回复底部"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:14
+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 ""
+"用户常为回复信息时光标位置不定而恼火。这个选项决定了回复时光标位于消息顶部还"
+"是底部。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:15
+msgid "Always request read receipt"
+msgstr "总是请求阅读收条"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:16
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "是否默认对所有信息添加阅读收条请求。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:17
+msgid "Send HTML mail by default"
+msgstr "默认以 HTML 发送邮件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:18
+msgid "Send HTML mail by default."
+msgstr "默认以 HTML 发送邮件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Spell checking color"
+msgstr "拼写检查颜色"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Underline color for misspelled words when using inline spelling."
+msgstr "当使用行内拼写检查时,错误拼写单词的下划线的颜色。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Spell checking languages"
+msgstr "拼写检查语言"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid "List of dictionary language codes used for spell checking."
+msgstr "列出用来拼写检查的字典语言编码"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "在发送邮件信息时显示密件抄送域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"在发送邮件信息时显示密件抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此"
+"功能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "在发送邮件信息时显示抄送域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"在发送邮件信息时显示抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此功"
+"能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "发送邮件时显示“Reply To”(回复至)域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:28
+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 ""
+"在发送邮件信息时显示“Reply To”域。在选定了一个邮件帐号时可以在查看菜单中控制"
+"此功能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "在发送内容到新闻组时显示发件人域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"在发送内容到新闻组时显示发件人域。在选定了一个新闻组帐号时可以在查看菜单中控"
+"制此功能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "在发送内容到新闻组时显示“Reply To”(回复至)域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:32
+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 ""
+"在发送内容到新闻组时显示“Reply To”域。在选定了一个新闻组帐号时可以在查看菜单"
+"中控制此功能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+msgid "Digitally sign replies when the original message is signed"
+msgstr "若原信息已签名,回复时添加数字签名"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:12
+msgid ""
+"Automatically enable PGP or S/MIME signatures when replying to a message "
+"which is also PGP or S/MIME signed."
+msgstr "在回复带 PGP 或 S/MIME 签名的信息时,自动启动 PGP 或 S/MIME 签名。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:33
+#, fuzzy
+#| msgid "Encode file names in an Outlook/GMail way"
+msgid "Encode filenames in an Outlook/GMail way"
+msgstr "使用 Outlook/Gmail 的方式编码文件名"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid ""
+"Encode filenames in the mail headers same as Outlook or GMail do, to let "
+"them display correctly filenames with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
+msgstr ""
+"以 Outlook 或 GMail 方式编码邮件头中的文件名,这样可以正确的显示由 Evolution "
+"发送的邮件带有的 UTF-8 字符的文件名,因为它们不符合 RFC 2231,而是使用了不正"
+"确的 RFC 2047 标准。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:35
+msgid "Put personalized signatures at the top of replies"
+msgstr "在回复的顶部添加个性签名"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:36
+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 ""
+"用户常为回复信息时签名位置不定而恼火。这个选项决定了回复时签名位于消息顶部还"
+"是底部。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Do not add signature delimiter"
+msgstr "不添加签名分隔符"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr "如果您不想在您写邮件时签名以前添加签名分隔符,那么设置为真"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Ignore list Reply-To:"
+msgstr "忽略邮件列表“回复至”域:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+"一些邮件列表设置了 Reply-To 头来使用户发送的回复直接到邮件列表,即使用户希望 "
+"Evolution 来发送一个私人的回复。设置这个选项为 TRUE 将会试图忽略 Reply-To: "
+"头,这样 Evolution 将会像您要求的那样发送私人的回复。如果您使用私人的回复动"
+"作,它会进行私人的回复;而如果您使用“回复到列表”行为,它就会回复到列表。如果"
+"存在的话,它会比较 Reply-To: 和 List-Post: 来完成该目的。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "List of localized 'Re'"
+msgstr "本地化的“Re”列表"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
+"text when replying to a message, as an addition to the standard \"Re\" "
+"prefix. An example is 'SV,AV'."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:53
+msgid "Show image animations"
+msgstr "显示图像动画"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
+"是动态的。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid "Enable or disable type ahead search feature"
+msgstr "启用或禁用自动前进功能"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:57
+msgid "Disable or enable ellipsizing of folder names in side bar"
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Whether disable ellipsizing feature of folder names in side bar."
+msgstr "禁用或启用侧边栏中文件夹名的省略显示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Enable or disable magic space bar"
+msgstr "启用或禁用魔术空格键"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:60
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr "启用以在信息预览、信息列表和文件夹中使用空格键。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:62
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:63
+msgid "Mark citations in the message \"Preview\""
+msgstr "在信息“预览”中标出引用"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:64
+msgid "Mark citations in the message \"Preview\"."
+msgstr "在信息“预览”中标出引用。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Citation highlight color"
+msgstr "引用突出颜色"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:66
+msgid "Citation highlight color."
+msgstr "引用突出颜色。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:67
+msgid "Enable/disable caret mode"
+msgstr "启用/禁用光标模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:68
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:69
+msgid "Default charset in which to display messages"
+msgstr "显示信息的默认字符集"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Default charset in which to display messages."
+msgstr "显示信息的默认字符集。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:71
+msgid "Load images for HTML messages over HTTP"
+msgstr "在 HTML 信息中载入 HTTP 图像"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:72
+msgid ""
+"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
+"Never load images off the net. \"1\" - Load images in messages from "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"在 HTML 信息中载入 HTTP(S) 图像。可供选择的值有:0 - 绝不从网上载入图像,1 - "
+"如果发送者在地址簿中则载入图像,2 - 总是从网上载入图像。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid "Show Animations"
+msgstr "显示动画"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid "Show animated images as animations."
+msgstr "将动画图像显示为动画。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:75
+msgid "Show all message headers"
+msgstr "显示全部信头"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid "Show all the headers when viewing a messages."
+msgstr "查看信息时显示全部信头。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid "List of custom headers and whether they are enabled."
+msgstr "自定义头及该头是否启用。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:78
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
+"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:79
+msgid "Show photo of the sender"
+msgstr "显示发件人照片"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "在信息阅读面板中显示发件人照片。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:81
+msgid "Search for the sender photo in local address books"
+msgstr "在本地地址薄中搜索发件人照片"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "This option would help in improving the speed of fetching."
+msgstr "此选项能帮助提高获取信息的速度"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:83
+msgid "List of MIME types to check for Bonobo component viewers"
+msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:84
+msgid ""
+"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
+"any MIME types appearing in this list which map to a Bonobo component viewer "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"如果 Evolution 内没有特定 MIME 类型的内置查看器,那么出现在此列表中的任何 "
+"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 Bonobo 组件查看器将被用来显示其"
+"内容。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:85
+msgid "Mark as Seen after specified timeout"
+msgstr "在指定超时过后标为已看"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Mark as Seen after specified timeout."
+msgstr "在指定超时过后标为已看。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
+#, fuzzy
+#| msgid "Timeout for marking message as seen"
+msgid "Timeout for marking messages as seen"
+msgstr "将信息标为已看的超时时长"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
+#, fuzzy
+#| msgid "Timeout for marking message as seen."
+msgid "Timeout in milliseconds for marking messages as seen."
+msgstr "将信息标为已看的超时时长。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Sender email-address column in the message list"
+msgstr "在信息列表中显示 email 地址列"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "在信息列表的以另外的列显示电子邮件的发送者。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#, fuzzy
+#| msgid ""
+#| "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#| "\" lines in the \"Messages\" column in vertical view."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view"
+msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:92
+msgid "Show deleted messages in the message-list"
+msgstr "在信息列表中显示删除了的信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:93
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr "在信息列表中显示删除了的信息(带有删除线)。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
+#, fuzzy
+#| msgid "All local folders"
+msgid "Enable local folders"
+msgstr "全部本地文件夹"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:94
+msgid "Enable search folders"
+msgstr "启用搜索文件夹"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:95
+msgid "Enable search folders on startup."
+msgstr "启动时启用搜索文件夹。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "隐藏单文件夹预览并移除选择"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid ""
+"This key is read only once and reset to \"false\" after read. This unselects "
+"the mail in the list and removes the preview for that folder."
+msgstr ""
+"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
+"件夹的预览。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Height of the message-list pane"
+msgstr "信息列表面板的高度"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Height of the message-list pane."
+msgstr "信息列表面板的高度。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "State of message headers in paned view"
+msgstr "窗格视图中信息头的状态"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#, fuzzy
+#| msgid ""
+#| "Describes whether message headers in paned view should be collapsed or "
+#| "expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgid ""
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded and \"1\" = collapsed"
+msgstr "描述了在窗格视图中信息头默认折叠还是展开。“0”为展开,“1”为折叠"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Width of the message-list pane"
+msgstr "信息列表面板的高度"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Width of the message-list pane."
+msgstr "信息列表面板的高度。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Layout style"
+msgstr "布局样式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
+"息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:106
+msgid "Variable width font"
+msgstr "变宽字体"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:107
+msgid "The variable width font for mail display."
+msgstr "用于显示邮件的变宽字体。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Terminal font"
+msgstr "终端字体"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:109
+msgid "The terminal font for mail display."
+msgstr "邮件显示用的终端字体。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:110
+msgid "Use custom fonts"
+msgstr "使用自定义字体"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:111
+msgid "Use custom fonts for displaying mail."
+msgstr "使用自定义字体显示邮件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr "压缩 TO/CC/BCC 中地址的显示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "仅显示不超过某一大小的文本信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr "启用仅显示不超过“message_text_part_limit”键值中定义的大小的邮件文本。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "信息文本显示限制"
 
-#: ../capplet/settings/mail-settings-view.c:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"此选项决定了 Evolution 中显示的最大文本部分大小,默认为 4096KB (4MB)。此值仅"
+"在 force_message_limit 键激活时有效。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:118
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr "要在 TO/CC/BCC 中显示的地址数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:119
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr "设定默认信息视图中要显示的地址数,超过的部分显示为“...”。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:120
+msgid "Thread the message-list based on Subject"
+msgstr "基于主题按线索编排信息列表"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:121
+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 头时强制按主题编排线索。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "Default value for thread expand state"
+msgstr "话题的默认展开状态"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr "此设置指定了默认情况下线索是展开还是折叠。此设置需要重启 Evolution。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "是否以线索中的最新信息来排序线索"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
+"启 Evolution。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "在文件夹树中按字母顺序排列帐号"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user"
+msgstr ""
+"指出在邮件视图的文件夹树里如何排序帐号。若设为 true,帐号按字母顺序排列,“在"
+"此计算机上”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Log filter actions"
+msgstr "记录过滤动作"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid "Log filter actions to the specified log file."
+msgstr "将过滤动作记录到指定日志文件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Logfile to log filter actions"
+msgstr "记录过滤动作的日志文件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:145
+msgid "Logfile to log filter actions."
+msgstr "记录过滤动作的日志文件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:146
+msgid "Flush Outbox after filtering"
+msgstr "在过滤之后清空输出窗口"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:147
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+"在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
+"约一分钟后进行发件箱刷新。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:148
+msgid "Default forward style"
+msgstr "默认转发方式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "信息显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Prompt on empty subject"
+msgstr "空主题时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:152
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr "用户视图发送没有主题的信息时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+msgid "Prompt when emptying the trash"
+msgstr "清空废件箱时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+msgid "Prompt the user when he or she tries to empty the trash."
+msgstr "在用户试图清空废件箱时提示他/她。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid "Prompt when user expunges"
+msgstr "用户销毁时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr "用户试图销毁文件夹时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid "Prompt before sending to recipients not entered as mail addresses"
+msgstr "下列接收者不能被识别为有效的电子邮件地址"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying to send "
+"a message to recipients not entered as mail addresses"
+msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid "Prompt when user only fills Bcc"
+msgstr "用户只填入密件抄送时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr "当用户试图发送没有收件人或抄送的信息时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr "当用户是否发送意外的 HTML 时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr "当用户试图一次打开超过十封信时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr "如果用户试图一次打开的信息大于等于十封,将会询问用户是否真的要这么做。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Prompt while marking multiple messages"
+msgstr "标记多封信息时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "禁用/启用对多条信息标记时的提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:163
+msgid "Prompt when deleting messages in search folder"
+msgstr "删除搜索文件夹中的信息时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:164
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid "Prompt when replying privately to list messages"
+msgstr "当对邮件列表作私人回复时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "当邮件列表劫持私人回复时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:168
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+"当您正要发送一个通过邮件列表收到的信息的私人回复,而邮件头的 Reply-To: 重定向"
+"到了列表时,禁用或启用反复的警告提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:169
+msgid "Prompt when replying to many recipients"
+msgstr "当向多个收件人回复时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr "禁用或启用当您发送回复给许多人的时候的反复的警告提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid ""
+"Asks whether to close the message window when the user forwards or replies "
+"to the message shown in the window"
+msgstr "在用户转发或回复显示在窗口中的信息时,询问是否关闭信息窗口"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+msgid ""
+"Possible values are: 'never' - to never close browser window, 'always' - to "
+"always close browser window or 'ask' - (or any other value) will ask user."
+msgstr ""
+"可取的值有:“never” - 不关闭浏览器窗口;“always” - 总是关闭浏览器窗口;“ask” "
+"- (或任何其他值)将询问用户。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:175
+msgid "Empty Trash folders on exit"
+msgstr "退出时清空废件箱"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:176
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "退出 Evolution 时清空废件箱。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:177
+msgid "Minimum days between emptying the trash on exit"
+msgstr "退出时清空废件箱的最少天数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:178
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr "退出时清空废件箱的最少天数。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:179
+msgid "Last time Empty Trash was run"
+msgstr "上次清空废件箱的时间为:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:180
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "上次清空废件箱的时间,以新纪元后的天数显示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:181
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr "在状态栏中显示错误的时间秒数。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:182
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
+msgid "Level beyond which the message should be logged."
+msgstr "大于此级别的信息会被记录。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Show original \"Date\" header value."
+msgstr "显示原始的邮件头日期值。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:185
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"显示原始的邮件头“Date” 值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
+"式和本地时区显示邮件头“Date” 值。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid "List of Labels and their associated colors"
+msgstr "标签及其对应颜色的列表"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:187
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
+"颜色使用了 HTML 十六进制编码方式。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Check incoming mail being junk"
+msgstr "检查收到的邮件是否是垃圾信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:189
+msgid "Run junk test on incoming mail."
+msgstr "对收到的邮件运行垃圾信息测试。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:190
+msgid "Empty Junk folders on exit"
+msgstr "退出时清空垃圾信息文件夹"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "退出 Evolution 时清空垃圾信息。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid "Minimum days between emptying the junk on exit"
+msgstr "退出时清空垃圾信息的最少天数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "退出时清空垃圾信息的最少时间,以天计。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Last time Empty Junk was run"
+msgstr "上次清空垃圾信息的时间为:"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "上次清空垃圾信息的时间,以自新纪元后的天数显示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid "The default plugin for Junk hook"
+msgstr "默认的垃圾信息钩子插件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:197
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"这是默认的垃圾信息插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
+"缺省到其它可用的插件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:198
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "决定是否在地址簿中查找发件人电子邮件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:199
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"决定是否在地址簿中查找发件人电子邮件。如果找到,则不应是垃圾信息。这将在标记"
+"为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
+"比较慢。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr "决定是否仅在本地地址簿中查找地址进行垃圾信息过滤"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"This option is related to the key lookup_addressbook and is used to "
+"determine whether to look up addresses in local address book only to exclude "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"此选项与 lookup_addressbook 键值相关,用于决定是否查询本地地址簿以避免您认识"
+"的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:202
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "决定是否使用自定义信头检测垃圾信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:203
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话,将提高"
+"垃圾信息检测速度。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:204
+msgid "Custom headers to use while checking for junk."
+msgstr "自定义用以检查垃圾信息的信头。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:205
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr "自定义用以检查垃圾信息的信头。列表元素的字符串格式为“信头名=值”。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:206
+msgid "UID string of the default account."
+msgstr "默认帐号的 UID 字符串。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:211
+msgid "Save directory"
+msgstr "保存目录"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid "Directory for saving mail component files."
+msgstr "保存邮件组件文件的目录。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid "Composer load/attach directory"
+msgstr "编辑器加载/附件目录"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid "Directory for loading/attaching files to composer."
+msgstr "邮件写作器用来加载/附加文件的目录"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:219
+msgid "Check for new messages on start"
+msgstr "启动时检查新信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#, fuzzy
+#| msgid ""
+#| "Whether check for new messages when Evolution is started. This includes "
+#| "also sending messages from Outbox."
+msgid ""
+"Whether to check for new messages when Evolution is started. This includes "
+"also sending messages from Outbox."
+msgstr "是否在 Evolution 启动时检查新信息。也包括发送发件箱中的信息。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:221
+msgid "Check for new messages in all active accounts"
+msgstr "检查所有活动帐号的新信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#, fuzzy
+#| msgid ""
+#| "Whether check for new messages in all active accounts regardless of the "
+#| "account \"Check for new messages every X minutes\" option when Evolution "
+#| "is started. This option is used only together with 'send_recv_on_start' "
+#| "option."
+msgid ""
+"Whether to check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
+msgstr ""
+"在 Evolution 启动时,是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
+"动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:239
+msgid "Server synchronization interval"
+msgstr "服务器同步间隔"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:240
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:1
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr "信息主体中的用于附件提醒插件的线索列表"
+
+#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "信息主体中的用于附件提醒插件的线索列表。"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:1
+msgid "Address book source"
+msgstr "地址簿来源"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
+#, fuzzy
+#| msgid "Address book to use for storing automatically synced contacts."
+msgid "Address book to use for storing automatically synced contacts"
+msgstr "选择用于自动同步联系人的地址簿。"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "Automatic Contacts"
+msgid "Auto sync GAIM contacts"
+msgstr "自动联系人"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
+msgid "Whether GAIM contacts should be automaticall synced"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
+msgid "Enable autocontacts"
+msgstr "启用自动联系人"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+msgid ""
+"Whether contacts should be automatically added to the user's addressbook"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+#, fuzzy
+#| msgid "Address Book Properties"
+msgid "GAIM address book source"
+msgstr "地址簿属性"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Address book to use for storing automatically synced contacts from GAIM"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+msgid "GAIM check interval"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+msgid "Check interval for GAIM syncing of contacts"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+msgid "GAIM last sync MD5"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+msgid "GAIM last sync time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
+msgid "List of Custom Headers"
+msgstr "自定义信头列表"
+
+#: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
+#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"此键值指定了您可以向发送邮件中添加的自定义头的列表。指定头和头值的格式为:自"
+"定义头的名称,接下来是“=”和它的值,头与头之间以“;”分割"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Default External Editor"
+msgstr "默认外部编辑器"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+msgid "The default command that must be used as the editor."
+msgstr "默认命令必须用作编辑器。"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
+#: ../plugins/external-editor/external-editor.c:125
+msgid "Automatically launch when a new mail is edited"
+msgstr "在编辑新邮件时自动启动"
+
+#: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:4
+#, fuzzy
+msgid "Automatically launch editor when key is pressed in the mail composer."
+msgstr "在邮件编辑器中按键时自动启动编辑器。"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:1
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr "按默认方式插入头像图片(_I)"
+
+#: ../data/org.gnome.evolution.plugin.face-picture.gschema.xml.in.h:2
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"是否按照默认插入头像图片到发送的信息。在选择之前必须先设置好头像图片,否则不"
+"会生效。"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:1
+msgid "Delete processed"
+msgstr "删除已处理的对象"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:2
+msgid "Whether to delete processed iTip objects"
+msgstr "是否删除已处理的 iTip 对象"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Notify new messages for Inbox only."
+msgstr "只通知收件箱中的新信息。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:2
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "是否只通知收件箱文件夹中的新信息。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "启用 D-Bus 信息。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "新邮件到达时生成 D-Bus 信息。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable icon in notification area."
+msgstr "启用通知区图标。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "新邮件到达时在通知区显示新邮件图标。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:7
+msgid "Popup message together with the icon."
+msgstr "同时弹出信息和图标。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:8
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "新邮件到达时是否在图标上显示信息"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "新邮件到达时播放声音。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "新邮件到达时是播放声音文件还是哔一下。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Beep or play sound file."
+msgstr "发出哔的一声或播放声音文件。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr "新信息到达时,此值如果为 true,则响铃,否则播放声音文件。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+#| msgid "Sound file name to be played."
+msgid "Sound filename to be played."
+msgstr "待播放的声音文件名。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "不在 beep 模式下时新邮件到达要播放的声音文件。"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
+#, fuzzy
+#| msgid "FILE"
+msgid "FIXME"
+msgstr "文件"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Use sound theme"
+msgstr "使用声音主题"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "不在 beep 模式下时新邮件到达要播放主题的声音文件。"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
+msgid "Mode to use when displaying mails"
+msgstr "显示邮件时所用模式"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+msgid ""
+"The mode to use for displaying mails. \"normal\" makes Evolution choose the "
+"best part to show, \"prefer_plain\" makes it use the text part, if present, "
+"and \"only_plain\" forces Evolution to only show plain text"
+msgstr ""
+"用于显示邮件的模式。“normal”使 Evolution 选择要显示的最佳部"
+"分;“prefer_plain”让 Evolution 尽可能用文字部分;“only_plain”强制 Evolution "
+"只显示纯文字"
+
+#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
+msgid "Whether to show suppressed HTML output"
+msgstr "是否显示压缩的 HTML 输出"
+
+#: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
+#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr "用于模板插件以替换邮件内容的键/值对列表。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:1
+#: ../shell/apps_evolution_shell.schemas.in.h:5
+msgid "Skip development warning dialog"
+msgstr "跳过开发警告对话框"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr "是否跳过 Evoltuion 开发版本的警告。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:7
+msgid "Initial attachment view"
+msgstr "初始附件视图"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:8
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "附件栏的初始视图。“0”是图标视图、“1”是列表视图。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:5
+msgid "Initial file chooser folder"
+msgstr "初始文件选择器文件夹"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:6
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser 对话框的起始文件夹。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:321
+msgid "Start in offline mode"
+msgstr "以离线模式启动"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr "是否以离线模式而非在线模式启动 Evolution。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:9
+msgid "Offline folder paths"
+msgstr "离线文件夹路径"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:10
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage."
+msgstr "要在离线使用时同步到磁盘的文件夹路径列表。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:61
+msgid "Enable express mode"
+msgstr "启用快捷模式"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:62
+msgid "Flag that enables a much simplified user interface."
+msgstr "用于启用简洁用户界面的标识。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:22
+msgid "Window buttons are visible"
+msgstr "窗口按钮可见"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:23
+msgid "Whether the window buttons should be visible."
+msgstr "窗口按钮是否可见。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Window button style"
+msgstr "窗口按钮样式"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:25
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、“toolbar”(工"
+"具栏)。如果设置为“toolbar”(工具栏),则工具栏的样式由 GNOME 设置决定。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:26
+msgid "Toolbar is visible"
+msgstr "工具栏可见"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:27
+msgid "Whether the toolbar should be visible."
+msgstr "工具栏是否可见。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:28
+msgid "Sidebar is visible"
+msgstr "侧边栏可见"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:29
+msgid "Whether the sidebar should be visible."
+msgstr "侧边栏是否可见。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Statusbar is visible"
+msgstr "状态栏可见"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:31
+msgid "Whether the status bar should be visible."
+msgstr "状态栏是否可见。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:32
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "启动时默认显示的组件 ID 或别名。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+msgid "Default sidebar width"
+msgstr "默认侧边栏宽度"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:34
+msgid "The default width for the sidebar, in pixels."
+msgstr "侧边栏的默认宽度,以像素计。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use only local spam tests."
+msgstr "只使用本地垃圾信息测试。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use only the local spam tests (no DNS)."
+msgstr "之使用本地垃圾信息测试(无 DNS)。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Socket path for SpamAssassin"
+msgstr "SpamAssassin 的套接字路径"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use SpamAssassin daemon and client"
+msgstr "使用垃圾克星守护程序和客户"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "使用垃圾克星守护程序和客户端(spamc/spamd)。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid "SpamAssassin client binary"
+msgstr "垃圾克星客户端二进制文件"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
+msgid "SpamAssassin daemon binary"
+msgstr "垃圾克星守护程序二进制文件"
+
+#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
+#: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "From"
+msgstr "发件人"
+
+#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
+#: ../modules/mail/em-mailer-prefs.c:71
+msgid "Reply-To"
+msgstr "回复至"
+
+#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
+#: ../mail/em-format-html.c:2702 ../mail/em-format-html.c:2770
+#: ../mail/em-format-html.c:2793 ../modules/mail/em-mailer-prefs.c:73
+msgid "Cc"
+msgstr "抄送"
+
+#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
+#: ../mail/em-format-html.c:2703 ../mail/em-format-html.c:2774
+#: ../mail/em-format-html.c:2796 ../modules/mail/em-mailer-prefs.c:74
+msgid "Bcc"
+msgstr "密件抄送"
+
+#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
+#: ../smime/lib/e-cert.c:1126
+msgid "Subject"
+msgstr "主题"
+
+#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
+#: ../widgets/misc/e-dateedit.c:548
+msgid "Date"
+msgstr "日期"
+
+#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "头像"
+
+#: ../em-format/em-format.c:1474
 #, c-format
-msgid "Modify %s..."
-msgstr "修改 %s..."
+msgid "%s attachment"
+msgstr "%s 附件"
 
-#: ../capplet/settings/mail-settings-view.c:152
-msgid "Add a new account"
-msgstr "添加新帐号"
+#: ../em-format/em-format.c:1594
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 S/MIME 信息:未知错误"
 
-#: ../capplet/settings/mail-settings-view.c:188
-msgid "Account management"
-msgstr "帐号管理"
+#: ../em-format/em-format.c:1788 ../em-format/em-format.c:2016
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 信息。显示源文本。"
 
-#: ../capplet/settings/mail-settings-view.c:264
-msgid "Settings"
-msgstr "设置"
+#: ../em-format/em-format.c:1799
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "不支持 multipart/encrypted 的加密类型"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Calendar event notifications"
-msgstr "日历事件信息"
+#: ../em-format/em-format.c:1819
+msgid "Could not parse PGP/MIME message"
+msgstr "无法解析 PGP/MIME 信息"
 
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Evolution Alarm Notify"
-msgstr "Evolution 提醒通知"
+#: ../em-format/em-format.c:1820
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "无法解析 PGP/MIME 信息:未知错误"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
-#: ../shell/e-shell-window-private.c:257
-msgid "Evolution"
-msgstr "Evolution"
+#: ../em-format/em-format.c:2041
+msgid "Unsupported signature format"
+msgstr "不支持的签名格式"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution 邮件及日历"
+#: ../em-format/em-format.c:2054 ../em-format/em-format.c:2236
+msgid "Error verifying signature"
+msgstr "校验签名错误"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
-msgid "Groupware Suite"
-msgstr "Groupwise 套件"
+#: ../em-format/em-format.c:2055 ../em-format/em-format.c:2221
+#: ../em-format/em-format.c:2237
+msgid "Unknown error verifying signature"
+msgstr "校验签名发生了未知错误"
 
-#: ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "配置您的电子邮件,联系人和日程表"
+#: ../em-format/em-format.c:2330
+msgid "Could not parse PGP message: "
+msgstr "无法解析 PGP 信息:"
 
-#: ../data/evolution-settings.desktop.in.in.h:1
-msgid "Configure email accounts"
-msgstr "配置电子邮件帐号"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2895
+#: ../modules/mail/em-mailer-prefs.c:1046
+msgid "Mailer"
+msgstr "邮件程序"
 
-#: ../data/evolution-settings.desktop.in.in.h:2
-msgid "Email Settings"
-msgstr "电子邮件设置"
+#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
+msgid "-------- Forwarded Message --------"
+msgstr "-------- 转发的信息 --------"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:227
+#: ../e-util/e-activity.c:248
 #, c-format
 msgid "%s (cancelled)"
-msgstr "%s(取消的)"
+msgstr "%s(已取消)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:230
+#: ../e-util/e-activity.c:251
 #, c-format
 msgid "%s (completed)"
-msgstr "%s(完成的)"
+msgstr "%s(已完成)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:233
+#: ../e-util/e-activity.c:254
 #, c-format
 msgid "%s (waiting)"
-msgstr "%s (等待中)"
+msgstr "%s (正在等待)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:237
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (正在取消)"
 
-#: ../e-util/e-activity.c:239
+#: ../e-util/e-activity.c:260
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:244
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
@@ -7427,14 +10193,14 @@ msgstr "可视"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
-#: ../plugins/itip-formatter/itip-view.c:191
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
+#: ../plugins/itip-formatter/itip-view.c:194
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
 msgid "Tomorrow"
 msgstr "明天"
 
@@ -7507,26 +10273,26 @@ msgstr "使用本地默认值"
 msgid "Format:"
 msgstr "格式:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(未知文件名)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:154
 #, 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:160
+#: ../e-util/e-file-utils.c:159
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "把“%s”写入到 %s"
 
-#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:388
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../e-util/e-plugin-util.c:455 ../filter/filter.ui.h:9
+#: ../plugins/google-account-setup/google-contacts-source.c:392
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
 msgid "weeks"
 msgstr "周"
 
@@ -7543,467 +10309,667 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "打印系统未报告关于错误的任何额外细节。"
 
-#: ../e-util/e-signature.c:708
-msgid "Autogenerated"
-msgstr "自动生成的"
-
 #: ../e-util/e-system.error.xml.h:1
-msgid "Because \"{1}\"."
-msgstr "原因是“{1}”。"
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "已经存在名为“{0}”的文件。您想替换它吗?"
 
 #: ../e-util/e-system.error.xml.h:2
-msgid "Cannot open file \"{0}\"."
-msgstr "无法打开文件“{0}”。"
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr "文件已存在于“{0}”中。若替换它会覆盖其内容。"
 
 #: ../e-util/e-system.error.xml.h:3
-msgid "Cannot save file \"{0}\"."
-msgstr "无法保存文件“{0}”。"
+msgid "_Replace"
+msgstr "替换(_R)"
 
 #: ../e-util/e-system.error.xml.h:4
-msgid "Do you wish to overwrite it?"
-msgstr "您打算覆盖它吗?"
+msgid "Cannot save file \"{0}\"."
+msgstr "无法保存文件“{0}”。"
 
 #: ../e-util/e-system.error.xml.h:5
-msgid "File exists \"{0}\"."
-msgstr "文件已存在“{0}”。"
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}”。"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
-msgid "_Overwrite"
-msgstr "覆盖(_O)"
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "无法打开文件“{0}”。"
 
-#: ../e-util/e-util.c:117
+#: ../e-util/e-util.c:245
 msgid "Could not open the link."
 msgstr "无法打开链接。"
 
-#: ../e-util/e-util.c:164
+#: ../e-util/e-util.c:292
 msgid "Could not display help for Evolution."
 msgstr "无法显示 Evolution 的帮助。"
 
-#: ../e-util/gconf-bridge.c:1332
-#, c-format
-msgid "GConf error: %s"
-msgstr "GConf 错误:%s"
-
-#: ../e-util/gconf-bridge.c:1343
-msgid "All further errors shown only on terminal."
-msgstr "后续所有的错误都只显示在终端。"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1060
-#: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:72
-msgid "From"
-msgstr "发件人"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1061
-#: ../modules/mail/em-mailer-prefs.c:73
-msgid "Reply-To"
-msgstr "回复至"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
-#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
-msgid "Cc"
-msgstr "抄送"
-
-#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
-#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
-msgid "Bcc"
-msgstr "密件抄送"
-
-#: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
-#: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
-msgid "Subject"
-msgstr "主题"
-
-#. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
-#: ../modules/mail/em-mailer-prefs.c:1028
-msgid "Mailer"
-msgstr "邮件程序"
-
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
-msgid "-------- Forwarded Message --------"
-msgstr "-------- 转发的信息 --------"
-
-#: ../em-format/em-format.c:1066 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
-#: ../widgets/misc/e-dateedit.c:545
-msgid "Date"
-msgstr "日期"
-
-#: ../em-format/em-format.c:1067 ../modules/mail/em-mailer-prefs.c:79
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: ../em-format/em-format.c:1068 ../modules/mail/em-mailer-prefs.c:80
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "头像"
-
-#: ../em-format/em-format.c:1472
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
-
-#: ../em-format/em-format.c:1583
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 信息:未知错误"
-
-#: ../em-format/em-format.c:1777 ../em-format/em-format.c:2005
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 信息。显示源文本。"
-
-#: ../em-format/em-format.c:1788
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "不支持 multipart/encrypted 的加密类型"
-
-#: ../em-format/em-format.c:1808
-msgid "Could not parse PGP/MIME message"
-msgstr "无法解析 PGP/MIME 信息"
-
-#: ../em-format/em-format.c:1809
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "无法解析 PGP/MIME 信息:未知错误"
-
-#: ../em-format/em-format.c:2030
-msgid "Unsupported signature format"
-msgstr "不支持的签名格式"
-
-#: ../em-format/em-format.c:2043 ../em-format/em-format.c:2225
-msgid "Error verifying signature"
-msgstr "校验签名错误"
-
-#: ../em-format/em-format.c:2044 ../em-format/em-format.c:2210
-#: ../em-format/em-format.c:2226
-msgid "Unknown error verifying signature"
-msgstr "校验签名发生了未知错误"
-
-#: ../em-format/em-format.c:2318
-msgid "Could not parse PGP message: "
-msgstr "无法解析 PGP 信息:"
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:66
+#: ../filter/e-filter-datespec.c:69
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../filter/e-filter-datespec.c:67
+#: ../filter/e-filter-datespec.c:70
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d 秒内"
 
-#: ../filter/e-filter-datespec.c:68
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../filter/e-filter-datespec.c:69
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d 分钟内"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d 小时内"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d 内"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 周前"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d 周内"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月前"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 个月内"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../filter/e-filter-datespec.c:81
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../filter/e-filter-datespec.c:82
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d 年内"
 
-#: ../filter/e-filter-datespec.c:129
+#: ../filter/e-filter-datespec.c:132
 msgid "<click here to select a date>"
 msgstr "<单击此处以选择日期>"
 
-#: ../filter/e-filter-datespec.c:132 ../filter/e-filter-datespec.c:143
-#: ../filter/e-filter-datespec.c:154
+#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
+#: ../filter/e-filter-datespec.c:157
 msgid "now"
 msgstr "现在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:139
+#: ../filter/e-filter-datespec.c:142
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/e-filter-datespec.c:286
+#: ../filter/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-#: ../filter/e-filter-file.c:190
+#: ../filter/e-filter-file.c:188
 msgid "Choose a File"
 msgstr "选择文件"
 
-#: ../filter/e-filter-rule.c:666
+#: ../filter/e-filter-rule.c:686
 msgid "R_ule name:"
 msgstr "规则名(_U):"
 
-#: ../filter/e-filter-rule.c:696
+#: ../filter/e-filter-rule.c:718
 msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
-#: ../filter/e-filter-rule.c:721
+#: ../filter/e-filter-rule.c:743
 msgid "If all conditions are met"
 msgstr "如果满足所有条件"
 
-#: ../filter/e-filter-rule.c:722
+#: ../filter/e-filter-rule.c:744
 msgid "If any conditions are met"
 msgstr "如果满足任一条件"
 
-#: ../filter/e-filter-rule.c:725
+#: ../filter/e-filter-rule.c:747
 msgid "_Find items:"
 msgstr "查找项目(_F):"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:754
+#. protocol:
+#. name:
+#: ../filter/e-filter-rule.c:776 ../libemail-engine/camel-null-store.c:28
 msgid "None"
 msgstr "无"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:777
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/e-filter-rule.c:756 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:778 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "回复"
 
-#: ../filter/e-filter-rule.c:757
+#: ../filter/e-filter-rule.c:779
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/e-filter-rule.c:758
+#: ../filter/e-filter-rule.c:780
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../filter/e-filter-rule.c:761
+#: ../filter/e-filter-rule.c:783
 msgid "I_nclude threads:"
 msgstr "包含线索(_N):"
 
-#: ../filter/e-filter-rule.c:786
+#: ../filter/e-filter-rule.c:808
 msgid "A_dd Condition"
 msgstr "添加动作(_D)"
 
-#: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:321
+#: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
+#: ../mail/em-utils.c:306
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
+#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
 msgid "Outgoing"
 msgstr "寄出"
 
-#: ../filter/e-rule-editor.c:270
+#: ../filter/e-rule-editor.c:273
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: ../filter/e-rule-editor.c:359
+#: ../filter/e-rule-editor.c:366
 msgid "Edit Rule"
 msgstr "编辑规则"
 
 #: ../filter/filter.error.xml.h:1
-msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "无效的正则表达式“{0}”。"
+msgid "Missing date."
+msgstr "缺少日期。"
 
 #: ../filter/filter.error.xml.h:2
-msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "无法编译正则表达式“{1}”。"
+msgid "You must choose a date."
+msgstr "您忘记选择日期了。"
 
 #: ../filter/filter.error.xml.h:3
-msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "文件“{0}”不存在或不是普通文件。"
+msgid "Missing filename."
+msgstr "缺少文件名。"
 
 #: ../filter/filter.error.xml.h:4
-msgid "Missing date."
-msgstr "缺少日期。"
+msgid "You must specify a filename."
+msgstr "您必须指定一个文件名。"
 
 #: ../filter/filter.error.xml.h:5
-msgid "Missing file name."
-msgstr "缺少文件名。"
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr "文件“{0}”不存在或不是普通文件。"
+
+#: ../filter/filter.error.xml.h:6
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr "无效的正则表达式“{0}”。"
+
+#: ../filter/filter.error.xml.h:7
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr "无法编译正则表达式“{1}”。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
 msgid "Missing name."
 msgstr "缺少名称。"
 
-#: ../filter/filter.error.xml.h:7
+#: ../filter/filter.error.xml.h:9
+msgid "You must name this filter."
+msgstr "您必须为该过滤规则命名。"
+
+#: ../filter/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "名称“{0}”已使用。"
 
-#: ../filter/filter.error.xml.h:8
+#: ../filter/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "请另选一个名称。"
 
-#: ../filter/filter.error.xml.h:9
-msgid "You must choose a date."
-msgstr "您忘记选择日期了。"
+#: ../filter/filter.ui.h:2
+msgid "the current time"
+msgstr "当前时间"
 
-#: ../filter/filter.error.xml.h:10
-msgid "You must name this filter."
-msgstr "您必须为该过滤规则命名。"
+#: ../filter/filter.ui.h:3
+msgid "the time you specify"
+msgstr "您指定的时间"
 
-#: ../filter/filter.error.xml.h:11
-msgid "You must specify a file name."
-msgstr "您必须指定文件名。"
+#: ../filter/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
 
-#: ../filter/filter.ui.h:1
-msgid "Compare against"
-msgstr "比较对象"
+#: ../filter/filter.ui.h:5
+msgid "seconds"
+msgstr "秒"
 
-#: ../filter/filter.ui.h:3
+#: ../filter/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "月"
+
+#: ../filter/filter.ui.h:11
+msgid "years"
+msgstr "年"
+
+#: ../filter/filter.ui.h:12
+msgid "ago"
+msgstr "过去"
+
+#: ../filter/filter.ui.h:13
+msgid "in the future"
+msgstr "未来"
+
+#: ../filter/filter.ui.h:14
 msgid "Show filters for mail:"
 msgstr "显示邮件过滤器:"
 
-#: ../filter/filter.ui.h:4
+#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "过滤规则(_F)"
+
+#: ../filter/filter.ui.h:17
+msgid "Compare against"
+msgstr "比较对象"
+
+#: ../filter/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
+
+#: ../filter/filter.ui.h:20
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr "信息的日期将会与指定日期的午夜12:00进行比较。"
 
-#: ../filter/filter.ui.h:6
+#: ../filter/filter.ui.h:22
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
 
-#: ../filter/filter.ui.h:8
+#: ../libemail-engine/e-mail-folder-utils.c:109
+#, c-format
+msgid "Saving message to folder '%s'"
+msgstr "把信息保存到文件夹 %s 中"
+
+#: ../libemail-engine/e-mail-folder-utils.c:270
+msgid "Forwarded messages"
+msgstr "转发的信息"
+
+#: ../libemail-engine/e-mail-folder-utils.c:378
+#: ../libemail-engine/e-mail-folder-utils.c:627
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "收取 %d 封信"
+
+#: ../libemail-engine/e-mail-folder-utils.c:472
+msgid "Scanning messages for duplicates"
+msgstr "扫描信息中的重复信息?"
+
+#: ../libemail-engine/e-mail-folder-utils.c:875
+#, c-format
+msgid "Removing folder '%s'"
+msgstr "删除文件夹 %s"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1009
+#, c-format
+msgid "File \"%s\" has been removed."
+msgstr "已经删除了“%s”文件。"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1013
+msgid "File has been removed."
+msgstr "文件已移除。"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1072
+msgid "Removing attachments"
+msgstr "正在移除附件"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1234
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messages"
+msgstr[0] "保存 %d 封信"
+
+#: ../libemail-engine/e-mail-folder-utils.c:1588 ../mail/em-folder-utils.c:624
+#, c-format
+msgid "Invalid folder URI '%s'"
+msgstr "无效的文件夹 URI:“%s”"
+
+#: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:719
+#: ../modules/mail/e-mail-shell-view-private.c:1100
+#: ../modules/mail/e-mail-shell-view-private.c:1111
+msgid "Inbox"
+msgstr "收件箱"
+
+#. E_MAIL_LOCAL_FOLDER_INBOX
+#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
+#: ../modules/mail/e-mail-shell-view-private.c:1098
+msgid "Drafts"
+msgstr "草稿"
+
+#. E_MAIL_LOCAL_FOLDER_DRAFTS
+#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
+#: ../modules/mail/e-mail-shell-view-private.c:1102
+msgid "Outbox"
+msgstr "发件箱"
+
+#. E_MAIL_LOCAL_FOLDER_OUTBOX
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
+#: ../modules/mail/e-mail-shell-view-private.c:1104
+msgid "Sent"
+msgstr "已发箱"
+
+#. E_MAIL_LOCAL_FOLDER_SENT
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
+#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
+#: ../plugins/templates/templates.c:1351
+msgid "Templates"
+msgstr "模板"
+
+#: ../libemail-engine/e-mail-session.c:697 ../mail/mail-vfolder-ui.c:79
+msgid "Search Folders"
+msgstr "搜索文件夹"
+
+#: ../libemail-engine/e-mail-session.c:987
+#, c-format
+msgid "Enter Passphrase for %s"
+msgstr "输入 %s 的密码"
+
+#: ../libemail-engine/e-mail-session.c:991
+msgid "Enter Passphrase"
+msgstr "输入密码"
+
+#: ../libemail-engine/e-mail-session.c:995
+#, c-format
+msgid "Enter Password for %s"
+msgstr "为 %s 输入密码"
+
+#: ../libemail-engine/e-mail-session.c:999
+msgid "Enter Password"
+msgstr "输入密码"
+
+#: ../libemail-engine/e-mail-session.c:1050
+#, c-format
+msgid "User canceled operation."
+msgstr "用户己取消操作。"
+
+#: ../libemail-engine/e-mail-session.c:1169
+#, c-format
 msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
+"No destination address provided, forward of the message has been cancelled."
+msgstr "缺少发送目标地址,信息转发被取消。"
 
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:194
-msgid "_Filter Rules"
-msgstr "过滤规则(_F)"
+#: ../libemail-engine/e-mail-session.c:1178
+#, c-format
+msgid "No account found to use, forward of the message has been cancelled."
+msgstr "无可用帐号,信息转发被取消。"
 
-#: ../filter/filter.ui.h:12
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
+#: ../libemail-engine/e-mail-session.c:1332
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s 认证失败"
 
-#: ../filter/filter.ui.h:13
-msgid "ago"
-msgstr "过去"
+#: ../libemail-engine/e-mail-session.c:1406
+#, c-format
+msgid "No password was provided"
+msgstr ""
 
-#: ../filter/filter.ui.h:16
-msgid "in the future"
-msgstr "未来"
+#: ../libemail-engine/e-mail-session-utils.c:416
+#, c-format
+msgid "Cannot get transport for account '%s'"
+msgstr ""
 
-#: ../filter/filter.ui.h:18
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-msgid "months"
-msgstr "月"
+#: ../libemail-engine/e-mail-session-utils.c:505
+#: ../libemail-engine/mail-ops.c:658
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "应用寄出过滤器失败:%s"
 
-#: ../filter/filter.ui.h:19
-msgid "seconds"
-msgstr "秒"
+#: ../libemail-engine/e-mail-session-utils.c:534
+#: ../libemail-engine/e-mail-session-utils.c:568
+#: ../libemail-engine/mail-ops.c:677 ../libemail-engine/mail-ops.c:713
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"追加到 %s:%s 失败\n"
+"转而追加到本地“已发”文件夹。"
 
-#: ../filter/filter.ui.h:20
-msgid "the current time"
-msgstr "当前时间"
+#: ../libemail-engine/e-mail-session-utils.c:588
+#: ../libemail-engine/mail-ops.c:735
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "追加到本地“已发”文件夹失败:%s"
 
-#: ../filter/filter.ui.h:21
-msgid "the time you specify"
-msgstr "您指定的时间"
+#: ../libemail-engine/e-mail-session-utils.c:816
+#: ../libemail-engine/mail-ops.c:863 ../libemail-engine/mail-ops.c:964
+msgid "Sending message"
+msgstr "发送信息"
 
-#: ../filter/filter.ui.h:23
-msgid "years"
-msgstr "年"
+#: ../libemail-engine/e-mail-session-utils.c:890
+#, c-format
+msgid "Unsubscribing from folder '%s'"
+msgstr "正在退订文件夹“%s”"
+
+#: ../libemail-engine/e-mail-store-utils.c:169
+#, c-format
+msgid "Disconnecting from '%s'"
+msgstr "断开与 %s 的连接"
+
+#: ../libemail-engine/e-mail-store-utils.c:260
+#, c-format
+msgid "Reconnecting to '%s'"
+msgstr "重新连接到 %s"
+
+#: ../libemail-engine/e-mail-store-utils.c:335
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "正在准备离线使用帐号“%s”"
+
+#: ../libemail-engine/mail-folder-cache.c:879
+#, c-format
+msgid "Pinging %s"
+msgstr "查验 %s"
+
+#: ../libemail-engine/mail-ops.c:94
+msgid "Filtering Selected Messages"
+msgstr "过滤选中的信息"
+
+#: ../libemail-engine/mail-ops.c:216
+msgid "Fetching Mail"
+msgstr "收取邮件"
+
+#: ../libemail-engine/mail-ops.c:874
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "正在发送第 %d 封信,共 %d 封"
+
+#. Translators: The string is distinguished by total
+#. * count of messages to be sent.  Failed messages is
+#. * always more than zero.
+#: ../libemail-engine/mail-ops.c:925
+#, c-format
+msgid "Failed to send a message"
+msgid_plural "Failed to send %d of %d messages"
+msgstr[0] "无法发送 %d/%d 条信息"
+
+#: ../libemail-engine/mail-ops.c:931 ../mail/mail-send-recv.c:886
+msgid "Canceled."
+msgstr "已取消。"
+
+#: ../libemail-engine/mail-ops.c:933 ../mail/mail-send-recv.c:888
+msgid "Complete."
+msgstr "完成。"
+
+#: ../libemail-engine/mail-ops.c:1045
+#, c-format
+msgid "Moving messages to '%s'"
+msgstr "正在移动信息至 %s"
+
+#: ../libemail-engine/mail-ops.c:1046
+#, c-format
+msgid "Copying messages to '%s'"
+msgstr "把信息复制到 %s"
+
+#: ../libemail-engine/mail-ops.c:1163
+#, c-format
+msgid "Storing folder '%s'"
+msgstr "存储文件夹“%s”"
+
+#: ../libemail-engine/mail-ops.c:1236
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr "销毁并存储帐号“%s”"
+
+#: ../libemail-engine/mail-ops.c:1237
+#, c-format
+msgid "Storing account '%s'"
+msgstr "存储帐号“%s”"
+
+#: ../libemail-engine/mail-ops.c:1299
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "刷新文件夹 %s"
+
+#: ../libemail-engine/mail-ops.c:1517
+#, c-format
+msgid "Expunging folder '%s'"
+msgstr "销毁文件夹 %s"
+
+#: ../libemail-engine/mail-ops.c:1610
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr "清空“%s”中的废件箱"
+
+#: ../libemail-engine/mail-ops.c:1706
+#, c-format
+msgid "Disconnecting %s"
+msgstr "正在断开 %s"
+
+#: ../libemail-engine/mail-tools.c:71
+#, c-format
+msgid "Could not create spool directory '%s': %s"
+msgstr "无法创建离线目录“%s”:%s"
+
+#: ../libemail-engine/mail-tools.c:112
+#, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
+msgstr "试图将邮件移至非 mbox 源 %s"
+
+#: ../libemail-engine/mail-tools.c:224
+#, c-format
+msgid "Forwarded message - %s"
+msgstr "转发的信息 - %s"
+
+#: ../libemail-engine/mail-tools.c:226
+msgid "Forwarded message"
+msgstr "转发的信息"
+
+#: ../libemail-engine/mail-vfolder.c:77
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr "设置搜索文件夹:%s"
+
+#: ../libemail-engine/mail-vfolder.c:214
+#, c-format
+msgid "Updating Search Folders for '%s' - %s"
+msgstr "更新搜索文件夹:“%s” - %s"
+
+#. Translators: The first %s is name of the affected
+#. * search folder(s), the second %s is the URI of the
+#. * removed folder. For more than one search folder is
+#. * each of them on a separate line, with four spaces
+#. * in front of its name, without quotes.
+#: ../libemail-engine/mail-vfolder.c:554
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been modified to account for the deleted "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been modified to account for the deleted folder\n"
+"\"%s\"."
+msgstr[0] ""
+"以下搜索文件夹\n"
+"%s 已经修改,以用于删除文件夹\n"
+"“%s”。"
+
+#: ../libemail-utils/e-signature.c:710
+msgid "Autogenerated"
+msgstr "自动生成的"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:863 ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:1660 ../widgets/misc/e-signature-combo-box.c:79
 msgctxt "mail-signature"
 msgid "None"
 msgstr "无"
 
-#: ../mail/em-account-editor.c:946
-msgid "Never"
-msgstr "从不"
-
-#: ../mail/em-account-editor.c:947
+#: ../mail/em-account-editor.c:1753
 msgid "Always"
 msgstr "总是"
 
-#: ../mail/em-account-editor.c:948
+#: ../mail/em-account-editor.c:1754
 msgid "Ask for each message"
 msgstr "每条信息都询问"
 
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "无"
+#: ../mail/em-account-editor.c:2934 ../mail/mail-config.ui.h:164
+msgid "_Path:"
+msgstr "路径(_P):"
 
-#: ../mail/em-account-editor.c:2237
+#: ../mail/em-account-editor.c:2937
 msgid "Fil_e:"
 msgstr "文件(_E):"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
-msgid "_Path:"
-msgstr "路径(_P):"
-
-#: ../mail/em-account-editor.c:2286
+#: ../mail/em-account-editor.c:2982
 msgid "Mail Configuration"
 msgstr "邮件配置"
 
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2983
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8013,7 +10979,7 @@ msgstr ""
 "\n"
 "单击“继续”开始。"
 
-#: ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2986
 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 "
@@ -8022,19 +10988,19 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+#: ../mail/em-account-editor.c:2988 ../mail/em-account-editor.c:3197
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: ../mail/em-account-editor.c:2293
+#: ../mail/em-account-editor.c:2989
 msgid "Please configure the following account settings."
 msgstr "请配置下列帐号设置。"
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+#: ../mail/em-account-editor.c:2991 ../mail/em-account-editor.c:3816
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: ../mail/em-account-editor.c:2296
+#: ../mail/em-account-editor.c:2992
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8042,23 +11008,22 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "帐号信息"
+#: ../mail/em-account-editor.c:2994
+#, fuzzy
+#| msgid "Account Search"
+msgid "Account Summary"
+msgstr "帐号搜索"
 
-#: ../mail/em-account-editor.c:2299
+#: ../mail/em-account-editor.c:2995
 msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
+"This is a summary of the settings which will be used to access your mail."
 msgstr ""
-"请在下面的空白处输入此帐号的描述性名称。\n"
-"此名称将只在显示时使用。"
 
-#: ../mail/em-account-editor.c:2303
+#: ../mail/em-account-editor.c:2999
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:3000
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8072,884 +11037,832 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: ../mail/em-account-editor.c:2843
+#: ../mail/em-account-editor.c:3563
 msgid "Check for _new messages every"
 msgstr "自动检查新信息的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2851
+#: ../mail/em-account-editor.c:3571
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:4289 ../mail/mail-config.ui.h:166
 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:3575 ../mail/em-account-editor.c:3658
+#: ../mail/em-account-editor.c:4344 ../mail/em-account-editor.c:4446
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:4345 ../mail/em-account-editor.c:4447
 msgid "Checking for New Messages"
 msgstr "检查新信息"
 
-#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../mail/em-account-editor.c:4956
+#, fuzzy
+#| msgid "Setup Google contacts with Evolution"
+msgid "Setup Google con_tacts with Evolution"
+msgstr "设置 Google 联系人到 Evolution"
+
+#: ../mail/em-account-editor.c:4963
+#, fuzzy
+#| msgid "Setup Google calendar with Evolution"
+msgid "Setup Google ca_lendar with Evolution"
+msgstr "添加 Google 日历到 Evolution"
+
+#: ../mail/em-account-editor.c:5011
+#, fuzzy
+#| msgid "Setup Yahoo calendar with Evolution"
+msgid "Setup _Yahoo calendar with Evolution"
+msgstr "添加 Yahoo 日历到 Evolution"
+
+#: ../mail/em-account-editor.c:5036
+#, fuzzy
+#| msgid "Yahoo Calendar name:"
+msgid "Yahoo Calen_dar name:"
+msgstr "Yahoo 日历名称:"
+
+#: ../mail/e-mail-account-manager.c:405
+#, fuzzy
+#| msgid "Use _Default"
+msgid "_Restore Default"
+msgstr "使用默认值(_D)"
+
+#: ../mail/e-mail-account-manager.c:418
+msgid "You can drag and drop account names to reorder them."
+msgstr ""
+
+#: ../mail/e-mail-account-manager.c:463
+msgid "De_fault"
+msgstr "默认(_F)"
+
+#: ../mail/e-mail-account-tree-view.c:85
+#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:855
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../mail/e-mail-account-tree-view.c:105
+msgid "Account Name"
+msgstr "帐号名"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
+#: ../mail/mail-config.ui.h:51
+#: ../plugins/google-account-setup/google-source.c:311
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:690
+msgid "Default"
+msgstr "默认"
+
+#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
+#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
+#: ../widgets/misc/e-attachment-paned.c:181
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:619
+#: ../widgets/misc/e-attachment-paned.c:703
 msgid "Icon View"
 msgstr "图标视图"
 
-#: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../mail/e-mail-attachment-bar.c:621
+#: ../widgets/misc/e-attachment-paned.c:705
 msgid "List View"
 msgstr "列表视图"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
-#: ../shell/e-shell-window-actions.c:1434
-#: ../shell/e-shell-window-actions.c:1441
+#: ../mail/e-mail-backend.c:661
+#, fuzzy
+#| msgid "Unknown action to be performed"
+msgid "Unknown background operation"
+msgstr "执行未知的动作"
+
+#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1441
+#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1455
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../mail/e-mail-browser.c:293
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(无主题)"
 
-#: ../mail/e-mail-display.c:66
+#: ../mail/e-mail-display.c:68
 msgid "_Add to Address Book..."
 msgstr "添加到地址簿(_A)..."
 
-#: ../mail/e-mail-display.c:73
+#: ../mail/e-mail-display.c:75
 msgid "_To This Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/e-mail-display.c:80
+#: ../mail/e-mail-display.c:82
 msgid "_From This Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/e-mail-display.c:87
+#: ../mail/e-mail-display.c:89
 msgid "Send _Reply To..."
 msgstr "发送回复给(_R)..."
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:91
 msgid "Send a reply message to this address"
 msgstr "发送一条回复信息到这个地址"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:98
 msgid "Create Search _Folder"
 msgstr "创建搜索文件夹(_F)"
 
-#: ../mail/e-mail-folder-utils.c:111
-#, c-format
-msgid "Saving message to folder '%s'"
-msgstr "把信息保存到文件夹 %s 中"
-
-#: ../mail/e-mail-folder-utils.c:274
-msgid "Forwarded messages"
-msgstr "转发的信息"
-
-#: ../mail/e-mail-folder-utils.c:391
-msgid "Scanning messages for duplicates"
-msgstr "扫描信息中的重复信息?"
-
-#: ../mail/e-mail-folder-utils.c:584
-#, c-format
-msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] "收取 %d 封信"
-
-#: ../mail/e-mail-folder-utils.c:834
-#, c-format
-msgid "Removing folder '%s'"
-msgstr "删除文件夹 %s"
-
-#: ../mail/e-mail-folder-utils.c:968
-#, c-format
-msgid "File \"%s\" has been removed."
-msgstr "已经删除了“%s”文件。"
-
-#: ../mail/e-mail-folder-utils.c:972
-msgid "File has been removed."
-msgstr "文件已移除。"
-
-#: ../mail/e-mail-folder-utils.c:1031
-msgid "Removing attachments"
-msgstr "正在移除附件"
-
-#: ../mail/e-mail-folder-utils.c:1195
-#, c-format
-msgid "Saving %d message"
-msgid_plural "Saving %d messages"
-msgstr[0] "保存 %d 封信"
-
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
-#, c-format
-msgid "Invalid folder URI '%s'"
-msgstr "无效的文件夹 URI:“%s”"
-
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
 msgid "Junk filtering software:"
 msgstr "垃圾过滤软件:"
 
-#: ../mail/e-mail-label-dialog.c:223
+#: ../mail/e-mail-label-dialog.c:225
 msgid "_Label name:"
 msgstr "标签名称(_L):"
 
-#: ../mail/e-mail-label-list-store.c:41
+#: ../mail/e-mail-label-list-store.c:49
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:42
+#: ../mail/e-mail-label-list-store.c:50
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:43
+#: ../mail/e-mail-label-list-store.c:51
 msgid "_Personal"
 msgstr "个人(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:44
+#: ../mail/e-mail-label-list-store.c:52
 msgid "_To Do"
 msgstr "待办(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:45
+#: ../mail/e-mail-label-list-store.c:53
 msgid "_Later"
 msgstr "稍候(_L)"
 
-#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../mail/e-mail-label-manager.c:170
+#: ../modules/mail/e-mail-shell-view-actions.c:736
 msgid "Add Label"
 msgstr "添加标签"
 
-#: ../mail/e-mail-label-manager.c:216
+#: ../mail/e-mail-label-manager.c:221
 msgid "Edit Label"
 msgstr "编辑标签"
 
-#: ../mail/e-mail-label-manager.c:350
+#: ../mail/e-mail-label-manager.c:353
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
 
-#: ../mail/e-mail-label-tree-view.c:88
+#: ../mail/e-mail-label-tree-view.c:89
 msgid "Color"
 msgstr "颜色"
 
-#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-#: ../plugins/caldav/caldav-browse-server.c:1358
-#: ../widgets/menus/gal-define-views-dialog.c:347
+#: ../mail/e-mail-label-tree-view.c:99
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../plugins/caldav/caldav-browse-server.c:1359
+#: ../widgets/menus/gal-define-views-dialog.c:352
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "姓名"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:720
-#: ../modules/mail/e-mail-shell-view-private.c:1066
-#: ../modules/mail/e-mail-shell-view-private.c:1077
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
-#: ../modules/mail/e-mail-shell-view-private.c:1064
-msgid "Drafts"
-msgstr "草稿"
-
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Outbox"
-msgstr "发件箱"
-
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
-#: ../modules/mail/e-mail-shell-view-private.c:1070
-msgid "Sent"
-msgstr "已发箱"
-
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
-#: ../plugins/templates/templates.c:1322
-msgid "Templates"
-msgstr "模板"
-
-#: ../mail/e-mail-migrate.c:134
-msgid "Migrating..."
-msgstr "正在升迁..."
-
-#: ../mail/e-mail-migrate.c:169
-msgid "Migration"
-msgstr "迁移"
-
-#: ../mail/e-mail-migrate.c:210
-#, c-format
-msgid "Migrating '%s':"
-msgstr "升迁“%s”:"
-
-#: ../mail/e-mail-migrate.c:728
-msgid "Migrating Folders"
-msgstr "迁移文件夹"
-
-#: ../mail/e-mail-migrate.c:729
-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 正在升迁您的文件夹..."
-
-#: ../mail/e-mail-migrate.c:1527
+#: ../mail/e-mail-migrate.c:830
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "无法在“%s”创建本地邮件文件夹:%s"
 
-#: ../mail/e-mail-notebook-view.c:621
+#: ../mail/e-mail-notebook-view.c:627
 msgid "Please select a folder"
 msgstr "请选择一个文件夹"
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
+#: ../mail/e-mail-reader.c:1424
 msgid "_Do not ask me again."
 msgstr "不再询问(_D)。"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1430
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1795
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1797
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1802
 msgid "Check for _Junk"
 msgstr "检查垃圾信息(_J)"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1804
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1809
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1811
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信息复制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1816
 msgid "_Delete Message"
 msgstr "删除信息(_D)"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1818
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信息做删除标记"
 
-#: ../mail/e-mail-reader.c:1803
+#: ../mail/e-mail-reader.c:1823
 msgid "Filter on Mailing _List..."
 msgstr "根据邮件列表过滤(_L)..."
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1825
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信息的规则"
 
-#: ../mail/e-mail-reader.c:1810
+#: ../mail/e-mail-reader.c:1830
 msgid "Filter on _Recipients..."
 msgstr "根据收件人过滤(_R)..."
 
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1832
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信息的规则"
 
-#: ../mail/e-mail-reader.c:1817
+#: ../mail/e-mail-reader.c:1837
 msgid "Filter on Se_nder..."
 msgstr "根据发件人过滤(_N)..."
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1839
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信息的规则"
 
-#: ../mail/e-mail-reader.c:1824
+#: ../mail/e-mail-reader.c:1844
 msgid "Filter on _Subject..."
 msgstr "根据主题过滤(_S)..."
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1846
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信息的规则"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1851
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1853
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信息"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1858
 msgid "_Find in Message..."
 msgstr "在信息中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1860
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信息的主体中搜索文本"
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1865
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1867
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "删除选中信息的跟随标志"
 
-#: ../mail/e-mail-reader.c:1852
+#: ../mail/e-mail-reader.c:1872
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1874
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置选中信息的跟随标志为已完成"
 
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1879
 msgid "Follow _Up..."
 msgstr "跟随(_U)..."
 
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1881
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信息添加跟随标志"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1886
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信息作为附件转发给某人"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1893
 msgid "Forward As _Attached"
 msgstr "作为附件转发(_A)"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1900
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信息"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1907
 msgid "Forward As _Inline"
 msgstr "嵌入正文转发(_I)"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1914
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信息"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1921
 msgid "Forward As _Quoted"
 msgstr "作文引用转发(_Q)"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1928
 msgid "_Load Images"
 msgstr "载入图像(_L)"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1930
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制载入 HTML 邮件中的图像"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1935
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1937
 msgid "Mark the selected messages as important"
 msgstr "把选中信息标记为重要邮件"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1942
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1944
 msgid "Mark the selected messages as junk"
 msgstr "把选中信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1949
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信息标记为非垃圾信息"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1956
 msgid "_Read"
 msgstr "读取(_R)"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1958
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信息标记为已读"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1963
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1965
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信息标记为不重要"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:1970
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1972
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信息标记为未读"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1977
 msgid "_Edit as New Message..."
 msgstr "作为新信息进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1979
 msgid "Open the selected messages in the composer for editing"
 msgstr "在编辑器中打开选中的信息以便编辑"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1984
 msgid "Compose _New Message"
 msgstr "撰写新信息(_N)"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1986
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信息"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1991
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1993
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信息"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1998
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2000
 msgid "Move selected messages to another folder"
 msgstr "把选中的信息移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2005
 msgid "_Switch to Folder"
 msgstr "切换到文件夹(_S)"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2007
 msgid "Display the parent folder"
 msgstr "显示上层文件夹"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2012
 msgid "Switch to _next tab"
 msgstr "切换到下一个标签(_N)"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2014
 msgid "Switch to the next tab"
 msgstr "切换到下一个标签"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2019
 msgid "Switch to _previous tab"
 msgstr "切换到上一个标签(_P)"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2021
 msgid "Switch to the previous tab"
 msgstr "切换到上一个标签"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2026
 msgid "Cl_ose current tab"
 msgstr "关闭当前标签(_O)"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2028
 msgid "Close current tab"
 msgstr "关闭当前标签"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2033
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2035
 msgid "Display the next message"
 msgstr "显示下一封信息"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2040
 msgid "Next _Important Message"
 msgstr "下一封重要信息(_I)"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2042
 msgid "Display the next important message"
 msgstr "显示下一封重要信息"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2047
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2049
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2054
 msgid "Next _Unread Message"
 msgstr "下一封未读信息(_U)"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2056
 msgid "Display the next unread message"
 msgstr "显示下一封未读信息"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2061
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2063
 msgid "Display the previous message"
 msgstr "显示上一封信息"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2068
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信息(_E)"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the previous important message"
 msgstr "显示上一封重要信息"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2075
 msgid "Previous T_hread"
 msgstr "上一条线索(_H)"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the previous thread"
 msgstr "显示上一条线索"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2082
 msgid "P_revious Unread Message"
 msgstr "上一封未读信息(_R)"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2084
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信息"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2091
 msgid "Print this message"
 msgstr "打印该信息"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2098
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信息"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2103
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2105
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信息重发(退回)给某人"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2110
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2112
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2117
 msgid "Remove Du_plicate Messages"
 msgstr "移除重复的信息(_P)"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2119
 msgid "Checks selected messages for duplicates"
 msgstr "检查所选信息中的重复信息?"
 
-#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:177
+#: ../modules/mail/e-mail-attachment-handler.c:181
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2126
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信息的所有收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2133
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信息的邮件列表撰写回复"
 
-#: ../mail/e-mail-reader.c:2118
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2138
+#: ../modules/mail/e-mail-attachment-handler.c:188
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2140
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信息的发件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2145
 msgid "_Save as mbox..."
 msgstr "另存为 mbox 格式(_S)..."
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2147
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信息另存为 mbox 格式文件"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2152
 msgid "_Message Source"
 msgstr "信息源代码(_M)"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2154
 msgid "Show the raw email source of the message"
 msgstr "显示信息的原始邮件源代码"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2166
 msgid "_Undelete Message"
 msgstr "取消删除信息(_U)"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2168
 msgid "Undelete the selected messages"
 msgstr "取消选中信息的删除"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2173
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2175
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2180
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2182
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2187
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2189
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2196
 msgid "Create R_ule"
 msgstr "创建规则(_U)"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2203
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2210
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2217
 msgid "_Group Reply"
 msgstr "回复全部(_G)"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2224
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2231
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2238
 msgid "_Message"
 msgstr "信息(_M)"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2245
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2255
 msgid "Search Folder from Mailing _List..."
 msgstr "基于邮件列表的搜索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2257
 msgid "Create a search folder for this mailing list"
 msgstr "为此邮件列表创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2262
 msgid "Search Folder from Recipien_ts..."
 msgstr "基于收件人的搜索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2264
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2269
 msgid "Search Folder from Sen_der..."
 msgstr "基于发件人的搜索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2271
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2276
 msgid "Search Folder from S_ubject..."
 msgstr "基于主题的搜索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2278
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2301
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2313
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2317
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2321
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2325
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2329
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2373
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2375
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信息的信体中显示闪烁光标"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2381
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2383
 msgid "Show messages with all email headers"
 msgstr "显示信息时显示所有信头"
 
-#: ../mail/e-mail-reader.c:2659
+#: ../mail/e-mail-reader.c:2712
 #, 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:3246 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:316
-#: ../plugins/google-account-setup/google-source.c:565
-#: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:253
-msgid "Default"
-msgstr "默认"
-
-#: ../mail/e-mail-reader.c:3415
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3632
+#: ../modules/mail/e-mail-attachment-handler.c:174
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3633
 msgid "Forward the selected message to someone"
 msgstr "把选中信息转发给某人"
 
-#: ../mail/e-mail-reader.c:3435
+#: ../mail/e-mail-reader.c:3652
 msgid "Group Reply"
 msgstr "回复全部"
 
-#: ../mail/e-mail-reader.c:3436
+#: ../mail/e-mail-reader.c:3653
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为选中信息的邮件列表或全部收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:3522
+#: ../mail/e-mail-reader.c:3743
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:3526
+#: ../mail/e-mail-reader.c:3747
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "回复"
 
-#: ../mail/e-mail-reader.c:4205
+#: ../mail/e-mail-reader.c:4457
 #, c-format
 msgid "Folder '%s'"
 msgstr "文件夹 %s"
 
-#: ../mail/e-mail-reader-utils.c:145
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:670
+#: ../mail/e-mail-reader-utils.c:641
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -8959,7 +11872,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗?"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1020
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "保存信息"
@@ -8969,96 +11882,12 @@ msgstr[0] "保存信息"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1068
+#: ../mail/e-mail-reader-utils.c:1041
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "信息"
 
-#: ../mail/e-mail-session.c:870
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "输入 %s 的密码"
-
-#: ../mail/e-mail-session.c:874
-msgid "Enter Passphrase"
-msgstr "输入密码"
-
-#: ../mail/e-mail-session.c:878
-#, c-format
-msgid "Enter Password for %s"
-msgstr "为 %s 输入密码"
-
-#: ../mail/e-mail-session.c:882
-msgid "Enter Password"
-msgstr "输入密码"
-
-#: ../mail/e-mail-session.c:933
-#, c-format
-msgid "User canceled operation."
-msgstr "用户己取消操作。"
-
-#: ../mail/e-mail-session.c:1046
-#, c-format
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
-msgstr "缺少发送目标地址,信息转发被取消。"
-
-#: ../mail/e-mail-session.c:1055
-#, c-format
-msgid "No account found to use, forward of the message has been cancelled."
-msgstr "无可用帐号,信息转发被取消。"
-
-#: ../mail/e-mail-session-utils.c:419
-#, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr ""
-
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "应用寄出过滤器失败:%s"
-
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"追加到 %s:%s 失败\n"
-"转而追加到本地“已发”文件夹。"
-
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "追加到本地“已发”文件夹失败:%s"
-
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
-msgid "Sending message"
-msgstr "发送信息"
-
-#: ../mail/e-mail-session-utils.c:873
-#, c-format
-msgid "Unsubscribing from folder '%s'"
-msgstr "正在退订文件夹“%s”"
-
-#: ../mail/e-mail-store-utils.c:168
-#, c-format
-msgid "Disconnecting from '%s'"
-msgstr "断开与 %s 的连接"
-
-#: ../mail/e-mail-store-utils.c:259
-#, c-format
-msgid "Reconnecting to '%s'"
-msgstr "重新连接到 %s"
-
-#: ../mail/e-mail-store-utils.c:334
-#, c-format
-msgid "Preparing account '%s' for offline"
-msgstr "正在准备离线使用帐号“%s”"
-
-#: ../mail/e-mail-tag-editor.c:291
+#: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
@@ -9066,7 +11895,7 @@ msgstr "跟随的标志"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1197
+#: ../mail/em-composer-utils.c:1229
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9074,35 +11903,23 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone},${Sender}写道:"
 
-#: ../mail/em-composer-utils.c:1208
+#: ../mail/em-composer-utils.c:1240
 msgid "-----Original Message-----"
 msgstr "-------- 原始信息 --------"
 
-#. Translators: First %s is an email address, second %s
-#. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1992
-#, c-format
-msgid "Your message to %s about \"%s\" on %s has been read."
-msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读。"
-
-#: ../mail/em-composer-utils.c:2052
-#, c-format
-msgid "Delivery Notification for: \"%s\""
-msgstr "邮件通知:%s"
-
-#: ../mail/em-composer-utils.c:2592
+#: ../mail/em-composer-utils.c:2467
 msgid "an unknown sender"
 msgstr "未知发件人"
 
-#: ../mail/em-composer-utils.c:2998
+#: ../mail/em-composer-utils.c:2866
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:2999
+#: ../mail/em-composer-utils.c:2867
 msgid "Choose folders to post the message to."
 msgstr "选择要将信息投递到哪个文件夹。"
 
-#: ../mail/em-filter-folder-element.c:241
+#: ../mail/em-filter-editor-folder-element.c:156
 msgid "Select Folder"
 msgstr "选择文件夹"
 
@@ -9156,204 +11973,216 @@ msgid "does not exist"
 msgstr "不存在"
 
 #: ../mail/em-filter-i18n.h:19
+msgid "does not have words"
+msgstr "不包含词语"
+
+#: ../mail/em-filter-i18n.h:20
 msgid "does not return"
 msgstr "不含有"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not sound like"
 msgstr "发音不像"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not start with"
 msgstr "不开始于"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:24
 msgid "Draft"
 msgstr "草稿"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "ends with"
 msgstr "结束于"
 
-#: ../mail/em-filter-i18n.h:26
+#: ../mail/em-filter-i18n.h:27
 msgid "exists"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "Expression"
 msgstr "表达式"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Follow Up"
 msgstr "跟随"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Forward to"
 msgstr "转发至"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
+msgid "has words"
+msgstr "包含词语"
+
+#: ../mail/em-filter-i18n.h:32
 msgid "Important"
 msgstr "重要"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:34
 msgid "is after"
 msgstr "之后"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:35
 msgid "is before"
 msgstr "之前"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:36
 msgid "is Flagged"
 msgstr "已标志"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:40
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:41
 msgid "is not set"
 msgstr "未设置"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:42
 msgid "is set"
 msgstr "已设置"
 
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:63
+#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:114
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:44
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:45
 msgid "Label"
 msgstr "标签"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:46
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:47
 msgid "Match All"
 msgstr "全部匹配"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:48
 msgid "Message Body"
 msgstr "信体"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Header"
 msgstr "信头"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:50
 msgid "Message is Junk"
 msgstr "是垃圾信息"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is not Junk"
 msgstr "不是垃圾信息"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Message Location"
 msgstr "信息位置"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:54
 msgid "Pipe to Program"
 msgstr "管道到程序"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:55
 msgid "Play Sound"
 msgstr "播放声音"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
+#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:19
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "收件人"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "Regex Match"
 msgstr "正则表达式匹配"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "Replied to"
 msgstr "已回复到"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns"
 msgstr "返回"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:62
 msgid "returns less than"
 msgstr "返回小于"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:63
 msgid "Run Program"
 msgstr "运行程序"
 
-#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "分数"
 
-#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "发送者"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Sender or Recipients"
 msgstr "发送者或接收者"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Set Label"
 msgstr "设置标签"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Status"
 msgstr "设置状态"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Size (kB)"
 msgstr "大小(kB)"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "sounds like"
 msgstr "发音类似"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:72
 msgid "Specific header"
 msgstr "指定信头"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "starts with"
 msgstr "开始于"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:77
+msgid "Unset Color"
+msgstr "取消颜色"
+
+#: ../mail/em-filter-i18n.h:78
 msgid "Unset Status"
 msgstr "取消状态"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:527
 msgid "Then"
 msgstr "然后"
 
-#: ../mail/em-filter-rule.c:592
+#: ../mail/em-filter-rule.c:558
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
@@ -9377,19 +12206,19 @@ msgstr "配额使用(%s):"
 msgid "Quota usage"
 msgstr "配额使用"
 
-#: ../mail/em-folder-properties.c:317
+#: ../mail/em-folder-properties.c:338
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
-#: ../mail/em-folder-selection-button.c:79
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<单击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:436
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:442
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "文件夹名称(_N):"
 
@@ -9397,209 +12226,202 @@ msgstr "文件夹名称(_N):"
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹名不能含有字符“/”"
 
-#: ../mail/em-folder-tree.c:768
+#: ../mail/em-folder-tree.c:783
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1590
+#: ../mail/em-folder-tree.c:1606
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2055 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2058 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2065 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信息移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2069 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信息复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2088
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信息放到顶级文件夹存储"
 
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
-msgid "Search Folders"
-msgstr "搜索文件夹"
-
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
 msgid "Loading..."
 msgstr "正在载入..."
 
-#: ../mail/em-folder-utils.c:488
+#: ../mail/em-folder-utils.c:489
 msgid "Move Folder To"
 msgstr "移动文件夹到"
 
-#: ../mail/em-folder-utils.c:488
+#: ../mail/em-folder-utils.c:489
 msgid "Copy Folder To"
 msgstr "复制文件夹到"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:601
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:602
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹:"
 
-#: ../mail/em-format-html.c:166
+#: ../mail/em-format-html.c:178
 msgid "Formatting message"
 msgstr "格式化信息"
 
-#: ../mail/em-format-html.c:378
+#: ../mail/em-format-html.c:393
 msgid "Formatting Message..."
 msgstr "正在格式化信息..."
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1646 ../mail/em-format-html.c:1660
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "收取“%s”"
 
-#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1837 ../mail/em-format-html-display.c:97
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1838 ../mail/em-format-html-display.c:98
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1839 ../mail/em-format-html-display.c:99
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1840 ../mail/em-format-html-display.c:100
 msgid "Valid signature, but cannot verify sender"
 msgstr "签名有效,但是无法校验发送者"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1841 ../mail/em-format-html-display.c:101
 msgid "Signature exists, but need public key"
 msgstr "签名已存在,但需要公钥"
 
-#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1847 ../mail/em-format-html-display.c:108
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1848 ../mail/em-format-html-display.c:109
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1849 ../mail/em-format-html-display.c:110
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html.c:1850 ../mail/em-format-html-display.c:111
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html.c:2136
+#: ../mail/em-format-html.c:2245
 msgid "Unknown external-body part."
 msgstr "未知的 external-body 部分。"
 
-#: ../mail/em-format-html.c:2146
+#: ../mail/em-format-html.c:2255
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:2177
+#: ../mail/em-format-html.c:2286
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:2188
+#: ../mail/em-format-html.c:2297
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: ../mail/em-format-html.c:2190
+#: ../mail/em-format-html.c:2299
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2320
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: ../mail/em-format-html.c:2226
+#: ../mail/em-format-html.c:2335
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2934
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../mail/em-format-html.c:3043
+#: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "来自:%s"
 
-#: ../mail/em-format-html.c:2956
+#: ../mail/em-format-html.c:3065
 msgid "(no subject)"
 msgstr "(无主题)"
 
-#: ../mail/em-format-html.c:3032
+#: ../mail/em-format-html.c:3141
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "此信息由 %s 代表 %s 的身份发送"
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:97
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信息未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html-display.c:98
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此信息已签名,而且签名是有效的。这意味着这封信应该是可信的。"
 
-#: ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html-display.c:99
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
 
-#: ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "这封信的签名有效,但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:108
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:109
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9608,13 +12430,13 @@ msgstr ""
 "这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
 "定时间进行暴力破解,这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html-display.c:110
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
 
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:111
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9623,15 +12445,15 @@ msgstr ""
 "这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
 "量时间进行暴力破解,这十分困难。"
 
-#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:254
+#: ../mail/em-format-html-display.c:274
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:566
+#: ../mail/em-format-html-display.c:589
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9639,43 +12461,52 @@ msgstr ""
 "Evolution 无法渲染此电子邮件,原因是该邮件太大。您可以以无格式方式查看该邮"
 "件,或者使用外部文本编辑器查看。"
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:773
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:821
 msgid "Save _Image..."
 msgstr "保存图像(_I)..."
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-format-html-display.c:823
 msgid "Save the image to a file"
 msgstr "保存该图像为文件"
 
-#: ../mail/em-format-html-display.c:1034
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "完成于"
 
-#: ../mail/em-format-html-display.c:1046
+#: ../mail/em-format-html-display.c:1036
 msgid "Overdue:"
 msgstr "延期:"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr "创建者:"
 
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+#: ../mail/em-format-html-display.c:1327 ../mail/em-format-html-display.c:1378
 msgid "View _Unformatted"
 msgstr "无格式查看(_U)"
 
-#: ../mail/em-format-html-display.c:1337
+#: ../mail/em-format-html-display.c:1329
 msgid "Hide _Unformatted"
 msgstr "无格式隐藏(_U)"
 
-#: ../mail/em-format-html-display.c:1408
+#: ../mail/em-format-html-display.c:1400
 msgid "O_pen With"
 msgstr "打开方式(_P)"
 
-#: ../mail/em-format-html-print.c:176
+#. Translators: Name of an Attachment button for a11y object
+#: ../mail/em-format-html-display.c:1409
+#, fuzzy
+#| msgid "Attachment"
+#| msgid_plural "Attachments"
+msgctxt "Button"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../mail/em-format-html-print.c:157
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页,共 %d 页"
@@ -9686,61 +12517,91 @@ msgstr "第 %d 页,共 %d 页"
 msgid "No HTML stream available"
 msgstr "没有可用的 HTML 流。"
 
-#: ../mail/em-subscription-editor.c:1162
+#: ../mail/em-subscription-editor.c:870
+#, fuzzy
+#| msgid "Su_bscribe"
+msgid "_Subscribe"
+msgstr "订阅(_B)"
+
+#: ../mail/em-subscription-editor.c:879
+#, fuzzy
+#| msgid "Su_bscribe"
+msgid "Su_bscribe To Shown"
+msgstr "订阅(_B)"
+
+#: ../mail/em-subscription-editor.c:887
+#, fuzzy
+#| msgid "Subscribe to my _alarms"
+msgid "Subscribe To _All"
+msgstr "订阅我的提醒(_A)"
+
+#: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
+msgid "_Unsubscribe"
+msgstr "退订(_U)"
+
+#: ../mail/em-subscription-editor.c:996
+#, fuzzy
+#| msgid "_Unsubscribe from List"
+msgid "Unsu_bscribe From Hidden"
+msgstr "退订列表(_U)"
+
+#: ../mail/em-subscription-editor.c:1004
+#, fuzzy
+#| msgid "_Unsubscribe from List"
+msgid "Unsubscribe From _All"
+msgstr "退订列表(_U)"
+
+#: ../mail/em-subscription-editor.c:1675
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../mail/em-subscription-editor.c:1201
+#: ../mail/em-subscription-editor.c:1715
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1730
 msgid "Clear Search"
 msgstr "清除搜索"
 
-#: ../mail/em-subscription-editor.c:1234
+#: ../mail/em-subscription-editor.c:1748
 msgid "Sho_w items that contain:"
 msgstr "显示包含以下内容的项目(_W):"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1793
 msgid "Subscribe to the selected folder"
 msgstr "订阅选定的文件夹"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1794
 msgid "Su_bscribe"
 msgstr "订阅(_B)"
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1839
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Unsubscribe from the selected folder"
 msgstr "取消对选定文件夹的订阅"
 
-#: ../mail/em-subscription-editor.c:1286
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
-msgid "_Unsubscribe"
-msgstr "退订(_U)"
-
-#: ../mail/em-subscription-editor.c:1297
+#: ../mail/em-subscription-editor.c:1879
 msgid "Collapse all folders"
 msgstr "折叠所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1298
+#: ../mail/em-subscription-editor.c:1880
 msgid "C_ollapse All"
 msgstr "全部折叠(_O)"
 
-#: ../mail/em-subscription-editor.c:1308
+#: ../mail/em-subscription-editor.c:1890
 msgid "Expand all folders"
 msgstr "展开所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1309
+#: ../mail/em-subscription-editor.c:1891
 msgid "E_xpand All"
 msgstr "全部展开(_X)"
 
-#: ../mail/em-subscription-editor.c:1319
+#: ../mail/em-subscription-editor.c:1901
 msgid "Refresh the folder list"
 msgstr "刷新文件夹列表"
 
-#: ../mail/em-subscription-editor.c:1331
+#: ../mail/em-subscription-editor.c:1913
 msgid "Stop the current operation"
 msgstr "停止当前操作"
 
@@ -9748,458 +12609,156 @@ msgstr "停止当前操作"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:102
+#: ../mail/em-utils.c:110
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "您确定要一次打开 %d 封信吗?"
 
-#: ../mail/em-utils.c:158
+#: ../mail/em-utils.c:166
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "不再显示此信息(_D)"
 
-#: ../mail/em-utils.c:333
+#: ../mail/em-utils.c:318
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:918
+#: ../mail/em-utils.c:979
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信息"
 
-#: ../mail/em-vfolder-editor.c:108
+#: ../mail/em-vfolder-editor.c:105
 msgid "Search _Folders"
 msgstr "搜索文件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:618
+#: ../mail/em-vfolder-editor-rule.c:340
 msgid "Add Folder"
 msgstr "添加文件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:1
-msgid "\"Filter Editor\" window height"
-msgstr "“过滤器编辑器”窗口高度"
-
-#: ../mail/evolution-mail.schemas.in.h:2
-msgid "\"Filter Editor\" window maximize state"
-msgstr "“过滤器编辑器”窗口最大化状态"
-
-#: ../mail/evolution-mail.schemas.in.h:3
-msgid "\"Filter Editor\" window width"
-msgstr "“过滤器编辑器”窗口宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:4
-msgid "\"Folder Subscriptions\" window height"
-msgstr "“文件夹订阅”窗口高度"
-
-#: ../mail/evolution-mail.schemas.in.h:5
-msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "“文件夹订阅”窗口最大化状态"
-
-#: ../mail/evolution-mail.schemas.in.h:6
-msgid "\"Folder Subscriptions\" window width"
-msgstr "“文件夹订阅”窗口宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:7
-msgid "\"Search Folder Editor\" window height"
-msgstr "“搜索文件夹编辑器”窗口高度"
-
-#: ../mail/evolution-mail.schemas.in.h:8
-msgid "\"Search Folder Editor\" window maximize state"
-msgstr "“搜索文件夹编辑器”窗口最大化状态"
-
-#: ../mail/evolution-mail.schemas.in.h:9
-msgid "\"Search Folder Editor\" window width"
-msgstr "“搜索文件夹编辑器”窗口宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:10
-msgid "\"Send and Receive Mail\" window height"
-msgstr "“发送和接收邮件”窗口高度"
-
 #: ../mail/evolution-mail.schemas.in.h:11
-msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "“发送和接收邮件”窗口最大化状态"
-
-#: ../mail/evolution-mail.schemas.in.h:12
-msgid "\"Send and Receive Mail\" window width"
-msgstr "“发送和接收邮件”窗口宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:13
-msgid "Always request read receipt"
-msgstr "总是请求阅读收条"
-
-#: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Amount of time in seconds the error should be shown on the status bar."
-msgstr "在状态栏中显示错误的时间秒数。"
-
-#: ../mail/evolution-mail.schemas.in.h:15
-msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
-msgstr "在用户转发或回复显示在窗口中的信息时,询问是否关闭信息窗口"
-
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Attribute message."
-msgstr "附属的信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Automatic emoticon recognition"
-msgstr "自动识别表情图标"
-
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Automatic link recognition"
-msgstr "自动识别链接"
-
-#: ../mail/evolution-mail.schemas.in.h:19
-msgid "Check for new messages in all active accounts"
-msgstr "检查所有活动账户的新信息"
-
-#: ../mail/evolution-mail.schemas.in.h:20
-msgid "Check for new messages on start"
-msgstr "启动时检查新信息"
-
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Check incoming mail being junk"
-msgstr "检查收到的邮件是否是垃圾信息"
-
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Citation highlight color"
-msgstr "引用突出颜色"
-
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Citation highlight color."
-msgstr "引用突出颜色。"
-
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Composer Window default height"
-msgstr "编写窗口的默认高度"
+msgid "Digitally sign messages when original message signed (PGP or S/MIME)"
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Composer Window default width"
 msgstr "编写窗口的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "编辑器加载/附件目录"
-
-#: ../mail/evolution-mail.schemas.in.h:27
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "压缩 TO/CC/BCC 中地址的显示"
-
-#: ../mail/evolution-mail.schemas.in.h:28
-msgid ""
-"Compress display of addresses in TO/CC/BCC to the number specified in "
-"address_count."
-msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
-
-#: ../mail/evolution-mail.schemas.in.h:29
-msgid ""
-"Controls how frequently local changes are synchronized with the remote mail "
-"server. The interval must be at least 30 seconds."
-msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
-
-#: ../mail/evolution-mail.schemas.in.h:30
-msgid "Custom headers to use while checking for junk."
-msgstr "自定义用以检查垃圾信息的信头。"
-
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid ""
-"Custom headers to use while checking for junk. The list elements are string "
-"in the format \"headername=value\"."
-msgstr "自定义用以检查垃圾信息的信头。列表元素的字符串格式为“信头名=值”。"
-
-#: ../mail/evolution-mail.schemas.in.h:32
-msgid "Default charset in which to compose messages"
-msgstr "编写信息的默认字符集"
-
-#: ../mail/evolution-mail.schemas.in.h:33
-msgid "Default charset in which to compose messages."
-msgstr "编写信息的默认字符集。"
-
-#: ../mail/evolution-mail.schemas.in.h:34
-msgid "Default charset in which to display messages"
-msgstr "显示信息的默认字符集"
-
-#: ../mail/evolution-mail.schemas.in.h:35
-msgid "Default charset in which to display messages."
-msgstr "显示信息的默认字符集。"
-
-#: ../mail/evolution-mail.schemas.in.h:36
-msgid "Default forward style"
-msgstr "默认转发方式"
-
-#: ../mail/evolution-mail.schemas.in.h:37
-msgid "Default height of the Composer Window."
-msgstr "撰写窗口的默认高度。"
-
-#: ../mail/evolution-mail.schemas.in.h:38
-msgid "Default height of the mail browser window."
-msgstr "邮件浏览器窗口的默认高度。"
-
-#: ../mail/evolution-mail.schemas.in.h:39
-msgid "Default maximized state of the mail browser window."
-msgstr "邮件浏览器窗口的默认最大化状态。"
-
 #: ../mail/evolution-mail.schemas.in.h:40
-msgid "Default reply style"
-msgstr "默认回复样式"
-
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid "Default value for thread expand state"
-msgstr "话题的默认展开状态"
-
-#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the Composer Window."
 msgstr "撰写窗口的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:43
-msgid "Default width of the mail browser window."
-msgstr "邮件浏览器窗口的默认宽度。"
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Composer Window default height"
+msgstr "编写窗口的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:44
-msgid ""
-"Describes whether message headers in paned view should be collapsed or "
-"expanded by default. \"0\" = expanded \"1\" = collapsed"
-msgstr "描述了在窗格视图中信息头是折叠还是展开。“0”为展开,“1”为折叠"
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Default height of the Composer Window."
+msgstr "撰写窗口的默认高度。"
 
 #: ../mail/evolution-mail.schemas.in.h:45
-msgid ""
-"Determines whether to look up addresses for junk filtering in local address "
-"book only"
-msgstr "决定是否仅在本地地址簿中查找地址进行垃圾信息过滤"
+msgid "Attribute message."
+msgstr "附属的信息。"
 
 #: ../mail/evolution-mail.schemas.in.h:46
-msgid "Determines whether to lookup in address book for sender email"
-msgstr "决定是否在地址簿中查找发件人电子邮件"
+msgid ""
+"The text that is inserted when replying to a message, attributing the "
+"message to the original author."
+msgstr "在回复时插入的文本,并标注有其原作者。"
 
 #: ../mail/evolution-mail.schemas.in.h:47
-msgid ""
-"Determines whether to lookup the sender email in address book. If found, it "
-"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
-"can be slow, if remote address books (like LDAP) are marked for "
-"autocompletion."
-msgstr ""
-"决定是否在地址簿中查找发件人电子邮件。如果找到,则不应是垃圾信息。这将在标记"
-"为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
-"比较慢。"
+msgid "Forward message."
+msgstr "转发信息。"
 
 #: ../mail/evolution-mail.schemas.in.h:48
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "决定是否使用自定义信头检测垃圾信息"
+msgid ""
+"The text that is inserted when forwarding a message, saying that the "
+"forwarded message follows."
+msgstr "在转发信息时插入的文本,写着下面是转发的信息。"
 
 #: ../mail/evolution-mail.schemas.in.h:49
-msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
-msgstr ""
-"决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话,将提高"
-"垃圾信息检测速度。"
+msgid "Original message."
+msgstr "原始信息。"
 
 #: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
-
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "邮件写作器用来加载/附加文件的目录"
+"The text that is inserted when replying to a message (top posting), saying "
+"that the original message follows."
+msgstr "在回复一封信时插入的文本(信息顶部),写着下面是原始信息。"
 
 #: ../mail/evolution-mail.schemas.in.h:52
-msgid "Directory for saving mail component files."
-msgstr "保存邮件组件文件的目录。"
-
-#: ../mail/evolution-mail.schemas.in.h:53
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-
-#: ../mail/evolution-mail.schemas.in.h:54
-msgid "Display only message texts not exceeding certain size"
-msgstr "仅显示不超过某一大小的文本信息"
-
-#: ../mail/evolution-mail.schemas.in.h:55
-msgid "Do not add signature delimiter"
-msgstr "不添加签名分隔符"
-
-#: ../mail/evolution-mail.schemas.in.h:56
-msgid "Draw spelling error indicators on words as you type."
-msgstr "在您打字的时候就显示拼写错误标识。"
-
-#: ../mail/evolution-mail.schemas.in.h:57
-msgid "Empty Junk folders on exit"
-msgstr "退出时清空垃圾信息文件夹"
-
-#: ../mail/evolution-mail.schemas.in.h:58
-msgid "Empty Trash folders on exit"
-msgstr "退出时清空废件箱"
-
-#: ../mail/evolution-mail.schemas.in.h:59
-msgid "Empty all Junk folders when exiting Evolution."
-msgstr "退出 Evolution 时清空垃圾信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:60
-msgid "Empty all Trash folders when exiting Evolution."
-msgstr "退出 Evolution 时清空废件箱。"
-
-#: ../mail/evolution-mail.schemas.in.h:61
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"This value can be an empty string, which means it'll use the system Picture "
+"folder, usually set to ~/Pictures. This folder will be also used when the "
+"set path is not pointing to the existent folder."
 msgstr ""
-"在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
-"是动态的。"
-
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
-
-#: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable or disable magic space bar"
-msgstr "启用或禁用魔术空格键"
-
-#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "禁用/启用对多条信息标记时的提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable or disable type ahead search feature"
-msgstr "启用或禁用自动前进功能"
-
-#: ../mail/evolution-mail.schemas.in.h:66
-msgid "Enable search folders"
-msgstr "启用搜索文件夹"
-
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "Enable search folders on startup."
-msgstr "启动时启用搜索文件夹。"
+"这个值可以是空字符串,表示将使用系统图片文件夹,通常设为 ~/图片。在设置的路径"
+"指向的文件夹不存在时也将使用该文件夹。"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid ""
-"Enable the side bar search feature to allow interactive searching of folder "
-"names."
-msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
-"Enable this to use Space bar key to scroll in message preview, message list "
-"and folders."
-msgstr "启用以在信息预览、信息列表和文件夹中使用空格键。"
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Requires a restart to apply."
+msgstr "此设置指定了默认情况下线索是被展开还是被折叠。要应用需要重启。"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr "启用仅显示不超过“message_text_part_limit”键值中定义的大小的邮件文本。"
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "Enable to use a similar message list view settings for all folders"
-msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
-
-#: ../mail/evolution-mail.schemas.in.h:72
-msgid "Enable to use a similar message list view settings for all folders."
-msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
-
-#: ../mail/evolution-mail.schemas.in.h:73
-msgid "Enable/disable caret mode"
-msgstr "启用/禁用光标模式"
-
-#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "使用 Outlook/Gmail 的方式编码文件名"
+"Describes whether message headers in paned view should be collapsed or "
+"expanded by default. \"0\" = expanded \"1\" = collapsed"
+msgstr "描述了在窗格视图中信息头是折叠还是展开。“0”为展开,“1”为折叠"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail do, to let "
-"them display correctly file names with UTF-8 letters sent by Evolution, "
-"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
-"standard."
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
 msgstr ""
-"如 Outlook 或 GMail 一样编码邮件头中的文件名,这样可以正确的显示由 Evolution "
-"发送的邮件带有的 UTF-8 的文件名称,因为它们不符合 RFC 2231,而是使用了不正确"
-"的 RFC 2047 标准。"
 
-#: ../mail/evolution-mail.schemas.in.h:76
-msgid "Flush Outbox after filtering"
-msgstr "在过滤之后清空输出窗口"
-
-#: ../mail/evolution-mail.schemas.in.h:77
-msgid "Forward message."
-msgstr "转发信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:78
-msgid "Group Reply replies to list"
-msgstr "“组回复”是回复到邮件列表"
-
-#: ../mail/evolution-mail.schemas.in.h:79
-msgid "Height of the message-list pane"
-msgstr "信息列表面板的高度"
+#: ../mail/evolution-mail.schemas.in.h:130
+msgid "Mail browser width"
+msgstr "邮件浏览器宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:80
-msgid "Height of the message-list pane."
-msgstr "信息列表面板的高度。"
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "Default width of the mail browser window."
+msgstr "邮件浏览器窗口的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:81
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "隐藏单文件夹预览并移除选择"
+#: ../mail/evolution-mail.schemas.in.h:132
+msgid "Mail browser height"
+msgstr "邮件浏览器高度"
 
-#: ../mail/evolution-mail.schemas.in.h:82
-msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
-msgstr "如果用户试图一次打开的信息大于等于十封,将会询问用户是否真的要这么做。"
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid "Default height of the mail browser window."
+msgstr "邮件浏览器窗口的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid ""
-"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
-"any MIME types appearing in this list which map to a Bonobo component viewer "
-"in GNOME's MIME type database may be used for displaying content."
-msgstr ""
-"如果 Evolution 内没有特定 MIME 类型的内置查看器,那么出现在此列表中的任何 "
-"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 Bonobo 组件查看器将被用来显示其"
-"内容。"
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Mail browser maximized"
+msgstr "邮件浏览器最大化"
 
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Ignore list Reply-To:"
-msgstr "忽略邮件列表“回复至”域:"
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid "Default maximized state of the mail browser window."
+msgstr "邮件浏览器窗口的默认最大化状态。"
 
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
-msgstr "“过滤编辑器”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid "\"Folder Subscriptions\" window height"
+msgstr "“文件夹订阅”窗口高度"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr "“文件夹订阅”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:87
-msgid ""
-"Initial height of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr "“搜索文件夹”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
-
-#: ../mail/evolution-mail.schemas.in.h:88
-msgid ""
-"Initial height of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window vertically."
-msgstr "“发送和接收邮件”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
-
-#: ../mail/evolution-mail.schemas.in.h:89
-msgid ""
-"Initial maximize state of the \"Filter Editor\" window. The value updates "
-"when the user maximizes or unmaximizes the window. Note, this particular "
-"value is not used by Evolution since the \"Filter Editor\" window cannot be "
-"maximized. This key exists only as an implementation detail."
-msgstr ""
-"“过滤器编辑器”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新该"
-"值,这个值是不会被 Evolution 使用的,因为“过滤器编辑器”窗口无法最大化。这个值"
-"只是作为实现细节而存在的。"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "\"Folder Subscriptions\" window maximize state"
+msgstr "“文件夹订阅”窗口最大化状态"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10210,132 +12769,33 @@ msgstr ""
 "这个值是不会被 Evolution 使用的,因为“过滤器编辑器”窗口无法最大化。这个值只是"
 "作为实现细节而存在的。"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid ""
-"Initial maximize state of the \"Search Folder Editor\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Search Folder Editor\" "
-"window cannot be maximized. This key exists only as an implementation detail."
-msgstr ""
-"“搜索文件夹编辑器”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新"
-"该值,这个值是不会被 Evolution 使用的,因为“搜索文件夹编辑器”窗口无法最大化。"
-"这个值只是作为实现细节而存在的。"
-
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid ""
-"Initial maximize state of the \"Send and Receive Mail\" window. The value "
-"updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
-msgstr ""
-"“发送和接收邮件”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新该"
-"值,这个值是不会被 Evolution 使用的,因为“发送和接收邮件”窗口无法最大化。这个"
-"值只是作为实现细节而存在的。"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid ""
-"Initial width of the \"Filter Editor\" window. The value updates as the user "
-"resizes the window horizontally."
-msgstr "“过滤编辑器”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "\"Folder Subscriptions\" window width"
+msgstr "“文件夹订阅”窗口宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr "“文件夹订阅”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:95
-msgid ""
-"Initial width of the \"Search Folder Editor\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr "“搜索文件夹”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
-
-#: ../mail/evolution-mail.schemas.in.h:96
-msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
-msgstr "“发送和接收邮件”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
-
-#: ../mail/evolution-mail.schemas.in.h:97
-msgid ""
-"Instead of the normal \"Reply to All\" behaviour, this option will make the "
-"'Group Reply' toolbar button try to reply only to the mailing list through "
-"which you happened to receive the copy of the message to which you're "
-"replying."
-msgstr ""
-"与普通的“回复全部”行为不同,这个选项使“组回复”工具按钮通过您正在回复的刚收到"
-"的信息只回复给邮件列表。"
-
-#: ../mail/evolution-mail.schemas.in.h:98
-msgid ""
-"It disables/enables the repeated prompts to warn that deleting messages from "
-"a search folder permanently deletes the message, not simply removing it from "
-"the search results."
-msgstr ""
-"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:99
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"private reply to a message which arrived via a mailing list."
-msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
-
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
-msgstr "禁用或启用当您发送回复给许多人的时候的反复的警告提示。"
+#: ../mail/evolution-mail.schemas.in.h:149
+msgid "Default reply style"
+msgstr "默认回复样式"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
-"It disables/enables the repeated prompts to warn that you are trying sending "
-"a private reply to a message which arrived via a mailing list, but the list "
-"sets a Reply-To: header which redirects your reply back to the list"
+"Possible values are: never - to never close browser window always - to "
+"always close browser window ask - (or any other value) will ask user"
 msgstr ""
-"当您正要发送一个通过邮件列表收到的信息的私人回复,而邮件头的 Reply-To: 重定向"
-"到了列表时,禁用或启用反复的警告提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"It disables/enables the repeated prompts to warn that you are trying to send "
-"a message to recipients not entered as mail addresses"
-msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
-
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Last time Empty Junk was run"
-msgstr "上次清空垃圾信息的时间为:"
-
-#: ../mail/evolution-mail.schemas.in.h:104
-msgid "Last time Empty Trash was run"
-msgstr "上次清空废件箱的时间为:"
-
-#: ../mail/evolution-mail.schemas.in.h:105
-msgid "Layout style"
-msgstr "布局样式"
-
-#: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Level beyond which the message should be logged."
-msgstr "大于此级别的信息会被记录。"
-
-#: ../mail/evolution-mail.schemas.in.h:107
-msgid "List of Labels and their associated colors"
-msgstr "标签及其对应颜色的列表"
-
-#: ../mail/evolution-mail.schemas.in.h:108
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-
-#: ../mail/evolution-mail.schemas.in.h:109
-msgid "List of accepted licenses"
-msgstr "列出接受的许可"
+"可能的取值有:never - 不关闭浏览器窗口 always - 问题关闭浏览器窗口 ask - (或"
+"任何其他值)将询问用户"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "List of accounts"
 msgstr "帐号列表"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10343,688 +12803,217 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的帐号。此列表包含了相对于 /apps/evolution/mail/"
 "accounts 的子目录命名字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "List of custom headers and whether they are enabled."
-msgstr "自定义头及该头是否启用。"
-
-#: ../mail/evolution-mail.schemas.in.h:113
-msgid "List of dictionary language codes used for spell checking."
-msgstr "列出用来拼写检查的字典语言编码"
-
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid ""
-"List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:color where color uses the HTML hex encoding."
-msgstr ""
-"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
-"颜色使用了 HTML 十六进制编码方式。"
+#: ../mail/evolution-mail.schemas.in.h:209
+msgid "List of accepted licenses"
+msgstr "列出接受的许可"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "List of protocol names whose license has been accepted."
 msgstr "列出接受协议的协议名称。"
 
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Load images for HTML messages over HTTP"
-msgstr "在 HTML 信息中载入 HTTP 图像"
-
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
-msgstr ""
-"在 HTML 信息中载入 HTTP(S) 图像。可供选择的值有:0 - 绝不从网上载入图像,1 - "
-"如果发送者在地址簿中则载入图像,2 - 总是从网上载入图像。"
-
-#: ../mail/evolution-mail.schemas.in.h:118
-msgid "Log filter actions"
-msgstr "记录过滤动作"
-
-#: ../mail/evolution-mail.schemas.in.h:119
-msgid "Log filter actions to the specified log file."
-msgstr "将过滤动作记录到指定日志文件。"
-
-#: ../mail/evolution-mail.schemas.in.h:120
-msgid "Logfile to log filter actions"
-msgstr "记录过滤动作的日志文件"
-
-#: ../mail/evolution-mail.schemas.in.h:121
-msgid "Logfile to log filter actions."
-msgstr "记录过滤动作的日志文件。"
-
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Mail browser height"
-msgstr "邮件浏览器高度"
-
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Mail browser maximized"
-msgstr "邮件浏览器最大化"
-
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Mail browser width"
-msgstr "邮件浏览器宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:125
-msgid "Mark as Seen after specified timeout"
-msgstr "在指定超时过后标为已看"
-
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Mark as Seen after specified timeout."
-msgstr "在指定超时过后标为已看。"
-
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Mark citations in the message \"Preview\""
-msgstr "在信息“预览”中标出引用"
-
-#: ../mail/evolution-mail.schemas.in.h:128
-msgid "Mark citations in the message \"Preview\"."
-msgstr "在信息“预览”中标出引用。"
-
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Message text limit for display"
-msgstr "信息文本显示限制"
-
-#: ../mail/evolution-mail.schemas.in.h:130
-msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "信息显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
-
-#: ../mail/evolution-mail.schemas.in.h:131
-msgid "Minimum days between emptying the junk on exit"
-msgstr "退出时清空垃圾信息的最少天数"
-
-#: ../mail/evolution-mail.schemas.in.h:132
-msgid "Minimum days between emptying the trash on exit"
-msgstr "退出时清空废件箱的最少天数"
-
-#: ../mail/evolution-mail.schemas.in.h:133
-msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "退出时清空垃圾信息的最少时间,以天计。"
-
-#: ../mail/evolution-mail.schemas.in.h:134
-msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "退出时清空废件箱的最少天数。"
-
-#: ../mail/evolution-mail.schemas.in.h:135
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "要在 TO/CC/BCC 中显示的地址数"
-
-#: ../mail/evolution-mail.schemas.in.h:136
-msgid "Original message."
-msgstr "原始信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Path where picture gallery should search for its content"
-msgstr "图像库搜索内容的路径"
-
-#: ../mail/evolution-mail.schemas.in.h:138
-msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
-msgstr ""
-"可能的取值有:never - 不关闭浏览器窗口 always - 问题关闭浏览器窗口 ask - (或"
-"任何其他值)将询问用户"
-
-#: ../mail/evolution-mail.schemas.in.h:139
-msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr "下列接收者不能被识别为有效的电子邮件地址"
-
-#: ../mail/evolution-mail.schemas.in.h:140
-msgid "Prompt on empty subject"
-msgstr "空主题时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr "用户试图销毁文件夹时提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:142
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr "用户视图发送没有主题的信息时提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:143
-msgid "Prompt when deleting messages in search folder"
-msgstr "删除搜索文件夹中的信息时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:144
-msgid "Prompt when mailing list hijacks private replies"
-msgstr "当邮件列表劫持私人回复时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:145
-msgid "Prompt when replying privately to list messages"
-msgstr "当对邮件列表作私人回复时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:146
-msgid "Prompt when replying to many recipients"
-msgstr "当向多个收件人回复时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:147
-msgid "Prompt when user expunges"
-msgstr "用户销毁时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:148
-msgid "Prompt when user only fills Bcc"
-msgstr "用户只填入密件抄送时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:149
-msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "当用户试图一次打开超过十封信时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:150
-msgid ""
-"Prompt when user tries to send HTML mail to recipients that may not want to "
-"receive HTML mail."
-msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:151
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "当用户试图发送没有收件人或抄送的信息时提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:152
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr "当用户是否发送意外的 HTML 时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Prompt while marking multiple messages"
-msgstr "标记多封信息时提示"
-
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Put personalized signatures at the top of replies"
-msgstr "在回复的顶部添加个性签名"
-
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Put the cursor at the bottom of replies"
-msgstr "将光标置于回复底部"
-
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "识别文本中的表情,并将其替换为图像。"
-
-#: ../mail/evolution-mail.schemas.in.h:157
-msgid "Recognize links in text and replace them."
-msgstr "识别文本中的链接并进行替换。"
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Run junk test on incoming mail."
-msgstr "对收到的邮件运行垃圾信息测试。"
-
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Save directory"
-msgstr "保存目录"
-
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Search for the sender photo in local address books"
-msgstr "在本地地址薄中搜索发件人照片"
-
-#: ../mail/evolution-mail.schemas.in.h:161
-msgid "Send HTML mail by default"
-msgstr "默认以 HTML 发送邮件"
-
-#: ../mail/evolution-mail.schemas.in.h:162
-msgid "Send HTML mail by default."
-msgstr "默认以 HTML 发送邮件。"
-
-#: ../mail/evolution-mail.schemas.in.h:163
-msgid "Sender email-address column in the message list"
-msgstr "在信息列表中显示 email 地址列"
-
-#: ../mail/evolution-mail.schemas.in.h:164
-msgid "Server synchronization interval"
-msgstr "服务器同步间隔"
-
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid ""
-"Set to TRUE in case you do not want to add signature delimiter before your "
-"signature when composing a mail."
-msgstr "如果您不想在您写邮件时签名以前添加签名分隔符,那么设置为真"
-
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "在发送邮件信息时显示密件抄送域"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "Show \"Cc\" field when sending a mail message"
-msgstr "在发送邮件信息时显示抄送域"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "在发送内容到新闻组时显示发件人域"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "在发送内容到新闻组时显示“Reply To”(回复至)域"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "发送邮件时显示“Reply To”(回复至)域"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "Show Animations"
-msgstr "显示动画"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "Show all message headers"
-msgstr "显示全部信头"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "Show all the headers when viewing a messages."
-msgstr "查看信息时显示全部信头。"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "Show animated images as animations."
-msgstr "将动画图像显示为动画。"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "在信息列表中显示删除了的信息(带有删除线)。"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "Show deleted messages in the message-list"
-msgstr "在信息列表中显示删除了的信息"
-
-#: ../mail/evolution-mail.schemas.in.h:177
-msgid "Show image animations"
-msgstr "显示图像动画"
-
-#: ../mail/evolution-mail.schemas.in.h:178
-msgid "Show original \"Date\" header value."
-msgstr "显示原始的邮件头日期值。"
-
-#: ../mail/evolution-mail.schemas.in.h:179
-msgid "Show photo of the sender"
-msgstr "显示发件人照片"
-
-#: ../mail/evolution-mail.schemas.in.h:180
-msgid ""
-"Show the \"Bcc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"在发送邮件信息时显示密件抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此"
-"功能。"
+#: ../mail/evolution-mail.schemas.in.h:213
+msgid "\"Filter Editor\" window height"
+msgstr "“过滤器编辑器”窗口高度"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid ""
-"Show the \"Cc\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-"在发送邮件信息时显示抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此功"
-"能。"
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr "“过滤编辑器”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid ""
-"Show the \"From\" field when posting to a newsgroup. This is controlled from "
-"the View menu when a news account is chosen."
-msgstr ""
-"在发送内容到新闻组时显示发件人域。在选定了一个新闻组帐号时可以在查看菜单中控"
-"制此功能。"
+#: ../mail/evolution-mail.schemas.in.h:215
+msgid "\"Filter Editor\" window maximize state"
+msgstr "“过滤器编辑器”窗口最大化状态"
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid ""
-"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
-"from the View menu when a news account is chosen."
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
 msgstr ""
-"在发送内容到新闻组时显示“Reply To”域。在选定了一个新闻组帐号时可以在查看菜单"
-"中控制此功能。"
+"“过滤器编辑器”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新该"
+"值,这个值是不会被 Evolution 使用的,因为“过滤器编辑器”窗口无法最大化。这个值"
+"只是作为实现细节而存在的。"
 
-#: ../mail/evolution-mail.schemas.in.h:184
-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 ""
-"在发送邮件信息时显示“Reply To”域。在选定了一个邮件帐号时可以在查看菜单中控制"
-"此功能。"
+#: ../mail/evolution-mail.schemas.in.h:217
+msgid "\"Filter Editor\" window width"
+msgstr "“过滤器编辑器”窗口宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
-msgstr "在信息列表的以另外的列显示电子邮件的发送者。"
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr "“过滤编辑器”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:220
 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 ""
-"显示原始的邮件头“Date” 值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
-"式和本地时区显示邮件头“Date” 值。"
-
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Show the photo of the sender in the message reading pane."
-msgstr "在信息阅读面板中显示发件人照片。"
+"Whether check for new messages when Evolution is started. This includes also "
+"sending messages from Outbox."
+msgstr "是否在 Evolution 启动时检查新信息。也包括发送发件箱中的信息。"
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"Whether check for new messages in all active accounts regardless of the "
+"account \"Check for new messages every X minutes\" option when Evolution is "
+"started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
-"一些邮件列表设置了 Reply-To 头来使用户发送的回复直接到邮件列表,即使用户希望 "
-"Evolution 来发送一个私人的回复。设置这个选项为 TRUE 将会试图忽略 Reply-To: "
-"头,这样 Evolution 将会像您要求的那样发送私人的回复。如果您使用私人的回复动"
-"作,它会进行私人的回复;而如果您使用“回复到列表”行为,它就会回复到列表。如果"
-"存在的话,它会比较 Reply-To: 和 List-Post: 来完成该目的。"
-
-#: ../mail/evolution-mail.schemas.in.h:189
-msgid "Spell check inline"
-msgstr "内嵌拼写检查"
-
-#: ../mail/evolution-mail.schemas.in.h:190
-msgid "Spell checking color"
-msgstr "拼写检查颜色"
-
-#: ../mail/evolution-mail.schemas.in.h:191
-msgid "Spell checking languages"
-msgstr "拼写检查语言"
-
-#: ../mail/evolution-mail.schemas.in.h:192
-msgid "State of message headers in paned view"
-msgstr "窗格视图中信息头的状态"
-
-#: ../mail/evolution-mail.schemas.in.h:193
-msgid "Terminal font"
-msgstr "终端字体"
+"在 Evolution 启动时,是不是检查所有活动账户的新信息而不管账户的“每隔 X 分钟自"
+"动检查新信息”选项如何设置。该选项与“send_recv_on_start”选项一起使用。"
 
-#: ../mail/evolution-mail.schemas.in.h:194
-msgid "The default plugin for Junk hook"
-msgstr "默认的垃圾信息钩子插件"
+#: ../mail/evolution-mail.schemas.in.h:223
+msgid "\"Send and Receive Mail\" window height"
+msgstr "“发送和接收邮件”窗口高度"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid ""
-"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
-msgstr "上次清空垃圾信息的时间,以自新纪元后的天数显示。"
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "“发送和接收邮件”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:196
-msgid ""
-"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
-msgstr "上次清空废件箱的时间,以新纪元后的天数显示。"
+#: ../mail/evolution-mail.schemas.in.h:225
+msgid "\"Send and Receive Mail\" window maximize state"
+msgstr "“发送和接收邮件”窗口最大化状态"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the message list. \"0\" (Classic View) places the preview pane below the "
-"message list. \"1\" (Vertical View) places the preview pane next to the "
-"message list."
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
 msgstr ""
-"布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
-"息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
-
-#: ../mail/evolution-mail.schemas.in.h:198
-msgid "The terminal font for mail display."
-msgstr "邮件显示用的终端字体。"
-
-#: ../mail/evolution-mail.schemas.in.h:199
-msgid ""
-"The text that is inserted when forwarding a message, saying that the "
-"forwarded message follows."
-msgstr "在转发信息时插入的文本,写着下面是转发的信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:200
-msgid ""
-"The text that is inserted when replying to a message (top posting), saying "
-"that the original message follows."
-msgstr "在回复一封信时插入的文本(信息顶部),写着下面是原始信息。"
-
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
-msgstr "在回复时插入的文本,并标注有其原作者。"
-
-#: ../mail/evolution-mail.schemas.in.h:202
-msgid "The variable width font for mail display."
-msgstr "用于显示邮件的变宽字体。"
+"“发送和接收邮件”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新该"
+"值,这个值是不会被 Evolution 使用的,因为“发送和接收邮件”窗口无法最大化。这个"
+"值只是作为实现细节而存在的。"
 
-#: ../mail/evolution-mail.schemas.in.h:203
-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:227
+msgid "\"Send and Receive Mail\" window width"
+msgstr "“发送和接收邮件”窗口宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"此选项决定了 Evolution 中显示的最大文本部分大小,默认为 4096KB (4MB)。此值仅"
-"在 force_message_limit 键激活时有效。"
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "“发送和接收邮件”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:205
-msgid ""
-"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
-msgstr ""
-"这是默认的垃圾信息插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
-"缺省到其它可用的插件。"
+#: ../mail/evolution-mail.schemas.in.h:229
+msgid "\"Search Folder Editor\" window height"
+msgstr "“搜索文件夹编辑器”窗口高度"
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid ""
-"This key is read only once and reset to \"false\" after read. This unselects "
-"the mail in the list and removes the preview for that folder."
-msgstr ""
-"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
-"件夹的预览。"
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr "“搜索文件夹”窗口的初始高度。这个值会在用户调整窗口竖直大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:207
-msgid ""
-"This key should contain a list of XML structures specifying custom headers, "
-"and whether they are to be displayed. The format of the XML structure is &lt;"
-"header enabled&gt; - set enabled if the header is to be displayed in the "
-"mail view."
-msgstr ""
-"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
-"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
+#: ../mail/evolution-mail.schemas.in.h:231
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "“搜索文件夹编辑器”窗口最大化状态"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:232
 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."
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"此选项与 lookup_addressbook 键值相关,用于决定是否查询本地地址簿以避免您认识"
-"的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
-
-#: ../mail/evolution-mail.schemas.in.h:209
-msgid "This option would help in improving the speed of fetching."
-msgstr "此选项能帮助提高获取信息的速度"
-
-#: ../mail/evolution-mail.schemas.in.h:210
-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:211
-msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
-msgstr "此设置指定了默认情况下线索是被展开还是被折叠。要应用需要重启。"
+"“搜索文件夹编辑器”窗口的最大化初始状态。当用户最大化或取消最大化窗口时会更新"
+"该值,这个值是不会被 Evolution 使用的,因为“搜索文件夹编辑器”窗口无法最大化。"
+"这个值只是作为实现细节而存在的。"
 
-#: ../mail/evolution-mail.schemas.in.h:212
-msgid ""
-"This setting specifies whether the threads should be sorted based on latest "
-"message in each thread, rather than by message's date. Evolution requires a "
-"restart."
-msgstr ""
-"此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
-"启 Evolution。"
+#: ../mail/evolution-mail.schemas.in.h:233
+msgid "\"Search Folder Editor\" window width"
+msgstr "“搜索文件夹编辑器”窗口宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid ""
-"This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
-msgstr ""
-"这个值可以是空字符串,表示将使用系统图片文件夹,通常设为 ~/图片。在设置的路径"
-"指向的文件夹不存在时也将使用该文件夹。"
-
-#: ../mail/evolution-mail.schemas.in.h:214
-msgid "Thread the message-list based on Subject"
-msgstr "基于主题按线索编排信息列表"
-
-#: ../mail/evolution-mail.schemas.in.h:215
-msgid "Timeout for marking message as seen"
-msgstr "将信息标为已看的超时时长"
-
-#: ../mail/evolution-mail.schemas.in.h:216
-msgid "Timeout for marking message as seen."
-msgstr "将信息标为已看的超时时长。"
-
-#: ../mail/evolution-mail.schemas.in.h:217
-msgid "UID string of the default account."
-msgstr "默认帐号的 UID 字符串。"
-
-#: ../mail/evolution-mail.schemas.in.h:218
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "当使用行内拼写检查时,错误拼写单词的下划线的颜色。"
-
-#: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use custom fonts"
-msgstr "使用自定义字体"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use custom fonts for displaying mail."
-msgstr "使用自定义字体显示邮件。"
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr "“搜索文件夹”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
 
-#: ../mail/evolution-mail.schemas.in.h:221
-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."
+#: ../mail/evolution-mail.schemas.in.h:235
+msgid "Drag'n'drop export format"
 msgstr ""
-"用户常为回复信息时光标位置不定而恼火。这个选项决定了回复时光标位于消息顶部还"
-"是底部。"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:236
 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."
+"Define the email export format when doing drag'n'drop. Possible values are "
+"mbox or pdf"
 msgstr ""
-"用户常为回复信息时签名位置不定而恼火。这个选项决定了回复时签名位于消息顶部还"
-"是底部。"
-
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Variable width font"
-msgstr "变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Whether a read receipt request gets added to every message by default."
-msgstr "是否默认对所有信息添加阅读收条请求。"
-
-#: ../mail/evolution-mail.schemas.in.h:225
-msgid ""
-"Whether check for new messages in all active accounts regardless of the "
-"account \"Check for new messages every X minutes\" option when Evolution is "
-"started. This option is used only together with 'send_recv_on_start' option."
+#: ../mail/evolution-mail.schemas.in.h:237
+msgid "Format of the drag'n'drop export filename"
 msgstr ""
-"在 Evolution 启动时,是不是检查所有活动账户的新信息而不管账户的“每隔 X 分钟自"
-"动检查新信息”选项如何设置。该选项与“send_recv_on_start”选项一起使用。"
-
-#: ../mail/evolution-mail.schemas.in.h:226
-msgid ""
-"Whether check for new messages when Evolution is started. This includes also "
-"sending messages from Outbox."
-msgstr "是否在 Evolution 启动时检查新信息。也包括发送发件箱中的信息。"
 
-#: ../mail/evolution-mail.schemas.in.h:227
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:238
 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:229
-msgid "Whether sort threads based on latest message in that thread"
-msgstr "是否以线索中的最新信息来排序线索"
-
-#: ../mail/evolution-mail.schemas.in.h:230
-msgid ""
-"Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
+"Exported filename will be YYYYmmDDHHMMSS_email_title Possible values: 1 (: "
+"email sent date), 2 (: drag'n'drop date)"
 msgstr ""
-"在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
-"约一分钟后进行发件箱刷新。"
-
-#: ../mail/evolution-mail.schemas.in.h:231
-msgid "Width of the message-list pane"
-msgstr "信息列表面板的高度"
-
-#: ../mail/evolution-mail.schemas.in.h:232
-msgid "Width of the message-list pane."
-msgstr "信息列表面板的高度。"
 
 #: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "导入 Elm 数据"
 
-#: ../mail/importers/elm-importer.c:351 ../mail/importers/pine-importer.c:458
-#: ../modules/mail/e-mail-shell-view.c:1051
-#: ../widgets/misc/e-send-options.c:520
+#: ../mail/importers/elm-importer.c:353 ../mail/importers/pine-importer.c:460
+#: ../modules/mail/e-mail-shell-view.c:1042
+#: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "邮件"
 
-#: ../mail/importers/elm-importer.c:396
+#: ../mail/importers/elm-importer.c:400
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: ../mail/importers/elm-importer.c:397
+#: ../mail/importers/elm-importer.c:401
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
-#: ../mail/importers/evolution-mbox-importer.c:138
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:260
 msgid "_Destination folder:"
 msgstr "目的文件夹(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:145
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:460
+#: ../mail/importers/evolution-mbox-importer.c:148
+#: ../plugins/dbx-import/dbx-importer.c:266
+#: ../plugins/pst-import/pst-importer.c:557
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:461
+#: ../mail/importers/evolution-mbox-importer.c:149
+#: ../plugins/dbx-import/dbx-importer.c:267
+#: ../plugins/pst-import/pst-importer.c:558
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:433
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "主题"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:443
 msgctxt "mboxImp"
 msgid "From"
 msgstr "来自"
 
-#: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
+#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../shell/e-shell-utils.c:195
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:483
+#: ../mail/importers/evolution-mbox-importer.c:488
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入 Berkeley 邮箱格式文件夹"
 
-#: ../mail/importers/mail-importer.c:64
+#: ../mail/importers/mail-importer.c:63
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:648
+#: ../plugins/dbx-import/dbx-importer.c:621
+#: ../plugins/pst-import/pst-importer.c:770
 #, c-format
 msgid "Importing '%s'"
 msgstr "正在导入“%s”"
@@ -11034,44 +13023,44 @@ msgstr "正在导入“%s”"
 msgid "Scanning %s"
 msgstr "正在扫描 %s"
 
-#: ../mail/importers/pine-importer.c:260
+#: ../mail/importers/pine-importer.c:262
 msgid "Importing Pine data"
 msgstr "导入 Pine 数据"
 
-#: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
+#: ../mail/importers/pine-importer.c:467
+#: ../modules/addressbook/addressbook-config.c:1115
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../mail/importers/pine-importer.c:509
+#: ../mail/importers/pine-importer.c:515
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:510
+#: ../mail/importers/pine-importer.c:516
 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:228 ../mail/mail-autofilter.c:271
+#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:254
+#: ../mail/mail-autofilter.c:255
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:295
+#: ../mail/mail-autofilter.c:296
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: ../mail/mail-autofilter.c:404
+#: ../mail/mail-autofilter.c:406
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
@@ -11080,7 +13069,7 @@ msgstr "添加过滤规则"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:507
+#: ../mail/mail-autofilter.c:513
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11094,1643 +13083,1572 @@ msgstr[0] ""
 "%s 已经修改,以用于删除文件夹\n"
 "“%s”。"
 
-#: ../mail/mail-config.ui.h:2
-msgid "Add Ne_w Signature..."
-msgstr "添加新签名(_W)..."
-
-#: ../mail/mail-config.ui.h:3
-msgid "Al_ways sign outgoing messages when using this account"
-msgstr "当使用该帐号时总是发送签名信息(_W)"
+#: ../mail/mail-config.ui.h:1
+msgid "Set custom junk header"
+msgstr "设置自定义垃圾信息头"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:2
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr "所有信头与所给内容匹配的新邮件将被自动按垃圾邮件过滤掉"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:6
-msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "允许邮件列表将私人回复重定向到列表(_M)"
+#: ../mail/mail-config.ui.h:3
+msgid "Header name"
+msgstr "信头名称"
 
-#: ../mail/mail-config.ui.h:7
-msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "当发送加密邮件时也对自身加密(_F)"
+#: ../mail/mail-config.ui.h:4
+msgid "Header content"
+msgstr "信头内容"
 
-#: ../mail/mail-config.ui.h:8
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "总是抄送到(_S):"
+#: ../mail/mail-config.ui.h:5
+msgid "_Add Signature"
+msgstr "添加签名(_A)"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "总是密件抄送到(_B):"
+#: ../mail/mail-config.ui.h:6
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+"此脚本的输出将用于您的签名。您指定的名称将只会\n"
+"用于显示。"
 
 #: ../mail/mail-config.ui.h:10
-msgid "Always _trust keys in my keyring when encrypting"
-msgstr "加密时总是信任我的密钥环中的密钥(_T)"
+msgid "_Script:"
+msgstr "脚本(_S):"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "当发送加密邮件时总是对自身加密(_M)"
+msgid "Default Behavior"
+msgstr "默认行为"
 
 #: ../mail/mail-config.ui.h:12
-msgid "Always request rea_d receipt"
-msgstr "请求阅读收条(_D)"
+msgid "For_mat messages in HTML"
+msgstr "以 HTML 方式格式化信息(_M)"
 
 #: ../mail/mail-config.ui.h:13
-msgid "Apply the same _view settings to all folders"
-msgstr "应用同样的查看设置到所有文件夹(_v)"
+msgid "Automatically insert _emoticon images"
+msgstr "自动插入表情图像(_E)"
+
+#: ../mail/mail-config.ui.h:14
+msgid "Always request rea_d receipt"
+msgstr "请求阅读收条(_D)"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
-msgid "Authentication"
-msgstr "身份验证"
+msgid "Encode filenames in an _Outlook/GMail way"
+msgstr "使用 _Outlook/Gmail 的方式编码文件名"
 
 #: ../mail/mail-config.ui.h:16
-msgid "Automatically insert _emoticon images"
-msgstr "自动插入表情图像(_E)"
+msgid "Ch_aracter encoding:"
+msgstr "字符编码(_A):"
 
 #: ../mail/mail-config.ui.h:17
-msgid "C_haracter set:"
-msgstr "字符集(_H):"
+msgid "Replies and Forwards"
+msgstr "回复和转发"
 
 #: ../mail/mail-config.ui.h:18
-msgid "Ch_eck for Supported Types"
-msgstr "检查支持的类型(_E)"
+msgid "_Reply style:"
+msgstr "回复风格(_R):"
 
 #: ../mail/mail-config.ui.h:19
-msgid "Check cu_stom headers for junk"
-msgstr "检查自定义信头以判别垃圾信息(_S)"
+msgid "_Forward style:"
+msgstr "转发方式(_F):"
 
 #: ../mail/mail-config.ui.h:20
-msgid "Check for new _messages on start"
-msgstr "启动时自动检查新信息(_M)"
+msgid "Start _typing at the bottom on replying"
+msgstr "回复时在底部开始打字(_T)"
 
 #: ../mail/mail-config.ui.h:21
-msgid "Check for new messa_ges in all active accounts"
-msgstr "检查所有活动账户的新信息(_G)"
+msgid "_Keep signature above the original message on replying"
+msgstr "回复时保留原始信息的签名(_K)"
 
 #: ../mail/mail-config.ui.h:22
-msgid "Check incoming _messages for junk"
-msgstr "检查收到的邮件是否是垃圾信息(_M)"
+#, fuzzy
+msgid "Ig_nore Reply-To: for mailing lists"
+msgstr "忽略邮件列表的“回复至”参数"
 
 #: ../mail/mail-config.ui.h:23
-msgid "Check spelling while I _type"
-msgstr "在我输入时进行拼写检查(_T)"
+#, fuzzy
+msgid "Gro_up Reply goes only to mailing list, if possible"
+msgstr "如果可能,组回复只回复给邮件列表(_U)"
 
 #: ../mail/mail-config.ui.h:24
-msgid "Cle_ar"
-msgstr "清除(_A)"
-
-#: ../mail/mail-config.ui.h:25
-msgid "Clea_r"
-msgstr "清除(_R)"
+msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
+msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
 
 #: ../mail/mail-config.ui.h:26
-msgid "Color for _misspelled words:"
-msgstr "给错误拼写的单词着色(_M):"
-
-#: ../mail/mail-config.ui.h:27
-msgid "Composing Messages"
-msgstr "撰写信息"
+msgid "Sig_natures"
+msgstr "签名(_N)"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:161
-msgid "Configuration"
-msgstr "配置"
+msgid "Signatures"
+msgstr "签名"
 
 #: ../mail/mail-config.ui.h:29
-msgid "Confirm _when expunging a folder"
-msgstr "销毁文件夹时确认(_W)"
+msgid "_Languages"
+msgstr "语言(_L)"
 
 #: ../mail/mail-config.ui.h:30
-msgid "Confirmations"
-msgstr "配置"
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "在此列出的语言反映了您所安装的字典。"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:188
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
-msgid "Date/Time Format"
-msgstr "日期/时间格式"
+msgid "Languages Table"
+msgstr "语言表"
 
 #: ../mail/mail-config.ui.h:33
-msgid "Default Behavior"
-msgstr "默认行为"
+msgid "Check spelling while I _type"
+msgstr "在我输入时进行拼写检查(_T)"
 
 #: ../mail/mail-config.ui.h:34
-msgid "Default character e_ncoding:"
-msgstr "默认字符编码(_N):"
+msgid "Color for _misspelled words:"
+msgstr "给错误拼写的单词着色(_M):"
 
 #: ../mail/mail-config.ui.h:35
-msgid "Delete Mail"
-msgstr "删除邮件"
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Pick a color"
+msgstr "选取一种颜色"
 
 #: ../mail/mail-config.ui.h:36
-msgid "Delete junk messages on e_xit"
-msgstr "退出时删除垃圾信息(_X)"
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#: ../mail/mail-config.ui.h:38
-msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "对寄出的信息进行数字签名(默认)(_U)"
+#: ../mail/mail-config.ui.h:37
+msgid ""
+"To help avoid email accidents and embarrassments, ask for confirmation "
+"before taking the following checkmarked actions:"
+msgstr "为了帮助避免电子邮件意外和问题,在采取以下勾选的操作前请求确认:"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:39
-msgid "Displayed Message Headers"
-msgstr "显示信头"
-
-#: ../mail/mail-config.ui.h:40
-msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
+msgid "Sending a message with an _empty subject line"
+msgstr "发送带空主题行的信息时(_E)"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:41
-msgid "Do not quote"
-msgstr "不引用"
-
-#: ../mail/mail-config.ui.h:42
-msgid "Drafts _Folder:"
-msgstr "草稿文件夹(_F):"
+msgid "Sending a message with only _Bcc recipients defined"
+msgstr "发送只填写了密件抄送收件人的信息时(_B)"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:43
-msgid "Email _Address:"
-msgstr "电子邮件地址(_A):"
-
-#: ../mail/mail-config.ui.h:44
-msgid "Empty trash folders on e_xit"
-msgstr "退出时清空已删除邮件(_X)"
+msgid "Sending a _private reply to a mailing list message"
+msgstr "向邮件列表邮箱发送私人回复时(_P)"
 
-#: ../mail/mail-config.ui.h:46
-msgid "Encry_ption certificate:"
-msgstr "加密证书(_P):"
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:45
+msgid "Sending a reply to a large _number of recipients"
+msgstr "向很多收件人发送回复时(_N)"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:47
-msgid "Encrypt out_going messages (by default)"
-msgstr "加密寄出的信息(默认)(_G)"
-
-#: ../mail/mail-config.ui.h:48
-msgid "F_all back to threading messages by subject"
-msgstr "默认按照主题对线索中的信息排序(_A)"
+msgid "Allowing a _mailing list to redirect a private reply to the list"
+msgstr "允许邮件列表将私人回复重定向到列表(_M)"
 
+#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:49
-msgid "Fix_ed Width Font:"
-msgstr "等宽字体(_E):"
+msgid "Sending a message with _recipients not entered as mail addresses"
+msgstr "发送只填写了密件抄送收件人的信息时(_B)"
 
 #: ../mail/mail-config.ui.h:50
-msgid "Format messages in _HTML"
-msgstr "用 HTML 格式化信息(_H)"
+msgid "Confirmations"
+msgstr "配置"
 
-#: ../mail/mail-config.ui.h:51
-msgid "Full Nam_e:"
-msgstr "全名(_E):"
+#: ../mail/mail-config.ui.h:52
+msgid "SHA1"
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:53
-msgid "Group Reply goes only to mailing list, if possible"
-msgstr "如果可能,组回复只回复给邮件列表。"
+msgid "SHA256"
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:54
-msgid "HTML Messages"
-msgstr "HTML 信息"
+msgid "SHA384"
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:55
-msgid "H_TTP Proxy:"
-msgstr "HTTP 代理服务器(_T):"
+msgid "SHA512"
+msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Header content"
-msgstr "信头内容"
+#: ../mail/mail-config.ui.h:56 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:57
-msgid "Header name"
-msgstr "信头名称"
+#: ../mail/mail-config.ui.h:57 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:58
-msgid "Headers"
-msgstr "信头"
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
 
 #: ../mail/mail-config.ui.h:59
-msgid "Highlight _quotations with"
-msgstr "突出显示引用(_Q)"
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "内嵌(Outlook 风格)"
 
 #: ../mail/mail-config.ui.h:60
-msgid "Ignore Reply-To: for mailing lists"
-msgstr "忽略邮件列表的“回复至”参数"
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引用"
 
 #: ../mail/mail-config.ui.h:61
-msgid "Inline"
-msgstr "嵌入"
+msgctxt "ReplyForward"
+msgid "Do not quote"
+msgstr "不引用"
 
 #: ../mail/mail-config.ui.h:62
-msgid "Inline (Outlook style)"
-msgstr "嵌入(Outlook 风格)"
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "内嵌"
 
-#: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
-msgid "Labels"
-msgstr "标签"
+#: ../mail/mail-config.ui.h:63
+msgid "Proxy Settings"
+msgstr "代理设置"
+
+#: ../mail/mail-config.ui.h:64
+msgid "_Use system defaults"
+msgstr "使用默认值(_U)"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Languages Table"
-msgstr "语言表"
+msgid "_Direct connection to the Internet"
+msgstr "直接连接到 Internet(_D)"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Loading Images"
-msgstr "载入图像"
+msgid "_Manual proxy configuration:"
+msgstr "手动代理服务器配置(_M):"
 
 #: ../mail/mail-config.ui.h:67
-msgid "Mail Headers Table"
-msgstr "邮件头表"
+msgid "H_TTP Proxy:"
+msgstr "HTTP 代理服务器(_T):"
 
 #: ../mail/mail-config.ui.h:68
-msgid "Mailbox location"
-msgstr "邮件箱位置"
+msgid "_Secure HTTP Proxy:"
+msgstr "安全 HTTP 代理(_S):"
 
 #: ../mail/mail-config.ui.h:69
-msgid "Message Display"
-msgstr "信息显示"
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS 代理:"
 
 #: ../mail/mail-config.ui.h:70
-msgid "Message Receipts"
-msgstr "已读回执"
-
-#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "不使用代理的情况(_P):"
 
-#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
-msgid "No encryption"
-msgstr "不加密"
+#: ../mail/mail-config.ui.h:71
+msgid "Port:"
+msgstr "端口:"
+
+#: ../mail/mail-config.ui.h:72
+msgid "Use Authe_ntication"
+msgstr "使用身份验证(_N)"
 
 #: ../mail/mail-config.ui.h:73
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
+msgid "Us_ername:"
+msgstr "用户名(_E):"
 
 #: ../mail/mail-config.ui.h:74
-#: ../plugins/publish-calendar/publish-calendar.ui.h:10
-msgid "Optional Information"
-msgstr "可选信息"
+msgid "Pass_word:"
+msgstr "密码(_W):"
+
+#: ../mail/mail-config.ui.h:75
+msgid "Start up"
+msgstr "启动"
 
 #: ../mail/mail-config.ui.h:76
-msgid "Or_ganization:"
-msgstr "组织(_G):"
+msgid "Check for new _messages on start"
+msgstr "启动时自动检查新信息(_M)"
 
 #: ../mail/mail-config.ui.h:77
-msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG 密钥 ID(_K):"
+msgid "Check for new messa_ges in all active accounts"
+msgstr "检查所有活动账户的新信息(_G)"
 
 #: ../mail/mail-config.ui.h:78
-msgid "Pass_word:"
-msgstr "密码(_W):"
+msgid "Message Display"
+msgstr "信息显示"
 
 #: ../mail/mail-config.ui.h:79
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
-msgid "Pick a color"
-msgstr "选取一种颜色"
+msgid "_Use the same fonts as other applications"
+msgstr "使用与其它应用程序相同的字体(_U)"
 
 #: ../mail/mail-config.ui.h:80
-msgid "Port:"
-msgstr "端口:"
+msgid "S_tandard Font:"
+msgstr "标准字体(_T):"
 
 #: ../mail/mail-config.ui.h:81
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "GNU 安全卫士(PGP/GPG)"
+msgid "Select HTML fixed width font"
+msgstr "选择 HTML 固定宽度字体"
+
+#: ../mail/mail-config.ui.h:82
+msgid "Select HTML variable width font"
+msgstr "选择 HTML 变宽度字体"
 
 #: ../mail/mail-config.ui.h:83
-msgid "Proxy Settings"
-msgstr "代理设置"
+msgid "Fix_ed Width Font:"
+msgstr "等宽字体(_E):"
 
 #: ../mail/mail-config.ui.h:84
-msgid "Quoted"
-msgstr "引用"
+msgid "Highlight _quotations with"
+msgstr "突出显示引用(_Q)"
 
 #: ../mail/mail-config.ui.h:85
-msgid "Re_member password"
-msgstr "记住密码(_M)"
+msgid "color"
+msgstr "颜色"
 
 #: ../mail/mail-config.ui.h:86
-msgid "Re_ply-To:"
-msgstr "回复到(_P):"
+msgid "Default character e_ncoding:"
+msgstr "默认字符编码(_N):"
 
 #: ../mail/mail-config.ui.h:87
-msgid "Remember _password"
-msgstr "记住密码(_P)"
+msgid "Apply the same _view settings to all folders"
+msgstr "应用同样的查看设置到所有文件夹(_v)"
 
 #: ../mail/mail-config.ui.h:88
-msgid "Replies and Forwards"
-msgstr "回复和转发"
+msgid "F_all back to threading messages by subject"
+msgstr "默认按照主题对线索中的信息排序(_A)"
 
 #: ../mail/mail-config.ui.h:89
-msgid "Required Information"
-msgstr "需要的信息"
+msgid "Delete Mail"
+msgstr "删除邮件"
 
 #: ../mail/mail-config.ui.h:90
-msgid "SHA1"
-msgstr "SHA1"
+msgid "Empty trash folders on e_xit"
+msgstr "退出时清空已删除邮件(_X)"
 
 #: ../mail/mail-config.ui.h:91
-msgid "SHA256"
-msgstr "SHA256"
-
-#: ../mail/mail-config.ui.h:92
-msgid "SHA384"
-msgstr "SHA384"
+msgid "Confirm _when expunging a folder"
+msgstr "销毁文件夹时确认(_W)"
 
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.ui.h:93
-msgid "SHA512"
-msgstr "SHA512"
+msgid "_Show animated images"
+msgstr "显示动态图像(_S)"
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL 加密"
+#: ../mail/mail-config.ui.h:94
+msgid "_Prompt on sending HTML mail to contacts that do not want them"
+msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
 #: ../mail/mail-config.ui.h:95
-msgid "SSL is not supported in this build of Evolution"
-msgstr "此次编译的 Evolution 不支持 SSL"
+msgid "Loading Images"
+msgstr "载入图像"
 
 #: ../mail/mail-config.ui.h:96
-msgid "S_earch for sender photograph only in local address books"
-msgstr "仅在本地地址簿中搜索发件人照片(_E)"
+msgid "_Never load images from the Internet"
+msgstr "绝不从 Internet 载入图像(_N)"
 
 #: ../mail/mail-config.ui.h:97
-msgid "S_elect..."
-msgstr "选择(_E)..."
+msgid "_Load images only in messages from contacts"
+msgstr "载入来自联系人的邮件中的图像(_L)"
 
 #: ../mail/mail-config.ui.h:98
-msgid "S_end message receipts:"
-msgstr "发送信息收条(_E):"
+msgid "_Always load images from the Internet"
+msgstr "总是从 Internet 上载入图像(_A)"
 
 #: ../mail/mail-config.ui.h:99
-msgid "S_tandard Font:"
-msgstr "标准字体(_T):"
+msgid "HTML Messages"
+msgstr "HTML 信息"
 
-#: ../mail/mail-config.ui.h:100
-msgid "Secure MIME (S/MIME)"
-msgstr "安全 MIME(S/MIME)"
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+msgid "Labels"
+msgstr "标签"
+
+#: ../mail/mail-config.ui.h:101
+msgid "Sender Photograph"
+msgstr "发送者照片"
 
 #: ../mail/mail-config.ui.h:102
-msgid "Select HTML fixed width font"
-msgstr "选择 HTML 固定宽度字体"
+msgid "_Show the photograph of sender in the message preview"
+msgstr "在信息预览中显示发送者的照片(_S)"
 
 #: ../mail/mail-config.ui.h:103
-msgid "Select HTML variable width font"
-msgstr "选择 HTML 变宽度字体"
+msgid "S_earch for sender photograph only in local address books"
+msgstr "仅在本地地址簿中搜索发件人照片(_E)"
 
 #: ../mail/mail-config.ui.h:104
-msgid "Sender Photograph"
-msgstr "发送者照片"
+msgid "Displayed Message Headers"
+msgstr "显示信头"
+
+#: ../mail/mail-config.ui.h:105
+msgid "Mail Headers Table"
+msgstr "邮件头表"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:106
-msgid "Sending a _private reply to a mailing list message"
-msgstr "向邮件列表邮箱发送私人回复时(_P)"
+#: ../modules/addressbook/autocompletion-config.c:188
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Date/Time Format"
+msgstr "日期/时间格式"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Headers"
+msgstr "信头"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:108
-msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr "发送只填写了密件抄送收件人的信息时(_B)"
+msgid "Check incoming _messages for junk"
+msgstr "检查收到的邮件是否是垃圾信息(_M)"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Delete junk messages on e_xit"
+msgstr "退出时删除垃圾信息(_X)"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:110
-msgid "Sending a message with an _empty subject line"
-msgstr "发送带空主题行的信息时(_E)"
+msgid "Check cu_stom headers for junk"
+msgstr "检查自定义信头以判别垃圾信息(_S)"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Do not mar_k messages as junk if sender is in my address book"
+msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
 
-#. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:112
-msgid "Sending a message with only _Bcc recipients defined"
-msgstr "发送只填写了密件抄送收件人的信息时(_B)"
+msgid "_Lookup in local address book only"
+msgstr "仅在本地地址簿中查阅(_L)"
 
-#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
-msgid "Sending a reply to a large _number of recipients"
-msgstr "向很多收件人发送回复时(_N)"
+#: ../mail/mail-config.ui.h:113
+msgid "Option is ignored if a match for custom junk headers is found."
+msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
 
-#: ../mail/mail-config.ui.h:115
-msgid "Sent _Messages Folder:"
-msgstr "已发送信息文件夹(_M):"
+#: ../mail/mail-config.ui.h:115 ../modules/addressbook/ldap-config.ui.h:3
+msgid "No encryption"
+msgstr "不加密"
 
-#: ../mail/mail-config.ui.h:116
-msgid "Ser_ver requires authentication"
-msgstr "服务器需要认证(_V)"
+#: ../mail/mail-config.ui.h:116 ../modules/addressbook/ldap-config.ui.h:1
+msgid "TLS encryption"
+msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:117
-msgid "Server Configuration"
-msgstr "服务器配置"
+#: ../mail/mail-config.ui.h:117 ../modules/addressbook/ldap-config.ui.h:2
+msgid "SSL encryption"
+msgstr "SSL 加密"
 
 #: ../mail/mail-config.ui.h:118
-msgid "Server _Type:"
-msgstr "服务器类型(_T):"
+msgid "Special Folders"
+msgstr "特殊文件夹"
 
 #: ../mail/mail-config.ui.h:119
-msgid "Set custom junk header"
-msgstr "设置自定义垃圾信息头"
+msgid "Drafts _Folder:"
+msgstr "草稿文件夹(_F):"
 
 #: ../mail/mail-config.ui.h:120
-msgid "Si_gning algorithm:"
-msgstr "签名函数(_N):"
+msgid "Sent _Messages Folder:"
+msgstr "已发送信息文件夹(_M):"
 
 #: ../mail/mail-config.ui.h:121
-msgid "Sig_natures"
-msgstr "签名(_N)"
+msgid "_Trash Folder:"
+msgstr "废件箱文件夹(_T):"
 
 #: ../mail/mail-config.ui.h:122
-msgid "Sig_ning certificate:"
-msgstr "签名证书(_N):"
+msgid "_Junk Folder:"
+msgstr "垃圾信息文件夹(_J):"
 
 #: ../mail/mail-config.ui.h:123
-msgid "Signat_ure:"
-msgstr "签名(_U):"
+msgid "Composing Messages"
+msgstr "撰写信息"
 
 #: ../mail/mail-config.ui.h:124
-msgid "Signatures"
-msgstr "签名"
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "总是密件抄送到(_B):"
 
 #: ../mail/mail-config.ui.h:125
-msgid "Signing _algorithm:"
-msgstr "签名函数(_A):"
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "总是抄送到(_S):"
 
 #: ../mail/mail-config.ui.h:126
-msgid "Special Folders"
-msgstr "特殊文件夹"
+msgid "Message Receipts"
+msgstr "已读回执"
 
 #: ../mail/mail-config.ui.h:127
-msgid "Spell Checking"
-msgstr "拼写检查"
+msgid "S_end message receipts:"
+msgstr "发送信息收条(_E):"
 
 #: ../mail/mail-config.ui.h:128
-msgid "Start _typing at the bottom on replying"
-msgstr "回复时在底部开始打字(_T)"
+msgid "Account Information"
+msgstr "帐号信息"
 
 #: ../mail/mail-config.ui.h:129
-msgid "Start up"
-msgstr "启动"
-
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
-msgid "TLS encryption"
-msgstr "TLS 加密"
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+"输入您想要给此帐号起的名字。\n"
+"如:“工作”或“私人”"
 
 #: ../mail/mail-config.ui.h:131
-msgid "T_ype:"
-msgstr "类型(_Y):"
+msgid "Required Information"
+msgstr "需要的信息"
 
 #: ../mail/mail-config.ui.h:132
-msgid ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "在此列出的语言反映了您所安装的字典。"
+msgid "Email _Address:"
+msgstr "电子邮件地址(_A):"
 
 #: ../mail/mail-config.ui.h:133
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
-msgstr ""
-"此脚本的输出将用于您的签名。您指定的名称将只会\n"
-"用于显示。"
+msgid "Full Nam_e:"
+msgstr "全名(_E):"
+
+#: ../mail/mail-config.ui.h:134
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
+msgid "Optional Information"
+msgstr "可选信息"
+
+#: ../mail/mail-config.ui.h:135
+msgid "Signat_ure:"
+msgstr "签名(_U):"
 
 #: ../mail/mail-config.ui.h:136
-msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
-msgstr "为了帮助避免电子邮件意外和问题,在采取以下勾选的操作前请求确认:"
+msgid "Add Ne_w Signature..."
+msgstr "添加新签名(_W)..."
 
 #: ../mail/mail-config.ui.h:137
-msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example: \"Work\" or \"Personal\""
-msgstr ""
-"输入您想要给此帐号起的名字。\n"
-"如:“工作”或“私人”"
+msgid "Or_ganization:"
+msgstr "组织(_G):"
+
+#: ../mail/mail-config.ui.h:138
+msgid "Re_ply-To:"
+msgstr "回复到(_P):"
 
 #: ../mail/mail-config.ui.h:139
-msgid "Us_ername:"
-msgstr "用户名(_E):"
+msgid "_Make this my default account"
+msgstr "使它成为我的默认帐号(_M)"
 
 #: ../mail/mail-config.ui.h:140
-msgid "Use Authe_ntication"
-msgstr "使用身份验证(_N)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
 #: ../mail/mail-config.ui.h:141
-msgid "User _Name:"
-msgstr "用户名(_N):"
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "GNU 安全卫士(PGP/GPG)"
 
 #: ../mail/mail-config.ui.h:142
-msgid "_Add Signature"
-msgstr "添加签名(_A)"
+msgid "PGP/GPG _Key ID:"
+msgstr "PGP/GPG 密钥 ID(_K):"
 
 #: ../mail/mail-config.ui.h:143
-msgid "_Always load images from the Internet"
-msgstr "总是从 Internet 上载入图像(_A)"
+msgid "Si_gning algorithm:"
+msgstr "签名函数(_N):"
 
 #: ../mail/mail-config.ui.h:144
-msgid "_Authentication Type"
-msgstr "身份验证类型(_A)"
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr "当使用该帐号时总是发送签名信息(_W)"
 
 #: ../mail/mail-config.ui.h:145
-msgid "_Direct connection to the Internet"
-msgstr "直接连接到 Internet(_D)"
+msgid "Always encrypt to _myself when sending encrypted messages"
+msgstr "当发送加密邮件时总是对自身加密(_M)"
 
 #: ../mail/mail-config.ui.h:146
-msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
 #: ../mail/mail-config.ui.h:147
-msgid "_Forward style:"
-msgstr "转发方式(_F):"
+msgid "Secure MIME (S/MIME)"
+msgstr "安全 MIME(S/MIME)"
 
 #: ../mail/mail-config.ui.h:148
-msgid "_Junk Folder:"
-msgstr "垃圾信息文件夹(_J):"
+msgid "Also encrypt to sel_f when sending encrypted messages"
+msgstr "当发送加密邮件时也对自身加密(_F)"
 
 #: ../mail/mail-config.ui.h:149
-msgid "_Keep signature above the original message on replying"
-msgstr "回复时保留原始信息的签名(_K)"
+msgid "Encrypt out_going messages (by default)"
+msgstr "加密寄出的信息(默认)(_G)"
 
 #: ../mail/mail-config.ui.h:150
-msgid "_Languages"
-msgstr "语言(_L)"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "对寄出的信息进行数字签名(默认)(_U)"
 
 #: ../mail/mail-config.ui.h:151
-msgid "_Load images only in messages from contacts"
-msgstr "载入来自联系人的邮件中的图像(_L)"
+msgid "Encry_ption certificate:"
+msgstr "加密证书(_P):"
 
 #: ../mail/mail-config.ui.h:152
-msgid "_Lookup in local address book only"
-msgstr "仅在本地地址簿中查阅(_L)"
+msgid "Sig_ning certificate:"
+msgstr "签名证书(_N):"
 
 #: ../mail/mail-config.ui.h:153
-msgid "_Make this my default account"
-msgstr "使它成为我的默认帐号(_M)"
+msgid "S_elect..."
+msgstr "选择(_E)..."
 
 #: ../mail/mail-config.ui.h:154
-msgid "_Manual proxy configuration:"
-msgstr "手动代理服务器配置(_M):"
+msgid "Clea_r"
+msgstr "清除(_R)"
 
-#: ../mail/mail-config.ui.h:156
-msgid "_Never load images from the Internet"
-msgstr "绝不从 Internet 载入图像(_N)"
+#: ../mail/mail-config.ui.h:155
+msgid "Signing _algorithm:"
+msgstr "签名函数(_A):"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
-msgid "_Port:"
-msgstr "端口(_P):"
+#: ../mail/mail-config.ui.h:157
+msgid "Cle_ar"
+msgstr "清除(_A)"
 
-#: ../mail/mail-config.ui.h:159
-msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
+#: ../mail/mail-config.ui.h:158
+msgid "Server _Type:"
+msgstr "服务器类型(_T):"
 
 #: ../mail/mail-config.ui.h:160
-msgid "_Reply style:"
-msgstr "回复风格(_R):"
+msgid "description"
+msgstr "描述"
 
 #: ../mail/mail-config.ui.h:161
-msgid "_Script:"
-msgstr "脚本(_S):"
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+msgid "Configuration"
+msgstr "配置"
 
 #: ../mail/mail-config.ui.h:162
-msgid "_Secure HTTP Proxy:"
-msgstr "安全 HTTP 代理(_S):"
-
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
-#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
-msgid "_Show animated images"
-msgstr "显示动态图像(_S)"
+#: ../mail/mail-config.ui.h:163 ../plugins/caldav/caldav-source.c:250
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:655
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:273
+msgid "User_name:"
+msgstr "用户名(_N):"
+
+#: ../mail/mail-config.ui.h:165
+msgid "Mailbox location"
+msgstr "邮件箱位置"
 
 #: ../mail/mail-config.ui.h:167
-msgid "_Show the photograph of sender in the message preview"
-msgstr "在信息预览中显示发送者的照片(_S)"
+msgid "_Use secure connection:"
+msgstr "使用安全连接(_U):"
 
 #: ../mail/mail-config.ui.h:168
-msgid "_Trash Folder:"
-msgstr "废件箱文件夹(_T):"
+msgid "SSL is not supported in this build of Evolution"
+msgstr "此次编译的 Evolution 不支持 SSL"
 
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "使用安全连接(_U):"
+#: ../mail/mail-config.ui.h:169
+msgid "_Authentication Type"
+msgstr "身份验证类型(_A)"
 
 #: ../mail/mail-config.ui.h:170
-msgid "_Use system defaults"
-msgstr "使用默认值(_U)"
+msgid "Ch_eck for Supported Types"
+msgstr "检查支持的类型(_E)"
 
 #: ../mail/mail-config.ui.h:171
-msgid "_Use the same fonts as other applications"
-msgstr "使用与其它应用程序相同的字体(_U)"
+msgid "Re_member password"
+msgstr "记住密码(_M)"
 
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
-msgid "a"
-msgstr "a"
+#: ../mail/mail-config.ui.h:172
+msgid "Server Configuration"
+msgstr "服务器配置"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
-msgid "b"
-msgstr "b"
+#: ../mail/mail-config.ui.h:173 ../modules/addressbook/ldap-config.ui.h:13
+msgid "_Port:"
+msgstr "端口(_P):"
 
 #: ../mail/mail-config.ui.h:174
-msgid "color"
-msgstr "颜色"
+msgid "Ser_ver requires authentication"
+msgstr "服务器需要认证(_V)"
 
 #: ../mail/mail-config.ui.h:175
-msgid "description"
-msgstr "描述"
+#: ../modules/addressbook/addressbook-config.c:1122
+msgid "Authentication"
+msgstr "身份验证"
+
+#: ../mail/mail-config.ui.h:176
+msgid "T_ype:"
+msgstr "类型(_Y):"
+
+#: ../mail/mail-config.ui.h:177
+msgid "User _Name:"
+msgstr "用户名(_N):"
+
+#: ../mail/mail-config.ui.h:178
+msgid "Remember _password"
+msgstr "记住密码(_P)"
+
+#: ../mail/mail-config.ui.h:179
+#, fuzzy
+#| msgid "Personal details:"
+msgid "Personal Details:"
+msgstr "个人详细信息:"
+
+#: ../mail/mail-config.ui.h:188
+#, fuzzy
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "加密"
+
+#: ../mail/mail-config.ui.h:189
+#, fuzzy
+#| msgid "None"
+msgid "none"
+msgstr "无"
+
+#: ../mail/mail-config.ui.h:190
+#, fuzzy
+#| msgid "Label"
+msgid "label"
+msgstr "标签"
 
 #: ../mail/mail-dialogs.ui.h:1
+msgid "Search Folder Sources"
+msgstr "搜索文件夹来源"
+
+#: ../mail/mail-dialogs.ui.h:2
+msgid "All local folders"
+msgstr "全部本地文件夹"
+
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All active remote folders"
 msgstr "全部活跃远程文件夹"
 
-#: ../mail/mail-dialogs.ui.h:2
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local and active remote folders"
 msgstr "全部本地和活跃远程文件夹"
 
-#: ../mail/mail-dialogs.ui.h:3
-msgid "All local folders"
-msgstr "全部本地文件夹"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Specific folders"
+msgstr "指定文件夹"
 
-#: ../mail/mail-dialogs.ui.h:4
-msgid "Call"
-msgstr "呼叫"
+#: ../mail/mail-dialogs.ui.h:6
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"您选中进行跟随的信息已经在下面列出。\n"
+"请从“标志”菜单中选择跟随操作。"
+
+#: ../mail/mail-dialogs.ui.h:8
+msgid "_Flag:"
+msgstr "标志(_F):"
+
+#: ../mail/mail-dialogs.ui.h:9
+msgid "_Due By:"
+msgstr "延期人(_D):"
 
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-#: ../mail/mail-dialogs.ui.h:7
-msgid "Digital Signature"
-msgstr "数字签名"
+#: ../mail/mail-dialogs.ui.h:12
+msgid "Call"
+msgstr "呼叫"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:13
 msgid "Do Not Forward"
 msgstr "不要转发"
 
-#: ../mail/mail-dialogs.ui.h:9
-msgid "Encryption"
-msgstr "加密"
-
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Follow-Up"
 msgstr "跟随"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:15
 msgid "For Your Information"
 msgstr "给您的信息"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:16
 msgid "Forward"
 msgstr "转发"
 
-#: ../mail/mail-dialogs.ui.h:13
-msgid "License Agreement"
-msgstr "许可协议"
-
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:17
 msgid "No Response Necessary"
 msgstr "不必回复"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Reply to All"
 msgstr "全部回复"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Review"
 msgstr "回顾"
 
-#: ../mail/mail-dialogs.ui.h:20
-msgid "Search Folder Sources"
-msgstr "搜索文件夹来源"
-
-#: ../mail/mail-dialogs.ui.h:21
-msgid "Security Information"
-msgstr "安全信息"
-
-#: ../mail/mail-dialogs.ui.h:22
-msgid "Specific folders"
-msgstr "指定文件夹"
-
 #: ../mail/mail-dialogs.ui.h:23
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"您选中进行跟随的信息已经在下面列出。\n"
-"请从“标志”菜单中选择跟随操作。"
+msgid "License Agreement"
+msgstr "许可协议"
+
+#: ../mail/mail-dialogs.ui.h:24
+msgid "_Tick this to accept the license agreement"
+msgstr "选中此处以表明您接受许可协议(_T)"
 
 #: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "接受协议(_A)"
 
 #: ../mail/mail-dialogs.ui.h:26
-msgid "_Due By:"
-msgstr "延期人(_D):"
+msgid "Security Information"
+msgstr "安全信息"
 
 #: ../mail/mail-dialogs.ui.h:27
-msgid "_Flag:"
-msgstr "标志(_F):"
+msgid "Digital Signature"
+msgstr "数字签名"
 
 #: ../mail/mail-dialogs.ui.h:28
-msgid "_Tick this to accept the license agreement"
-msgstr "选中此处以表明您接受许可协议(_T)"
-
-#: ../mail/mail-folder-cache.c:779
-#, c-format
-msgid "Pinging %s"
-msgstr "查验 %s"
-
-#: ../mail/mail-ops.c:85
-msgid "Filtering Selected Messages"
-msgstr "过滤选中的信息"
-
-#: ../mail/mail-ops.c:205
-msgid "Fetching Mail"
-msgstr "收取邮件"
-
-#: ../mail/mail-ops.c:821
-#, c-format
-msgid "Sending message %d of %d"
-msgstr "正在发送第 %d 封信,共 %d 封"
-
-#: ../mail/mail-ops.c:869
-#, c-format
-msgid "Failed to send %d of %d messages"
-msgstr "在第%d封信失败,共%d封"
-
-#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
-msgid "Canceled."
-msgstr "已取消。"
-
-#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
-msgid "Complete."
-msgstr "完成。"
-
-#: ../mail/mail-ops.c:985
-#, c-format
-msgid "Moving messages to '%s'"
-msgstr "正在移动信息至 %s"
-
-#: ../mail/mail-ops.c:986
-#, c-format
-msgid "Copying messages to '%s'"
-msgstr "把信息复制到 %s"
-
-#: ../mail/mail-ops.c:1104
-#, c-format
-msgid "Storing folder '%s'"
-msgstr "存储文件夹“%s”"
-
-#: ../mail/mail-ops.c:1179
-#, c-format
-msgid "Expunging and storing account '%s'"
-msgstr "销毁并存储帐号“%s”"
-
-#: ../mail/mail-ops.c:1180
-#, c-format
-msgid "Storing account '%s'"
-msgstr "存储帐号“%s”"
-
-#: ../mail/mail-ops.c:1242
-#, c-format
-msgid "Refreshing folder '%s'"
-msgstr "刷新文件夹 %s"
-
-#: ../mail/mail-ops.c:1432
-#, c-format
-msgid "Expunging folder '%s'"
-msgstr "销毁文件夹 %s"
-
-#: ../mail/mail-ops.c:1517
-#, c-format
-msgid "Emptying trash in '%s'"
-msgstr "清空“%s”中的废件箱"
-
-#: ../mail/mail-ops.c:1619
-#, c-format
-msgid "Disconnecting %s"
-msgstr "正在断开 %s"
-
-#: ../mail/mail-send-recv.c:198
-msgid "Canceling..."
-msgstr "正在取消..."
-
-#: ../mail/mail-send-recv.c:454
-msgid "Send & Receive Mail"
-msgstr "发送和接收邮件"
-
-#: ../mail/mail-send-recv.c:470
-msgid "Cancel _All"
-msgstr "全部取消(_A)"
-
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
-msgid "Updating..."
-msgstr "正在更新..."
-
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:691
-msgid "Waiting..."
-msgstr "正在等待..."
-
-#: ../mail/mail-send-recv.c:959
-#, c-format
-msgid "Checking for new mail"
-msgstr "检查新邮件"
-
-#: ../mail/mail-tools.c:72
-#, c-format
-msgid "Could not create spool directory '%s': %s"
-msgstr "无法创建离线目录“%s”:%s"
-
-#: ../mail/mail-tools.c:106
-#, c-format
-msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "试图将邮件移至非 mbox 源 %s"
-
-#: ../mail/mail-tools.c:215
-#, c-format
-msgid "Forwarded message - %s"
-msgstr "转发的信息 - %s"
-
-#: ../mail/mail-tools.c:217
-msgid "Forwarded message"
-msgstr "转发的信息"
-
-#: ../mail/mail-vfolder.c:92
-#, c-format
-msgid "Setting up Search Folder: %s"
-msgstr "设置搜索文件夹:%s"
-
-#: ../mail/mail-vfolder.c:232
-#, c-format
-msgid "Updating Search Folders for '%s' : %s"
-msgstr "更新“%s”的搜索文件夹:%s"
-
-#. Translators: The first %s is name of the affected
-#. * search folder(s), the second %s is the URI of the
-#. * removed folder. For more than one search folder is
-#. * each of them on a separate line, with four spaces
-#. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:678
-#, c-format
-msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
-"\"%s\"."
-msgid_plural ""
-"The following Search Folders\n"
-"%s have been modified to account for the deleted folder\n"
-"\"%s\"."
-msgstr[0] ""
-"以下搜索文件夹\n"
-"%s 已经修改,以用于删除文件夹\n"
-"“%s”。"
-
-#: ../mail/mail-vfolder.c:1314
-msgid "Edit Search Folder"
-msgstr "编辑搜索文件夹"
-
-#: ../mail/mail-vfolder.c:1423
-msgid "New Search Folder"
-msgstr "新建搜索文件夹"
+msgid "Encryption"
+msgstr "加密"
 
 #: ../mail/mail.error.xml.h:1
-msgid "\"Check Junk\" Failed"
-msgstr "检查垃圾信息失败"
+msgid "Invalid authentication"
+msgstr "无效的身份验证"
 
 #: ../mail/mail.error.xml.h:2
-msgid "\"Report Junk\" Failed"
-msgstr "报告垃圾信息失败"
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
 
 #: ../mail/mail.error.xml.h:3
-msgid "\"Report Not Junk\" Failed"
-msgstr "报告非垃圾信息失败"
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "您以“{0}”的身份登录到服务器“{0}”失败。"
 
 #: ../mail/mail.error.xml.h:4
-msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
+"Lock 灯可能为开。"
 
 #: ../mail/mail.error.xml.h:5
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "您确定想要以 HTML 格式发送信息吗?"
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit."
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}"
 msgstr ""
-"“{1}”已经存在非空文件夹。\n"
-"\n"
-"您可以选择忽略此文件夹,覆盖或追加其内容,或者退出。"
+"请确定下列收件人愿意并且能够接收 HTML 邮件:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:9
-msgid ""
-"A read receipt notification has been requested for \"{1}\". Send the receipt "
-"notification to {0}?"
-msgstr "“{1}”请求了阅读收条。将阅读收条发送给{0}吗?"
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "您确定想要发送没有主题的信息吗?"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
-"A signature already exists with the name \"{0}\". Please specify a different "
-"name."
-msgstr "已经存在名为“{0}”的签名。请使用不同的名称。"
-
-#: ../mail/mail.error.xml.h:11
-msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 msgstr "在您的信息中添加有意义的主题可以让您的收件人更容易明白您邮件的内容。"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "您确定要删除此帐号及其全部代理服务器吗?"
-
-#: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to delete this account?"
-msgstr "您确定要删除此帐号吗?"
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "您确信您要发送只有密件抄送收件人的信息吗?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:12
 msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
-msgstr "您确定要禁用此帐号及其全部代理服务器吗?"
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+"您即将发送的联系人列表配置为隐藏列表收件人。\n"
+"\n"
+"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
+"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
+"一个 To: 或 CC: 收件人。"
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
+"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
+"一个 To: 或 CC: 收件人。"
 
 #: ../mail/mail.error.xml.h:16
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in "
-"folder \"{0}\"?"
-msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信息吗?"
-
-#: ../mail/mail.error.xml.h:17
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "您确定想要以 HTML 格式发送信息吗?"
-
-#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "您确信您要发送收件人地址无效的信息吗?"
 
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+"下列接收者不能被识别为有效的电子邮件地址:\n"
+"{0}"
+
 #: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "您确信您要发送收件人地址无效的信息吗?"
 
 #: ../mail/mail.error.xml.h:20
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "您确信您要发送只有密件抄送收件人的信息吗?"
-
-#: ../mail/mail.error.xml.h:21
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "您确定想要发送没有主题的信息吗?"
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+"下列接收者不能被识别为有效的电子邮件地址:\n"
+"{0}"
 
 #: ../mail/mail.error.xml.h:22
-msgid "Blank Signature"
-msgstr "空签名"
+msgid "Send private reply?"
+msgstr "发送私人回复?"
 
 #: ../mail/mail.error.xml.h:23
-msgid "Cannot add Search Folder \"{0}\"."
-msgstr "无法添加搜索文件夹“{0}”。"
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+"您正在给一封通过邮件列表收到的邮件发送一个私下的回复,而邮件列表正试图重定向"
+"您的回复回邮件列表。您确定要继续么?"
 
 #: ../mail/mail.error.xml.h:24
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "无法将文件夹“{0}”复制到“{1}”。"
-
-#: ../mail/mail.error.xml.h:25
-msgid "Cannot create folder \"{0}\"."
-msgstr "无法创建文件夹“{0}”。"
+msgid "Reply _Privately"
+msgstr "私人回复(_P)"
 
 #: ../mail/mail.error.xml.h:26
-msgid "Cannot create temporary save directory."
-msgstr "无法创建临时保存目录。"
-
-#: ../mail/mail.error.xml.h:27
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "无法创建保存目录,原因是“{1}”"
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+"您正在回复一封通过邮件列表收到的邮件,但是您正私下的回复给发件人,而不是邮件"
+"列表。您确定要这么做么?"
 
 #: ../mail/mail.error.xml.h:28
-msgid "Cannot delete folder \"{0}\"."
-msgstr "无法删除文件夹“{0}”。"
+msgid "Send reply to all recipients?"
+msgstr "发送回复给所有收件人?"
 
 #: ../mail/mail.error.xml.h:29
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "无法删除系统文件夹“{0}”。"
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr "您正要向多个收件人回复信息,您确定要回复其中的所有人吗?"
 
 #: ../mail/mail.error.xml.h:30
-msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr "无法发送此信息,因为您没有指定任何收件人"
 
 #: ../mail/mail.error.xml.h:31
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "无法将文件夹“{0}”移至“{1}”。"
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
+"邮件地址。"
 
 #: ../mail/mail.error.xml.h:32
-msgid "Cannot open source \"{1}\"."
-msgstr "无法打开源“{1}”"
+msgid "Use default drafts folder?"
+msgstr "使用默认的草稿文件夹吗?"
 
 #: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{2}\"."
-msgstr "无法打开源“{2}”。"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr "无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗?"
 
 #: ../mail/mail.error.xml.h:34
-msgid "Cannot open target \"{2}\"."
-msgstr "无法打开目标“{2}”。"
+msgid "Use _Default"
+msgstr "使用默认值(_D)"
 
 #: ../mail/mail.error.xml.h:35
 msgid ""
-"Cannot read the license file \"{0}\", due to an installation problem. You "
-"will not be able to use this provider until you can accept its license."
-msgstr ""
-"无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
-"可协议。"
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
+msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信息吗?"
 
 #: ../mail/mail.error.xml.h:36
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "无法将“{0}”重命名为“{1}”。"
+msgid "If you continue, you will not be able to recover these messages."
+msgstr "如果您继续的话,您将无法恢复这些信息。"
 
 #: ../mail/mail.error.xml.h:37
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "无法重命名或移动系统文件夹“{0}”。"
+msgid "_Expunge"
+msgstr "销毁(_E)"
 
 #: ../mail/mail.error.xml.h:38
-msgid "Cannot save changes to account."
-msgstr "无法将更改保存到帐号。"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
 
 #: ../mail/mail.error.xml.h:39
-msgid "Cannot save to directory \"{0}\"."
-msgstr "无法保存到目录“{0}”。"
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
+msgid "_Empty Trash"
+msgstr "清空废件箱(_E)"
 
 #: ../mail/mail.error.xml.h:40
-msgid "Cannot save to file \"{0}\"."
-msgstr "无法保存到文件“{0}”。"
+msgid "Opening too many messages at once may take a long time."
+msgstr "一次打开太多封信可能要花一点时间。"
 
 #: ../mail/mail.error.xml.h:41
-msgid "Cannot set signature script \"{0}\"."
-msgstr "无法设定签名脚本“{0}”。"
+msgid "_Open Messages"
+msgstr "打开信息(_O)"
 
 #: ../mail/mail.error.xml.h:42
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
-"Lock 灯可能为开。"
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "您有未发送信息,您仍然想要退出吗?"
 
 #: ../mail/mail.error.xml.h:43
-msgid "Close message window."
-msgstr "关闭信息窗口。"
-
-#: ../mail/mail.error.xml.h:44
-msgid "Could not save signature file."
-msgstr "无法保存签名文件。"
-
-#: ../mail/mail.error.xml.h:46
-msgid "Do _Not Disable"
-msgstr "不禁用(_N)"
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr "如果您退出,这些信息将会等到 Evolution 下次启动才会发出。"
 
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:47
-msgid "Do _Not Send"
-msgstr "不发送(_N)"
+msgid "Error while {0}."
+msgstr "{0} 时出错。"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do _Not Synchronize"
-msgstr "不同步(_D)"
+msgid "Error while performing operation."
+msgstr "执行操作时出错。"
 
 #: ../mail/mail.error.xml.h:49
-msgid ""
-"Do you want to locally synchronize the folders that are marked for offline "
-"usage?"
-msgstr "您想要同步那些标记为离线使用的文件夹吗?"
+msgid "Enter password."
+msgstr "输入密码。"
 
 #: ../mail/mail.error.xml.h:50
-msgid "Do you want to mark all messages as read?"
-msgstr "您是否想要把所有信息标记为已读?"
+msgid "Error loading filter definitions."
+msgstr "载入过滤器定义错误。"
 
 #: ../mail/mail.error.xml.h:51
-msgid "Do you wish to save your changes?"
-msgstr "您希望保存更改吗?"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "无法保存到目录“{0}”。"
 
 #: ../mail/mail.error.xml.h:52
-msgid "Enter password."
-msgstr "输入密码。"
+msgid "Cannot save to file \"{0}\"."
+msgstr "无法保存到文件“{0}”。"
 
 #: ../mail/mail.error.xml.h:53
-msgid "Error loading filter definitions."
-msgstr "载入过滤器定义错误。"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "无法创建保存目录,原因是“{1}”"
 
 #: ../mail/mail.error.xml.h:54
-msgid "Error while performing operation."
-msgstr "执行操作时出错。"
+msgid "Cannot create temporary save directory."
+msgstr "无法创建临时保存目录。"
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but cannot overwrite it."
+msgstr "文件存在但无法覆盖。"
+
+#: ../mail/mail.error.xml.h:56
+msgid "File exists but is not a regular file."
+msgstr "文件存在但不是普通文件。"
+
+#: ../mail/mail.error.xml.h:57
+msgid "Cannot delete folder \"{0}\"."
+msgstr "无法删除文件夹“{0}”。"
 
-#. Translators: the {0} is replaced with an operation name, which failed.
-#. It can be basically anything run asynchronously, like "Fetching Mail",
-#. "Sending message" and others, mostly from mail-ops.c file.
 #: ../mail/mail.error.xml.h:58
-msgid "Error while {0}."
-msgstr "{0} 时出错。"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "无法删除系统文件夹“{0}”。"
 
 #: ../mail/mail.error.xml.h:59
 msgid ""
-"Evolution's local mail format has changed from mbox to Maildir. Your local "
-"mail must be migrated to the new format before Evolution can proceed. Do you "
-"want to migrate now?\n"
-"\n"
-"An mbox account will be created to preserve the old mbox folders. You can "
-"delete the account after ensuring the data is safely migrated. Please make "
-"sure there is enough disk space if you choose to migrate now."
-msgstr ""
-"默认的本地存储已经从 mbox 格式改为 maildir 格式。您想现在进行迁移吗?\n"
-"\n"
-"将会创建一个 mbox 账户来保留旧的 mbox 文件夹。在确信数据已经安全迁移后,您可"
-"以删除它。要迁移,请先确保有足够的磁盘空间。"
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
 
-#: ../mail/mail.error.xml.h:62
-msgid "Evolution's local mail format has changed."
-msgstr "Evolution 的本地邮件格式已更改。"
+#: ../mail/mail.error.xml.h:60
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "无法重命名或移动系统文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:63
-msgid "Failed to download messages for offline viewing."
-msgstr "无法下载信息以离线查看。"
+#: ../mail/mail.error.xml.h:61
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
+
+#: ../mail/mail.error.xml.h:62
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
 
 #: ../mail/mail.error.xml.h:64
-msgid "Failed to find duplicate messages."
-msgstr "查找重复信息失败。"
+msgid "Really delete folder \"{0}\"?"
+msgstr "真要删除文件夹“{0}”?"
 
 #: ../mail/mail.error.xml.h:65
-msgid "Failed to open folder."
-msgstr "打开文件夹失败。"
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
+msgstr "如果您删除文件夹,其中的全部内容将被永久删除。"
 
 #: ../mail/mail.error.xml.h:66
-msgid ""
-"Failed to query server for a list of supported authentication mechanisms."
-msgstr "查询服务器所支持的身份验证方法列表失败。"
+msgid "These messages are not copies."
+msgstr "这些信息不是副本。"
 
 #: ../mail/mail.error.xml.h:67
-msgid "Failed to remove attachments from messages."
-msgstr "移除信息里的附件失败。"
+msgid ""
+"Messages shown in Search Folders are not copies. Deleting them from a Search "
+"Folder will delete the actual messages from the folder or folders in which "
+"they physically reside. Do you really want to delete these messages?"
+msgstr ""
+"搜索文件夹中所显示的信息不是副本。从搜索文件夹删除他们将删除其所在文件夹中的"
+"实际信息。您真的要删除这些信息吗?"
 
 #: ../mail/mail.error.xml.h:68
-msgid "Failed to retrieve messages."
-msgstr "获取信息失败。"
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "无法将“{0}”重命名为“{1}”。"
 
 #: ../mail/mail.error.xml.h:69
-msgid "Failed to save messages to disk."
-msgstr "保存信息到磁盘失败。"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
 
 #: ../mail/mail.error.xml.h:70
-msgid "Failed to unsubscribe from folder."
-msgstr "无法退订文件夹。"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "无法将文件夹“{0}”移至“{1}”。"
 
 #: ../mail/mail.error.xml.h:71
-msgid "File exists but cannot overwrite it."
-msgstr "文件存在但无法覆盖。"
+msgid "Cannot open source \"{2}\"."
+msgstr "无法打开源“{2}”。"
 
 #: ../mail/mail.error.xml.h:72
-msgid "File exists but is not a regular file."
-msgstr "文件存在但不是普通文件。"
+msgid "Cannot open target \"{2}\"."
+msgstr "无法打开目标“{2}”。"
+
+#: ../mail/mail.error.xml.h:73
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "无法将文件夹“{0}”复制到“{1}”。"
 
-#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:74
-msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "“{0}”文件夹中没有重复信息。"
+msgid "Cannot create folder \"{0}\"."
+msgstr "无法创建文件夹“{0}”。"
 
 #: ../mail/mail.error.xml.h:75
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "如果您继续的话,您将无法恢复这些信息。"
+msgid "Cannot open source \"{1}\"."
+msgstr "无法打开源“{1}”"
 
 #: ../mail/mail.error.xml.h:76
-msgid ""
-"If you delete the folder, all of its contents and its subfolders' contents "
-"will be deleted permanently."
-msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
+msgid "Cannot save changes to account."
+msgstr "无法将更改保存到帐号。"
 
 #: ../mail/mail.error.xml.h:77
-msgid ""
-"If you delete the folder, all of its contents will be deleted permanently."
-msgstr "如果您删除文件夹,其中的全部内容将被永久删除。"
+msgid "You have not filled in all of the required information."
+msgstr "您没有填入所需的全部信息。"
 
 #: ../mail/mail.error.xml.h:78
-msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "如果您继续的话,全部代理服务器帐号都将被永久删除。"
+msgid "You may not create two accounts with the same name."
+msgstr "您不能创建两个同名帐号。"
 
 #: ../mail/mail.error.xml.h:79
-msgid ""
-"If you proceed, the account information and\n"
-"all proxy information will be deleted permanently."
-msgstr "如果您继续的话,帐号信息及其全部代理服务器信息将被永久删除。"
+msgid "Are you sure you want to delete this account?"
+msgstr "您确定要删除此帐号吗?"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果您继续的话,帐号信息将被永久删除。"
 
+#: ../mail/mail.error.xml.h:81
+msgid "Are you sure you want to delete this account and all its proxies?"
+msgstr "您确定要删除此帐号及其全部代理服务器吗?"
+
 #: ../mail/mail.error.xml.h:82
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr "如果您退出,这些信息将会等到 Evolution 下次启动才会发出。"
-
-#: ../mail/mail.error.xml.h:83
-msgid "Ignore"
-msgstr "忽略"
+"If you proceed, the account information and\n"
+"all proxy information will be deleted permanently."
+msgstr "如果您继续的话,帐号信息及其全部代理服务器信息将被永久删除。"
 
 #: ../mail/mail.error.xml.h:84
-msgid "Invalid authentication"
-msgstr "无效的身份验证"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "您确定要禁用此帐号及其全部代理服务器吗?"
 
 #: ../mail/mail.error.xml.h:85
-msgid "Mail Deletion Failed"
-msgstr "邮件删除失败"
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "如果您继续的话,全部代理服务器帐号都将被永久删除。"
 
 #: ../mail/mail.error.xml.h:86
-msgid "Mail filters automatically updated."
-msgstr "邮件过滤器已自动更新。"
+msgid "Do _Not Disable"
+msgstr "不禁用(_N)"
 
 #: ../mail/mail.error.xml.h:87
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
-"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
-"一个 To: 或 CC: 收件人。"
+#: ../plugins/publish-calendar/publish-calendar.c:617
+msgid "_Disable"
+msgstr "禁用(_D)"
 
 #: ../mail/mail.error.xml.h:88
-msgid ""
-"Messages shown in Search Folders are not copies. Deleting them from a Search "
-"Folder will delete the actual messages from the folder or folders in which "
-"they physically reside. Do you really want to delete these messages?"
-msgstr ""
-"搜索文件夹中所显示的信息不是副本。从搜索文件夹删除他们将删除其所在文件夹中的"
-"实际信息。您真的要删除这些信息吗?"
+msgid "Could not save signature file."
+msgstr "无法保存签名文件。"
 
 #: ../mail/mail.error.xml.h:89
-msgid "Missing folder."
-msgstr "缺少文件夹。"
+msgid "Cannot set signature script \"{0}\"."
+msgstr "无法设定签名脚本“{0}”。"
+
+#: ../mail/mail.error.xml.h:90
+msgid "The script file must exist and be executable."
+msgstr "脚本文件必须存在且可执行。"
 
 #: ../mail/mail.error.xml.h:91
-msgid "N_ever"
-msgstr "从不(_E)"
+msgid "Do you wish to save your changes?"
+msgstr "您希望保存更改吗?"
 
 #: ../mail/mail.error.xml.h:92
-msgid "No duplicate messages found."
-msgstr "没有找到重复信息。"
+msgid "This signature has been changed, but has not been saved."
+msgstr "签名已经更改,但尚未保存。"
 
 #: ../mail/mail.error.xml.h:93
-msgid "No sources selected."
-msgstr "没有选中源。"
+msgid "_Discard changes"
+msgstr "丢弃更改(_D)"
 
 #: ../mail/mail.error.xml.h:94
-msgid "Opening too many messages at once may take a long time."
-msgstr "一次打开太多封信可能要花一点时间。"
+msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
+msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
 
 #: ../mail/mail.error.xml.h:95
-msgid "Please check your account settings and try again."
-msgstr "请检查您的帐号设置,然后再试一次。"
-
-#: ../mail/mail.error.xml.h:96
-msgid "Please enable the account or send using another account."
-msgstr "请启用帐号或者使用其它帐号发送。"
-
-#: ../mail/mail.error.xml.h:97
 msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
-"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
-"邮件地址。"
+"此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
+
+#: ../mail/mail.error.xml.h:97
+msgid "Cannot add Search Folder \"{0}\"."
+msgstr "无法添加搜索文件夹“{0}”。"
 
 #: ../mail/mail.error.xml.h:98
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}"
-msgstr ""
-"请确定下列收件人愿意并且能够接收 HTML 邮件:\n"
-"{0}"
+msgid "A folder named \"{0}\" already exists. Please use a different name."
+msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
+
+#: ../mail/mail.error.xml.h:99
+msgid "Search Folders automatically updated."
+msgstr "搜索文件夹已自动更新。"
 
 #: ../mail/mail.error.xml.h:100
-msgid "Please provide an unique name to identify this signature."
-msgstr "请提供此签名的唯一标识名称。"
+msgid "Mail filters automatically updated."
+msgstr "邮件过滤器已自动更新。"
 
 #: ../mail/mail.error.xml.h:101
-msgid "Please wait."
-msgstr "请稍候。"
+msgid "Missing folder."
+msgstr "缺少文件夹。"
 
 #: ../mail/mail.error.xml.h:102
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-
-#: ../mail/mail.error.xml.h:103
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "查询服务器所支持的身份验证算法列表。"
+msgid "You must specify a folder."
+msgstr "您必须指定文件夹。"
 
 #: ../mail/mail.error.xml.h:104
-msgid "Read receipt requested."
-msgstr "阅读收条已请求。"
+msgid "You must name this Search Folder."
+msgstr "您必须为此搜索文件夹命名。"
 
 #: ../mail/mail.error.xml.h:105
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
+msgid "No sources selected."
+msgstr "没有选中源。"
 
 #: ../mail/mail.error.xml.h:106
-msgid "Really delete folder \"{0}\"?"
-msgstr "真要删除文件夹“{0}”?"
-
-#: ../mail/mail.error.xml.h:107
-msgid "Remove duplicate messages?"
-msgstr "移除重复的信息?"
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
+msgstr ""
+"您必须一次至少指定一个文件夹作为源。\n"
+"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
 
 #: ../mail/mail.error.xml.h:108
-msgid "Reply _Privately"
-msgstr "私人回复(_P)"
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
 
-#: ../mail/mail.error.xml.h:111
-msgid "Search Folders automatically updated."
-msgstr "搜索文件夹已自动更新。"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
+msgstr ""
+"“{1}”已经存在非空文件夹。\n"
+"\n"
+"您可以选择忽略此文件夹,覆盖或追加其内容,或者退出。"
 
 #: ../mail/mail.error.xml.h:112
-msgid "Send private reply?"
-msgstr "发送私人回复?"
+msgid "Ignore"
+msgstr "忽略"
 
 #: ../mail/mail.error.xml.h:113
-msgid "Send reply to all recipients?"
-msgstr "发送回复给所有收件人?"
+msgid "_Overwrite"
+msgstr "覆盖(_O)"
 
 #: ../mail/mail.error.xml.h:114
-msgid "Signature Already Exists"
-msgstr "签名已经存在"
+msgid "_Append"
+msgstr "追加(_A)"
 
 #: ../mail/mail.error.xml.h:115
-msgid "Synchronize folders locally for offline usage?"
-msgstr "同步文件夹到本地以离线使用吗?"
+msgid "Evolution's local mail format has changed."
+msgstr "Evolution 的本地邮件格式已更改。"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
-msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
-
-#: ../mail/mail.error.xml.h:117
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
+"Evolution's local mail format has changed from mbox to Maildir. Your local "
+"mail must be migrated to the new format before Evolution can proceed. Do you "
+"want to migrate now?\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"An mbox account will be created to preserve the old mbox folders. You can "
+"delete the account after ensuring the data is safely migrated. Please make "
+"sure there is enough disk space if you choose to migrate now."
 msgstr ""
-"您即将发送的联系人列表配置为隐藏列表收件人。\n"
+"默认的本地存储已经从 mbox 格式改为 maildir 格式。您想现在进行迁移吗?\n"
 "\n"
-"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
-"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
-"一个 To: 或 CC: 收件人。"
+"将会创建一个 mbox 账户来保留旧的 mbox 文件夹。在确信数据已经安全迁移后,您可"
+"以删除它。要迁移,请先确保有足够的磁盘空间。"
+
+#: ../mail/mail.error.xml.h:119
+msgid "_Exit Evolution"
+msgstr "退出 Evolution(_E)"
 
 #: ../mail/mail.error.xml.h:120
-msgid ""
-"The following recipient was not recognized as a valid mail address:\n"
-"{0}"
-msgstr ""
-"下列接收者不能被识别为有效的电子邮件地址:\n"
-"{0}"
+msgid "_Migrate Now"
+msgstr "迁移 Now(_M)"
+
+#: ../mail/mail.error.xml.h:121
+msgid "Unable to read license file."
+msgstr "无法读取许可文件。"
 
 #: ../mail/mail.error.xml.h:122
 msgid ""
-"The following recipients were not recognized as valid mail addresses:\n"
-"{0}"
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
 msgstr ""
-"下列接收者不能被识别为有效的电子邮件地址:\n"
-"{0}"
+"无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
+"可协议。"
+
+#: ../mail/mail.error.xml.h:123
+msgid "Please wait."
+msgstr "请稍候。"
+
+#: ../mail/mail.error.xml.h:124
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr "查询服务器所支持的身份验证算法列表。"
 
 #: ../mail/mail.error.xml.h:125
-msgid "The script file must exist and be executable."
-msgstr "脚本文件必须存在且可执行。"
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "查询服务器所支持的身份验证方法列表失败。"
 
 #: ../mail/mail.error.xml.h:126
-msgid "These messages are not copies."
-msgstr "这些信息不是副本。"
+msgid "Unable to connect to the GroupWise server."
+msgstr "无法连接到 GroupWise 服务器。"
 
 #: ../mail/mail.error.xml.h:127
-msgid ""
-"This folder may have been added implicitly,\n"
-"go to the Search Folder editor to add it explicitly, if required."
-msgstr ""
-"此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
+msgid "Please check your account settings and try again."
+msgstr "请检查您的帐号设置,然后再试一次。"
+
+#: ../mail/mail.error.xml.h:128
+msgid "Synchronize folders locally for offline usage?"
+msgstr "同步文件夹到本地以离线使用吗?"
 
 #: ../mail/mail.error.xml.h:129
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
-msgstr "无法发送此信息,因为您所选择用来发送的帐号未启用"
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr "您想要同步那些标记为离线使用的文件夹吗?"
 
 #: ../mail/mail.error.xml.h:130
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr "无法发送此信息,因为您没有指定任何收件人"
+msgid "Do _Not Synchronize"
+msgstr "不同步(_D)"
 
 #: ../mail/mail.error.xml.h:131
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
+msgid "_Synchronize"
+msgstr "同步(_S)"
 
 #: ../mail/mail.error.xml.h:132
-msgid "This signature has been changed, but has not been saved."
-msgstr "签名已经更改,但尚未保存。"
+msgid "Do you want to mark all messages as read?"
+msgstr "您是否想要把所有信息标记为已读?"
 
 #: ../mail/mail.error.xml.h:133
+msgid "This will mark all messages as read in the selected folder."
+msgstr "这将把选中文件夹中的全部信息标记为已读。"
+
+#: ../mail/mail.error.xml.h:134
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "这将把选中文件夹及其子文件夹中的全部信息标记为已读。"
 
-#: ../mail/mail.error.xml.h:134
-msgid "This will mark all messages as read in the selected folder."
-msgstr "这将把选中文件夹中的全部信息标记为已读。"
-
 #: ../mail/mail.error.xml.h:135
-msgid "Unable to connect to the GroupWise server."
-msgstr "无法连接到 GroupWise 服务器。"
+msgid "Close message window."
+msgstr "关闭信息窗口。"
 
 #: ../mail/mail.error.xml.h:136
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr "无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗?"
+msgid "Would you like to close the message window?"
+msgstr "您想关闭信息窗口吗?"
 
 #: ../mail/mail.error.xml.h:137
-msgid "Unable to read license file."
-msgstr "无法读取许可文件。"
+msgid "_Yes"
+msgstr "是(_Y)"
 
 #: ../mail/mail.error.xml.h:138
-msgid "Unable to retrieve message."
-msgstr "无法获取信息。"
+msgid "_No"
+msgstr "否(_N)"
 
 #: ../mail/mail.error.xml.h:139
-msgid "Use _Default"
-msgstr "使用默认值(_D)"
+msgid "_Always"
+msgstr "总是(_A)"
 
 #: ../mail/mail.error.xml.h:140
-msgid "Use default drafts folder?"
-msgstr "使用默认的草稿文件夹吗?"
+msgid "N_ever"
+msgstr "从不(_E)"
 
 #: ../mail/mail.error.xml.h:141
-msgid "Would you like to close the message window?"
-msgstr "您想关闭信息窗口吗?"
+msgid "Signature Already Exists"
+msgstr "签名已经存在"
 
 #: ../mail/mail.error.xml.h:142
 msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
-msgstr ""
-"您正在给一封通过邮件列表收到的邮件发送一个私下的回复,而邮件列表正试图重定向"
-"您的回复回邮件列表。您确定要继续么?"
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
+msgstr "已经存在名为“{0}”的签名。请使用不同的名称。"
 
 #: ../mail/mail.error.xml.h:143
-msgid ""
-"You are replying to a message which arrived via a mailing list, but you are "
-"replying privately to the sender; not to the list. Are you sure you want to "
-"proceed?"
-msgstr ""
-"您正在回复一封通过邮件列表收到的邮件,但是您正私下的回复给发件人,而不是邮件"
-"列表。您确定要这么做么?"
+msgid "Blank Signature"
+msgstr "空签名"
 
 #: ../mail/mail.error.xml.h:144
-msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
-msgstr "您正要向多个收件人回复信息,您确定要回复其中的所有人吗?"
+msgid "Please provide an unique name to identify this signature."
+msgstr "请提供此签名的唯一标识名称。"
 
 #: ../mail/mail.error.xml.h:145
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "您没有足够的权限删除此邮件。"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr "无法发送此信息,因为您所选择用来发送的帐号未启用"
 
 #: ../mail/mail.error.xml.h:146
-msgid "You have not filled in all of the required information."
-msgstr "您没有填入所需的全部信息。"
+msgid "Please enable the account or send using another account."
+msgstr "请启用帐号或者使用其它帐号发送。"
 
 #: ../mail/mail.error.xml.h:147
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "您有未发送信息,您仍然想要退出吗?"
+msgid "Mail Deletion Failed"
+msgstr "邮件删除失败"
 
 #: ../mail/mail.error.xml.h:148
-msgid "You may not create two accounts with the same name."
-msgstr "您不能创建两个同名帐号。"
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "您没有足够的权限删除此邮件。"
 
 #: ../mail/mail.error.xml.h:149
-msgid "You must name this Search Folder."
-msgstr "您必须为此搜索文件夹命名。"
+msgid "\"Check Junk\" Failed"
+msgstr "检查垃圾信息失败"
 
 #: ../mail/mail.error.xml.h:150
-msgid "You must specify a folder."
-msgstr "您必须指定文件夹。"
+msgid "\"Report Junk\" Failed"
+msgstr "报告垃圾信息失败"
 
 #: ../mail/mail.error.xml.h:151
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local "
-"folders, all remote folders, or both."
-msgstr ""
-"您必须一次至少指定一个文件夹作为源。\n"
-"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
+msgid "\"Report Not Junk\" Failed"
+msgstr "报告非垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:153
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "您以“{0}”的身份登录到服务器“{0}”失败。"
+#: ../mail/mail.error.xml.h:152
+msgid "Remove duplicate messages?"
+msgstr "移除重复的信息?"
 
-#: ../mail/mail.error.xml.h:154
-msgid "_Always"
-msgstr "总是(_A)"
+#: ../mail/mail.error.xml.h:153
+msgid "No duplicate messages found."
+msgstr "没有找到重复信息。"
 
+#. Translators: {0} is replaced with a folder name
 #: ../mail/mail.error.xml.h:155
-msgid "_Append"
-msgstr "追加(_A)"
+msgid "Folder '{0}' doesn't contain any duplicate message."
+msgstr "“{0}”文件夹中没有重复信息。"
 
 #: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
-msgid "_Disable"
-msgstr "禁用(_D)"
-
-#: ../mail/mail.error.xml.h:157
-msgid "_Discard changes"
-msgstr "丢弃更改(_D)"
+msgid "Failed to unsubscribe from folder."
+msgstr "无法退订文件夹。"
 
 #: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
-msgid "_Empty Trash"
-msgstr "清空废件箱(_E)"
+msgid "Unable to retrieve message."
+msgstr "无法获取信息。"
 
 #: ../mail/mail.error.xml.h:159
-msgid "_Exit Evolution"
-msgstr "退出 Evolution(_E)"
+msgid "{0}"
+msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
-msgid "_Expunge"
-msgstr "销毁(_E)"
+msgid "Failed to open folder."
+msgstr "打开文件夹失败。"
 
 #: ../mail/mail.error.xml.h:161
-msgid "_Migrate Now"
-msgstr "迁移 Now(_M)"
+msgid "Failed to find duplicate messages."
+msgstr "查找重复信息失败。"
 
 #: ../mail/mail.error.xml.h:162
-msgid "_No"
-msgstr "否(_N)"
+msgid "Failed to retrieve messages."
+msgstr "获取信息失败。"
 
 #: ../mail/mail.error.xml.h:163
-msgid "_Open Messages"
-msgstr "打开信息(_O)"
+msgid "Failed to remove attachments from messages."
+msgstr "移除信息里的附件失败。"
+
+#: ../mail/mail.error.xml.h:164
+msgid "Failed to download messages for offline viewing."
+msgstr "无法下载信息以离线查看。"
+
+#: ../mail/mail.error.xml.h:165
+msgid "Failed to save messages to disk."
+msgstr "保存信息到磁盘失败。"
 
 #: ../mail/mail.error.xml.h:166
-msgid "_Send Receipt"
-msgstr "发送已读回执(_S)"
+msgid "Hidden file is attached."
+msgstr "附加了隐藏文件。"
 
 #: ../mail/mail.error.xml.h:167
-msgid "_Synchronize"
-msgstr "同步(_S)"
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr "名为 {0} 的附件是隐藏文件,可能包含敏感数据。请在发送前核查一下它。"
 
-#: ../mail/mail.error.xml.h:168
-msgid "_Yes"
-msgstr "是(_Y)"
+#: ../mail/mail-send-recv.c:208
+msgid "Canceling..."
+msgstr "正在取消..."
 
-#: ../mail/mail.error.xml.h:169
-msgid "{0}"
-msgstr "{0}"
+#: ../mail/mail-send-recv.c:535
+msgid "Send & Receive Mail"
+msgstr "发送和接收邮件"
+
+#: ../mail/mail-send-recv.c:551
+msgid "Cancel _All"
+msgstr "全部取消(_A)"
+
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:1046
+msgid "Updating..."
+msgstr "正在更新..."
+
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:737
+msgid "Waiting..."
+msgstr "正在等待..."
+
+#: ../mail/mail-send-recv.c:1026
+#, c-format
+msgid "Checking for new mail"
+msgstr "检查新邮件"
+
+#: ../mail/mail-vfolder-ui.c:159
+msgid "Edit Search Folder"
+msgstr "编辑搜索文件夹"
 
-#: ../mail/message-list.c:1261
+#: ../mail/mail-vfolder-ui.c:270
+msgid "New Search Folder"
+msgstr "新建搜索文件夹"
+
+#: ../mail/message-list.c:1272
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1262
+#: ../mail/message-list.c:1273
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1263
+#: ../mail/message-list.c:1274
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1264
+#: ../mail/message-list.c:1275
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:1276
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信息"
 
-#: ../mail/message-list.c:1266
+#: ../mail/message-list.c:1277
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1270
+#: ../mail/message-list.c:1281
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:1282
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:1286
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1287
 msgid "Highest"
 msgstr "最高"
 
@@ -12740,7 +14658,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
@@ -12760,97 +14678,97 @@ msgstr "%m月%d日%p%l:%M"
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2752
+#: ../mail/message-list.c:2754
 msgid "Select all visible messages"
 msgstr "选中所有可见的信息"
 
-#: ../mail/message-list.c:2912 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2890 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "信息"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4160
+#: ../mail/message-list.c:4113
 msgid "Follow-up"
 msgstr "跟随"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4675 ../mail/message-list.c:5098
+#: ../mail/message-list.c:4650 ../mail/message-list.c:5070
 msgid "Generating message list"
 msgstr "生成信息列表"
 
-#: ../mail/message-list.c:4912
+#: ../mail/message-list.c:4887
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr "没有信息满足您的搜索条件。用“搜索”菜单的“清除”菜单项清除"
 
-#: ../mail/message-list.c:4914
+#: ../mail/message-list.c:4889
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信息。"
 
-#: ../mail/message-list.etspec.h:3
-msgid "Due By"
-msgstr "延期"
+#: ../mail/message-list.etspec.h:2
+msgid "Flagged"
+msgstr "已标志"
+
+#: ../mail/message-list.etspec.h:8
+msgid "Received"
+msgstr "已接收"
+
+#: ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "大小"
 
-#: ../mail/message-list.etspec.h:4
+#: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "标志状态"
 
-#: ../mail/message-list.etspec.h:5
-msgid "Flagged"
-msgstr "已标志"
-
-#: ../mail/message-list.etspec.h:6
+#: ../mail/message-list.etspec.h:12
 msgid "Follow Up Flag"
 msgstr "跟随标志"
 
-#: ../mail/message-list.etspec.h:11
-msgid "Received"
-msgstr "已接收"
+#: ../mail/message-list.etspec.h:13
+msgid "Due By"
+msgstr "延期"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:18
 msgid "Sent Messages"
 msgstr "已发送信息"
 
-#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:572
-msgid "Size"
-msgstr "大小"
-
-#: ../mail/message-list.etspec.h:19
+#: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
 msgstr "主题 - 被截断"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
-msgid "Body contains"
-msgstr "邮件体含有"
+msgid "Subject or Addresses contains"
+msgstr "主题或地址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
-msgid "Message contains"
-msgstr "信息含有"
-
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Recipients contain"
 msgstr "收件人含有"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
-msgid "Sender contains"
-msgstr "发件人含有"
+#: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+msgid "Message contains"
+msgstr "信息含有"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Subject contains"
 msgstr "主题含有"
 
+#: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
+msgid "Sender contains"
+msgstr "发件人含有"
+
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Addresses contains"
-msgstr "主题或地址包含"
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
+msgid "Body contains"
+msgstr "邮件体含有"
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:204
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -12858,7 +14776,7 @@ msgstr ""
 "选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 时才连接到您的 LDAP "
 "服务器。"
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -12866,7 +14784,7 @@ msgstr ""
 "选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 TLS 时才连接到您的 LDAP "
 "服务器。"
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:208
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
@@ -12875,15 +14793,15 @@ msgstr ""
 "选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
 "接不太安全,您也易于受到安全漏洞的攻击。"
 
-#: ../modules/addressbook/addressbook-config.c:641
+#: ../modules/addressbook/addressbook-config.c:649
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "在生日和纪念日日历中使用(_U)"
 
-#: ../modules/addressbook/addressbook-config.c:683
+#: ../modules/addressbook/addressbook-config.c:693
 msgid "Copy _book content locally for offline operation"
 msgstr "将地址簿内容复制到本地以进行离线操作(_B)"
 
-#: ../modules/addressbook/addressbook-config.c:798
+#: ../modules/addressbook/addressbook-config.c:812
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
@@ -12892,7 +14810,7 @@ msgstr ""
 "这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。如果"
 "您不清楚要指定的端口,请询问您的系统管理员。"
 
-#: ../modules/addressbook/addressbook-config.c:879
+#: ../modules/addressbook/addressbook-config.c:898
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -12901,7 +14819,7 @@ msgstr ""
 "这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
 "对 LDAP 服务器的匿名访问权限。"
 
-#: ../modules/addressbook/addressbook-config.c:962
+#: ../modules/addressbook/addressbook-config.c:987
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -12912,1462 +14830,1132 @@ msgstr ""
 "搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
 "级的项目。"
 
-#: ../modules/addressbook/addressbook-config.c:1086
+#: ../modules/addressbook/addressbook-config.c:1120
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../modules/addressbook/addressbook-config.c:1091
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../modules/addressbook/addressbook-config.c:1125
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Details"
 msgstr "细节"
 
-#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/addressbook/addressbook-config.c:1126
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "搜索"
 
-#: ../modules/addressbook/addressbook-config.c:1094
+#: ../modules/addressbook/addressbook-config.c:1128
 msgid "Downloading"
 msgstr "下载"
 
-#: ../modules/addressbook/addressbook-config.c:1309
+#: ../modules/addressbook/addressbook-config.c:1346
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1348
 msgid "New Address Book"
 msgstr "新地址簿"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "自动补全长度"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
-msgid "Contact layout style"
-msgstr "联系人布局风格"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
-msgid "Contact preview pane position (horizontal)"
-msgstr "联系人预览面板位置(水平)"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
-msgid "Contact preview pane position (vertical)"
-msgstr "联系人预览面板位置(竖直)"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "补全 URI 列表的 EFolderList xml"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "补全 URI 列表的 EFolderList xml。"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
-msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "设为水平时联系人预览窗口的位置"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
-msgid "Position of the contact preview pane when oriented vertically."
-msgstr "设为竖直时联系人预览窗口的位置"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-msgid "Primary address book"
-msgstr "主地址薄"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
-msgid "Show autocompleted name with an address"
-msgstr "显示自动完成的名称和地址"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "Show maps"
-msgstr "显示地图"
-
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "Show preview pane"
-msgstr "显示预览面板"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
 msgstr "“联系人”视图中侧边栏中选择的(或“主”)地址薄的 UID。"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the contact list. \"0\" (Classic View) places the preview pane below the "
-"contact list. \"1\" (Vertical View) places the preview pane next to the "
-"contact list."
-msgstr ""
-"布局样式决定了在哪里放置联系人列表的预览面板。“0”(经典视图)会把预览面板放置在"
-"联系人列表下面。“1”(竖直视图)会把预览面板放置在联系人列表旁边。"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
-msgid "URI for the folder last used in the select names dialog"
-msgstr "选择名称对话框中上次使用的文件夹 URI"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
-msgid "URI for the folder last used in the select names dialog."
-msgstr "选择名称对话框中上次使用的文件夹 URI。"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr "在条目里是否强制显示自动完成的联系人的邮件地址和自动完成的名称"
-
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show maps in preview pane."
 msgstr "是否在预览面板中显示地图。"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
-msgid "Whether to show the preview pane."
-msgstr "是否显示预览面板。"
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
+msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:194
-#: ../modules/mail/em-mailer-prefs.c:1049
+#: ../modules/mail/em-mailer-prefs.c:1067
 msgid "_Table column:"
 msgstr "表列(T):"
 
 #: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
+msgstr "地址格式化"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "根据目的地国家标准格式化地址(_F)"
+
+#: ../modules/addressbook/autocompletion-config.c:209
 msgid "Autocompletion"
 msgstr "自动补全"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:212
 msgid "Always _show address of the autocompleted contact"
 msgstr "总是显示自动补全的联系人的地址(_S)"
 
+#: ../modules/addressbook/eab-composer-util.c:149
+msgid "Multiple vCards"
+msgstr "多个 vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#, c-format
+msgid "vCard for %s"
+msgstr "%s 的 vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
+#, c-format
+msgid "Contact information"
+msgstr "联系人信息"
+
+#: ../modules/addressbook/eab-composer-util.c:198
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s 的联系人信息"
+
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:102
+#: ../modules/addressbook/e-book-shell-backend.c:108
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "在 LDAP 服务器上"
 
-#: ../modules/addressbook/e-book-shell-backend.c:302
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "_Contact"
 msgstr "联系人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-backend.c:311
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:309
+#: ../modules/addressbook/e-book-shell-backend.c:316
 msgctxt "New"
 msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:311
-#: ../modules/addressbook/e-book-shell-view-actions.c:912
+#: ../modules/addressbook/e-book-shell-backend.c:318
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
-#: ../modules/addressbook/e-book-shell-backend.c:319
+#: ../modules/addressbook/e-book-shell-backend.c:326
 msgctxt "New"
 msgid "Address _Book"
 msgstr "地址簿(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:321
-#: ../modules/addressbook/e-book-shell-view-actions.c:835
+#: ../modules/addressbook/e-book-shell-backend.c:328
+#: ../modules/addressbook/e-book-shell-view-actions.c:839
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:338
-#: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-backend.c:345
+#: ../modules/addressbook/e-book-shell-view.c:402
+#: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:366
+#: ../modules/online-accounts/e-online-accounts-google.c:385
 msgid "Contacts"
 msgstr "联系人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:348
+#: ../modules/addressbook/e-book-shell-backend.c:356
 msgid "Certificates"
 msgstr "证书"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:387
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:391
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Save as vCard"
 msgstr "另存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Co_py All Contacts To..."
 msgstr "将全部联系人复制到(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:818
 msgid "Copy the contacts of the selected address book to another"
 msgstr "把选中地址簿中的联系人复制到其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:819
+#: ../modules/addressbook/e-book-shell-view-actions.c:823
 msgid "D_elete Address Book"
 msgstr "删除地址簿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:821
+#: ../modules/addressbook/e-book-shell-view-actions.c:825
 msgid "Delete the selected address book"
 msgstr "删除选中的地址薄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:826
+#: ../modules/addressbook/e-book-shell-view-actions.c:830
 msgid "Mo_ve All Contacts To..."
 msgstr "将全部联系人移至(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:828
+#: ../modules/addressbook/e-book-shell-view-actions.c:832
 msgid "Move the contacts of the selected address book to another"
 msgstr "把选中的地址簿中的联系人移至其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:833
+#: ../modules/addressbook/e-book-shell-view-actions.c:837
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:840
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Address _Book Properties"
 msgstr "地址簿属性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:842
+#: ../modules/addressbook/e-book-shell-view-actions.c:846
 msgid "Show properties of the selected address book"
 msgstr "更改选中地址薄的属性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:851
 msgid "Address Book _Map"
 msgstr "地址簿地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/addressbook/e-book-shell-view-actions.c:853
 msgid "Show map with all contacts from selected address book"
 msgstr "显示选中地址簿中所有联系人的地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:854
+#: ../modules/addressbook/e-book-shell-view-actions.c:858
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/addressbook/e-book-shell-view-actions.c:860
 msgid "Rename the selected address book"
 msgstr "重命名选中地址薄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/addressbook/e-book-shell-view-actions.c:867
 msgid "Stop loading"
 msgstr "停止载入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:868
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "_Copy Contact To..."
 msgstr "复制联系人到(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Copy selected contacts to another address book"
 msgstr "把选中的联系人复制到其它地址薄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:875
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 msgid "_Delete Contact"
 msgstr "删除联系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:882
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "_Find in Contact..."
 msgstr "在联系人查找(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Search for text in the displayed contact"
 msgstr "在显示的联系人中搜索文本"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:889
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:891
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "Send selected contacts to another person"
 msgstr "把选中的联系人发送给其他人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:896
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "_Move Contact To..."
 msgstr "移动联系人至(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:898
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "Move selected contacts to another address book"
 msgstr "把选中的联系人移至其它地址薄"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:903
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:910
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:917
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "_Open Contact"
 msgstr "打开联系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:919
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:924
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
 msgid "_Send Message to Contact..."
 msgstr "给联系人发送信息(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Send a message to the selected contacts"
 msgstr "给选中的联系人发送信息"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 #: ../modules/calendar/e-cal-shell-view-actions.c:1540
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "操作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 #: ../modules/calendar/e-cal-shell-view-actions.c:1557
 #: ../modules/calendar/e-memo-shell-view-actions.c:690
 #: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Address Book Map"
 msgstr "地址簿地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:989
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Contact _Preview"
 msgstr "联系人预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Show contact preview window"
 msgstr "显示联系人预览窗口"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "Show _Maps"
 msgstr "显示地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Show maps in contact preview window"
 msgstr "在联系人预览窗口中显示地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1548
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Show contact preview below the contact list"
 msgstr "在联系人列表下方显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Vertical View"
 msgstr "竖直视图(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Show contact preview alongside the contact list"
 msgstr "在联系人列表旁显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
 #: ../modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
 #: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "任何类别"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
-#: ../shell/e-shell-content.c:666
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1085
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
 msgid "Print all shown contacts"
 msgstr "打印全部显示的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1092
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
 msgid "Preview the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1099
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1114
+#: ../modules/addressbook/e-book-shell-view-actions.c:1118
 msgid "S_ave Address Book as vCard"
 msgstr "保存地址簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1120
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "把选中地址薄中的的联系人保存为 VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1122
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/addressbook/e-book-shell-view-actions.c:1126
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
 msgid "_Save as vCard..."
 msgstr "另存为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1124
+#: ../modules/addressbook/e-book-shell-view-actions.c:1128
 msgid "Save selected contacts as a vCard"
 msgstr "把选中的联系人保存为 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Forward Contacts"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:351
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Forward Contact"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:382
+#: ../modules/addressbook/e-book-shell-view.c:379
 msgid "_Send Message to Contacts"
 msgstr "给联系人发送信息(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:384
+#: ../modules/addressbook/e-book-shell-view.c:381
 msgid "_Send Message to List"
 msgstr "给列表发送信息(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:386
+#: ../modules/addressbook/e-book-shell-view.c:383
 msgid "_Send Message to Contact"
 msgstr "给联系人发送信息(_M)"
 
-#: ../modules/addressbook/eab-composer-util.c:149
-msgid "Multiple vCards"
-msgstr "多个 vCard"
-
-#: ../modules/addressbook/eab-composer-util.c:157
-#, c-format
-msgid "vCard for %s"
-msgstr "%s 的 vCard"
-
-#: ../modules/addressbook/eab-composer-util.c:169
-#: ../modules/addressbook/eab-composer-util.c:196
-#, c-format
-msgid "Contact information"
-msgstr "联系人信息"
-
-#: ../modules/addressbook/eab-composer-util.c:198
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s 的联系人信息"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
 msgid "Anonymously"
 msgstr "匿名"
 
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time 
limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:7
-msgid "B_rowse this book until limit reached"
-msgstr "浏览此地址簿直到达到极限(_R)"
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "Using email address"
+msgstr "使用电子邮件地址"
 
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "Lo_gin:"
-msgstr "登录(_G):"
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Using distinguished name (DN)"
+msgstr "使用已识别的姓名(DN)"
 
 #. 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:11
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "One"
 msgstr "一次"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
-msgid "Search Filter"
-msgstr "搜索过滤器"
+#. 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:10
+msgid "Sub"
+msgstr "子"
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "Supported Search Bases"
+msgstr "支持的搜索起点"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Search _base:"
-msgstr "搜索基础(_B):"
+msgid "Ser_ver:"
+msgstr "服务器(_V):"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Search _filter:"
-msgstr "搜索过滤器(_F):"
+msgid "Use secure _connection:"
+msgstr "使用安全连接(_C):"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话,默认情况下搜索"
-"将会在“个人”类型的对象类型。"
+msgid "_Login method:"
+msgstr "登录方式(_L):"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Lo_gin:"
+msgstr "登录(_G):"
 
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this 
file for more detailed explanation.
 #: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Sub"
-msgstr "子"
+msgid "Search _base:"
+msgstr "搜索基础(_B):"
 
 #: ../modules/addressbook/ldap-config.ui.h:19
-msgid "Supported Search Bases"
-msgstr "支持的搜索起点"
+msgid "_Search scope:"
+msgstr "搜索范围(_S):"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "_Find Possible Search Bases"
+msgstr "查找可能的搜索基础(_F)"
 
 #: ../modules/addressbook/ldap-config.ui.h:21
-msgid "Using distinguished name (DN)"
-msgstr "使用已识别的姓名(DN)"
+msgid "S_earch filter:"
+msgstr "搜索过滤器(_E):"
 
 #: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Using email address"
-msgstr "使用电子邮件地址"
+msgid "Search Filter"
+msgstr "搜索过滤器"
 
 #: ../modules/addressbook/ldap-config.ui.h:23
-msgid "_Download limit:"
-msgstr "下载限制(_D):"
-
-#: ../modules/addressbook/ldap-config.ui.h:24
-msgid "_Find Possible Search Bases"
-msgstr "查找可能的搜索基础(_F)"
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话,默认情况下搜索"
+"将会在“个人”类型的对象类型。"
 
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:25
-msgid "_Login method:"
-msgstr "登录方式(_L):"
+msgid "1"
+msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
-msgid "_Search scope:"
-msgstr "搜索范围(_S):"
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "5"
+msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
+msgid "contacts"
+msgstr "联系人"
+
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "超时(_T):"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
-msgid "cards"
-msgstr "名片"
+msgid "_Download limit:"
+msgstr "下载限制(_D):"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time 
limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:34
+msgid "B_rowse this book until limit reached"
+msgstr "浏览此地址簿直到达到极限(_R)"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:146
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:164
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "无法将邮件信息内容通过流传送给 Bogofilter:"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:213
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter 可能崩溃了或无法处理邮件信息"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:312
+#: ../modules/bogofilter/evolution-bogofilter.c:311
 msgid "Bogofilter Options"
 msgstr "Bogofilter 选项"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:321
+#: ../modules/bogofilter/evolution-bogofilter.c:320
 msgid "Convert message text to _Unicode"
 msgstr "将信息文本转换为 _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:477
+#: ../modules/bogofilter/evolution-bogofilter.c:476
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
-msgid "Convert mail messages to Unicode"
-msgstr "将邮件信息转换为 Unicode"
-
-#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:2
-msgid ""
-"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
-"different character sets."
-msgstr ""
-"将信息文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信息特征。"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
-#, no-c-format
-msgid "%u and %d will be replaced by user and domain from the email address."
-msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
-msgid "(Shown in a Day View)"
-msgstr "(在日视图中显示)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
-msgid "05 minutes"
-msgstr "05 分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
-msgid "10 minutes"
-msgstr "10 分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
-msgid "15 minutes"
-msgstr "15 分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
-msgid "30 minutes"
-msgstr "30 分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
-msgid "60 minutes"
-msgstr "60 分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alerts"
-msgstr "提醒"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
-msgid "Day _ends:"
-msgstr "一天结束(_E):"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
-msgid "Days"
-msgstr "天"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Default Free/Busy Server"
-msgstr "默认闲/忙服务器"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
-msgid "Display"
-msgstr "显示"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
-msgid "Display reminders in _notification area only"
-msgstr "只在通知区域显示提醒(_O)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
-msgid "Hours"
-msgstr "小时"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Minutes"
-msgstr "分钟"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
-msgid "Publishing Information"
-msgstr "发布信息"
-
-#. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "S_un"
-msgstr "周日(_U)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
-msgid "Sc_roll Month View by a week"
-msgstr "通过一个周来滚动月视图(_R)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Se_cond zone:"
-msgstr "第二时区(_C):"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for reminder notification"
-msgstr "选择用于提醒通知的日历"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Sh_ow a reminder"
-msgstr "显示一条提醒(_O)"
-
-#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
-msgid "Show a _reminder"
-msgstr "显示一条提醒(_R)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Show r_ecurring events in italic in bottom left calendar"
-msgstr "在底部左侧的日历中以斜体显示重复发生的事件(_E)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
-msgid "Show week _numbers"
-msgstr "显示周数(_N)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "T_asks due today:"
-msgstr "今天到期的任务(_A):"
-
-#. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
-msgid "T_hu"
-msgstr "周四(_H)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
-msgid "Template:"
-msgstr "模板:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
-#: ../widgets/misc/e-dateedit.c:592
-msgid "Time"
-msgstr "时间"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "Time format:"
-msgstr "时间格式:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
-msgid "Use s_ystem time zone"
-msgstr "显示系统时区(_Y)"
-
-#. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-msgid "Wee_k starts on:"
-msgstr "一周开始于(_K):"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
-msgid "Work Week"
-msgstr "工作日"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
-msgid "Work days:"
-msgstr "工作日:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
-msgid "_12 hour (AM/PM)"
-msgstr "_12 小时(上/下午)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
-msgid "_24 hour"
-msgstr "_24 小时"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
-msgid "_Ask for confirmation when deleting items"
-msgstr "删除项时要求确认(_A)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
-msgid "_Compress weekends in month view"
-msgstr "不在月视图中显示周末(_C)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "_Day begins:"
-msgstr "一天开始(_D):"
-
-#. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
-msgid "_Fri"
-msgstr "周五(_F)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-msgid "_Hide completed tasks after"
-msgstr "随后隐藏已完成的任务(_H)"
-
-#. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "_Mon"
-msgstr "周一(_M)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
-msgid "_Overdue tasks:"
-msgstr "延期任务(_O):"
-
-#. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
-msgid "_Sat"
-msgstr "周六(_S)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
-msgid "_Show appointment end times in week and month view"
-msgstr "在周视图和月视图中显示约会结束时间(_S)"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:68
-msgid "_Time divisions:"
-msgstr "时间分割(_T):"
-
-#. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:70
-msgid "_Tue"
-msgstr "周二(_T)"
-
-#. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
-msgid "_Wed"
-msgstr "周三(_W)"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "before every anniversary/birthday"
-msgstr "在每个周年/生日前"
-
-#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-msgid "before every appointment"
-msgstr "在每次约会前"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
-msgid "Ask for confirmation when deleting items"
-msgstr "删除项时要求确认"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
-msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "今天到期任务的背景颜色,以“#rrggbb”格式。"
+msgid ""
+"The UID of the selected (or \"primary\") calendar in the sidebar of the "
+"\"Calendar\" view."
+msgstr "在“日历”视图侧边栏中选择的(或“主”)日历的 UID。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
-msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
-msgid "Birthday and anniversary reminder"
-msgstr "生日和纪念日提醒"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
+"Shanghai”。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-msgid "Birthday and anniversary reminder units"
-msgstr "生日和纪念日提醒单位"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-msgid "Birthday and anniversary reminder value"
-msgstr "生日和纪念日提醒值"
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-msgid "Calendars to run reminders for"
-msgstr "用来运行提醒的日历"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr "如果被设定,在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
-msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
+msgid "List of recently used second time zones in a Day View."
+msgstr "列出在日视图中最近使用过的第二时区。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
-msgid "Compress weekends in month view"
-msgstr "在月视图中压缩周末"
+msgid "Maximum number of recently used timezones to remember."
+msgstr "最近使用过的时区最大记忆数目"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
-msgid "Confirm expunge"
-msgstr "确认销毁"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
-msgid "Days on which the start and end of work hours should be indicated."
-msgstr "标为工作日的日子。"
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr "在 'day_second_zones' 列表中,最近使用过的时区最大记忆数目"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
-msgid "Default appointment reminder"
-msgstr "默认约会提醒"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
-msgid "Default reminder units"
-msgstr "默认提醒单位"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
-msgid "Default reminder value"
-msgstr "默认提醒值"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
-msgid "Directory for saving reminder audio files"
-msgstr "保存提醒音频文件的目录"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Free/busy server URLs"
-msgstr "忙/闲服务器 URL"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
-msgid "Free/busy template URL"
-msgstr "忙/闲模板 URL"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
-msgid "Hide completed tasks"
-msgstr "隐藏已完成的任务"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
-msgid "Hide task units"
-msgstr "隐藏任务单位"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
-msgid "Hide task value"
-msgstr "隐藏任务值"
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
-msgid "Horizontal pane position"
-msgstr "水平面板位置"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
-msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "工作日开始的小时,以 24 小时格式表示,0 到 23。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
-msgid "If \"true\", show the memo preview pane in the main window."
-msgstr "如果 “true”,在主窗口中显示备忘预览面板。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
-msgid "If \"true\", show the task preview pane in the main window."
-msgstr "如果 “true”,在主窗口中显示任务预览面板。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
-msgid "Last reminder time"
-msgstr "上次提醒时间"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
-msgid "List of recently used second time zones in a Day View."
-msgstr "列出在日视图中最近使用过的第二时区。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
-msgid "List of server URLs for free/busy publishing."
-msgstr "列出发表忙/闲的服务器 URL。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
-msgid "Marcus Bains Line"
-msgstr "Marcus Bains 线"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
-msgid "Marcus Bains Line Color - Day View"
-msgstr "Marcus Bains 线颜色 - 日视图"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
-msgid "Marcus Bains Line Color - Time bar"
-msgstr "Marcus Bains 线颜色 - 日期栏"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
-msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
-msgstr "在 'day_second_zones' 列表中,最近使用过的时区最大记忆数目"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
-msgid "Maximum number of recently used timezones to remember."
-msgstr "最近使用过的时区最大记忆数目"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
-msgid "Memo layout style"
-msgstr "备忘外观风格"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
-msgid "Memo preview pane position (horizontal)"
-msgstr "备忘预览面板的水平位置"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
-msgid "Memo preview pane position (vertical)"
-msgstr "备忘预览面板的竖直位置"
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
-msgid "Minute the workday ends on, 0 to 59."
-msgstr "工作日结束的分钟,0 到 59。"
+msgid "Vertical pane position"
+msgstr "竖直面板的位置"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
-msgid "Minute the workday starts on, 0 to 59."
-msgstr "工作日开始的分钟,0 到 59。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
-msgid "Month view horizontal pane position"
-msgstr "月视图水平面板的位置"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr "非月视图中视图和日期导航器日历及任务列表之间竖直面板的位置,以像素计。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
-msgid "Month view vertical pane position"
-msgstr "月视图中竖直面板的位置"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
-msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "决定生日或周年纪念日提醒的单位数量。"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-msgid "Number of units for determining a default reminder."
-msgstr "确定默认提醒的单位数量。"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr "月视图中视图和日期导航器日历及任务列表之间竖直面板的位置,以像素计。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
-msgid "Number of units for determining when to hide tasks."
-msgstr "决定何时隐藏任务的数字单位。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
-msgid "Overdue tasks color"
-msgstr "延期任务的颜色"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
-"Position of the horizontal pane, between the date navigator calendar and the "
-"task list when not in the month view, in pixels."
-msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置,以像素计。"
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "日历列表和日期导航器日历之间竖直面板的位置。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
-"Position of the horizontal pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"布局样式决定了在哪里放置备忘列表的预览面板。“0”(经典视图)会把预览面板放置在备"
+"忘列表下面。“1”(竖直视图)会把预览面板放置在备忘列表旁边。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
-msgid "Position of the memo preview pane when oriented vertically."
-msgstr "当竖直定向时,备忘预览面板的位置。"
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr "如果 “true”,在主窗口中显示备忘预览面板。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "当水平定向时,任务预览面板的位置。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the task preview pane when oriented vertically."
-msgstr "当竖直定向时,任务预览面板的位置。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
-msgid ""
-"Position of the vertical pane, between the calendar lists and the date "
-"navigator calendar."
-msgstr "日历列表和日期导航器日历之间竖直面板的位置。"
-
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list in the month view, in pixels."
-msgstr "月视图中视图和日期导航器日历及任务列表之间竖直面板的位置,以像素计。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
-msgid ""
-"Position of the vertical pane, between the view and the date navigator "
-"calendar and task list when not in the month view, in pixels."
-msgstr "非月视图中视图和日期导航器日历及任务列表之间竖直面板的位置,以像素计。"
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr "当竖直定向时,备忘预览面板的位置。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
-msgid "Primary calendar"
-msgstr "首选日历"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
-msgid "Primary memo list"
-msgstr "首选备忘列表"
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
+"务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
-msgid "Primary task list"
-msgstr "首选任务列表"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
-msgid "Programs that are allowed to be run by reminders."
-msgstr "允许提醒运行的程序。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Recently used second time zones in a Day View"
-msgstr "日视图中最近是用过的第二时区"
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr "如果 “true”,在主窗口中显示任务预览面板。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
-msgid "Recurrent Events in Italic"
-msgstr "以斜体显示重复事件"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
-msgid "Reminder programs"
-msgstr "提醒程序"
+msgid "Position of the task preview pane when oriented vertically."
+msgstr "当竖直定向时,任务预览面板的位置。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for reminder audio"
-msgstr "保存提醒音频的目录"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
-msgid "Scroll Month View by a week"
-msgstr "通过一个周来滚动月视图"
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
-msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "在事件/任务/会议编辑器中显示请回复域"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
-msgid "Show Role field in the event/task/meeting editor"
-msgstr "在事件/任务/会议编辑器中显示角色域"
+msgid "Whether to display the end time of events in the week and month views."
+msgstr "是否在周视图和月视图中显示事件的结束时间。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:68
-msgid "Show appointment end times in week and month views"
-msgstr "在周视图和月视图中显示约会结束时间"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:69
-msgid "Show categories field in the event/meeting/task editor"
-msgstr "在事件/会议/任务编辑器中显示分类域"
+msgid "Days on which the start and end of work hours should be indicated."
+msgstr "标为工作日的日子。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
-msgid "Show days with recurrent events in italic font in bottom left calendar."
-msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display reminders in notification tray"
-msgstr "在通知托盘中显示提醒"
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
-msgid "Show status field in the event/task/meeting editor"
-msgstr "在事件/任务/会议编辑器中显示状态域"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:73
-msgid "Show the memo preview pane"
-msgstr "显示“备忘预览”面板"
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:74
-msgid "Show the task preview pane"
-msgstr "显示“任务预览”面板"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:75
-msgid "Show timezone field in the event/meeting editor"
-msgstr "在事件/会议编辑器中显示时区域"
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:76
-msgid "Show type field in the event/task/meeting editor"
-msgstr "在事件/任务/会议编辑器中显示类型域"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
-msgstr "在日视图、工作日视图和日期导航中显示周数"
+msgid "Show days with recurrent events in italic font in bottom left calendar."
+msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
-"Shows the second time zone in a Day View, if set. Value is similar to one "
-"used in a 'timezone' key."
-msgstr "如果被设定,在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:79
-msgid "Task layout style"
-msgstr "任务外观风格"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
-msgid "Task preview pane position (horizontal)"
-msgstr "任务预览面板的水平位置"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:81
-msgid "Task preview pane position (vertical)"
-msgstr "任务预览面板的竖直位置"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
-msgid "Tasks due today color"
-msgstr "今天到期的任务颜色"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:83
-msgid ""
-"The UID of the selected (or \"primary\") calendar in the sidebar of the "
-"\"Calendar\" view."
-msgstr "在“日历”视图侧边栏中选择的(或“主”)日历的 UID。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
-msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr "在“备忘”视图侧边栏中选择的(或“主”)备忘列表的 UID。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:80
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
 msgstr "在“任务”视图侧边栏中选择的(或“主”)任务列表的 UID。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
-#, no-c-format
-msgid ""
-"The URL template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
-"名。"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:82
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr "是否在任务视图中隐藏已完成的任务。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
-msgstr ""
-"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
-"Shanghai”。"
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the memo list. \"0\" (Classic View) places the preview pane below the memo "
-"list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr ""
-"布局样式决定了在哪里放置备忘列表的预览面板。“0”(经典视图)会把预览面板放置在备"
-"忘列表下面。“1”(竖直视图)会把预览面板放置在备忘列表旁边。"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:86
+msgid "Number of units for determining when to hide tasks."
+msgstr "决定何时隐藏任务的数字单位。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
-msgid ""
-"The layout style determines where to place the preview pane in relation to "
-"the task list. \"0\" (Classic View) places the preview pane below the task "
-"list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr ""
-"布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
-"务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:88
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr "今天到期任务的背景颜色,以“#rrggbb”格式。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
-msgid "The second timezone for a Day View"
-msgstr "日视图的第二时区"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:90
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:92
-msgid ""
-"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
-"debug messages."
-msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:93
-msgid "Time divisions"
-msgstr "时间分割"
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr "删除约会或任务时是否要求确认。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last reminder ran, in time_t."
-msgstr "提醒上次运行的时间,以 time_t 格式。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
-msgid "Timezone"
-msgstr "时区"
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr "销毁约会和任务时是否要求确认。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:96
-msgid "Twenty four hour time format"
-msgstr "二十四小时时间格式"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
-msgstr "生日或周年纪念日提醒的单位,可为“minutes”,“hours”或“days”。"
+msgid "Whether to set a default reminder for appointments."
+msgstr "是否为约会设置默认提醒。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
-msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:99
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
+msgid "Number of units for determining a default reminder."
+msgstr "确定默认提醒的单位数量。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:100
-msgid "Use system timezone"
-msgstr "使用系统时区"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
-msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:102
-msgid "Vertical pane position"
-msgstr "竖直面板的位置"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:103
-msgid "Week start"
-msgstr "一周开始"
+msgid "Whether to set a reminder for birthdays and anniversaries."
+msgstr "是否为生日或周年纪念日设置提醒。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:104
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display reminders."
-msgstr "是否使用通知托盘来显示提醒。"
+msgid "Number of units for determining a birthday or anniversary reminder."
+msgstr "决定生日或周年纪念日提醒的单位数量。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
-msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "删除约会或任务时是否要求确认。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
-msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "销毁约会和任务时是否要求确认。"
+msgid ""
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
+"\"days\"."
+msgstr "生日或周年纪念日提醒的单位,可为“minutes”,“hours”或“days”。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:108
-msgid ""
-"Whether to compress weekends in the month view, which puts Saturday and "
-"Sunday in the space of one weekday."
-msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "是否在日历中显示周数。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to display the end time of events in the week and month views."
-msgstr "是否在周视图和月视图中显示事件的结束时间。"
+msgid "Scroll Month View by a week"
+msgstr "通过一个周来滚动月视图"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:110
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to hide completed tasks in the tasks view."
-msgstr "是否在任务视图中隐藏已完成的任务。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "是否按星期滚动一个月,而不是按照月份滚动。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
-msgid "Whether to set a default reminder for appointments."
-msgstr "是否为约会设置默认提醒。"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
+msgid "Time the last reminder ran, in time_t."
+msgstr "提醒上次运行的时间,以 time_t 格式。"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "是否为生日或周年纪念日设置提醒。"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:113
+msgid "Calendars to run reminders for"
+msgstr "用来运行提醒的日历"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
-msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
-msgid "Whether to show categories field in the event/meeting editor"
-msgstr "是否在事件/会议编辑器中显示分类域"
+msgid "Programs that are allowed to be run by reminders."
+msgstr "允许提醒运行的程序。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:117
-msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "是否在事件/任务/会议中显示角色域"
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "是否使用通知托盘来显示提醒。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:118
-msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "是否在事件/任务/会议编辑器中显示状态域"
+msgid "Free/busy server URLs"
+msgstr "忙/闲服务器 URL"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:120
-msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "是否在事件/会议编辑器中显示时区域"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "是否在事件/任务/会议编辑器中显示类型域"
+msgid "List of server URLs for free/busy publishing."
+msgstr "列出发表忙/闲的服务器 URL。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "是否在日历中显示周数。"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
-msgid "Work days"
-msgstr "工作日"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:124
-msgid "Workday end hour"
-msgstr "工作日结束小时"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
-msgid "Workday end minute"
-msgstr "工作日结束分钟"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
-msgid "Workday start hour"
-msgstr "工作日开始小时"
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
+"名。"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:127
-msgid "Workday start minute"
-msgstr "工作日开始分钟"
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:312
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../modules/calendar/e-cal-attachment-handler.c:320
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "导入(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:393
+#: ../modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "选择一个日历"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:420
+#: ../modules/calendar/e-cal-attachment-handler.c:428
 msgid "Select a Task List"
 msgstr "选择一个任务列表"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:430
+#: ../modules/calendar/e-cal-attachment-handler.c:438
 msgid "I_mport to Calendar"
 msgstr "导入到日历(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:437
+#: ../modules/calendar/e-cal-attachment-handler.c:445
 msgid "I_mport to Tasks"
 msgstr "导入到任务(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:461
+#: ../modules/calendar/e-calendar-preferences.c:467
 msgid "Selected Calendars for Reminders"
 msgstr "已选择用于提醒的日历"
 
-#: ../modules/calendar/e-calendar-preferences.c:863
+#: ../modules/calendar/e-calendar-preferences.c:891
 msgid "Ti_me and date:"
 msgstr "时间和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:864
+#: ../modules/calendar/e-calendar-preferences.c:892
 msgid "_Date only:"
 msgstr "仅日期(_D):"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
+msgid "Minutes"
+msgstr "分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Hours"
+msgstr "小时"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
+msgid "Days"
+msgstr "天"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
+msgid "60 minutes"
+msgstr "60 分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
+msgid "30 minutes"
+msgstr "30 分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "15 minutes"
+msgstr "15 分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
+msgid "10 minutes"
+msgstr "10 分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
+msgid "05 minutes"
+msgstr "05 分钟"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+#: ../widgets/misc/e-dateedit.c:595
+msgid "Time"
+msgstr "时间"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
+msgid "Se_cond zone:"
+msgstr "第二时区(_C):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:19
+msgid "(Shown in a Day View)"
+msgstr "(在日视图中显示)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
+msgid "Use s_ystem time zone"
+msgstr "显示系统时区(_Y)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
+msgid "Time format:"
+msgstr "时间格式:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:23
+msgid "_12 hour (AM/PM)"
+msgstr "_12 小时(上/下午)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "_24 hour"
+msgstr "_24 小时"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+msgid "Work Week"
+msgstr "工作日"
+
+#. A weekday like "Monday" follows
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
+msgid "Wee_k starts on:"
+msgstr "一周开始于(_K):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Work days:"
+msgstr "工作日:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
+msgid "_Day begins:"
+msgstr "一天开始(_D):"
+
+#. Monday
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "_Mon"
+msgstr "周一(_M)"
+
+#. Tuesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
+msgid "_Tue"
+msgstr "周二(_T)"
+
+#. Wednesday
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
+msgid "_Wed"
+msgstr "周三(_W)"
+
+#. Thursday
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "T_hu"
+msgstr "周四(_H)"
+
+#. Friday
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
+msgid "_Fri"
+msgstr "周五(_F)"
+
+#. Saturday
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
+msgid "_Sat"
+msgstr "周六(_S)"
+
+#. Sunday
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "S_un"
+msgstr "周日(_U)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
+msgid "Day _ends:"
+msgstr "一天结束(_E):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
+msgid "Alerts"
+msgstr "提醒"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
+msgid "_Ask for confirmation when deleting items"
+msgstr "删除项时要求确认(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
+msgid "_Time divisions:"
+msgstr "时间分割(_T):"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
+msgid "_Show appointment end times in week and month view"
+msgstr "在周视图和月视图中显示约会结束时间(_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
+msgid "_Compress weekends in month view"
+msgstr "不在月视图中显示周末(_C)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
+msgid "Show week _numbers"
+msgstr "显示周数(_N)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show r_ecurring events in italic in bottom left calendar"
+msgstr "在底部左侧的日历中以斜体显示重复发生的事件(_E)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
+msgid "Sc_roll Month View by a week"
+msgstr "通过一个周来滚动月视图(_R)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "Display"
+msgstr "显示"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
+msgid "Highlight t_asks due today"
+msgstr "高亮今天到期的任务(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Highlight _overdue tasks"
+msgstr "高亮延期任务(_O)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "_Hide completed tasks after"
+msgstr "随后隐藏已完成的任务(_H)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+msgid "Display reminders in _notification area only"
+msgstr "只在通知区域显示提醒(_O)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Sh_ow a reminder"
+msgstr "显示一条提醒(_O)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
+msgid "before every appointment"
+msgstr "在每次约会前"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Show a _reminder"
+msgstr "显示一条提醒(_R)"
+
+#. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
+msgid "before every anniversary/birthday"
+msgstr "在每个周年/生日前"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Select the calendars for reminder notification"
+msgstr "选择用于提醒通知的日历"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Default Free/Busy Server"
+msgstr "默认闲/忙服务器"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Template:"
+msgstr "模板:"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
+msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "Publishing Information"
+msgstr "发布信息"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:117
+#: ../modules/calendar/e-cal-shell-backend.c:123
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:104
-#: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:104
+#: ../modules/calendar/e-memo-shell-backend.c:114
+#: ../modules/calendar/e-memo-shell-migrate.c:155
+#: ../modules/calendar/e-task-shell-backend.c:110
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "网上"
 
-#: ../modules/calendar/e-cal-shell-backend.c:119
+#: ../modules/calendar/e-cal-shell-backend.c:125
 #: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "天气"
 
-#: ../modules/calendar/e-cal-shell-backend.c:206
+#: ../modules/calendar/e-cal-shell-backend.c:212
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "生日和纪念日"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:451
 msgctxt "New"
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-backend.c:453
 #: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:458
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
+#: ../modules/calendar/e-cal-shell-backend.c:460
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:465
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:467
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:463
+#: ../modules/calendar/e-cal-shell-backend.c:475
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-backend.c:477
 #: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: ../modules/calendar/e-cal-shell-backend.c:788
+#: ../modules/calendar/e-cal-shell-backend.c:800
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:184
+#: ../modules/calendar/e-cal-shell-sidebar.c:190
 msgid "Loading calendars"
 msgstr "载入日历"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:755
+#: ../modules/calendar/e-cal-shell-sidebar.c:761
 msgid "_New Calendar..."
 msgstr "新建日历(_N)..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:772
+#: ../modules/calendar/e-cal-shell-sidebar.c:778
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1123
+#: ../modules/calendar/e-cal-shell-sidebar.c:1114
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "在 %s 打开日历"
@@ -14621,27 +16209,31 @@ msgstr "活动约会"
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr "发生不到 5 次"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 #: ../modules/calendar/e-memo-shell-view-actions.c:795
 #: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
 #: ../modules/calendar/e-memo-shell-view-actions.c:802
 #: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "打印此日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-actions.c:1789
 #: ../modules/calendar/e-cal-shell-view-memopad.c:294
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:381
 #: ../modules/calendar/e-memo-shell-view-actions.c:843
@@ -14649,7 +16241,7 @@ msgstr "预览将要打印的日历"
 msgid "_Save as iCalendar..."
 msgstr "保存为 iCalendar(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 msgid "Go To"
 msgstr "转到"
 
@@ -14666,7 +16258,7 @@ msgid "New _Memo"
 msgstr "新建备忘(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-backend.c:310
 #: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "创建新备忘"
@@ -14732,7 +16324,7 @@ msgid "New _Task"
 msgstr "新建任务(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:349
-#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-backend.c:305
 #: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "创建新任务"
@@ -14752,40 +16344,40 @@ msgstr "查看选中的任务"
 msgid "Print the selected task"
 msgstr "打印选中的任务"
 
-#: ../modules/calendar/e-memo-shell-backend.c:298
+#: ../modules/calendar/e-memo-shell-backend.c:308
 msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:305
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共享的备忘(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:307
+#: ../modules/calendar/e-memo-shell-backend.c:317
 msgid "Create a new shared memo"
 msgstr "创建一个新的共享备忘"
 
-#: ../modules/calendar/e-memo-shell-backend.c:315
+#: ../modules/calendar/e-memo-shell-backend.c:325
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "备忘列表(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-backend.c:327
 #: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:179
+#: ../modules/calendar/e-memo-shell-sidebar.c:186
 msgid "Loading memos"
 msgstr "载入备忘"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:696
+#: ../modules/calendar/e-memo-shell-sidebar.c:703
 msgid "Memo List Selector"
 msgstr "备忘列表选择器"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:1009
+#: ../modules/calendar/e-memo-shell-sidebar.c:1001
 #, c-format
 msgid "Opening memos at %s"
 msgstr "在 %s 打开备忘"
@@ -14870,45 +16462,45 @@ msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:585
+#: ../modules/calendar/e-task-shell-view-private.c:609
 #, c-format
 msgid "%d selected"
 msgstr "选中 %d 个"
 
-#: ../modules/calendar/e-task-shell-backend.c:297
+#: ../modules/calendar/e-task-shell-backend.c:303
 msgctxt "New"
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:304
+#: ../modules/calendar/e-task-shell-backend.c:310
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分配的任务(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:306
+#: ../modules/calendar/e-task-shell-backend.c:312
 msgid "Create a new assigned task"
 msgstr "创建新分配的任务"
 
-#: ../modules/calendar/e-task-shell-backend.c:314
+#: ../modules/calendar/e-task-shell-backend.c:320
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "任务列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-backend.c:322
 #: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:179
+#: ../modules/calendar/e-task-shell-sidebar.c:186
 msgid "Loading tasks"
 msgstr "载入任务"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:696
+#: ../modules/calendar/e-task-shell-sidebar.c:703
 msgid "Task List Selector"
 msgstr "任务列表选择器"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:1010
+#: ../modules/calendar/e-task-shell-sidebar.c:1002
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -15033,449 +16625,462 @@ msgstr "删除任务"
 msgid "Delete Task"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view-private.c:472
+#: ../modules/calendar/e-task-shell-view-private.c:498
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../modules/calendar/e-task-shell-view-private.c:581
+#: ../modules/calendar/e-task-shell-view-private.c:605
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: ../modules/mail/em-account-prefs.c:219
-msgid "Evolution Account Assistant"
-msgstr "Evolution 帐号助手"
-
-#: ../modules/mail/em-account-prefs.c:268
-msgid "Account Editor"
-msgstr "帐号编辑器"
-
-#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:384
-#, c-format
-msgid "%d attached messages"
-msgstr "%d 个附加的信息"
+#: ../modules/mail/e-mail-attachment-handler.c:389
+#, fuzzy, c-format
+#| msgid "%d attached messages"
+msgid "%d attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d 个附加的信息"
 
-#: ../modules/mail/e-mail-shell-backend.c:195
+#: ../modules/mail/e-mail-shell-backend.c:230
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "信息(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:197
+#: ../modules/mail/e-mail-shell-backend.c:232
 msgid "Compose a new mail message"
 msgstr "撰写一封新信"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:240
+#, fuzzy
+#| msgid "Mail Accounts"
+msgctxt "New"
+msgid "Mail Acco_unt"
+msgstr "邮件帐号"
+
+#: ../modules/mail/e-mail-shell-backend.c:242
+#, fuzzy
+#| msgid "Create a new mail folder"
+msgid "Create a new mail account"
+msgstr "创建新邮件文件夹"
+
+#: ../modules/mail/e-mail-shell-backend.c:247
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:249
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:464
 msgid "Mail Accounts"
 msgstr "邮件帐号"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:473
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:482
 msgid "Composer Preferences"
 msgstr "编写器首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:491
 msgid "Network Preferences"
 msgstr "网络首选项"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
-#: ../modules/mail/e-mail-shell-view.c:960
+#: ../modules/mail/e-mail-shell-backend.c:725
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帐号助手"
+
+#: ../modules/mail/e-mail-shell-backend.c:771
+msgid "Account Editor"
+msgstr "帐号编辑器"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "禁用帐号(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
 msgid "Disable this account"
 msgstr "禁用这个帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#, fuzzy
+#| msgid "Change the properties of this folder"
+msgid "Edit properties of this account"
+msgstr "更改此文件夹的属性"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信息以离线使用(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下载标记为离线使用的帐号和文件夹的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 msgid "Fl_ush Outbox"
 msgstr "清空发件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Copy the selected folder into another folder"
 msgstr "把选中的文件夹复制到其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "E_xpunge"
 msgstr "销毁(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "从该文件夹永久删除所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Mar_k All Messages as Read"
 msgstr "把全部信息标记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1238
 msgid "Mark all messages in the folder as read"
 msgstr "将此文件夹中的所有信息标记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Move the selected folder into another folder"
 msgstr "把选中的文件夹移至其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1250
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Create a new folder for storing mail"
 msgstr "创建存储邮件的新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Change the properties of this folder"
 msgstr "更改此文件夹的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的名称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Select Message _Thread"
 msgstr "选择信息线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Select all messages in the same thread as the selected message"
 msgstr "把同一线索中的所有信息选择为选中信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Select Message S_ubthread"
 msgstr "选择信息子线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Select all replies to the currently selected message"
 msgstr "选择当前选中信息的所有回复"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "Empty _Trash"
 msgstr "清空废件箱(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久删除所有帐号中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "_Manage Subscriptions"
 msgstr "管理订阅(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程服务器上的文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1338
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
 msgid "Receive new items from all accounts"
 msgstr "接收所有账户中的新条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1350
 msgid "_Send All"
 msgstr "全部发送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
 msgid "Send queued items in all accounts"
 msgstr "发送所有账户的队列中的条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
-#: ../widgets/misc/e-activity-proxy.c:310
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "取消"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Cancel the current mail operation"
 msgstr "取消当前邮件操作"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Collapse All _Threads"
 msgstr "折叠全部线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
 msgid "Collapse all message threads"
 msgstr "折叠全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1392
 msgid "E_xpand All Threads"
 msgstr "展开全部线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
 msgid "Expand all message threads"
 msgstr "展开全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1399
 msgid "_Message Filters"
 msgstr "信息过滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 msgid "_Subscriptions..."
 msgstr "订阅(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "F_older"
 msgstr "文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Search F_olders"
 msgstr "搜索文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Create or edit search folder definitions"
 msgstr "创建或编辑搜索文件夹定义"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1483
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "Show Message _Preview"
 msgstr "显示信息预览(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1513
 msgid "Show message preview pane"
 msgstr "显示信息预览窗口"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "Show _Deleted Messages"
 msgstr "显示删除的信息(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Show deleted messages with a line through them"
 msgstr "在信息列表中显示删除了的信息(带有删除线)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1527
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "Threaded message list"
 msgstr "按线索排列信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Show message preview below the message list"
 msgstr "在信息列表下方显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Show message preview alongside the message list"
 msgstr "在信息列表旁显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "All Messages"
 msgstr "全部信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Important Messages"
 msgstr "重要信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Messages Not Junk"
 msgstr "不是垃圾信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Messages with Attachments"
 msgstr "有附件的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Read Messages"
 msgstr "已读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Recent Messages"
 msgstr "最近信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Unread Messages"
 msgstr "未读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Subject or Addresses contain"
 msgstr "主题或地址含有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1683
 msgid "All Accounts"
 msgstr "全部帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1690
 msgid "Current Account"
 msgstr "当前帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1697
 msgid "Current Folder"
 msgstr "当前文件夹"
 
-#: ../modules/mail/e-mail-shell-view.c:563
+#: ../modules/mail/e-mail-shell-view.c:560
 msgid "All Account Search"
 msgstr "全部帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view.c:736
+#: ../modules/mail/e-mail-shell-view.c:721
 msgid "Account Search"
 msgstr "帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view.c:958
+#: ../modules/mail/e-mail-shell-view.c:945
 msgid "Proxy _Logout"
 msgstr "代理服务器注销(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1028
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
-#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../modules/mail/e-mail-shell-view-private.c:1052
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1027
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 封草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1033
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] ",%d 封未读,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1054
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1108
 msgid "Trash"
 msgstr "回收站"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1584
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:361
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Enabled"
-msgstr "已启用"
-
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:513
 msgid "Language(s)"
 msgstr "语言"
 
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:89
 msgid "Every time"
 msgstr "每次"
 
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:90
 msgid "Once per day"
 msgstr "每天一次"
 
-#: ../modules/mail/em-mailer-prefs.c:93
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Once per week"
 msgstr "每周一次"
 
-#: ../modules/mail/em-mailer-prefs.c:94
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per month"
 msgstr "每月一次"
 
@@ -15488,87 +17093,113 @@ msgid "Contains Value"
 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:1051
+#: ../modules/mail/em-mailer-prefs.c:1069
 msgid "_Date header:"
 msgstr "日期头:(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1052
+#: ../modules/mail/em-mailer-prefs.c:1070
 msgid "Show _original header value"
 msgstr "显示原始邮件头值(_o)"
 
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "检查 Evolution 是否是默认邮件程序"
-
-#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "每次启动 Evolution 的时候,检查它是否是默认邮件程序。"
-
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "Do you want to make Evolution your default email client?"
 msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
 
+#. Translators: First %s is an email address, second %s
+#. * is the subject of the email, third %s is the date.
+#: ../modules/mdn/evolution-mdn.c:291
+#, c-format
+msgid "Your message to %s about \"%s\" on %s has been read."
+msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读。"
+
+#. Translators: %s is the subject of the email message.
+#: ../modules/mdn/evolution-mdn.c:357
+#, fuzzy, c-format
+#| msgid "Delivery Notification for: \"%s\""
+msgid "Delivery Notification for \"%s\""
+msgstr "邮件通知:%s"
+
+#: ../modules/mdn/evolution-mdn.c:499
+#, fuzzy, c-format
+#| msgid "S_end message receipts:"
+msgid "Send a read receipt to '%s'"
+msgstr "发送信息收条(_E):"
+
+#. name doesn't matter
+#: ../modules/mdn/evolution-mdn.c:504
+#, fuzzy
+#| msgid "Do _Not Send"
+msgid "_Notify Sender"
+msgstr "不发送(_N)"
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:1
+msgid "Sender wants to be notified when you have read this message."
+msgstr ""
+
+#: ../modules/mdn/evolution-mdn.error.xml.h:2
+msgid "Sender has been notified that you have read this message."
+msgstr ""
+
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
+msgid "Evolution is currently offline."
+msgstr "Evolution 目前离线。"
+
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
 msgid "Click 'Work Online' to return to online mode."
 msgstr "点击“在线工作”返回在线模式。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
+#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
 msgid "Evolution is currently offline due to a network outage."
 msgstr "由于网络断开,Evolution 目前离线。"
 
-#: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-msgid "Evolution is currently offline."
-msgstr "Evolution 目前离线。"
-
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
 msgstr "一旦建立了网络连接,Evolution 将返回在线模式。"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+#: ../modules/online-accounts/camel-sasl-xoauth.c:388
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
 msgstr "在 org.gnome.OnlineAccounts 服务找不到对应的账户来获取认证令牌。"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+#: ../modules/online-accounts/camel-sasl-xoauth.c:475
 msgid "OAuth"
 msgstr "OAuth"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+#: ../modules/online-accounts/camel-sasl-xoauth.c:477
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 msgstr "此选项将通过 GNOME 在线账户服务连接到服务器"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "插件管理器"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意:某些更改直到重新启动后才生效"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "概览"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:369
-#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "插件"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "插件(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Enable and disable plugins"
 msgstr "启用和禁用插件"
 
@@ -15581,148 +17212,135 @@ msgid "Test Plugin for Python EPlugin loader."
 msgstr "Python Eplugin 加载器测试插件。"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
-msgid "Hello Python"
-msgstr "您好 Python"
-
-#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
 msgstr "Python 插件加载器测试"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:191
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Hello Python"
+msgstr "您好 Python"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:190
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:214
+#: ../modules/spamassassin/evolution-spamassassin.c:213
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "无法将邮件信息内容通过流传送给 SpamAssassin:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:233
+#: ../modules/spamassassin/evolution-spamassassin.c:232
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "无法将“%s”写入 SpamAssassin:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:261
+#: ../modules/spamassassin/evolution-spamassassin.c:260
 msgid "Failed to read output from SpamAssassin: "
 msgstr "读取 SpamAssassin 输出失败:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:316
+#: ../modules/spamassassin/evolution-spamassassin.c:315
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin 崩溃了,或无法处理邮件信息"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:835
+#: ../modules/spamassassin/evolution-spamassassin.c:834
 msgid "SpamAssassin Options"
 msgstr "垃圾克星选项"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:850
+#: ../modules/spamassassin/evolution-spamassassin.c:849
 msgid "I_nclude remote tests"
 msgstr "包含远程测试(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:864
+#: ../modules/spamassassin/evolution-spamassassin.c:863
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "这将让 SpamAssassin 更可靠,但稍慢。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1073
+#: ../modules/spamassassin/evolution-spamassassin.c:1072
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
-msgid "Use SpamAssassin daemon and client"
-msgstr "使用垃圾克星守护程序和客户"
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
-msgid "Use only local spam tests."
-msgstr "只使用本地垃圾信息测试。"
-
-#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
-msgid "Use only the local spam tests (no DNS)."
-msgstr "之使用本地垃圾信息测试(无 DNS)。"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:136
+#, fuzzy
+#| msgid ""
+#| "Welcome to Evolution. The next few screens will allow Evolution to "
+#| "connect to your email accounts, and to import files from other "
+#| "applications. \n"
+#| "\n"
+#| "Please click the \"Forward\" button to continue. "
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications."
+msgstr ""
+"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的电子邮件帐号,并从其它"
+"应用程序中导入文件。\n"
+"\n"
+"请单击“前进”按钮继续。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
-#: ../widgets/misc/e-import-assistant.c:396
+#: ../modules/startup-wizard/evolution-startup-wizard.c:297
+#: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:312
-#: ../widgets/misc/e-import-assistant.c:552
+#: ../modules/startup-wizard/evolution-startup-wizard.c:329
+#: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "从 %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
-#: ../modules/startup-wizard/evolution-startup-wizard.c:421
+#: ../modules/startup-wizard/evolution-startup-wizard.c:340
+#: ../modules/startup-wizard/evolution-startup-wizard.c:438
 msgid "Importing Files"
 msgstr "导入文件"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:399
-msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr "导入被取消。点击“前进”继续"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#, fuzzy
+#| msgid "%s (cancelled)"
+msgid "Import cancelled."
+msgstr "%s(取消的)"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:417
-msgid "Import complete. Click \"Forward\" to continue."
-msgstr "导入已完成。点击“前进”继续"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:434
+#, fuzzy
+#| msgid "Update complete\n"
+msgid "Import complete."
+msgstr "更新完成\n"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:497
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:514
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:508
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的电子邮件帐号,并从其它"
-"应用程序中导入文件。\n"
-"\n"
-"请单击“前进”按钮继续。"
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:626
 msgid "Loading accounts..."
 msgstr "正在载入..."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Add local address books to Evolution."
-msgstr "添加本地地址薄到Evolution。"
-
-#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
 msgstr "本地地址簿"
 
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
-msgstr "信息主体中的用于附件提醒插件的线索列表"
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Add local address books to Evolution."
+msgstr "添加本地地址薄到Evolution。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:136
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "关键字"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Message has no attachments"
+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:2
-msgid "Message has no attachments"
-msgstr "信息无附件"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
 msgstr "添加附件(_A)..."
@@ -15747,63 +17365,6 @@ msgstr "嵌入音频"
 msgid "Play audio attachments directly in mail messages."
 msgstr "直接在邮件信息里播放音频附件"
 
-#: ../plugins/backup-restore/backup-restore.c:192
-msgid "Select name of the Evolution backup file"
-msgstr "选择 Evolution 备份文件名称"
-
-#: ../plugins/backup-restore/backup-restore.c:225
-msgid "_Restart Evolution after backup"
-msgstr "备份后重新启动 Evolution(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:251
-msgid "Select name of the Evolution backup file to restore"
-msgstr "选择要恢复的 Evolution 备份文件名称"
-
-#: ../plugins/backup-restore/backup-restore.c:264
-msgid "_Restart Evolution after restore"
-msgstr "恢复后重新启动 Evolution(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:337
-msgid ""
-"You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
-"settings, mail filters etc."
-msgstr ""
-"您可以从备份中恢复 Evolution。它能够恢复所有邮件、日历、任务、备忘和联系人。"
-"它还能恢复您的所有的个人设置和邮件过滤器等。"
-
-#: ../plugins/backup-restore/backup-restore.c:344
-msgid "_Restore Evolution from the backup file"
-msgstr "从备份文件中恢复 Evolution(_R)"
-
-#: ../plugins/backup-restore/backup-restore.c:351
-msgid "Please select an Evolution Archive to restore:"
-msgstr "选择要恢复的 Evolution 存档:"
-
-#: ../plugins/backup-restore/backup-restore.c:354
-msgid "Choose a file to restore"
-msgstr "选择要恢复的文件"
-
-#: ../plugins/backup-restore/backup-restore.c:362
-msgid "Restore from backup"
-msgstr "从备份中恢复"
-
-#: ../plugins/backup-restore/backup-restore.c:402
-msgid "_Back up Evolution Data..."
-msgstr "备份 Evolution 数据(_B)..."
-
-#: ../plugins/backup-restore/backup-restore.c:404
-msgid "Back up Evolution data and settings to an archive file"
-msgstr "备份 Evolution 的数据和设置到一个归档文件"
-
-#: ../plugins/backup-restore/backup-restore.c:409
-msgid "R_estore Evolution Data..."
-msgstr "恢复 Evolution 数据(_E)..."
-
-#: ../plugins/backup-restore/backup-restore.c:411
-msgid "Restore Evolution data and settings from an archive file"
-msgstr "从归档文件备份及恢复 Evolution 的数据和设置"
-
 #: ../plugins/backup-restore/backup.c:77
 msgid "Back up Evolution directory"
 msgstr "备份 Evolution 目录"
@@ -15825,87 +17386,145 @@ msgid "With Graphical User Interface"
 msgstr "带图形用户界面"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:432
 msgid "Shutting down Evolution"
 msgstr "关闭 Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:317
 msgid "Backing Evolution accounts and settings"
 msgstr "备份 Evolution 的帐号及设置"
 
-#: ../plugins/backup-restore/backup.c:318
+#: ../plugins/backup-restore/backup.c:329
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../plugins/backup-restore/backup.c:345
 msgid "Back up complete"
 msgstr "备份完成"
 
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
+#: ../plugins/backup-restore/backup.c:352
+#: ../plugins/backup-restore/backup.c:570
 msgid "Restarting Evolution"
 msgstr "重新启动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:424
+#: ../plugins/backup-restore/backup.c:438
 msgid "Back up current Evolution data"
 msgstr "备份当前 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:446
 msgid "Extracting files from back up"
 msgstr "从备份中提取文件"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:515
 msgid "Loading Evolution settings"
 msgstr "载入 Evolution 的设置"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:551
 msgid "Removing temporary back up files"
 msgstr "删除临时备份文件"
 
-#: ../plugins/backup-restore/backup.c:520
+#: ../plugins/backup-restore/backup.c:563
 msgid "Ensuring local sources"
 msgstr "确保本地源"
 
-#: ../plugins/backup-restore/backup.c:707
+#: ../plugins/backup-restore/backup.c:767
+#, fuzzy
+#| msgid "Evolution Back up"
+msgid "Evolution Back Up"
+msgstr "Evolution 备份"
+
+#: ../plugins/backup-restore/backup.c:768
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:712
+#: ../plugins/backup-restore/backup.c:772
+msgid "Evolution Restore"
+msgstr "Evolution 恢复"
+
+#: ../plugins/backup-restore/backup.c:773
 #, 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:736
-msgid "Evolution Back up"
-msgstr "Evolution 备份"
-
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Evolution 恢复"
-
-#: ../plugins/backup-restore/backup.c:774
+#: ../plugins/backup-restore/backup.c:841
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:775
+#: ../plugins/backup-restore/backup.c:842
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请稍候,Evolution 正在备份您的数据。"
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../plugins/backup-restore/backup.c:844
 msgid "Restoring Evolution Data"
 msgstr "正在恢复 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:778
+#: ../plugins/backup-restore/backup.c:845
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请稍候,Evolution 正在恢复您的数据。"
 
-#: ../plugins/backup-restore/backup.c:796
+#: ../plugins/backup-restore/backup.c:863
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这可能要花一点时间,取决于您帐号中的数据总量。"
 
+#: ../plugins/backup-restore/backup-restore.c:225
+msgid "Select name of the Evolution backup file"
+msgstr "选择 Evolution 备份文件名称"
+
+#: ../plugins/backup-restore/backup-restore.c:258
+msgid "_Restart Evolution after backup"
+msgstr "备份后重新启动 Evolution(_R)"
+
+#: ../plugins/backup-restore/backup-restore.c:285
+msgid "Select name of the Evolution backup file to restore"
+msgstr "选择要恢复的 Evolution 备份文件名称"
+
+#: ../plugins/backup-restore/backup-restore.c:298
+msgid "_Restart Evolution after restore"
+msgstr "恢复后重新启动 Evolution(_R)"
+
+#: ../plugins/backup-restore/backup-restore.c:385
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"您可以从备份中恢复 Evolution。它能够恢复所有邮件、日历、任务、备忘和联系人。"
+"它还能恢复您的所有的个人设置和邮件过滤器等。"
+
+#: ../plugins/backup-restore/backup-restore.c:395
+msgid "_Restore Evolution from the backup file"
+msgstr "从备份文件中恢复 Evolution(_R)"
+
+#: ../plugins/backup-restore/backup-restore.c:405
+msgid "Please select an Evolution Archive to restore:"
+msgstr "选择要恢复的 Evolution 存档:"
+
+#: ../plugins/backup-restore/backup-restore.c:409
+msgid "Choose a file to restore"
+msgstr "选择要恢复的文件"
+
+#: ../plugins/backup-restore/backup-restore.c:423
+msgid "Restore from backup"
+msgstr "从备份中恢复"
+
+#: ../plugins/backup-restore/backup-restore.c:470
+msgid "_Back up Evolution Data..."
+msgstr "备份 Evolution 数据(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:472
+msgid "Back up Evolution data and settings to an archive file"
+msgstr "备份 Evolution 的数据和设置到一个归档文件"
+
+#: ../plugins/backup-restore/backup-restore.c:477
+msgid "R_estore Evolution Data..."
+msgstr "恢复 Evolution 数据(_E)..."
+
+#: ../plugins/backup-restore/backup-restore.c:479
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "从归档文件备份及恢复 Evolution 的数据和设置"
+
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Back up and Restore"
@@ -15916,39 +17535,22 @@ msgid "Back up and restore your Evolution data and settings."
 msgstr "备份及恢复 Evolution 的数据和设置。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
-msgid "Are you sure you want to close Evolution?"
-msgstr "您确定要关闭 Evolution 吗?"
+#, fuzzy
+#| msgid "Invalid Evolution back up file"
+msgid "Invalid Evolution backup file"
+msgstr "无效的 Evolution 备份文件"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected back up file?"
-msgstr "您确定想要从选中的备份文件中恢复 Evolution 吗?"
+#, fuzzy
+#| msgid "Please select a valid back up file to restore."
+msgid "Please select a valid backup file to restore."
+msgstr "请选择一个有效的备份文件进行恢复。"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Close and Back up Evolution"
-msgstr "关闭并备份 Evolution"
+msgid "Are you sure you want to close Evolution?"
+msgstr "您确定要关闭 Evolution 吗?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Close and Restore Evolution"
-msgstr "关闭并恢复 Evolution"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Insufficient Permissions"
-msgstr "权限不够"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
-msgid "Invalid Evolution back up file"
-msgstr "无效的 Evolution 备份文件"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-msgid "Please select a valid back up file to restore."
-msgstr "请选择一个有效的备份文件进行恢复。"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "The selected folder is not writable."
-msgstr "选中的文件夹不可写。"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
@@ -15956,45 +17558,75 @@ msgstr ""
 "要备份您的数据和设置,您必须先关闭 Evolution。请在处理前确认您保存了所有未保"
 "存的数据。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Close and Back up Evolution"
+msgstr "关闭并备份 Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to restore Evolution from the selected back up file?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "您确定想要从选中的备份文件中恢复 Evolution 吗?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#, fuzzy
+#| msgid ""
+#| "To restore your data and settings, you must first close Evolution. Please "
+#| "make sure that you save any unsaved data before proceeding. This will "
+#| "delete all your current Evolution data and settings and restore them from "
+#| "your back up."
 msgid ""
 "To restore your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding. This will delete "
-"all your current Evolution data and settings and restore them from your back "
-"up."
+"all your current Evolution data and settings and restore them from your "
+"backup."
 msgstr ""
 "要恢复您的数据和设置,您必须先关闭 Evolution。请在处理前确认您保存了所有未保"
 "存的数据。这会删除所有您当前 Evolution 的数据和设置,并从您的备份中恢复。"
 
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
+msgid "Close and Restore Evolution"
+msgstr "关闭并恢复 Evolution"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid "Insufficient Permissions"
+msgstr "权限不够"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid "The selected folder is not writable."
+msgstr "选中的文件夹不可写。"
+
+#: ../plugins/bbdb/bbdb.c:668 ../plugins/bbdb/bbdb.c:677
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:692
 msgid "Create _address book entries when sending mails"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_a)"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:700
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:717
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
+#: ../plugins/bbdb/bbdb.c:732
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像(_S)"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:740
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:753
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -16015,15 +17647,15 @@ msgstr ""
 "在您回复邮件时自动用姓名和电子邮件地址填入您的地址簿。同时还将填入您好友列表"
 "的即时通讯联系信息。"
 
-#: ../plugins/caldav/caldav-browse-server.c:214
+#: ../plugins/caldav/caldav-browse-server.c:215
 msgid "Authentication failed. Server requires correct login."
 msgstr "验证错误。服务器需要正确的登录。"
 
-#: ../plugins/caldav/caldav-browse-server.c:216
+#: ../plugins/caldav/caldav-browse-server.c:217
 msgid "Given URL cannot be found."
 msgstr "无法找到给定的 URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:221
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16032,178 +17664,179 @@ msgstr ""
 "服务器返回未预料的数据。\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:360
-#: ../plugins/caldav/caldav-browse-server.c:694
+#: ../plugins/caldav/caldav-browse-server.c:361
+#: ../plugins/caldav/caldav-browse-server.c:695
 msgid "Failed to parse server response."
 msgstr "处理服务器响应失败"
 
-#: ../plugins/caldav/caldav-browse-server.c:454
+#: ../plugins/caldav/caldav-browse-server.c:455
 msgid "Events"
 msgstr "事件"
 
-#: ../plugins/caldav/caldav-browse-server.c:476
+#: ../plugins/caldav/caldav-browse-server.c:477
 msgid "User's calendars"
 msgstr "用户的日历"
 
-#: ../plugins/caldav/caldav-browse-server.c:588
-#: ../plugins/caldav/caldav-browse-server.c:763
+#: ../plugins/caldav/caldav-browse-server.c:589
+#: ../plugins/caldav/caldav-browse-server.c:764
 msgid "Failed to get server URL."
 msgstr "获得服务器 URL 失败。"
 
-#: ../plugins/caldav/caldav-browse-server.c:761
-#: ../plugins/caldav/caldav-browse-server.c:802
-#: ../plugins/caldav/caldav-browse-server.c:1493
+#: ../plugins/caldav/caldav-browse-server.c:762
+#: ../plugins/caldav/caldav-browse-server.c:803
+#: ../plugins/caldav/caldav-browse-server.c:1502
 msgid "Searching for user's calendars..."
 msgstr "搜索用户的日历..."
 
-#: ../plugins/caldav/caldav-browse-server.c:800
+#: ../plugins/caldav/caldav-browse-server.c:801
 msgid "Could not find any user calendar."
 msgstr "无法找到用户的日历。"
 
-#: ../plugins/caldav/caldav-browse-server.c:938
+#: ../plugins/caldav/caldav-browse-server.c:939
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "上次尝试失败:%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:940
+#: ../plugins/caldav/caldav-browse-server.c:941
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "上次尝试失败码%d"
 
-#: ../plugins/caldav/caldav-browse-server.c:945
+#: ../plugins/caldav/caldav-browse-server.c:946
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "输入服务器 %2$s 上用户 %1$s 的密码"
 
-#: ../plugins/caldav/caldav-browse-server.c:1008
+#: ../plugins/caldav/caldav-browse-server.c:1009
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "无法为 URL “%s”创建 soup 消息"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1266
+#: ../plugins/caldav/caldav-browse-server.c:1267
 msgid "Searching folder content..."
 msgstr "搜索文件夹内容..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1325
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-browse-server.c:1326
+#: ../plugins/caldav/caldav-source.c:262
 msgid "Server _handles meeting invitations"
 msgstr "服务器处理会议邀请(_H)"
 
-#: ../plugins/caldav/caldav-browse-server.c:1332
+#: ../plugins/caldav/caldav-browse-server.c:1333
 msgid "List of available calendars:"
 msgstr "可用日历列表:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1370
+#: ../plugins/caldav/caldav-browse-server.c:1371
 msgid "Supports"
 msgstr "支持"
 
-#: ../plugins/caldav/caldav-browse-server.c:1397
-#: ../plugins/caldav/caldav-source.c:259
+#: ../plugins/caldav/caldav-browse-server.c:1402
+#: ../plugins/caldav/caldav-source.c:260
 msgid "User e_mail:"
 msgstr "用户电子邮箱(_M):"
 
-#: ../plugins/caldav/caldav-browse-server.c:1469
+#: ../plugins/caldav/caldav-browse-server.c:1478
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "创建本地邮件线索失败:%s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1585
+#: ../plugins/caldav/caldav-browse-server.c:1599
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "服务器 URL %s 不是有效的 URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1591
+#: ../plugins/caldav/caldav-browse-server.c:1609
 msgid "Browse for a CalDAV calendar"
 msgstr "浏览以查找 CalDAV 日历"
 
-#: ../plugins/caldav/caldav-source.c:240
-#: ../plugins/calendar-http/calendar-http.c:107
+#: ../plugins/caldav/caldav-source.c:241
+#: ../plugins/calendar-http/calendar-http.c:109
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:261
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/caldav/caldav-source.c:248
+#: ../plugins/calendar-http/calendar-http.c:149
 #: ../plugins/google-account-setup/google-contacts-source.c:359
 msgid "Use _secure connection"
 msgstr "使用安全连接(_S):"
 
-#: ../plugins/caldav/caldav-source.c:249
-#: ../plugins/google-account-setup/google-contacts-source.c:337
-#: ../plugins/google-account-setup/google-source.c:669
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
-msgid "User_name:"
-msgstr "用户名(_N):"
-
-#: ../plugins/caldav/caldav-source.c:264
+#: ../plugins/caldav/caldav-source.c:265
 msgid "Brows_e server for a calendar"
 msgstr "浏览服务器以查找日历(_E)"
 
-#: ../plugins/caldav/caldav-source.c:282
-#: ../plugins/calendar-file/calendar-file.c:204
-#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/caldav/caldav-source.c:283
+#: ../plugins/calendar-file/calendar-file.c:207
+#: ../plugins/calendar-http/calendar-http.c:132
 #: ../plugins/calendar-weather/calendar-weather.c:421
 #: ../plugins/google-account-setup/google-contacts-source.c:377
-#: ../plugins/google-account-setup/google-source.c:675
+#: ../plugins/google-account-setup/google-source.c:661
 msgid "Re_fresh:"
 msgstr "刷新(_F):"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "Add CalDAV support to Evolution."
-msgstr "为 Evolution 添加 CalDAV 支持。"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
 msgstr "CalDAV 支持"
 
-#: ../plugins/calendar-file/calendar-file.c:134
-msgid "_Customize options"
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "Add CalDAV support to Evolution."
+msgstr "为 Evolution 添加 CalDAV 支持。"
+
+#: ../plugins/calendar-file/calendar-file.c:136
+#, fuzzy
+#| msgid "_Customize options"
+msgid "C_ustomize options"
 msgstr "自定义(_C)"
 
-#: ../plugins/calendar-file/calendar-file.c:153
-msgid "File _name:"
-msgstr "文件名(_N):"
+#: ../plugins/calendar-file/calendar-file.c:155
+#: ../widgets/misc/e-attachment-dialog.c:333
+#: ../widgets/misc/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "文件名(_I):"
 
-#: ../plugins/calendar-file/calendar-file.c:157
+#: ../plugins/calendar-file/calendar-file.c:160
 msgid "Choose calendar file"
 msgstr "选择日历文件"
 
-#: ../plugins/calendar-file/calendar-file.c:209
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "On open"
 msgstr "打开时"
 
-#: ../plugins/calendar-file/calendar-file.c:210
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:215
 msgid "On file change"
 msgstr "在文件改变时"
 
-#: ../plugins/calendar-file/calendar-file.c:211
+#. Translators: This is one setting for when to refresh a memo/calendar/tasks list
+#: ../plugins/calendar-file/calendar-file.c:217
 msgid "Periodically"
 msgstr "定期"
 
-#: ../plugins/calendar-file/calendar-file.c:228
+#: ../plugins/calendar-file/calendar-file.c:238
 msgid "Force read _only"
 msgstr "强制只读(_O)"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Add local calendars to Evolution."
-msgstr "添加本地日历到 Evolution。"
-
-#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "载入日历"
 
-#: ../plugins/calendar-http/calendar-http.c:207
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+msgid "Add local calendars to Evolution."
+msgstr "添加本地日历到 Evolution。"
+
+#: ../plugins/calendar-http/calendar-http.c:214
 msgid "Userna_me:"
 msgstr "用户名(_M):"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "Add web calendars to Evolution."
-msgstr "添加网络日历到 Evolution。"
-
-#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
 msgstr "网络日历"
 
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Add web calendars to Evolution."
+msgstr "添加网络日历到 Evolution。"
+
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "天气:雾"
@@ -16264,46 +17897,46 @@ msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(华氏、英寸等等)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Add weather calendars to Evolution."
-msgstr "添加天气日历到 Evolution。"
-
-#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "天气月历"
 
-#: ../plugins/dbx-import/dbx-importer.c:284
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Add weather calendars to Evolution."
+msgstr "添加天气日历到 Evolution。"
+
+#: ../plugins/dbx-import/dbx-importer.c:292
 msgid "Importing Outlook Express data"
 msgstr "导入 Outlook Express 数据"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
-msgid "Import Outlook Express messages from DBX file"
-msgstr "从 DBX 文件中导入 Outlook 邮件"
-
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook DBX import"
 msgstr "Outlook DBX 导入"
 
-#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook 个人文件夹(.dbx)"
 
-#: ../plugins/default-source/default-source.c:168
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+msgid "Import Outlook Express messages from DBX file"
+msgstr "从 DBX 文件中导入 Outlook 邮件"
+
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "标为默认地址簿(_D)"
 
-#: ../plugins/default-source/default-source.c:182
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr "用此地址薄自动完成"
 
-#: ../plugins/default-source/default-source.c:191
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "标为默认日历(_D)"
 
-#: ../plugins/default-source/default-source.c:192
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default task list"
 msgstr "标为默认任务列表(_D)"
 
-#: ../plugins/default-source/default-source.c:193
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr "标为默认备忘列表(_D)"
 
@@ -16315,65 +17948,52 @@ msgstr "默认源"
 msgid "Mark your preferred address book and calendar as default."
 msgstr "把您首选的地址薄和日历设为默认。"
 
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
-msgid "List of Custom Headers"
-msgstr "自定义信头列表"
-
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid ""
-"The key specifies the list of custom headers that you can add to an outgoing "
-"message. The format for specifying a Header and Header value is: Name of the "
-"custom header followed by \"=\" and the values separated by \";\""
-msgstr ""
-"此键值指定了您可以向发送邮件中添加的自定义头的列表。指定头和头值的格式为:自"
-"定义头的名称,接下来是“=”和它的值,头与头之间以“;”分割"
-
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "安全:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:305
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "个人"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:306
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "未分类"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:307
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "受保护的"
 
-#: ../plugins/email-custom-header/email-custom-header.c:329
+#: ../plugins/email-custom-header/email-custom-header.c:308
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "机密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:330
+#: ../plugins/email-custom-header/email-custom-header.c:309
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "机密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:331
+#: ../plugins/email-custom-header/email-custom-header.c:310
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "绝密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:388
+#: ../plugins/email-custom-header/email-custom-header.c:367
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "无"
 
-#: ../plugins/email-custom-header/email-custom-header.c:584
+#: ../plugins/email-custom-header/email-custom-header.c:540
 msgid "_Custom Header"
 msgstr "自定义信头(_C)"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:847
+#: ../plugins/email-custom-header/email-custom-header.c:803
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16381,59 +18001,50 @@ msgstr ""
 "指定头和头值的格式为:\n"
 "自定义头的名称,值,头与头之间以“;”分割。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:901
+#: ../plugins/email-custom-header/email-custom-header.c:857
 msgid "Key"
 msgstr "键"
 
-#: ../plugins/email-custom-header/email-custom-header.c:917
-#: ../plugins/templates/templates.c:468
+#: ../plugins/email-custom-header/email-custom-header.c:873
+#: ../plugins/templates/templates.c:470
 msgid "Values"
 msgstr "值"
 
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
+msgid "Custom Header"
+msgstr "自定义信头"
+
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to 
specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Add custom headers to outgoing mail messages."
 msgstr "添加自定义邮件头到发送的邮件信息"
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "自定义信头"
-
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
 msgid "Email Custom Header"
 msgstr "自定义信头"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "在邮件编辑器中按键时自动启动文本编辑器"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:132
-msgid "Automatically launch when a new mail is edited"
-msgstr "在编辑新邮件时自动启动"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
-msgid "Default External Editor"
-msgstr "默认外部编辑器"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
-msgid "The default command that must be used as the editor."
-msgstr "默认命令必须用作编辑器。"
-
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:114
 msgid "Command to be executed to launch the editor: "
 msgstr "调用编辑器要执行的命令:"
 
-#: ../plugins/external-editor/external-editor.c:122
+#: ../plugins/external-editor/external-editor.c:115
+#, fuzzy
+#| msgid ""
+#| "For Emacs use \"xemacs\"\n"
+#| "For VI use \"gvim -f\""
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim -f\""
+"For XEmacs use \"xemacs\"\n"
+"For Vim use \"gvim -f\""
 msgstr ""
 "Emacs 应使用“xemacs”\n"
 "VI 应使用“gvim -f”"
 
-#: ../plugins/external-editor/external-editor.c:402
-#: ../plugins/external-editor/external-editor.c:404
+#: ../plugins/external-editor/external-editor.c:396
+#: ../plugins/external-editor/external-editor.c:398
 msgid "Compose in External Editor"
 msgstr "在外部编辑器中写作"
 
@@ -16446,47 +18057,35 @@ msgid "Use an external editor to compose plain-text mail messages."
 msgstr "一个使用外部编辑器编写纯文本信息的插件。"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
-msgid "Cannot create Temporary File"
-msgstr "无法创建临时保存文件"
-
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "编辑器不可调用"
 
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr "您在插件首选项中设定的外部编辑器无法调用,请尝试设置另外一个编辑器。"
+
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
+msgid "Cannot create Temporary File"
+msgstr "无法创建临时保存文件"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "Evolution 无法创建临时文件来保存您的邮件。请稍候再试。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
 msgid "External editor still running"
 msgstr "外部编辑器还在运行"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr "外部编辑器仍在运行。邮件编辑器窗口无法在外部文本编辑器活动时关闭。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
-msgid ""
-"The external editor set in your plugin preferences cannot be launched. Try "
-"setting a different editor."
-msgstr "您在插件首选项中设定的外部编辑器无法调用,请尝试设置另外一个编辑器。"
-
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
-msgid "Insert Face picture by default"
-msgstr "按默认方式插入头像图片(_I)"
-
-#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid ""
-"Whether insert Face picture to outgoing messages by default. The picture "
-"should be set before checking this, otherwise nothing happens."
-msgstr ""
-"是否按照默认插入头像图片到发送的信息。在选择之前必须先设置好头像图片,否则不"
-"会生效。"
-
 #: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "选择一个文件"
@@ -16495,19 +18094,19 @@ msgstr "选择一个文件"
 msgid "Image files"
 msgstr "图像文件"
 
-#: ../plugins/face/face.c:359
+#: ../plugins/face/face.c:361
 msgid "_Insert Face picture by default"
 msgstr "按默认方式插入头像图片(_I)"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:374
 msgid "Load new _Face picture"
 msgstr "加载新头像图片(_F)"
 
-#: ../plugins/face/face.c:429
+#: ../plugins/face/face.c:435
 msgid "Include _Face"
 msgstr "包含头像(_F)"
 
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Attach a small picture of your face to outgoing messages."
 msgstr "在发送信息里附加您的小头像。"
 
@@ -16516,36 +18115,36 @@ msgid "Failed Read"
 msgstr "读取失败"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:2
-msgid "Invalid Image Size"
-msgstr "无效的图像大小"
+msgid "The file cannot be read"
+msgstr "这个文件不能被读取"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:3
-msgid "Not an image"
-msgstr "不是一个图像"
+msgid "Invalid Image Size"
+msgstr "无效的图像大小"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
 msgid "Please select an image of size 48 * 48"
 msgstr "请选择一个 48x48 的图像"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "The file cannot be read"
-msgstr "这个文件不能被读取"
+msgid "Not an image"
+msgstr "不是一个图像"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "您选择的文件好象不是有效的 PNG 图像。错误:{0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:249
 msgid "Server"
 msgstr "服务器"
 
-#: ../plugins/google-account-setup/google-source.c:459
+#: ../plugins/google-account-setup/google-source.c:452
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
 
-#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16554,28 +18153,28 @@ msgstr ""
 "无法从 Google 服务器上读取数据。\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:813
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/google-account-setup/google-source.c:564
+#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:1103
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../plugins/google-account-setup/google-source.c:679
+#: ../plugins/google-account-setup/google-source.c:665
 msgid "Cal_endar:"
 msgstr "日历(_E):"
 
-#: ../plugins/google-account-setup/google-source.c:714
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "获取列表(_L)"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "Add Google Calendars to Evolution."
-msgstr "添加谷歌日历到Evolution。"
-
-#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
 msgstr "Google 日历"
 
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Add Google Calendars to Evolution."
+msgstr "添加谷歌日历到Evolution。"
+
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "嵌入图像"
@@ -16584,30 +18183,17 @@ msgstr "嵌入图像"
 msgid "View image attachments directly in mail messages."
 msgstr "直接在邮件信息里查看图像附件"
 
-#: ../plugins/imap-features/imap-headers.c:337
-#: ../plugins/imap-features/imap-headers.ui.h:2
+#: ../plugins/imap-features/imap-headers.c:334
+#: ../plugins/imap-features/imap-headers.ui.h:10
 msgid "Custom Headers"
 msgstr "自定义信头"
 
-#: ../plugins/imap-features/imap-headers.c:349
-#: ../plugins/imap-features/imap-headers.ui.h:5
+#: ../plugins/imap-features/imap-headers.c:356
+#: ../plugins/imap-features/imap-headers.ui.h:7
 msgid "IMAP Headers"
 msgstr "IMAP 信头"
 
 #: ../plugins/imap-features/imap-headers.ui.h:1
-msgid "Basic and _Mailing List Headers (Default)"
-msgstr "基本和邮件列表信头(默认)(_M)"
-
-#: ../plugins/imap-features/imap-headers.ui.h:3
-msgid ""
-"Give the extra headers that you need to fetch in addition to the above "
-"standard headers. \n"
-"You can ignore this if you choose \"All Headers\"."
-msgstr ""
-"除了以上的标准信头之外,在此给出想要获取的额外信头。\n"
-"如果您选择的是“全部信头”的话,可以忽略此项。"
-
-#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -16615,7 +18201,11 @@ msgstr ""
 "选择您的 IMAP 信头首选项。\n"
 "您所选择的信头越多,下载所花费的时间越长。"
 
-#: ../plugins/imap-features/imap-headers.ui.h:8
+#: ../plugins/imap-features/imap-headers.ui.h:3
+msgid "_Fetch All Headers"
+msgstr "获取全部信头(_F)"
+
+#: ../plugins/imap-features/imap-headers.ui.h:4
 msgid ""
 "_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -16623,776 +18213,885 @@ msgstr ""
 "基本信头(最快)(_B)\n"
 "如果您没有基于邮件列表的过滤器,请选择此项"
 
-#: ../plugins/imap-features/imap-headers.ui.h:10
-msgid "_Fetch All Headers"
-msgstr "获取全部信头(_F)"
+#: ../plugins/imap-features/imap-headers.ui.h:6
+msgid "Basic and _Mailing List Headers (Default)"
+msgstr "基本和邮件列表信头(默认)(_M)"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "Fine-tune your IMAP accounts."
-msgstr "调整您的 IMAP 帐号。"
+#: ../plugins/imap-features/imap-headers.ui.h:8
+msgid ""
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
+"You can ignore this if you choose \"All Headers\"."
+msgstr ""
+"除了以上的标准信头之外,在此给出想要获取的额外信头。\n"
+"如果您选择的是“全部信头”的话,可以忽略此项。"
 
-#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "IMAP Features"
 msgstr "IMAP 特性"
 
+#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
+msgid "Fine-tune your IMAP accounts."
+msgstr "调整您的 IMAP 帐号。"
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:499
+#: ../plugins/itip-formatter/itip-formatter.c:505
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "载入日历“%s”失败(%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:659
+#: ../plugins/itip-formatter/itip-formatter.c:665
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s”中的一个约会与此会议冲突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:683
+#: ../plugins/itip-formatter/itip-formatter.c:689
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:789
+#: ../plugins/itip-formatter/itip-formatter.c:802
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:796
+#: ../plugins/itip-formatter/itip-formatter.c:809
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:813
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:804
+#: ../plugins/itip-formatter/itip-formatter.c:817
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1082
+#: ../plugins/itip-formatter/itip-formatter.c:1119
 msgid "Opening the calendar. Please wait..."
 msgstr "正在打开日历,请稍候..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1085
+#: ../plugins/itip-formatter/itip-formatter.c:1122
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1362
-msgid "Unable to parse item"
-msgstr "无法分析项目"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1451
+#: ../plugins/itip-formatter/itip-formatter.c:1484
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1463
+#: ../plugins/itip-formatter/itip-formatter.c:1498
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1467
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1472
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1477
+#: ../plugins/itip-formatter/itip-formatter.c:1512
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1579
+#: ../plugins/itip-formatter/itip-formatter.c:1581
+#: ../plugins/itip-formatter/itip-formatter.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:2065
+#, fuzzy
+#| msgid "Opening the calendar. Please wait..."
+msgid "Saving changes to the calendar. Please wait..."
+msgstr "正在打开日历,请稍候..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:1620
+msgid "Unable to parse item"
+msgstr "无法分析项目"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1800
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1586
+#: ../plugins/itip-formatter/itip-formatter.c:1807
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1588
+#: ../plugins/itip-formatter/itip-formatter.c:1809
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1700
-msgid "Attendee status could not be updated because the status is invalid"
-msgstr "出席者状态无法更新,原因是状态无效"
-
-#: ../plugins/itip-formatter/itip-formatter.c:1729
+#: ../plugins/itip-formatter/itip-formatter.c:1855
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1733
+#: ../plugins/itip-formatter/itip-formatter.c:1861
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#, fuzzy
+#| msgid "Object is invalid and cannot be updated\n"
+msgid "The meeting is invalid and cannot be updated"
+msgstr "对象无效,无法更新\n"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1947
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr "出席者状态无法更新,原因是状态无效"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:2086
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1762
+#: ../plugins/itip-formatter/itip-formatter.c:2089
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1765
+#: ../plugins/itip-formatter/itip-formatter.c:2092
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1774
+#: ../plugins/itip-formatter/itip-formatter.c:2101
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息,会议不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1777
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息,任务不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1780
+#: ../plugins/itip-formatter/itip-formatter.c:2107
 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:1846
+#: ../plugins/itip-formatter/itip-formatter.c:2173
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:2178
 msgid "Save Calendar"
 msgstr "保存日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1914
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:2241
+#: ../plugins/itip-formatter/itip-formatter.c:2252
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1915
-#: ../plugins/itip-formatter/itip-formatter.c:1926
+#: ../plugins/itip-formatter/itip-formatter.c:2242
+#: ../plugins/itip-formatter/itip-formatter.c:2253
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信息声明其包含日历,但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1966
-#: ../plugins/itip-formatter/itip-formatter.c:1994
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2293
+#: ../plugins/itip-formatter/itip-formatter.c:2321
+#: ../plugins/itip-formatter/itip-formatter.c:2432
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1967
-#: ../plugins/itip-formatter/itip-formatter.c:1995
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../plugins/itip-formatter/itip-formatter.c:2294
+#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2433
 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:2008
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2009
+#: ../plugins/itip-formatter/itip-formatter.c:2336
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要处理这些全部项目,应该保存文件并导入日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2672
+#: ../plugins/itip-formatter/itip-formatter.c:2860
 msgctxt "cal-itip"
 msgid "None"
 msgstr "无"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../plugins/itip-formatter/itip-formatter.c:2876
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../plugins/itip-formatter/itip-formatter.c:2994
 msgid "This meeting recurs"
 msgstr "此会议重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2997
 msgid "This task recurs"
 msgstr "此任务重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2812
+#: ../plugins/itip-formatter/itip-formatter.c:3000
 msgid "This memo recurs"
 msgstr "此备忘重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3036
+#: ../plugins/itip-formatter/itip-formatter.c:3231
 msgid "Meeting Invitations"
 msgstr "会议邀请"
 
-#. Delete message after acting
-#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/itip-formatter/itip-formatter.c:3257
 msgid "_Delete message after acting"
 msgstr "操作后删除信息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
+#: ../plugins/itip-formatter/itip-formatter.c:3271
+#: ../plugins/itip-formatter/itip-formatter.c:3304
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
+#: ../plugins/itip-formatter/itip-formatter.c:3286
 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:196
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:212
 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:224
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:231
 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:233
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:240
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:259
 #, 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:261
+#: ../plugins/itip-formatter/itip-view.c:264
 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:265
+#: ../plugins/itip-formatter/itip-view.c:268
 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:270
+#: ../plugins/itip-formatter/itip-view.c:273
 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:274
+#: ../plugins/itip-formatter/itip-view.c:277
 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:283
+#: ../plugins/itip-formatter/itip-view.c:286
 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:289
+#: ../plugins/itip-formatter/itip-view.c:292
 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:293
+#: ../plugins/itip-formatter/itip-view.c:296
 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:298
+#: ../plugins/itip-formatter/itip-view.c:301
 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:302
+#: ../plugins/itip-formatter/itip-view.c:305
 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:308
+#: ../plugins/itip-formatter/itip-view.c:311
 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:313
+#: ../plugins/itip-formatter/itip-view.c:316
 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:317
+#: ../plugins/itip-formatter/itip-view.c:320
 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:322
+#: ../plugins/itip-formatter/itip-view.c:325
 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:326
+#: ../plugins/itip-formatter/itip-view.c:329
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#: ../plugins/itip-formatter/itip-view.c:365
-#: ../plugins/itip-formatter/itip-view.c:452
-#: ../plugins/itip-formatter/itip-view.c:453
-#: ../plugins/itip-formatter/itip-view.c:540
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:543
 msgid "An unknown person"
 msgstr "未知的人"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:372
+#: ../plugins/itip-formatter/itip-view.c:460
+#: ../plugins/itip-formatter/itip-view.c:547
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "请以 %s 的身份回应"
 
-#: ../plugins/itip-formatter/itip-view.c:371
-#: ../plugins/itip-formatter/itip-view.c:459
-#: ../plugins/itip-formatter/itip-view.c:546
+#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:549
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "以 %s 的身份接收"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 通过 %s 发布了会议信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 发布了会议信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 为您代理了下列会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 通过 %s 请求您参加下列会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 请求您参加下列会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 通过 %s 希望加入到已有的会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s 希望加入到已有的会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 通过 %s 希望接收到下列会议的最新信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望接收到下列会议的最新信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 通过 %s 发回了下列会议请求的响应:"
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 发回了下列会议请求的响应:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 通过 %s 取消了下列会议:"
 
-#: ../plugins/itip-formatter/itip-view.c:414
-#, c-format
-msgid "%s has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:417
+#, fuzzy, c-format
+#| msgid "%s has canceled the following meeting."
+msgid "%s has canceled the following meeting:"
 msgstr "%s 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:421
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 通过 %s 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:420
-#, c-format
-msgid "%s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:423
+#, fuzzy, c-format
+#| msgid "%s has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes:"
 msgstr "%s 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:427
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 通过 %s 拒绝了下列会议变更:"
 
-#: ../plugins/itip-formatter/itip-view.c:426
-#, c-format
-msgid "%s has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:429
+#, fuzzy, c-format
+#| msgid "%s has declined the following meeting changes."
+msgid "%s has declined the following meeting changes:"
 msgstr "%s 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 通过 %s 发布了下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 发布了下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 请求给 %s 分配下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:477
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 通过 %s 为您分配了下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s 为您分配了一个任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 通过 %s 希望加入到已有的任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s 希望加入到已存在的任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 通过 %s 想要收到所分配的下列任务的最新信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 想要收到所分配的下列任务的最新信息:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 通过 %s 发回了下列分配任务的回应:"
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 发回了下列分配任务的回应:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s 通过 %s 取消了下列任务分配:"
 
-#: ../plugins/itip-formatter/itip-view.c:502
+#: ../plugins/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s 取消分配的下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:509
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 通过 %s 提议了下列任务分配变更:"
 
-#: ../plugins/itip-formatter/itip-view.c:508
+#: ../plugins/itip-formatter/itip-view.c:511
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 提议了下列任务分配变更:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 通过 %s 拒绝了下列任务分配:"
 
-#: ../plugins/itip-formatter/itip-view.c:514
+#: ../plugins/itip-formatter/itip-view.c:517
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 拒绝了分配的下列任务:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:554
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 通过 %s 发布了下列备忘:"
 
-#: ../plugins/itip-formatter/itip-view.c:553
+#: ../plugins/itip-formatter/itip-view.c:556
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 发布了下列备忘:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:561
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 通过 %s 希望加入到已有的备忘:"
 
-#: ../plugins/itip-formatter/itip-view.c:560
+#: ../plugins/itip-formatter/itip-view.c:563
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入到已有的备忘中:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 通过 %s 取消了下列共享备忘:"
 
-#: ../plugins/itip-formatter/itip-view.c:566
+#: ../plugins/itip-formatter/itip-view.c:569
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 取消了下列共享备忘:"
 
-#: ../plugins/itip-formatter/itip-view.c:690
+#: ../plugins/itip-formatter/itip-view.c:693
 msgid "All day:"
 msgstr "全天:"
 
-#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:703
 msgid "Start day:"
 msgstr "开始日期:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:700
-#: ../plugins/itip-formatter/itip-view.c:1062
+#: ../plugins/itip-formatter/itip-view.c:703
+#: ../plugins/itip-formatter/itip-view.c:1061
 msgid "Start time:"
 msgstr "开始时间:"
 
-#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:715
 msgid "End day:"
 msgstr "结束日期:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:712
-#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:1072
 msgid "End time:"
 msgstr "结束时间:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:881
-#: ../plugins/itip-formatter/itip-view.c:886
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:889
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:883
-#: ../plugins/itip-formatter/itip-view.c:888
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:886
+#: ../plugins/itip-formatter/itip-view.c:891
 msgid "A_ccept"
 msgstr "接受(_C)"
 
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:859
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:882
-#: ../plugins/itip-formatter/itip-view.c:887
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:868
+#: ../plugins/itip-formatter/itip-view.c:885
+#: ../plugins/itip-formatter/itip-view.c:890
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "A_ccept all"
 msgstr "全部接受(_C)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:874
 msgid "_Send Information"
 msgstr "发送信息(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:875
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1093
-#: ../plugins/itip-formatter/itip-view.c:1147
+#: ../plugins/itip-formatter/itip-view.c:1092
+#: ../plugins/itip-formatter/itip-view.c:1148
 msgid "Comment:"
 msgstr "注释:"
 
-#: ../plugins/itip-formatter/itip-view.c:1132
+#: ../plugins/itip-formatter/itip-view.c:1131
 msgid "Send _reply to sender"
 msgstr "回复发件人(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1162
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Send _updates to attendees"
 msgstr "给出席者发送更新(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Apply to all instances"
 msgstr "应用到全部实例(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
+#: ../plugins/itip-formatter/itip-view.c:1191
 msgid "Show time as _free"
 msgstr "将时间显示为空闲(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1183
+#: ../plugins/itip-formatter/itip-view.c:1194
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1200
 msgid "_Inherit reminder"
 msgstr "继承提醒(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1965
+#: ../plugins/itip-formatter/itip-view.c:1982
 msgid "_Tasks:"
 msgstr "任务(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1967
+#: ../plugins/itip-formatter/itip-view.c:1984
 msgid "_Memos:"
 msgstr "备忘(_M):"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
-
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip 格式化"
 
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
-msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "该会议已被代理"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Beep or play sound file."
-msgstr "发出哔的一声或播放声音文件。"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:350
+msgid "Get List _Archive"
+msgstr "获得列表存档(_A)"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable icon in notification area."
-msgstr "启用通知区图标。"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+msgid "Get an archive of the list this message belongs to"
+msgstr "获取这封信所属邮件列表的存档"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:357
+msgid "Get List _Usage Information"
+msgstr "获得列表用法信息(_U)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "获取这封信所属邮件列表的用法信息"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+msgid "Contact List _Owner"
+msgstr "联系列表所有者(_O)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "联系这封信所属邮件列表的所有者"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+msgid "_Post Message to List"
+msgstr "投递到列表(_P)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "给这封信所属的邮件列表投递"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+msgid "_Subscribe to List"
+msgstr "订阅列表(_S)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "订阅这封信所属的邮件列表"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+msgid "_Unsubscribe from List"
+msgstr "退订列表(_U)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "退订这封信所属的邮件列表"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+msgid "Mailing _List"
+msgstr "邮件列表(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "邮件列表操作"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "执行普通邮件列表活动 (订阅,取消订阅,等等)。"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr "没有可用的动作"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
-msgstr "新信息到达时,此值如果为 true,则响铃,否则播放声音文件。"
+"This message does not contain the header information required for this "
+"action."
+msgstr "这封信不包含此动作所需的头信息。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Notify new messages for Inbox only."
-msgstr "只通知收件箱中的新信息。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:3
+msgid "Posting not allowed"
+msgstr "不允许投递"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "新邮件到达时播放声音。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:4
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"不允许投递到此邮件列表。可能这是一个只读的邮件列表。详情请联系列表所有人。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "不在 beep 模式下时新邮件到达要播放主题的声音文件。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Send e-mail message to mailing list?"
+msgstr "把信息发送到邮件列表吗?"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "新邮件到达时在通知区显示新邮件图标。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+"将向 URL “{0}”发送电子邮件。您可以自动发送此信息,或者先看看再改改。\n"
+"\n"
+"稍后这封信发出之后,您应该能够从邮件列表收到响应。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid "Sound file name to be played."
-msgstr "待播放的声音文件名。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "_Send message"
+msgstr "发送信息(_S)"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "不在 beep 模式下时新邮件到达要播放的声音文件。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid "_Edit message"
+msgstr "编辑信息(_E)"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-msgid "Use sound theme"
-msgstr "使用声音主题"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:11
+msgid "Malformed header"
+msgstr "头格式不对"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
-msgid "Whether play sound or beep when new messages arrive."
-msgstr "新邮件到达时是播放声音文件还是哔一下。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:12
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+"信息的 {0} 头格式不对,无法处理。\n"
+"\n"
+"头:{1}"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
-msgid "Whether to notify new messages in Inbox folder only."
-msgstr "是否只通知收件箱文件夹中的新信息。"
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:15
+msgid "No e-mail action"
+msgstr "无电子邮件动作"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+"无法执行此动作。这意味着此动作所用的头不包含可处理的任何动作。\n"
+"\n"
+"头:{0}"
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17404,55 +19103,55 @@ msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "主题:%s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:420
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:429
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:440
 msgid "New email"
 msgstr "新电子邮件"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "显示 %s"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "新信息到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "响铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "使用声音主题(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "播放文件(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件箱中的新信息(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "新信息到达时在通知区显示通知(_N)"
 
@@ -17465,131 +19164,152 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "当新的邮件信息到达时提示您。"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:238
+#: ../plugins/mail-to-task/mail-to-task.c:243
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "被%s从邮件创建"
 
-#: ../plugins/mail-to-task/mail-to-task.c:603
+#: ../plugins/mail-to-task/mail-to-task.c:618
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "选定的日历已经包含“%s”事件。您想编辑旧的事件吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:621
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "选定的任务列表已经包含“%s”任务。您想编辑旧的任务吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:624
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr "选定的备忘列表已经包含“%s”备忘。您想编辑旧的备忘吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
-#, c-format
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:643
+#, fuzzy, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to events. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
-msgstr "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗?"
+msgid_plural ""
+"You have selected %d mails to be converted to events. Do you really want to "
+"add them all?"
+msgstr[0] "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:629
-#, c-format
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:649
+#, fuzzy, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to tasks. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
-msgstr "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗?"
+msgid_plural ""
+"You have selected %d mails to be converted to tasks. Do you really want to "
+"add them all?"
+msgstr[0] "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:632
-#, c-format
+#. Translators: Note there are always more than 10 mails selected
+#: ../plugins/mail-to-task/mail-to-task.c:655
+#, fuzzy, c-format
+#| msgid ""
+#| "You have selected %d mails to be converted to memos. Do you really want "
+#| "to add them all?"
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
-msgstr "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗?"
+msgid_plural ""
+"You have selected %d mails to be converted to memos. Do you really want to "
+"add them all?"
+msgstr[0] "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:651
+#: ../plugins/mail-to-task/mail-to-task.c:676
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "您想继续转换剩下的邮件吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:726
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[没有概要]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "从一个服务器上返回了无效的对象"
 
-#: ../plugins/mail-to-task/mail-to-task.c:788
+#: ../plugins/mail-to-task/mail-to-task.c:815
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "在处理时出现了一个错误:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:840
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:847
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr "选中的源是只读的,因此不能在此创建事件。请选择其它的源。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../plugins/mail-to-task/mail-to-task.c:850
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:826
+#: ../plugins/mail-to-task/mail-to-task.c:853
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
 msgstr "选中的源是只读的,因此不能在此创建备忘录。请选择其它的源。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1103
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "能获取源列表。 %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1138
+#: ../plugins/mail-to-task/mail-to-task.c:1164
 msgid "No writable calendar is available."
 msgstr "没有可写的日历。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1230
+#: ../plugins/mail-to-task/mail-to-task.c:1258
 msgid "Create an _Event"
 msgstr "创建一个事件(_E)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1232
+#: ../plugins/mail-to-task/mail-to-task.c:1260
 msgid "Create a new event from the selected message"
 msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a Mem_o"
 msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1267
 msgid "Create a new memo from the selected message"
 msgstr "用所选邮件创建新备忘"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1272
 msgid "Create a _Task"
 msgstr "创建一个任务(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1274
 msgid "Create a new task from the selected message"
 msgstr "用所选邮件创建新任务"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1254
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a _Meeting"
 msgstr "创建一个会议(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1256
+#: ../plugins/mail-to-task/mail-to-task.c:1284
 msgid "Create a new meeting from the selected message"
 msgstr "用所选邮件创建新会议"
 
@@ -17597,159 +19317,25 @@ msgstr "用所选邮件创建新会议"
 msgid "Convert a mail message to a task."
 msgstr "转换一个邮件信息成为一个任务。"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
-msgid "Get List _Archive"
-msgstr "获得列表存档(_A)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
-msgid "Get an archive of the list this message belongs to"
-msgstr "获取这封信所属邮件列表的存档"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
-msgid "Get List _Usage Information"
-msgstr "获得列表用法信息(_U)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
-msgid "Get information about the usage of the list this message belongs to"
-msgstr "获取这封信所属邮件列表的用法信息"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
-msgid "Contact List _Owner"
-msgstr "联系列表所有者(_O)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
-msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "联系这封信所属邮件列表的所有者"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
-msgid "_Post Message to List"
-msgstr "投递到列表(_P)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
-msgid "Post a message to the mailing list this message belongs to"
-msgstr "给这封信所属的邮件列表投递"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
-msgid "_Subscribe to List"
-msgstr "订阅列表(_S)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "订阅这封信所属的邮件列表"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
-msgid "_Unsubscribe from List"
-msgstr "退订列表(_U)"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
-msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "退订这封信所属的邮件列表"
-
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
-msgid "Mailing _List"
-msgstr "邮件列表(_L)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Mailing List Actions"
-msgstr "邮件列表操作"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "执行普通邮件列表活动 (订阅,取消订阅,等等)。"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
-msgid "Action not available"
-msgstr "没有可用的动作"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
-msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the "
-"message automatically, or see and change it first.\n"
-"\n"
-"You should receive an answer from the mailing list shortly after the message "
-"has been sent."
-msgstr ""
-"将向 URL “{0}”发送电子邮件。您可以自动发送此信息,或者先看看再改改。\n"
-"\n"
-"稍后这封信发出之后,您应该能够从邮件列表收到响应。"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
-msgid "Malformed header"
-msgstr "头格式不对"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-msgid "No e-mail action"
-msgstr "无电子邮件动作"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
-msgid "Posting not allowed"
-msgstr "不允许投递"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid ""
-"Posting to this mailing list is not allowed. Possibly, this is a read-only "
-"mailing list. Contact the list owner for details."
-msgstr ""
-"不允许投递到此邮件列表。可能这是一个只读的邮件列表。详情请联系列表所有人。"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
-msgid "Send e-mail message to mailing list?"
-msgstr "把信息发送到邮件列表吗?"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
-msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
-"\n"
-"Header: {0}"
-msgstr ""
-"无法执行此动作。这意味着此动作所用的头不包含可处理的任何动作。\n"
-"\n"
-"头:{0}"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
-msgid ""
-"The {0} header of this message is malformed and could not be processed.\n"
-"\n"
-"Header: {1}"
-msgstr ""
-"信息的 {0} 头格式不对,无法处理。\n"
-"\n"
-"头:{1}"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid ""
-"This message does not contain the header information required for this "
-"action."
-msgstr "这封信不包含此动作所需的头信息。"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
-msgid "_Edit message"
-msgstr "编辑信息(_E)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
-msgid "_Send message"
-msgstr "发送信息(_S)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:42
+#: ../plugins/mark-all-read/mark-all-read.c:43
 msgid "Also mark messages in subfolders?"
 msgstr "也标记的子文件夹中的信息吗?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:44
+#: ../plugins/mark-all-read/mark-all-read.c:45
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr "您是想要只标记当前文件夹中的信息,还是也包括子文件夹中的信息?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:215
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current Folder and _Subfolders"
 msgstr "在当前文件夹和子文件夹(_S)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:229
+#: ../plugins/mark-all-read/mark-all-read.c:199
 msgid "In Current _Folder Only"
 msgstr "只在当前文件夹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:575
+#: ../plugins/mark-all-read/mark-all-read.c:545
 msgid "Mark Me_ssages as Read"
 msgstr "把信息标记为已读(_S)"
 
@@ -17761,48 +19347,48 @@ msgstr "全部标为已读"
 msgid "Mark all messages in a folder as read."
 msgstr "将此文件夹中的所有信息标记为已读。"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid "Prefer Plain Text"
+msgstr "首选纯文本"
+
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
 msgid "Plain Text Mode"
 msgstr "纯文字模式"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
-msgid "Prefer Plain Text"
-msgstr "首选纯文本"
-
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "作为纯文本来查看邮件信息,甚至在它们包含 HTML 内容时。"
 
-#: ../plugins/prefer-plain/prefer-plain.c:251
+#: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:252
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Let Evolution choose the best part to show."
 msgstr "让Evolution选择最好的部分显示。"
 
-#: ../plugins/prefer-plain/prefer-plain.c:255
+#: ../plugins/prefer-plain/prefer-plain.c:254
 msgid "Show plain text if present"
 msgstr "如果可用则显示纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:256
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "如果提出,那么显示纯文本部分,否则让Evolution选择好的部分显示,"
 
-#: ../plugins/prefer-plain/prefer-plain.c:260
+#: ../plugins/prefer-plain/prefer-plain.c:259
 msgid "Only ever show plain text"
 msgstr "仅显示纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:261
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "如果请求,总是显示文本部分而把其他部分作为附件"
 
-#: ../plugins/prefer-plain/prefer-plain.c:313
+#: ../plugins/prefer-plain/prefer-plain.c:311
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "显示支持的HTML部分作为附件(_s)"
 
@@ -17811,42 +19397,42 @@ msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
-msgid "Import Outlook messages from PST file"
-msgstr "从 PST 文件中导入 Outlook 邮件"
-
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
 msgstr "Outlook PST 导入"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook 个人文件夹(.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:450
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
+msgid "Import Outlook messages from PST file"
+msgstr "从 PST 文件中导入 Outlook 邮件"
+
+#: ../plugins/pst-import/pst-importer.c:543
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:469
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: ../plugins/pst-import/pst-importer.c:475
+#: ../plugins/pst-import/pst-importer.c:581
 msgid "_Address Book"
 msgstr "地址簿(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:476
+#: ../plugins/pst-import/pst-importer.c:586
 msgid "A_ppointments"
 msgstr "约会(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:591 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "任务(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:596
 msgid "_Journal entries"
 msgstr "日记项(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:585
+#: ../plugins/pst-import/pst-importer.c:707
 msgid "Importing Outlook data"
 msgstr "导入 Outlook 数据"
 
@@ -17865,38 +19451,38 @@ msgstr "位置"
 msgid "Publish calendars to the web."
 msgstr "将日历发布到 Web。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:471
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:469
 #, c-format
 msgid "Could not open %s:"
 msgstr "无法打开 %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:220
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "无法打开 %s:未知错误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:238
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "发布到%s时出现错误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:240
+#: ../plugins/publish-calendar/publish-calendar.c:242
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "发布到%s成功完成"
 
-#: ../plugins/publish-calendar/publish-calendar.c:288
+#: ../plugins/publish-calendar/publish-calendar.c:286
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "加载 %s 失败:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
-#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../plugins/publish-calendar/publish-calendar.c:617
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:765
 msgid "Are you sure you want to remove this location?"
 msgstr "您确定您想要删除此位置吗?"
 
@@ -17911,105 +19497,107 @@ msgstr "无法创建发布索引。"
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Custom Location"
-msgstr "自定义位置"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+msgid "iCal"
+msgstr "iCal"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:3
 msgid "Daily"
 msgstr "每天"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:5
-msgid "FTP (with login)"
-msgstr "FTP(使用登录)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "Weekly"
+msgstr "每周"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "Manual (via Actions menu)"
 msgstr "手动(通过动作菜单)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:11
-msgid "P_ort:"
-msgstr "端口(_O):"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+#| msgid "Secure FTP (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "安全 FTP (SSH)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Public FTP"
 msgstr "公共 FTP"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:13
-msgid "Publishing Location"
-msgstr "发布位置"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
+msgid "FTP (with login)"
+msgstr "FTP(使用登录)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:14
-msgid "Publishing _Frequency:"
-msgstr "发布频率(_F):"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Windows share"
+msgstr "窗口共享"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "安全 FTP (SSH)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Secure WebDAV (HTTPS)"
 msgstr "安全 WebDAV (HTTPS)"
 
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Custom Location"
+msgstr "自定义位置"
+
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
-msgid "Service _type:"
-msgstr "服务类型(_T):"
+msgid "_Publish as:"
+msgstr "发布为(_P):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
-msgid "Sources"
-msgstr "来源"
+msgid "Publishing _Frequency:"
+msgstr "发布频率(_F):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
 msgstr "时长(_D):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
-msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Weekly"
-msgstr "每周"
+msgid "Sources"
+msgstr "来源"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:22
-msgid "Windows share"
-msgstr "窗口共享"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+msgid "Service _type:"
+msgstr "服务类型(_T):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_File:"
 msgstr "文件(_F):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+msgid "P_ort:"
+msgstr "端口(_O):"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Username:"
+msgstr "用户名(_U):"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:26
-msgid "_Publish as:"
-msgstr "发布为(_P):"
-
-#: ../plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "_Remember password"
 msgstr "记住密码(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.ui.h:29
-msgid "_Username:"
-msgstr "用户名(_U):"
-
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
-msgid "iCal"
-msgstr "iCal"
+msgid "Publishing Location"
+msgstr "发布位置"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:95
-#: ../plugins/publish-calendar/publish-format-ical.c:92
+#: ../plugins/publish-calendar/publish-format-fb.c:94
+#: ../plugins/publish-calendar/publish-format-ical.c:91
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "不能发布日历:日历后端已经不存在了"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:518
+#: ../plugins/publish-calendar/url-editor-dialog.c:521
 msgid "New Location"
 msgstr "新建位置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:520
+#: ../plugins/publish-calendar/url-editor-dialog.c:523
 msgid "Edit Location"
 msgstr "编辑位置"
 
@@ -18092,7 +19680,7 @@ msgstr "封装数值使用(_E):"
 msgid "Comma separated values (.csv)"
 msgstr "逗号分隔的值(.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:175 ../shell/e-shell-utils.c:199
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18109,11 +19697,11 @@ msgstr "保存一个日历或者任务到磁盘。"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:156
+#: ../plugins/save-calendar/rdf-format.c:152
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:389
+#: ../plugins/save-calendar/rdf-format.c:387
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
@@ -18137,13 +19725,7 @@ msgstr "保存选中的备忘列表到磁盘"
 msgid "Save the selected task list to disk"
 msgstr "保存选中的任务列表到磁盘"
 
-#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid ""
-"List of keyword/value pairs for the Templates plugin to substitute in a "
-"message body."
-msgstr "用于模板插件以替换邮件内容的键/值对列表。"
-
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
@@ -18152,26 +19734,26 @@ msgstr ""
 "基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
 "$ORIG[body] 这样的变量,它们将替换为您所回复邮件中对应的值。"
 
-#: ../plugins/templates/templates.c:1094
+#: ../plugins/templates/templates.c:1105
 msgid "No Title"
 msgstr "无标题"
 
-#: ../plugins/templates/templates.c:1195
+#: ../plugins/templates/templates.c:1217
 msgid "Save as _Template"
 msgstr "另存为模板(_T)"
 
-#: ../plugins/templates/templates.c:1197
+#: ../plugins/templates/templates.c:1219
 msgid "Save as Template"
 msgstr "另存为模板"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "从 Microsoft Outlook 中解码 TNEF (winmail.dat) 附件。"
-
-#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
 msgstr "TNEF 解码器"
 
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "从 Microsoft Outlook 中解码 TNEF (winmail.dat) 附件。"
+
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
 msgstr "嵌入 vCard"
@@ -18180,185 +19762,95 @@ msgstr "嵌入 vCard"
 msgid "Show vCards directly in mail messages."
 msgstr "在邮件信息里直接查看 vCards。"
 
-#: ../plugins/vcard-inline/vcard-inline.c:207
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
 msgid "Show Full vCard"
 msgstr "显示完整 vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:210
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr "显示紧凑 vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr "有另外 1 个联系人。"
 
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:281
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "有另外 %d 个联系人。"
 
-#: ../plugins/vcard-inline/vcard-inline.c:301
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "保存至地址簿"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "Add WebDAV contacts to Evolution."
-msgstr "添加 WebDAV 联系人到 Evolution。"
-
-#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV 联系人"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
+#: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
+msgid "Add WebDAV contacts to Evolution."
+msgstr "添加 WebDAV 联系人到 Evolution。"
+
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:70
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
-msgid "URL:"
-msgstr "URL:"
-
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:287
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "Authenticate proxy server connections"
-msgstr "认证代理服务器连接"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:2
-msgid "Automatic proxy configuration URL"
-msgstr "自动代理服务器配置 URL"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:3
-msgid "Configuration version"
-msgstr "配置版本"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:4
-msgid "Default sidebar width"
-msgstr "默认侧边栏宽度"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:5
-msgid "Default window X coordinate"
-msgstr "默认窗口横坐标"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:6
-msgid "Default window Y coordinate"
-msgstr "默认窗口纵坐标"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:7
-msgid "Default window height"
-msgstr "默认窗口高度"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid "Default window state"
-msgstr "默认窗口状态"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:9
-msgid "Default window width"
-msgstr "默认窗口宽度"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-msgid "Enable express mode"
-msgstr "启用快捷模式"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "在互联网上连接到 HTTP/HTTPS 时,启用代理设置。"
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr "列出离线使用时要同步到磁盘的文件夹路径"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
-msgid "Flag that enables a much simplified user interface."
-msgstr "用于启用简洁用户界面的标识。"
+msgid "Default window Y coordinate"
+msgstr "默认窗口纵坐标"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
-msgid "HTTP proxy host name"
-msgstr "HTTP 代理主机名称"
+msgid "The default Y coordinate for the main window."
+msgstr "主窗口的默认纵坐标。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
-msgid "HTTP proxy password"
-msgstr "HTTP 代理密码"
+msgid "Default window X coordinate"
+msgstr "默认窗口横坐标"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "HTTP proxy port"
-msgstr "HTTP 代理端口"
+msgid "The default X coordinate for the main window."
+msgstr "主窗口的默认横坐标。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
-msgid "HTTP proxy username"
-msgstr "HTTP 代理用户名"
+msgid "Default window width"
+msgstr "默认窗口宽度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "启动时默认显示的组件 ID 或别名。"
+msgid "The default width for the main window, in pixels."
+msgstr "主窗口的默认宽度,以像素计。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid ""
-"If true, then connections to the proxy server require authentication. The "
-"username is retrieved from the \"/apps/evolution/shell/network_config/"
-"authentication_user\" GConf key, and the password is retrieved from either "
-"gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr ""
-"如果为真,那么到代理服务器的链接需要认证。用户名从 GConf 的键值 “/apps/"
-"evolution/shell/network_config/authentication_user” 中得到,而密码将来自 "
-"gnome-keyring 或者 ~/.gnome2_private/Evolution 密码文件。"
+msgid "Default window height"
+msgstr "默认窗口高度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
-msgid "Initial attachment view"
-msgstr "初始附件视图"
+msgid "The default height for the main window, in pixels."
+msgstr "主窗口的默认高度,以像素计。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "初始文件选择器文件夹"
+msgid "Default window state"
+msgstr "默认窗口状态"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "GtkFileChooser 对话框的起始文件夹。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid ""
-"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
-"View."
-msgstr "附件栏的初始视图。“0”是图标视图、“1”是列表视图。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:23
-msgid "Last upgraded configuration version"
-msgstr "上次升级的配置版本"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "列出离线使用时要同步到磁盘的文件夹路径"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:25
-msgid "Non-proxy hosts"
-msgstr "非代理主机"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:26
-msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "用于 HTTP 代理认证的密码。"
+msgid "Whether or not the window should be maximized."
+msgstr "窗口是否应为最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "Proxy configuration mode"
 msgstr "代理配置模式"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
-msgid "SOCKS proxy host name"
-msgstr "SOCKS 代理主机名"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:29
-msgid "SOCKS proxy port"
-msgstr "SOCKS 代理端口"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:30
-msgid "Secure HTTP proxy host name"
-msgstr "安全 HTTP 代理主机名"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:31
-msgid "Secure HTTP proxy port"
-msgstr "安全 HTTP 代理端口"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -18369,168 +19861,146 @@ msgstr ""
 "理服务器”、“使用手动代理服务器设置”与“使用 autoconfig 链接中的代理服务器设"
 "置”。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
-msgid "Sidebar is visible"
-msgstr "侧边栏可见"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:34
-msgid "Skip development warning dialog"
-msgstr "跳过开发警告对话框"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
-msgid "Start in offline mode"
-msgstr "以离线模式启动"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:36
-msgid "Statusbar is visible"
-msgstr "状态栏可见"
-
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid ""
-"The configuration version of Evolution, with major/minor/configuration level "
-"(for example \"2.6.0\")."
-msgstr "Evolution 的配置版本,带主/次/配置级别(如“2.6.0”)。"
+msgid "HTTP proxy port"
+msgstr "HTTP 代理端口"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
-msgid "The default X coordinate for the main window."
-msgstr "主窗口的默认横坐标。"
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"在这台机器上您可以通过“/apps/evolution/shell/network_config/http_host”定义的"
+"端口代理。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:39
-msgid "The default Y coordinate for the main window."
-msgstr "主窗口的默认纵坐标。"
+msgid "HTTP proxy host name"
+msgstr "HTTP 代理主机名称"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
-msgid "The default height for the main window, in pixels."
-msgstr "主窗口的默认高度,以像素计。"
+msgid "The machine name to proxy HTTP through."
+msgstr "代理 HTTP 的机器名。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
-msgid "The default width for the main window, in pixels."
-msgstr "主窗口的默认宽度,以像素计。"
+msgid "Secure HTTP proxy port"
+msgstr "安全 HTTP 代理端口"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
-msgid "The default width for the sidebar, in pixels."
-msgstr "侧边栏的默认宽度,以像素计。"
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"在这台机器上您可以通过“/apps/evolution/shell/network_config/secure_host”定义"
+"的端口代理。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid ""
-"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level (for example \"2.6.0\")."
-msgstr "上次升级的 Evolution 配置版本,带主/次/配置级别(如“2.6.0”)。"
+msgid "Secure HTTP proxy host name"
+msgstr "安全 HTTP 代理主机名"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
-msgid "The machine name to proxy HTTP through."
-msgstr "代理 HTTP 的机器名。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
 msgstr "代理安全 HTTP 的机器名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
-msgid "The machine name to proxy socks through."
-msgstr "代理套接字的机器名。"
+#: ../shell/apps_evolution_shell.schemas.in.h:45
+msgid "SOCKS proxy port"
+msgstr "SOCKS 代理端口"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"http_host\" that you proxy through."
+"socks_host\" that you proxy through."
 msgstr ""
-"在这台机器上您可以通过“/apps/evolution/shell/network_config/http_host”定义的"
+"在这台机器上您可以通过“/apps/evolution/shell/network_config/socks_host”定义的"
 "端口代理。"
 
+#: ../shell/apps_evolution_shell.schemas.in.h:47
+msgid "SOCKS proxy host name"
+msgstr "SOCKS 代理主机名"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"secure_host\" that you proxy through."
-msgstr ""
-"在这台机器上您可以通过“/apps/evolution/shell/network_config/secure_host”定义"
-"的端口代理。"
+msgid "The machine name to proxy socks through."
+msgstr "代理套接字的机器名。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid ""
-"The port on the machine defined by \"/apps/evolution/shell/network_config/"
-"socks_host\" that you proxy through."
-msgstr ""
-"在这台机器上您可以通过“/apps/evolution/shell/network_config/socks_host”定义的"
-"端口代理。"
+msgid "Use HTTP proxy"
+msgstr "使用 HTTP 代理"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
-"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
-"by the GNOME toolbar setting."
-msgstr ""
-"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、“toolbar”(工"
-"具栏)。如果设置为“toolbar”(工具栏),则工具栏的样式由 GNOME 设置决定。"
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "在互联网上连接到 HTTP/HTTPS 时,启用代理设置。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"This key contains a list of hosts which are connected to directly, rather "
-"than via the proxy (if it is active). The values can be hostnames, domains "
-"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
-"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr ""
-"此键值包含了直接连接的,而不是通过代理服务器的(如果被选中),主机列表。值可以"
-"为主机名、域名(使用初始通配符如 *.foo.com)、IP 主机地址 (IPv4 或 IPv6)和带子"
-"网掩码的网络地址(如 192.168.0.0/24)。"
+msgid "Authenticate proxy server connections"
+msgstr "认证代理服务器连接"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
-msgid "Toolbar is visible"
-msgstr "工具栏可见"
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"如果为真,那么到代理服务器的链接需要认证。用户名从 GConf 的键值 “/apps/"
+"evolution/shell/network_config/authentication_user” 中得到,而密码将来自 "
+"gnome-keyring 或者 ~/.gnome2_private/Evolution 密码文件。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:53
-msgid "URL that provides proxy configuration values."
-msgstr "提供代理配置值的 URL。"
+msgid "HTTP proxy username"
+msgstr "HTTP 代理用户名"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:54
-msgid "Use HTTP proxy"
-msgstr "使用 HTTP 代理"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "用于 HTTP 代理认证的用户名。"
 
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "HTTP proxy password"
+msgstr "HTTP 代理密码"
+
 #: ../shell/apps_evolution_shell.schemas.in.h:56
-msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "是否以离线模式而非在线模式启动 Evolution。"
+msgid "Password to pass as authentication when doing HTTP proxying."
+msgstr "用于 HTTP 代理认证的密码。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
-msgid "Whether or not the window should be maximized."
-msgstr "窗口是否应为最大化。"
+msgid "Non-proxy hosts"
+msgstr "非代理主机"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:58
-msgid "Whether the sidebar should be visible."
-msgstr "侧边栏是否可见。"
+msgid ""
+"This key contains a list of hosts which are connected to directly, rather "
+"than via the proxy (if it is active). The values can be hostnames, domains "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"此键值包含了直接连接的,而不是通过代理服务器的(如果被选中),主机列表。值可以"
+"为主机名、域名(使用初始通配符如 *.foo.com)、IP 主机地址 (IPv4 或 IPv6)和带子"
+"网掩码的网络地址(如 192.168.0.0/24)。"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:59
-msgid "Whether the status bar should be visible."
-msgstr "状态栏是否可见。"
+msgid "Automatic proxy configuration URL"
+msgstr "自动代理服务器配置 URL"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:60
-msgid "Whether the toolbar should be visible."
-msgstr "工具栏是否可见。"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "是否跳过 Evoltuion 开发版本的警告。"
+msgid "URL that provides proxy configuration values."
+msgstr "提供代理配置值的 URL。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
-msgid "Whether the window buttons should be visible."
-msgstr "窗口按钮是否可见。"
+#: ../shell/e-shell.c:312
+msgid "Preparing to go offline..."
+msgstr "正在准备离线..."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
-msgid "Window button style"
-msgstr "窗口按钮样式"
+#: ../shell/e-shell.c:365
+msgid "Preparing to go online..."
+msgstr "正在准备上线..."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
-msgid "Window buttons are visible"
-msgstr "窗口按钮可见"
+#: ../shell/e-shell.c:436
+msgid "Preparing to quit..."
+msgstr "正在准备退出..."
 
-#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "搜索"
 
-#: ../shell/e-shell-content.c:773
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "保存搜索"
 
@@ -18538,31 +20008,31 @@ msgstr "保存搜索"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:940
 msgid "Sho_w:"
 msgstr "显示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:973
 msgid "Sear_ch:"
 msgstr "搜索(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1036
 msgid "i_n"
 msgstr "在(_N) "
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:197
 msgid "vCard (.vcf)"
 msgstr "vCard (.vff)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:220
 msgid "All Files (*)"
 msgstr "全部文件(*)"
 
-#: ../shell/e-shell-view.c:296
+#: ../shell/e-shell-view.c:303
 msgid "Saving user interface state"
 msgstr "保存用户界面状态"
 
@@ -18584,293 +20054,287 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-actions.c:902
+#: ../shell/e-shell-window-actions.c:914
 msgid "Categories Editor"
 msgstr "类别编辑器"
 
-#: ../shell/e-shell-window-actions.c:1237
+#: ../shell/e-shell-window-actions.c:1251
 msgid "Bug Buddy is not installed."
 msgstr "未安装 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1239
+#: ../shell/e-shell-window-actions.c:1253
 msgid "Bug Buddy could not be run."
 msgstr "无法运行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1420
+#: ../shell/e-shell-window-actions.c:1434
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../shell/e-shell-window-actions.c:1425
 #: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1453
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1460
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../shell/e-shell-window-actions.c:1448
+#: ../shell/e-shell-window-actions.c:1462
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指南"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1488
 msgid "_Forget Passwords"
 msgstr "丢弃密码(_F)"
 
-#: ../shell/e-shell-window-actions.c:1476
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Forget all remembered passwords"
 msgstr "丢弃所有记住的密码"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1495
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1483
+#: ../shell/e-shell-window-actions.c:1497
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1502
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1490
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗口来显示这个视图"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1516
 msgid "Available Cate_gories"
 msgstr "可用类别(_G)"
 
-#: ../shell/e-shell-window-actions.c:1504
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Manage available categories"
 msgstr "管理可用类别"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1518
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Show Evolution's shortcut keys"
 msgstr "显示 Evolution 的快捷键"
 
-#: ../shell/e-shell-window-actions.c:1525
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Advanced Search..."
 msgstr "高级搜索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1532
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Construct a more advanced search"
 msgstr "构造一个更高级的搜索"
 
-#: ../shell/e-shell-window-actions.c:1539
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Clear the current search parameters"
 msgstr "清楚当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Edit Saved Searches..."
 msgstr "编辑保存的搜索(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1546
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Manage your saved searches"
 msgstr "管理您保存的搜索"
 
-#: ../shell/e-shell-window-actions.c:1553
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1572
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1560
+#: ../shell/e-shell-window-actions.c:1574
 msgid "Execute the current search parameters"
 msgstr "执行当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1579
 msgid "_Save Search..."
 msgstr "保存搜索(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1567
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Save the current search parameters"
 msgstr "保存当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1593
 msgid "Submit _Bug Report..."
 msgstr "提交错误报告(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1581
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1600
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1588
+#: ../shell/e-shell-window-actions.c:1602
 msgid "Put Evolution into offline mode"
 msgstr "将 Evolution 转入离线模式"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1607
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1595
+#: ../shell/e-shell-window-actions.c:1609
 msgid "Put Evolution into online mode"
 msgstr "将 Evolution 转入在线模式"
 
-#: ../shell/e-shell-window-actions.c:1623
+#: ../shell/e-shell-window-actions.c:1637
 msgid "Lay_out"
 msgstr "布局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1630
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1637
+#: ../shell/e-shell-window-actions.c:1651
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1644
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../shell/e-shell-window-actions.c:1658
+#: ../shell/e-shell-window-actions.c:1672
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show Side _Bar"
 msgstr "显示侧边栏(_B)"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the side bar"
 msgstr "显示侧边栏"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the switcher buttons"
 msgstr "显示切换器按钮"
 
-#: ../shell/e-shell-window-actions.c:1703
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: ../shell/e-shell-window-actions.c:1705
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the status bar"
 msgstr "显示状态栏"
 
-#: ../shell/e-shell-window-actions.c:1711
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Show _Tool Bar"
 msgstr "显示工具栏(_T)"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1727
 msgid "Show the tool bar"
 msgstr "显示工具栏"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1749
 msgid "_Icons Only"
 msgstr "只有图标(_I)"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons only"
 msgstr "显示只有图标的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1756
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1744
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons with text only"
 msgstr "显示只有文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1749
+#: ../shell/e-shell-window-actions.c:1763
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1751
+#: ../shell/e-shell-window-actions.c:1765
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1770
 msgid "Tool_bar Style"
 msgstr "工具栏样式(_B)"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具栏设置显示窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1780
 msgid "Define Views..."
 msgstr "定义视图..."
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1782
 msgid "Create or edit views"
 msgstr "创建或编辑视图"
 
-#: ../shell/e-shell-window-actions.c:1773
+#: ../shell/e-shell-window-actions.c:1787
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1789
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1796
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1806
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1808
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1804
+#: ../shell/e-shell-window-actions.c:1818
 msgid "Change the page settings for your current printer"
 msgstr "更改当前打印机的页面设置"
 
-#: ../shell/e-shell-window-actions.c:2194
+#: ../shell/e-shell-window-actions.c:2208
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell-window-actions.c:2414
+#: ../shell/e-shell-window-actions.c:2329
+#, fuzzy, c-format
+#| msgid "Select A File"
+msgid "Select view: %s"
+msgstr "选择一个文件"
+
+#: ../shell/e-shell-window-actions.c:2430
 msgid "Execute these search parameters"
 msgstr "执行这些搜索参数"
 
+#: ../shell/e-shell-window.c:494
+msgid "New"
+msgstr "新建"
+
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:584
+#: ../shell/e-shell-window-private.c:582
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:442
-msgid "New"
-msgstr "新建"
-
-#: ../shell/e-shell.c:361
-msgid "Preparing to go offline..."
-msgstr "正在准备离线..."
-
-#: ../shell/e-shell.c:414
-msgid "Preparing to go online..."
-msgstr "正在准备上线..."
-
-#: ../shell/e-shell.c:476
-msgid "Preparing to quit..."
-msgstr "正在准备退出..."
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18902,7 +20366,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18910,13 +20374,13 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:224
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:315
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -18924,51 +20388,49 @@ msgstr ""
 "启动 Evolution 后显示特定组件。可用的选项"
 "有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:319
 msgid "Apply the given geometry to the main window"
 msgstr "应用给定的几何参数到主窗口"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:323
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:325
 msgid "Ignore network availability"
 msgstr "忽略网络是否可用"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:327
 msgid "Start in \"express\" mode"
 msgstr "以“快速”模式启动"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:330
 msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution"
 
-#: ../shell/main.c:326
-msgid "Send the debugging output of all components to a file."
-msgstr "把所有成员的调试输出发送到一个文件中。"
-
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Disable loading of any plugins."
 msgstr "禁止载入任何插件。"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:335
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:334
-msgid "Import URIs or file names given as rest of arguments."
+#: ../shell/main.c:339
+#, fuzzy
+#| msgid "Import URIs or file names given as rest of arguments."
+msgid "Import URIs or filenames given as rest of arguments."
 msgstr "导入URIs或者文件名作为剩余的参数"
 
-#: ../shell/main.c:336
+#: ../shell/main.c:341
 msgid "Request a running Evolution process to quit"
 msgstr "请求正在运行的 Evolution 进程退出"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:518 ../shell/main.c:526
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:591
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18977,7 +20439,7 @@ msgstr ""
 "%s:不能同时使用 --online 和 --offline。\n"
 "  运行 %s --help 了解更多信息。\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:597
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -18986,19 +20448,34 @@ msgstr ""
 "%s:不能同时使用 --force-online 和 --offline。\n"
 "  运行 %s --help 了解更多信息。\n"
 
-#: ../shell/shell.error.xml.h:1
-msgid "Are you sure you want to forget all remembered passwords?"
-msgstr "您确定要忘记记住的所有密码吗?"
-
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot upgrade directly from version {0}"
-msgstr "无法直接从 {0} 版本升级?"
+msgid "Upgrade from previous version failed:"
+msgstr "从先前版本升级失败:"
 
 #: ../shell/shell.error.xml.h:3
+msgid ""
+"{0}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{0}\n"
+"\n"
+"如果您选择继续,您可能无法访问您的某些旧数据。\n"
+
+#: ../shell/shell.error.xml.h:7
 msgid "Continue Anyway"
 msgstr "无论如何,继续"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:8
+msgid "Quit Now"
+msgstr "现在离开"
+
+#: ../shell/shell.error.xml.h:9
+msgid "Cannot upgrade directly from version {0}"
+msgstr "无法直接从 {0} 版本升级?"
+
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
 "a workaround you might try first upgrading to Evolution 2, and then "
@@ -19007,50 +20484,35 @@ msgstr ""
 "Evolution不再支持从版本{0}直接升级。然而您可以尝试先升级到Evolution 2,然后再"
 "升级到Evolution 3。"
 
-#: ../shell/shell.error.xml.h:5
+#: ../shell/shell.error.xml.h:11
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr "您确定要忘记记住的所有密码吗?"
+
+#: ../shell/shell.error.xml.h:12
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候,您必须重新输入。"
 
-#: ../shell/shell.error.xml.h:7
-msgid "Quit Now"
-msgstr "现在离开"
-
-#: ../shell/shell.error.xml.h:8
-msgid "Upgrade from previous version failed:"
-msgstr "从先前版本升级失败:"
-
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:13
 msgid "_Forget"
 msgstr "忘记(_F)"
 
-#: ../shell/shell.error.xml.h:10
-msgid ""
-"{0}\n"
-"\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
-msgstr ""
-"{0}\n"
-"\n"
-"如果您选择继续,您可能无法访问您的某些旧数据。\n"
-
-#: ../shell/test/e-test-shell-backend.c:56
+#: ../shell/test/e-test-shell-backend.c:52
 msgctxt "New"
 msgid "_Test Item"
 msgstr "测试条目(_T)"
 
-#: ../shell/test/e-test-shell-backend.c:58
+#: ../shell/test/e-test-shell-backend.c:54
 msgid "Create a new test item"
 msgstr "创建新测试项"
 
-#: ../shell/test/e-test-shell-backend.c:66
+#: ../shell/test/e-test-shell-backend.c:62
 msgctxt "New"
 msgid "Test _Source"
 msgstr "测试来源(_S)"
 
-#: ../shell/test/e-test-shell-backend.c:68
+#: ../shell/test/e-test-shell-backend.c:64
 msgid "Create a new test source"
 msgstr "创建一个新的测试来源"
 
@@ -19089,31 +20551,31 @@ msgstr "不能传递文档的URIs(统一资源定位符)到一个'类型=链接'
 msgid "Not a launchable item"
 msgstr "不是一个可加载的条目"
 
-#: ../smclient/eggsmclient.c:226
+#: ../smclient/eggsmclient.c:229
 msgid "Disable connection to session manager"
 msgstr "禁止连接到会话管理器"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "Specify file containing saved configuration"
 msgstr "指定包含了保存的配置的文件。"
 
-#: ../smclient/eggsmclient.c:229
+#: ../smclient/eggsmclient.c:232
 msgid "FILE"
 msgstr "文件"
 
-#: ../smclient/eggsmclient.c:232
+#: ../smclient/eggsmclient.c:235
 msgid "Specify session management ID"
 msgstr "特殊的会话管理ID"
 
-#: ../smclient/eggsmclient.c:232
+#: ../smclient/eggsmclient.c:235
 msgid "ID"
 msgstr "ID"
 
-#: ../smclient/eggsmclient.c:253
+#: ../smclient/eggsmclient.c:256
 msgid "Session management options:"
 msgstr "会话管理选项:"
 
-#: ../smclient/eggsmclient.c:254
+#: ../smclient/eggsmclient.c:257
 msgid "Show session management options"
 msgstr "显示会话管理选项"
 
@@ -19128,118 +20590,122 @@ msgstr ""
 "\n"
 "编辑信任设置:"
 
-#: ../smime/gui/cert-trust-dialog.c:146
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr "由于您信任颁发此证书的机构,您就将信任此证书的权威性,除非在此声明"
-
-#: ../smime/gui/cert-trust-dialog.c:150
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
-
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:116
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
 msgid "Issued To Organization"
 msgstr "授予组织"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
 msgid "Issued To Organizational Unit"
 msgstr "授予组织单元"
 
-#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
+#: ../smime/lib/e-cert.c:543
 msgid "Serial Number"
 msgstr "序列号"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116 ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
 msgid "Issued By"
 msgstr "颁发者"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 msgid "Issued By Organization"
 msgstr "颁发组织"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Issued By Organizational Unit"
 msgstr "颁发组织单元"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Issued"
 msgstr "已颁发"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Expires"
 msgstr "到期时间"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:117
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: ../smime/gui/certificate-manager.c:575
+#: ../smime/gui/certificate-manager.c:584
 msgid "Select a certificate to import..."
 msgstr "选择要导入的证书..."
 
-#: ../smime/gui/certificate-manager.c:588
+#: ../smime/gui/certificate-manager.c:597
 msgid "All files"
 msgstr "全部文件"
 
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:632
 msgid "Failed to import certificate"
 msgstr "导入证书失败"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:1006
 msgid "All PKCS12 files"
 msgstr "全部 PKCS12 文件"
 
-#: ../smime/gui/certificate-manager.c:1009
+#: ../smime/gui/certificate-manager.c:1023
 msgid "All email certificate files"
 msgstr "所有电子邮件证书文件"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1040
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
-#: ../smime/gui/certificate-viewer.c:345
+#: ../smime/gui/certificate-viewer.c:349
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "证书查看器:%s"
 
+#: ../smime/gui/cert-trust-dialog.c:148
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr "由于您信任颁发此证书的机构,您就将信任此证书的权威性,除非在此声明"
+
+#: ../smime/gui/cert-trust-dialog.c:152
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
+
 #: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
@@ -19250,12 +20716,12 @@ msgstr "输入“%s”的密码"
 msgid "Enter new password for certificate database"
 msgstr "输入证书数据库的新密码"
 
-#: ../smime/gui/component.c:78
+#: ../smime/gui/component.c:79
 msgid "Enter new password"
 msgstr "输入新密码"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -19264,7 +20730,7 @@ msgstr ""
 "发行给:\n"
 "  主题:%s\n"
 
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:123
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -19273,313 +20739,315 @@ msgstr ""
 "发行者:\n"
 "  主题:%s\n"
 
-#: ../smime/gui/e-cert-selector.c:172
+#: ../smime/gui/e-cert-selector.c:176
 msgid "Select certificate"
 msgstr "选择证书"
 
-#: ../smime/gui/smime-ui.ui.h:1
-msgid "<Not Part of Certificate>"
-msgstr "<不是证书的一部分>"
-
-#: ../smime/gui/smime-ui.ui.h:2
-msgid "Authorities"
-msgstr "证书颁发机构"
-
-#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup _All"
-msgstr "全部备份(_A)"
+#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:803
+msgid "SSL Client Certificate"
+msgstr "SSL 客户证书"
 
-#: ../smime/gui/smime-ui.ui.h:4
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
+#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:807
+msgid "SSL Server Certificate"
+msgstr "SSL 服务器证书"
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
-msgid "Certificate"
-msgstr "证书"
+#: ../smime/gui/smime-ui.ui.h:5
+msgid "Email Signer Certificate"
+msgstr "电子邮件签名者证书"
 
 #: ../smime/gui/smime-ui.ui.h:6
-msgid "Certificate Authority Trust"
-msgstr "证书颁发机构信任"
+msgid "Email Recipient Certificate"
+msgstr "电子邮件收件人证书"
 
 #: ../smime/gui/smime-ui.ui.h:7
-msgid "Certificate Fields"
-msgstr "证书域"
+msgid "This certificate has been verified for the following uses:"
+msgstr "此证书已经被下列用户所验证:"
 
 #: ../smime/gui/smime-ui.ui.h:8
-msgid "Certificate Hierarchy"
-msgstr "证书层次"
+msgid "Issued To"
+msgstr "颁发给"
 
 #: ../smime/gui/smime-ui.ui.h:9
-msgid "Certificate details"
-msgstr "证书细节"
+msgid "Common Name (CN)"
+msgstr "通用名(CN)"
 
 #: ../smime/gui/smime-ui.ui.h:10
-msgid "Certificates Table"
-msgstr "证书表"
+msgid "Organization (O)"
+msgstr "组织(O)"
 
 #: ../smime/gui/smime-ui.ui.h:11
-msgid "Common Name (CN)"
-msgstr "通用名(CN)"
+msgid "Organizational Unit (OU)"
+msgstr "组织单元(OU)"
 
-#: ../smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "联系人证书"
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "Issued On"
+msgstr "发行日期"
 
 #: ../smime/gui/smime-ui.ui.h:14
-msgid "Do not trust the authenticity of this certificate"
-msgstr "不信任此证书的颁发机构"
-
-#: ../smime/gui/smime-ui.ui.h:15
-msgid "Email Certificate Trust Settings"
-msgstr "电子邮件证书信任设置"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Email Recipient Certificate"
-msgstr "电子邮件收件人证书"
-
-#: ../smime/gui/smime-ui.ui.h:17
-msgid "Email Signer Certificate"
-msgstr "电子邮件签名者证书"
-
-#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "到期"
 
+#: ../smime/gui/smime-ui.ui.h:16
+msgid "Fingerprints"
+msgstr "指纹"
+
 #: ../smime/gui/smime-ui.ui.h:19
-msgid "Field Value"
-msgstr "域值"
+msgid "<Not Part of Certificate>"
+msgstr "<不是证书的一部分>"
 
 #: ../smime/gui/smime-ui.ui.h:20
-msgid "Fingerprints"
-msgstr "指纹"
+msgid "Validity"
+msgstr "有效性"
+
+#: ../smime/gui/smime-ui.ui.h:22
+msgid "Certificate Hierarchy"
+msgstr "证书层次"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Certificate Fields"
+msgstr "证书域"
 
 #: ../smime/gui/smime-ui.ui.h:24
-msgid "Issued On"
-msgstr "发行日期"
+msgid "Field Value"
+msgstr "域值"
 
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Issued To"
-msgstr "颁发给"
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "You have certificates from these organizations that identify you:"
+msgstr "您拥有这些组织证明您身份的证书:"
 
 #: ../smime/gui/smime-ui.ui.h:27
-msgid "Organization (O)"
-msgstr "组织(O)"
-
-#: ../smime/gui/smime-ui.ui.h:28
-msgid "Organizational Unit (OU)"
-msgstr "组织单元(OU)"
+msgid "Certificates Table"
+msgstr "证书表"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
-msgid "SSL Client Certificate"
-msgstr "SSL 客户证书"
+#. This is a verb, as in "make a backup".
+#: ../smime/gui/smime-ui.ui.h:30
+msgid "_Backup"
+msgstr "备份(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
-msgid "SSL Server Certificate"
-msgstr "SSL 服务器证书"
+#: ../smime/gui/smime-ui.ui.h:31
+msgid "Backup _All"
+msgstr "全部备份(_A)"
 
 #: ../smime/gui/smime-ui.ui.h:33
-msgid "This certificate has been verified for the following uses:"
-msgstr "此证书已经被下列用户所验证:"
+msgid "Your Certificates"
+msgstr "您的证书"
 
 #: ../smime/gui/smime-ui.ui.h:34
-msgid "Trust the authenticity of this certificate"
-msgstr "信任此证书的颁发机构"
+msgid "You have certificates on file that identify these people:"
+msgstr "您拥有证明这些人的文件型证书:"
 
 #: ../smime/gui/smime-ui.ui.h:35
-msgid "Trust this CA to identify email users."
-msgstr "信任此颁发机构标识的电子邮件用户。"
+msgid "Contact Certificates"
+msgstr "联系人证书"
 
 #: ../smime/gui/smime-ui.ui.h:36
-msgid "Trust this CA to identify software developers."
-msgstr "信任此颁发机构标识的软件开发者。"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr "您拥有证明这些颁发机构的文件型证书:"
 
 #: ../smime/gui/smime-ui.ui.h:37
-msgid "Trust this CA to identify websites."
-msgstr "信任此颁发机构标识的网站。"
+msgid "Authorities"
+msgstr "证书颁发机构"
 
 #: ../smime/gui/smime-ui.ui.h:38
-msgid "Validity"
-msgstr "有效性"
+msgid "Certificate Authority Trust"
+msgstr "证书颁发机构信任"
 
 #: ../smime/gui/smime-ui.ui.h:39
-msgid "You have certificates from these organizations that identify you:"
-msgstr "您拥有这些组织证明您身份的证书:"
+#, fuzzy
+#| msgid "Trust this CA to identify websites."
+msgid "Trust this CA to identify _websites."
+msgstr "信任此颁发机构标识的网站。"
 
 #: ../smime/gui/smime-ui.ui.h:40
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr "您拥有证明这些颁发机构的文件型证书:"
+#, fuzzy
+#| msgid "Trust this CA to identify email users."
+msgid "Trust this CA to identify _email users."
+msgstr "信任此颁发机构标识的电子邮件用户。"
 
 #: ../smime/gui/smime-ui.ui.h:41
-msgid "You have certificates on file that identify these people:"
-msgstr "您拥有证明这些人的文件型证书:"
+#, fuzzy
+#| msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify _software developers."
+msgstr "信任此颁发机构标识的软件开发者。"
 
 #: ../smime/gui/smime-ui.ui.h:42
-msgid "Your Certificates"
-msgstr "您的证书"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
 
-#. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:44
-msgid "_Backup"
-msgstr "备份(_B)"
+#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1072
+msgid "Certificate"
+msgstr "证书"
 
 #: ../smime/gui/smime-ui.ui.h:45
+msgid "Certificate details"
+msgstr "证书细节"
+
+#: ../smime/gui/smime-ui.ui.h:46
+msgid "Email Certificate Trust Settings"
+msgstr "电子邮件证书信任设置"
+
+#: ../smime/gui/smime-ui.ui.h:47
+msgid "Trust the authenticity of this certificate"
+msgstr "信任此证书的颁发机构"
+
+#: ../smime/gui/smime-ui.ui.h:48
+msgid "Do not trust the authenticity of this certificate"
+msgstr "不信任此证书的颁发机构"
+
+#: ../smime/gui/smime-ui.ui.h:49
 msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
-#: ../smime/lib/e-cert-db.c:912
-msgid "Certificate already exists"
-msgstr "证书已经存在"
-
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:202 ../smime/lib/e-cert.c:214
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
+#: ../smime/lib/e-cert.c:391
 msgid "Sign"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:418
+#: ../smime/lib/e-cert.c:392
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:504
 msgid "Version"
 msgstr "版本"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:519
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:522
 msgid "Version 2"
 msgstr "版本 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:525
 msgid "Version 3"
 msgstr "版本 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:608
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:611
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:614
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-cert.c:617
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-256"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-cert.c:620
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-384"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:623
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-512"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:650
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-cert.c:653
 msgid "Certificate Key Usage"
 msgstr "证书密钥用途"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-cert.c:656
 msgid "Netscape Certificate Type"
 msgstr "Netscape 证书类型"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-cert.c:659
 msgid "Certificate Authority Key Identifier"
 msgstr "证书颁发密钥身份"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-cert.c:671
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "对象标识符(%s)"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-cert.c:723
 msgid "Algorithm Identifier"
 msgstr "算法标识符"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:731
 msgid "Algorithm Parameters"
 msgstr "算法参数"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:753
 msgid "Subject Public Key Info"
 msgstr "主题公钥信息"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-cert.c:758
 msgid "Subject Public Key Algorithm"
 msgstr "主题公钥算法"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-cert.c:773
 msgid "Subject's Public Key"
 msgstr "主题公钥"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:794 ../smime/lib/e-cert.c:844
 msgid "Error: Unable to process extension"
 msgstr "错误:无法处理扩展"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:827
 msgid "Object Signer"
 msgstr "对象签名者"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-cert.c:819
 msgid "SSL Certificate Authority"
 msgstr "SSL 证书颁发机构"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-cert.c:823
 msgid "Email Certificate Authority"
 msgstr "电子邮件证书颁发机构"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:852
 msgid "Signing"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:856
 msgid "Non-repudiation"
 msgstr "不可抵赖"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:860
 msgid "Key Encipherment"
 msgstr "密钥编码器"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:864
 msgid "Data Encipherment"
 msgstr "数据编码器"
 
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-cert.c:868
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-cert.c:872
 msgid "Certificate Signer"
 msgstr "证书签名者"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-cert.c:876
 msgid "CRL Signer"
 msgstr "CRL 签名者"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:925
 msgid "Critical"
 msgstr "关键"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-cert.c:927 ../smime/lib/e-cert.c:930
 msgid "Not Critical"
 msgstr "非关键"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-cert.c:951
 msgid "Extensions"
 msgstr "扩展"
 
@@ -19591,90 +21059,94 @@ msgstr "扩展"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-cert.c:1086 ../smime/lib/e-cert.c:1209
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-cert.c:1095
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-cert.c:1150
 msgid "Issuer Unique ID"
 msgstr "发行者唯一 ID"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-cert.c:1169
 msgid "Subject Unique ID"
 msgstr "主题唯一 ID"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-cert.c:1215
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
-#: ../smime/lib/e-pkcs12.c:256
+#: ../smime/lib/e-cert-db.c:859
+msgid "Certificate already exists"
+msgstr "证书已经存在"
+
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "输入 PKCS12 文件的密码:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:306
 msgid "Imported Certificate"
 msgstr "导入的证书"
 
 #: ../views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "按公司(_C)"
-
-#: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "地址名片(_A)"
 
-#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
 msgid "_List View"
 msgstr "列表视图(_L)"
 
-#: ../views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "周视图(_E)"
+#: ../views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "按公司(_C)"
 
-#: ../views/calendar/galview.xml.h:2
+#: ../views/calendar/galview.xml.h:1
 msgid "_Day View"
 msgstr "日视图(_D)"
 
+#: ../views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "工作日视图(_W)"
+
+#: ../views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "周视图(_E)"
+
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "月视图(_M)"
 
-#: ../views/calendar/galview.xml.h:5
-msgid "_Work Week View"
-msgstr "工作日视图(_W)"
-
 #: ../views/mail/galview.xml.h:1
-msgid "As Sent Folder for Wi_de View"
-msgstr "对宽屏视图显示已发文件夹(_D)"
+msgid "_Messages"
+msgstr "信息(_M)"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
 msgstr "作为已发文件夹(_S)"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By S_tatus"
-msgstr "按状态(_T)"
+msgid "By Su_bject"
+msgstr "按主题(_B)"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "按发件人(_N)"
 
 #: ../views/mail/galview.xml.h:5
-msgid "By Su_bject"
-msgstr "按主题(_B)"
+msgid "By S_tatus"
+msgstr "按状态(_T)"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
@@ -19685,43 +21157,35 @@ msgid "For _Wide View"
 msgstr "对宽屏视图(_W)"
 
 #: ../views/mail/galview.xml.h:8
-msgid "_Messages"
-msgstr "信息(_M)"
+msgid "As Sent Folder for Wi_de View"
+msgstr "对宽屏视图显示已发文件夹(_D)"
 
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "备忘(_M)"
 
-#: ../views/tasks/galview.xml.h:1
+#: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
 msgstr "到期日期(_D)"
 
-#: ../views/tasks/galview.xml.h:2
+#: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "状态(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:202
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "Select a Time Zone"
 msgstr "选择一个时区"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
-msgid "Time Zones"
-msgstr "时区"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Timezone drop-down combination box"
-msgstr "时区下拉组合框"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19730,18 +21194,26 @@ msgstr ""
 "用鼠标左键放大地图的某个区域并选择时区。\n"
 "用鼠标右键缩小。"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "时区"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid "_Selection"
 msgstr "选择(_S)"
 
-#: ../widgets/menus/gal-define-views-dialog.c:359
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "时区下拉组合框"
+
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../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:367
-#: ../widgets/menus/gal-define-views-dialog.c:369
+#: ../widgets/menus/gal-define-views-dialog.c:372
+#: ../widgets/menus/gal-define-views-dialog.c:374
 msgid "Define Views"
 msgstr "定义视图"
 
@@ -19750,11 +21222,11 @@ msgstr "定义视图"
 msgid "Define Views for \"%s\""
 msgstr "定义“%s”的视图"
 
-#: ../widgets/menus/gal-view-factory-etable.c:111
+#: ../widgets/menus/gal-view-factory-etable.c:115
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:289
 msgid "Save Current View"
 msgstr "保存当前视图"
 
@@ -19766,7 +21238,7 @@ msgstr "创建新视图(_C)"
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
-#: ../widgets/menus/gal-view-new-dialog.c:108
+#: ../widgets/menus/gal-view-new-dialog.c:172
 msgid "Define New View"
 msgstr "定义新视图"
 
@@ -19775,47 +21247,107 @@ msgid "Name of new view:"
 msgstr "新视图的名称:"
 
 #: ../widgets/menus/gal-view-new-dialog.ui.h:2
+msgid "Type of view:"
+msgstr "视图类型:"
+
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of View"
 msgstr "视图类型"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of view:"
-msgstr "视图类型:"
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
+msgid "%d %B %Y"
+msgstr "%Y年%-m月%-d日"
 
-#: ../widgets/misc/e-account-manager.c:353
-msgid "De_fault"
-msgstr "默认(_F)"
+#: ../widgets/misc/ea-calendar-item.c:318
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "日历:从 %s 到 %s"
 
-#: ../widgets/misc/e-account-tree-view.c:243
-msgid "Account Name"
-msgstr "帐号名"
+#: ../widgets/misc/ea-calendar-item.c:354
+msgid "evolution calendar item"
+msgstr "Evolution 日历项目"
 
-#: ../widgets/misc/e-account-tree-view.c:274
-msgid "Protocol"
-msgstr "协议"
+#: ../widgets/misc/e-alert-bar.c:120
+#, fuzzy
+#| msgid "Send this message"
+msgid "Close this message"
+msgstr "发送这条信息"
 
-#: ../widgets/misc/e-attachment-dialog.c:308
+#. 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:1000
+msgid "Attached message"
+msgstr "附加的信息"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2382
+#: ../widgets/misc/e-attachment-store.c:525
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2684
+msgid "A load operation is already in progress"
+msgstr "一个已经加载的操作正在进行"
+
+#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2692
+msgid "A save operation is already in progress"
+msgstr "个已经保存的操作正在进行"
+
+#: ../widgets/misc/e-attachment.c:1987
+#, c-format
+msgid "Could not load '%s'"
+msgstr "不能加载“%s”"
+
+#: ../widgets/misc/e-attachment.c:1990
+#, c-format
+msgid "Could not load the attachment"
+msgstr "不能加载附件"
+
+#: ../widgets/misc/e-attachment.c:2263
+#, c-format
+msgid "Could not open '%s'"
+msgstr "不能打开“%s”"
+
+#: ../widgets/misc/e-attachment.c:2266
+#, c-format
+msgid "Could not open the attachment"
+msgstr "不能打开附件"
+
+#: ../widgets/misc/e-attachment.c:2700
+msgid "Attachment contents not loaded"
+msgstr "附件内容未载入"
+
+#: ../widgets/misc/e-attachment.c:2776
+#, c-format
+msgid "Could not save '%s'"
+msgstr "不能保存“%s”"
+
+#: ../widgets/misc/e-attachment.c:2779
+#, c-format
+msgid "Could not save the attachment"
+msgstr "无法保存附件"
+
+#: ../widgets/misc/e-attachment-dialog.c:311
 msgid "Attachment Properties"
 msgstr "附件属性"
 
-#: ../widgets/misc/e-attachment-dialog.c:330
-msgid "_Filename:"
-msgstr "文件名(_F):"
-
-#: ../widgets/misc/e-attachment-dialog.c:365
+#: ../widgets/misc/e-attachment-dialog.c:368
 msgid "MIME Type:"
 msgstr "MIME  类型:"
 
-#: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-dialog.c:376
+#: ../widgets/misc/e-attachment-store.c:442
 msgid "_Suggest automatic display of attachment"
 msgstr "建议自动显示附件(_S)"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:99
 msgid "Could not set as background"
 msgstr "不能设置为背景"
 
-#: ../widgets/misc/e-attachment-handler-image.c:145
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
@@ -19832,244 +21364,184 @@ msgstr "发送到(_S)..."
 msgid "Send the selected attachments somewhere"
 msgstr "发送某个选中的附件"
 
-#: ../widgets/misc/e-attachment-icon-view.c:162
-#: ../widgets/misc/e-attachment-tree-view.c:547
+#: ../widgets/misc/e-attachment-icon-view.c:166
+#: ../widgets/misc/e-attachment-tree-view.c:549
 msgid "Loading"
 msgstr "载入"
 
-#: ../widgets/misc/e-attachment-icon-view.c:174
-#: ../widgets/misc/e-attachment-tree-view.c:559
+#: ../widgets/misc/e-attachment-icon-view.c:178
+#: ../widgets/misc/e-attachment-tree-view.c:561
 msgid "Saving"
 msgstr "保存"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
 msgstr "隐藏附件栏(_B)"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:106
+#: ../widgets/misc/e-attachment-paned.c:719
 msgid "Show Attachment _Bar"
 msgstr "显示附件栏(_B)"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:430
 msgid "Add Attachment"
 msgstr "添加附件"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:433
 msgid "A_ttach"
 msgstr "附件(_T)"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:496
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "保存附件"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment-view.c:404
+#: ../widgets/misc/e-attachment-view.c:379
 msgid "Open With Other Application..."
 msgstr "用其他应用程序打开..."
 
-#: ../widgets/misc/e-attachment-view.c:411
+#: ../widgets/misc/e-attachment-view.c:386
 msgid "S_ave All"
 msgstr "全部保存(_A)"
 
-#: ../widgets/misc/e-attachment-view.c:437
+#: ../widgets/misc/e-attachment-view.c:412
 msgid "A_dd Attachment..."
 msgstr "添加附件(_D)..."
 
-#: ../widgets/misc/e-attachment-view.c:461
+#: ../widgets/misc/e-attachment-view.c:436
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../widgets/misc/e-attachment-view.c:468
+#: ../widgets/misc/e-attachment-view.c:443
 msgid "Hid_e All"
 msgstr "全部隐藏(_E)"
 
-#: ../widgets/misc/e-attachment-view.c:475
+#: ../widgets/misc/e-attachment-view.c:450
 msgid "_View Inline"
 msgstr "嵌入查看(_V)"
 
-#: ../widgets/misc/e-attachment-view.c:482
+#: ../widgets/misc/e-attachment-view.c:457
 msgid "Vie_w All Inline"
 msgstr "嵌入查看(_W)"
 
-#: ../widgets/misc/e-attachment-view.c:803
+#: ../widgets/misc/e-attachment-view.c:778
 #, c-format
 msgid "Open With \"%s\""
 msgstr "使用“%s”打开"
 
-#: ../widgets/misc/e-attachment-view.c:806
+#: ../widgets/misc/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "在 %s 中打开附件"
 
-#. 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:998
-msgid "Attached message"
-msgstr "附加的信息"
-
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
-msgid "A load operation is already in progress"
-msgstr "一个已经加载的操作正在进行"
-
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
-msgid "A save operation is already in progress"
-msgstr "个已经保存的操作正在进行"
-
-#: ../widgets/misc/e-attachment.c:1953
-#, c-format
-msgid "Could not load '%s'"
-msgstr "不能加载“%s”"
-
-#: ../widgets/misc/e-attachment.c:1956
-#, c-format
-msgid "Could not load the attachment"
-msgstr "不能加载附件"
-
-#: ../widgets/misc/e-attachment.c:2232
-#, c-format
-msgid "Could not open '%s'"
-msgstr "不能打开“%s”"
-
-#: ../widgets/misc/e-attachment.c:2235
-#, c-format
-msgid "Could not open the attachment"
-msgstr "不能打开附件"
-
-#: ../widgets/misc/e-attachment.c:2670
-msgid "Attachment contents not loaded"
-msgstr "附件内容未载入"
-
-#: ../widgets/misc/e-attachment.c:2746
-#, c-format
-msgid "Could not save '%s'"
-msgstr "不能保存“%s”"
-
-#: ../widgets/misc/e-attachment.c:2749
-#, c-format
-msgid "Could not save the attachment"
-msgstr "无法保存附件"
-
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl 加单击来打开一个链接"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
-msgid "%B %Y"
-msgstr "%Y年%B"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "月历"
 
-#: ../widgets/misc/e-charset-combo-box.c:96
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1269
+msgid "%B %Y"
+msgstr "%Y年%B"
+
+#: ../widgets/misc/e-charset-combo-box.c:100
 msgid "Character Encoding"
 msgstr "字符编码"
 
-#: ../widgets/misc/e-charset-combo-box.c:119
+#: ../widgets/misc/e-charset-combo-box.c:123
 msgid "Enter the character set to use"
 msgstr "输入要使用的字符集"
 
-#: ../widgets/misc/e-charset-combo-box.c:339
+#: ../widgets/misc/e-charset-combo-box.c:342
 msgid "Other..."
 msgstr "其它..."
 
-#: ../widgets/misc/e-contact-map-window.c:355
+#: ../widgets/misc/e-contact-map-window.c:359
 msgid "Contacts Map"
 msgstr "联系人地图"
 
-#: ../widgets/misc/e-dateedit.c:501
+#: ../widgets/misc/e-dateedit.c:504
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../widgets/misc/e-dateedit.c:522
+#: ../widgets/misc/e-dateedit.c:525
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:547
 msgid "Click this button to show a calendar"
 msgstr "单击此按钮可显示日历"
 
-#: ../widgets/misc/e-dateedit.c:591
+#: ../widgets/misc/e-dateedit.c:594
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../widgets/misc/e-dateedit.c:663
+#: ../widgets/misc/e-dateedit.c:666
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:669
+#: ../widgets/misc/e-dateedit.c:673
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:677
+#: ../widgets/misc/e-dateedit.c:682
 msgid "_None"
 msgstr "无(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1688 ../widgets/misc/e-dateedit.c:1921
+#: ../widgets/misc/e-dateedit.c:1694 ../widgets/misc/e-dateedit.c:1927
 msgctxt "date"
 msgid "None"
 msgstr "无"
 
-#: ../widgets/misc/e-dateedit.c:1815
+#: ../widgets/misc/e-dateedit.c:1821
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1859
+#: ../widgets/misc/e-dateedit.c:1865
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
-#: ../widgets/misc/e-import-assistant.c:249
+#: ../widgets/misc/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
 msgstr "选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
 
-#: ../widgets/misc/e-import-assistant.c:266
-msgid "F_ilename:"
-msgstr "文件名(_I):"
-
-#: ../widgets/misc/e-import-assistant.c:276
+#: ../widgets/misc/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: ../widgets/misc/e-import-assistant.c:290
-#: ../widgets/misc/e-import-assistant.c:465
+#: ../widgets/misc/e-import-assistant.c:297
+#: ../widgets/misc/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "文件类型(_T):"
 
-#: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:913
+#: ../widgets/misc/e-import-assistant.c:340
+#: ../widgets/misc/e-import-assistant.c:920
 msgid "Choose the destination for this import"
 msgstr "选择此导入的目的位置"
 
-#: ../widgets/misc/e-import-assistant.c:358
+#: ../widgets/misc/e-import-assistant.c:365
 msgid "Choose the type of importer to run:"
 msgstr "选择要运行的导入器类型:"
 
-#: ../widgets/misc/e-import-assistant.c:366
+#: ../widgets/misc/e-import-assistant.c:373
 msgid "Import data and settings from _older programs"
 msgstr "从旧版程序中导入数据和设置(_O)"
 
-#: ../widgets/misc/e-import-assistant.c:374
+#: ../widgets/misc/e-import-assistant.c:381
 msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:526
+#: ../widgets/misc/e-import-assistant.c:533
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -20079,37 +21551,37 @@ msgstr ""
 "现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:768
+#: ../widgets/misc/e-import-assistant.c:775
 msgid "_Cancel Import"
 msgstr "取消导入(_C)"
 
-#: ../widgets/misc/e-import-assistant.c:912
+#: ../widgets/misc/e-import-assistant.c:919
 msgid "Preview data to be imported"
 msgstr "预览要导入的信息"
 
-#: ../widgets/misc/e-import-assistant.c:918
-#: ../widgets/misc/e-import-assistant.c:931
-#: ../widgets/misc/e-import-assistant.c:1276
-#: ../widgets/misc/e-import-assistant.c:1352
-#: ../widgets/misc/e-import-assistant.c:1361
+#: ../widgets/misc/e-import-assistant.c:925
+#: ../widgets/misc/e-import-assistant.c:938
+#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1367
+#: ../widgets/misc/e-import-assistant.c:1376
 msgid "Import Data"
 msgstr "导入数据"
 
-#: ../widgets/misc/e-import-assistant.c:926
+#: ../widgets/misc/e-import-assistant.c:933
 msgid "Select what type of file you want to import from the list."
 msgstr "选择您想从列表导入的类型"
 
-#: ../widgets/misc/e-import-assistant.c:1266
-#: ../widgets/misc/e-import-assistant.c:1301
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1316
 msgid "Evolution Import Assistant"
 msgstr "Evolution 导入助手"
 
-#: ../widgets/misc/e-import-assistant.c:1283
-#: ../widgets/misc/e-import-assistant.c:1339
+#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1354
 msgid "Import Location"
 msgstr "导入位置"
 
-#: ../widgets/misc/e-import-assistant.c:1294
+#: ../widgets/misc/e-import-assistant.c:1309
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -20118,27 +21590,27 @@ msgstr ""
 "欢迎使用 Evolution 导入助手。\n"
 "本助手将全程指导您将外部文件导入 Evolution。"
 
-#: ../widgets/misc/e-import-assistant.c:1311
+#: ../widgets/misc/e-import-assistant.c:1326
 msgid "Importer Type"
 msgstr "导入器类型"
 
-#: ../widgets/misc/e-import-assistant.c:1321
+#: ../widgets/misc/e-import-assistant.c:1336
 msgid "Select Information to Import"
 msgstr "选择要导入的信息"
 
-#: ../widgets/misc/e-import-assistant.c:1330
+#: ../widgets/misc/e-import-assistant.c:1345
 msgid "Select a File"
 msgstr "选择一个文件"
 
-#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1362
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "单击“应用”以便开始将文件导入到 Evolution。"
 
-#: ../widgets/misc/e-map.c:883
+#: ../widgets/misc/e-map.c:886
 msgid "World Map"
 msgstr "世界地图"
 
-#: ../widgets/misc/e-map.c:886
+#: ../widgets/misc/e-map.c:889
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -20146,234 +21618,234 @@ msgstr ""
 "基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
 "区。"
 
-#: ../widgets/misc/e-online-button.c:27
+#: ../widgets/misc/e-online-button.c:31
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution 目前在线。单击该按钮可离线工作。"
 
-#: ../widgets/misc/e-online-button.c:30
+#: ../widgets/misc/e-online-button.c:34
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution 目前离线。单击该按钮可在线工作。"
 
-#: ../widgets/misc/e-online-button.c:33
+#: ../widgets/misc/e-online-button.c:37
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "因为网络不可用,所以 Evolution 目前离线。"
 
-#: ../widgets/misc/e-preferences-window.c:279
+#: ../widgets/misc/e-preferences-window.c:317
 msgid "Evolution Preferences"
 msgstr "Evolution 首选项"
 
-#: ../widgets/misc/e-search-bar.c:81
+#: ../widgets/misc/e-search-bar.c:85
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配:%d"
 
-#: ../widgets/misc/e-search-bar.c:563
+#: ../widgets/misc/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "关闭查找栏"
 
-#: ../widgets/misc/e-search-bar.c:571
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "查找(_D):"
 
-#: ../widgets/misc/e-search-bar.c:583
+#: ../widgets/misc/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "清除搜索"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../widgets/misc/e-search-bar.c:613
+#: ../widgets/misc/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "寻找该词句出现的前一个位置"
 
-#: ../widgets/misc/e-search-bar.c:626
+#: ../widgets/misc/e-search-bar.c:629
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../widgets/misc/e-search-bar.c:632
+#: ../widgets/misc/e-search-bar.c:635
 msgid "Find the next occurrence of the phrase"
 msgstr "寻找该词句出现的下一个位置"
 
-#: ../widgets/misc/e-search-bar.c:645
+#: ../widgets/misc/e-search-bar.c:648
 msgid "Mat_ch case"
 msgstr "大小写匹配(_C)"
 
-#: ../widgets/misc/e-search-bar.c:673
+#: ../widgets/misc/e-search-bar.c:676
 msgid "Reached bottom of page, continued from top"
 msgstr "到达页面底部,移到顶部继续"
 
-#: ../widgets/misc/e-search-bar.c:695
+#: ../widgets/misc/e-search-bar.c:698
 msgid "Reached top of page, continued from bottom"
 msgstr "到达页面顶部,移到底部继续"
 
-#: ../widgets/misc/e-send-options.c:552
+#: ../widgets/misc/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "删除时(_L):"
 
-#: ../widgets/misc/e-send-options.ui.h:1
-msgid "A_uto-delete sent item"
-msgstr "自动删除已发项目(_U)"
-
 #: ../widgets/misc/e-send-options.ui.h:3
-msgid "Creat_e a sent item to track information"
-msgstr "创建一个已发送项以跟踪信息(_E)"
-
-#: ../widgets/misc/e-send-options.ui.h:4
-msgid "Deli_vered and opened"
-msgstr "已发送和已打开(_V)"
-
-#: ../widgets/misc/e-send-options.ui.h:5
-msgid "Delivery Options"
-msgstr "发送选项"
+msgid "Standard"
+msgstr "标准"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "直到(_U)"
-
-#: ../widgets/misc/e-send-options.ui.h:7
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "经过(_A)"
+msgid "Proprietary"
+msgstr "优先级"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "天"
+msgid "Secret"
+msgstr "机密"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "少于(_T)"
+msgid "Top Secret"
+msgstr "绝密"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "天"
-
-#: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
 msgstr "独家"
 
+#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:12
-msgid "Gene_ral Options"
-msgstr "常规选项(_R)"
+msgctxt "send-options"
+msgid "None"
+msgstr "无"
 
-#: ../widgets/misc/e-send-options.ui.h:15
+#: ../widgets/misc/e-send-options.ui.h:13
 msgid "Mail Receipt"
 msgstr "已读回执"
 
+#: ../widgets/misc/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "请求回复(_E)"
+
+#: ../widgets/misc/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "少于(_T)"
+
 #: ../widgets/misc/e-send-options.ui.h:17
-msgid "Proprietary"
-msgstr "优先级"
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
 
 #: ../widgets/misc/e-send-options.ui.h:18
-msgid "R_eply requested"
-msgstr "请求回复(_E)"
+msgid "_When convenient"
+msgstr "方便时(_W)"
 
 #: ../widgets/misc/e-send-options.ui.h:20
-msgid "Return Notification"
-msgstr "返回通知"
+msgid "_Delay message delivery"
+msgstr "推迟信息投递(_D)"
 
 #: ../widgets/misc/e-send-options.ui.h:21
-msgid "Secret"
-msgstr "机密"
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "经过(_A)"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
 
 #: ../widgets/misc/e-send-options.ui.h:23
-msgid "Sta_tus Tracking"
-msgstr "状态跟踪(_T)"
+msgid "_Set expiration date"
+msgstr "设置过期时间(_S)"
 
 #: ../widgets/misc/e-send-options.ui.h:24
-msgid "Standard"
-msgstr "标准"
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "直到(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:25
-msgid "Status Tracking"
-msgstr "状态跟踪"
+msgid "Delivery Options"
+msgstr "发送选项"
 
-#: ../widgets/misc/e-send-options.ui.h:26
-msgid "Top Secret"
-msgstr "绝密"
+#: ../widgets/misc/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "分类(_C):"
 
 #: ../widgets/misc/e-send-options.ui.h:28
-msgid "When acce_pted:"
-msgstr "接受时(_P):"
+msgid "Gene_ral Options"
+msgstr "常规选项(_R)"
 
 #: ../widgets/misc/e-send-options.ui.h:29
-msgid "When co_mpleted:"
-msgstr "完成时(_M):"
+msgid "Creat_e a sent item to track information"
+msgstr "创建一个已发送项以跟踪信息(_E)"
 
 #: ../widgets/misc/e-send-options.ui.h:30
-msgid "When decli_ned:"
-msgstr "拒绝时(_N):"
+msgid "_Delivered"
+msgstr "已投递(_D)"
 
 #: ../widgets/misc/e-send-options.ui.h:31
-msgid "_All information"
-msgstr "全部信息(_A)"
+msgid "Deli_vered and opened"
+msgstr "已发送和已打开(_V)"
 
 #: ../widgets/misc/e-send-options.ui.h:32
-msgid "_Classification:"
-msgstr "分类(_C):"
+msgid "_All information"
+msgstr "全部信息(_A)"
 
 #: ../widgets/misc/e-send-options.ui.h:33
-msgid "_Delay message delivery"
-msgstr "推迟信息投递(_D)"
+msgid "A_uto-delete sent item"
+msgstr "自动删除已发项目(_U)"
 
 #: ../widgets/misc/e-send-options.ui.h:34
-msgid "_Delivered"
-msgstr "已投递(_D)"
+msgid "Status Tracking"
+msgstr "状态跟踪"
+
+#: ../widgets/misc/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "打开时(_W):"
 
 #: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Set expiration date"
-msgstr "设置过期时间(_S)"
+msgid "When decli_ned:"
+msgstr "拒绝时(_N):"
 
 #: ../widgets/misc/e-send-options.ui.h:37
-msgid "_When convenient"
-msgstr "方便时(_W)"
+msgid "When co_mpleted:"
+msgstr "完成时(_M):"
 
 #: ../widgets/misc/e-send-options.ui.h:38
-msgid "_When opened:"
-msgstr "打开时(_W):"
+msgid "When acce_pted:"
+msgstr "接受时(_P):"
+
+#: ../widgets/misc/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "返回通知"
 
-#. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-msgctxt "send-options"
-msgid "None"
-msgstr "无"
+msgid "Sta_tus Tracking"
+msgstr "状态跟踪(_T)"
 
-#: ../widgets/misc/e-signature-editor.c:138
-#: ../widgets/misc/e-signature-editor.c:564
-#: ../widgets/misc/e-signature-manager.c:372
-#: ../widgets/misc/e-signature-script-dialog.c:219
+#: ../widgets/misc/e-signature-editor.c:142
+#: ../widgets/misc/e-signature-editor.c:567
+#: ../widgets/misc/e-signature-manager.c:376
+#: ../widgets/misc/e-signature-script-dialog.c:223
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../widgets/misc/e-signature-editor.c:214
+#: ../widgets/misc/e-signature-editor.c:218
 msgid "_Save and Close"
 msgstr "保存并关闭(_S)"
 
-#: ../widgets/misc/e-signature-editor.c:431
+#: ../widgets/misc/e-signature-editor.c:434
 msgid "Edit Signature"
 msgstr "编辑签名"
 
-#: ../widgets/misc/e-signature-editor.c:446
+#: ../widgets/misc/e-signature-editor.c:449
 msgid "_Signature Name:"
 msgstr "签名(_S):"
 
-#: ../widgets/misc/e-signature-manager.c:317
+#: ../widgets/misc/e-signature-manager.c:321
 msgid "Add Signature Script"
 msgstr "添加签名脚本"
 
-#: ../widgets/misc/e-signature-manager.c:382
+#: ../widgets/misc/e-signature-manager.c:386
 msgid "Edit Signature Script"
 msgstr "编辑签名脚本"
 
-#: ../widgets/misc/e-signature-manager.c:602
+#: ../widgets/misc/e-signature-manager.c:605
 msgid "Add _Script"
 msgstr "添加脚本(_S)"
 
-#: ../widgets/misc/e-signature-script-dialog.c:268
+#: ../widgets/misc/e-signature-script-dialog.c:270
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -20382,11 +21854,11 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: ../widgets/misc/e-signature-script-dialog.c:313
+#: ../widgets/misc/e-signature-script-dialog.c:315
 msgid "S_cript:"
 msgstr "脚本(_C):"
 
-#: ../widgets/misc/e-signature-script-dialog.c:344
+#: ../widgets/misc/e-signature-script-dialog.c:346
 msgid "Script file must be executable."
 msgstr "脚本文件必须可执行。"
 
@@ -20422,39 +21894,25 @@ msgstr "复制图像(_C)"
 msgid "Copy the image to the clipboard"
 msgstr "将图像复制到剪贴板"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1338
 msgid "Select all text and images"
 msgstr "选中全部文本和图像"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1002 ../widgets/misc/e-web-view.c:1004
+#: ../widgets/misc/e-web-view.c:1006
 #, c-format
 msgid "Click to call %s"
 msgstr "单击以呼叫 %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1008
 msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1010
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../widgets/misc/ea-calendar-item.c:306
-#: ../widgets/misc/ea-calendar-item.c:315
-msgid "%d %B %Y"
-msgstr "%Y年%-m月%-d日"
-
-#: ../widgets/misc/ea-calendar-item.c:318
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "日历:从 %s 到 %s"
-
-#: ../widgets/misc/ea-calendar-item.c:354
-msgid "evolution calendar item"
-msgstr "Evolution 日历项目"
-
 #: ../widgets/table/e-cell-combo.c:187
 msgid "popup list"
 msgstr "弹出列表"
@@ -20463,17 +21921,18 @@ msgstr "弹出列表"
 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:316
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../widgets/table/e-cell-date-edit.c:317
 msgctxt "table-date"
 msgid "None"
 msgstr "无"
 
-#: ../widgets/table/e-cell-date-edit.c:324
+#: ../widgets/table/e-cell-date-edit.c:325
 msgid "OK"
 msgstr "确定"
 
-#: ../widgets/table/e-cell-date-edit.c:868
+#: ../widgets/table/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "时间必须采用格式:%s"
@@ -20482,7 +21941,7 @@ msgstr "时间必须采用格式:%s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
 
-#: ../widgets/table/e-table-click-to-add.c:607
+#: ../widgets/table/e-table-click-to-add.c:610
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
@@ -20505,7 +21964,7 @@ msgid "No grouping"
 msgstr "未分组"
 
 #: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "Show Fields"
 msgstr "显示域"
 
@@ -20513,91 +21972,87 @@ msgstr "显示域"
 msgid "Available Fields"
 msgstr "可用域"
 
-#: ../widgets/table/e-table-config.ui.h:1
+#: ../widgets/table/e-table-config.ui.h:2
 msgid "A_vailable Fields:"
 msgstr "可用域(_V):"
 
-#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Ascending"
-msgstr "升序"
-
 #: ../widgets/table/e-table-config.ui.h:3
-msgid "Clear All"
-msgstr "全部清除"
+msgid "_Show these fields in order:"
+msgstr "按顺序显示这些域(_S):"
 
 #: ../widgets/table/e-table-config.ui.h:4
-msgid "Clear _All"
-msgstr "全部清除(_A)"
+msgid "Move _Up"
+msgstr "上移(_U)"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
-msgid "Descending"
-msgstr "降序"
+msgid "Move _Down"
+msgstr "下移(_D)"
 
-#: ../widgets/table/e-table-config.ui.h:8
-msgid "Group Items By"
-msgstr "分组依据"
+#: ../widgets/table/e-table-config.ui.h:7
+msgid "_Remove"
+msgstr "删除(_R)"
 
 #: ../widgets/table/e-table-config.ui.h:9
-msgid "Move _Down"
-msgstr "下移(_D)"
+msgid "_Show field in View"
+msgstr "在视图中显示域(_S)"
 
 #: ../widgets/table/e-table-config.ui.h:10
-msgid "Move _Up"
-msgstr "上移(_U)"
+#: ../widgets/table/e-table-header-item.c:1736
+msgid "Ascending"
+msgstr "升序"
+
+#: ../widgets/table/e-table-config.ui.h:11
+#: ../widgets/table/e-table-header-item.c:1736
+msgid "Descending"
+msgstr "降序"
 
 #: ../widgets/table/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "分组依据"
+
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show _field in View"
 msgstr "在视图中显示域(_F)"
 
-#: ../widgets/table/e-table-config.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "然后按"
+
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Show field i_n View"
 msgstr "在视图中显示域(_N)"
 
-#: ../widgets/table/e-table-config.ui.h:14
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Show field in _View"
 msgstr "在视图中显示域(_V)"
 
-#: ../widgets/table/e-table-config.ui.h:15
+#: ../widgets/table/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "排序"
 
-#: ../widgets/table/e-table-config.ui.h:16
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "Sort Items By"
 msgstr "排序依据"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Then By"
-msgstr "然后按"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "_Fields Shown..."
-msgstr "显示的域(_F)..."
-
 #: ../widgets/table/e-table-config.ui.h:20
-msgid "_Group By..."
-msgstr "分组依据(_G)..."
+msgid "Clear All"
+msgstr "全部清除"
 
 #: ../widgets/table/e-table-config.ui.h:21
-msgid "_Remove"
-msgstr "删除(_R)"
+msgid "_Sort..."
+msgstr "排序(_S)..."
 
 #: ../widgets/table/e-table-config.ui.h:22
-msgid "_Show field in View"
-msgstr "在视图中显示域(_S)"
+msgid "_Group By..."
+msgstr "分组依据(_G)..."
 
 #: ../widgets/table/e-table-config.ui.h:23
-msgid "_Show these fields in order:"
-msgstr "按顺序显示这些域(_S):"
-
-#: ../widgets/table/e-table-config.ui.h:24
-msgid "_Sort..."
-msgstr "排序(_S)..."
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:119
-msgid "Add a Column"
-msgstr "添加一列"
+msgid "_Fields Shown..."
+msgstr "显示的域(_F)..."
 
 #: ../widgets/table/e-table-field-chooser.c:153
 msgid ""
@@ -20605,6 +22060,10 @@ msgid ""
 "the location in which you want it to appear."
 msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
 
+#: ../widgets/table/e-table-field-chooser-dialog.c:224
+msgid "Add a Column"
+msgstr "添加一列"
+
 #. Translators: This text is used as a special row when an ETable
 #. * has turned on grouping on a column, which has set a title.
 #. * The first %s is replaced with a column title.
@@ -20630,63 +22089,67 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1574
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1605
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1608
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1615
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1619
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../widgets/table/e-table-header-item.c:1622
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../widgets/table/e-table-header-item.c:1625
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1629
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1674
+#: ../widgets/table/e-table-header-item.c:1691
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1692
+#: ../widgets/table/e-table-header-item.c:1709
 msgid "_Custom"
 msgstr "自定义(_C)"
 
+#: ../widgets/table/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "表格单元格"
+
 #. Translators: description of a "popup" action
 #: ../widgets/table/gal-a11y-e-cell-popup.c:125
 msgid "popup a child"
@@ -20707,26 +22170,134 @@ msgstr "在包含此单元格的 ETree 中展开行"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "在包含此单元格的 ETree 中折叠行"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "表格单元格"
-
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "单击"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:158
+#: ../widgets/table/gal-a11y-e-table-column-header.c:161
 msgid "sort"
 msgstr "排序"
 
-#: ../widgets/text/e-text.c:2327
+#: ../widgets/text/e-text.c:2338
 msgid "Select All"
 msgstr "全选"
 
-#: ../widgets/text/e-text.c:2339
+#: ../widgets/text/e-text.c:2351
 msgid "Input Methods"
 msgstr "输入法"
 
+#~| msgid "List of server URLs for free/busy publishing."
+#~ msgid "List of Destinations for publishing"
+#~ msgstr "发布目标位置列表"
+
+#~ msgid ""
+#~ "The key specifies the list of destinations to where publish calendars. "
+#~ "Each values specifies an XML with setup for publishing to one destination."
+#~ msgstr ""
+#~ "此键指定发布日历的目标位置的列表。每个值指定一个带有发布到某个目标位置的相"
+#~ "应设置的 XML 文件。"
+
+#~ msgid "Recent _Documents"
+#~ msgstr "最近文档(_D)"
+
+#~ msgid "Categor_ies..."
+#~ msgstr "类别(_I)..."
+
+#~ msgid "%A, %B %d, %Y"
+#~ msgstr "%Y年%m月%d日%A"
+
+#~ msgid "%a %m/%d/%Y"
+#~ msgstr "%Y年%m月%d日%A"
+
+#~ msgid "%m/%d/%Y"
+#~ msgstr "%Y-%m-%d"
+
+#~ msgid "never"
+#~ msgstr "从不"
+
+#~ msgid "Do you wish to overwrite it?"
+#~ msgstr "您打算覆盖它吗?"
+
+#~ msgid "File exists \"{0}\"."
+#~ msgstr "文件已存在“{0}”。"
+
+#~ msgid "GConf error: %s"
+#~ msgstr "GConf 错误:%s"
+
+#~ msgid "All further errors shown only on terminal."
+#~ msgstr "后续所有的错误都只显示在终端。"
+
+#~ msgctxt "mail-receiving"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid ""
+#~ "Please enter a descriptive name for this account below.\n"
+#~ "This name will be used for display purposes only."
+#~ msgstr ""
+#~ "请在下面的空白处输入此帐号的描述性名称。\n"
+#~ "此名称将只在显示时使用。"
+
+#~ msgid "Migrating..."
+#~ msgstr "正在升迁..."
+
+#~ msgid "Migration"
+#~ msgstr "迁移"
+
+#~ msgid "Migrating '%s':"
+#~ msgstr "升迁“%s”:"
+
+#~ msgid "Migrating Folders"
+#~ msgstr "迁移文件夹"
+
+#~ 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 正在升迁您的文件夹..."
+
+#~ msgid "C_haracter set:"
+#~ msgstr "字符集(_H):"
+
+#~ msgid ""
+#~ "A read receipt notification has been requested for \"{1}\". Send the "
+#~ "receipt notification to {0}?"
+#~ msgstr "“{1}”请求了阅读收条。将阅读收条发送给{0}吗?"
+
+#~ msgid "Read receipt requested."
+#~ msgstr "阅读收条已请求。"
+
+#~ msgid "_Send Receipt"
+#~ msgstr "发送已读回执(_S)"
+
+#~ msgid "cards"
+#~ msgstr "名片"
+
+#~ msgid "Import cancelled. Click \"Forward\" to continue."
+#~ msgstr "导入被取消。点击“前进”继续"
+
+#~ msgid "Import complete. Click \"Forward\" to continue."
+#~ msgstr "导入已完成。点击“前进”继续"
+
+#~ msgid "File _name:"
+#~ msgstr "文件名(_N):"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Send the debugging output of all components to a file."
+#~ msgstr "把所有成员的调试输出发送到一个文件中。"
+
+#~ msgid "Protocol"
+#~ msgstr "协议"
+
+#~ msgid "_Filename:"
+#~ msgstr "文件名(_F):"
+
 #~ msgid "Invalid object"
 #~ msgstr "无效的对象"
 
@@ -20789,9 +22360,6 @@ msgstr "输入法"
 #~ msgid "Anjal email client"
 #~ msgstr "Anjal 邮件客户端"
 
-#~ msgid "Opening folder '%s'"
-#~ msgstr "打开文件夹 %s"
-
 #~ msgid "Please select a folder from the current account."
 #~ msgstr "请从当前帐号选择一个文件夹。"
 
@@ -21101,9 +22669,6 @@ msgstr "输入法"
 #~ msgid "Read items marked _private"
 #~ msgstr "读取标为私有的项目(_P)"
 
-#~ msgid "Subscribe to my _alarms"
-#~ msgstr "订阅我的提醒(_A)"
-
 #~ msgid "Subscribe to my _notifications"
 #~ msgstr "订阅我的通知(_N)"
 
@@ -21192,18 +22757,6 @@ msgstr "输入法"
 #~ msgid "Undelivered: "
 #~ msgstr "未投递:"
 
-#~ msgid "Enable D-Bus messages."
-#~ msgstr "启用 D-Bus 信息。"
-
-#~ msgid "Generates a D-Bus message when new mail messages arrive."
-#~ msgstr "新邮件到达时生成 D-Bus 信息。"
-
-#~ msgid "Popup message together with the icon."
-#~ msgstr "同时弹出信息和图标。"
-
-#~ msgid "Whether show message over the icon when new messages arrive."
-#~ msgstr "新邮件到达时是否在图标上显示信息"
-
 #~ msgid "Show icon in _notification area"
 #~ msgstr "在通知区显示图标(_N)"
 
@@ -21539,12 +23092,6 @@ msgstr "输入法"
 #~ msgid "The attachment has no viewable calendar items"
 #~ msgstr "附件中没有可查看的日历项目"
 
-#~ msgid "Update complete\n"
-#~ msgstr "更新完成\n"
-
-#~ msgid "Object is invalid and cannot be updated\n"
-#~ msgstr "对象无效,无法更新\n"
-
 #~ msgid "This response is not from a current attendee.  Add as an attendee?"
 #~ msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
 
@@ -22044,9 +23591,6 @@ msgstr "输入法"
 #~ msgid "Could not cancel"
 #~ msgstr "无法取消"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "认证失败"
-
 #~ msgid "Authentication Required"
 #~ msgstr "必须认证"
 
@@ -22424,10 +23968,6 @@ msgstr "输入法"
 #~ msgstr "默认邮件客户端"
 
 #, fuzzy
-#~ msgid "The registry of memo lists"
-#~ msgstr "打印备忘列表"
-
-#, fuzzy
 #~ msgid "The memo table model"
 #~ msgstr "表格模型"
 
@@ -22436,10 +23976,6 @@ msgstr "输入法"
 #~ msgstr "默认邮件客户端"
 
 #, fuzzy
-#~ msgid "The registry of task lists"
-#~ msgstr "打印任务列表"
-
-#, fuzzy
 #~ msgid "The task table model"
 #~ msgstr "表格模型"
 
@@ -22493,11 +24029,6 @@ msgstr "输入法"
 #~ "Hide deleted messages rather than displaying them with a line through them"
 #~ msgstr "隐藏已删除的信息而不是在上面显示一条线"
 
-#~ msgid ""
-#~ "List of clues for the attachment reminder plugin to look for in a message "
-#~ "body."
-#~ msgstr "信息主体中的用于附件提醒插件的线索列表。"
-
 #~ msgid "Check whether Evolution is the default mail client on startup."
 #~ msgstr "在启动时检查 Evolution 是不是默认的邮件客户端。"
 
@@ -22761,10 +24292,6 @@ msgstr "输入法"
 #~ msgid "Horizontal Position"
 #~ msgstr "水平面板位置"
 
-#, fuzzy
-#~ msgid "Vertical Position"
-#~ msgstr "竖直面板的位置"
-
 #~| msgid "Position"
 #~ msgid "Proportion"
 #~ msgstr "位置"
@@ -22803,9 +24330,6 @@ msgstr "输入法"
 #~ msgid "Focused Column"
 #~ msgstr "聚焦列"
 
-#~ msgid "Unselected Column"
-#~ msgstr "未选列"
-
 #~ msgid "Strikeout Column"
 #~ msgstr "给列加删除线"
 


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