[evolution] Update Chinese simplified translation



commit 4fafc3ce04108177298acc6222d39858235223ac
Author: 甘露(Gan  Lu) <rhythm gan gmail com>
Date:   Sat Nov 23 20:57:38 2013 +0800

    Update Chinese simplified translation

 po/zh_CN.po |12618 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 6420 insertions(+), 6198 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1371893..2d9f3c9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,25 +12,27 @@
 # Aron Xu <aronxu gnome org>, 2010.
 # du baodao <centerpoint 139 com>, 2010.
 # Tao Wang <dancefire gmail com>, 2010.
-# 李炜 <lw124124 gmail com>, 2011.
+#  李炜 <lw124124 gmail com>, 2011.
 # Wylmer Wang <wantinghard gmail com>, 2011,2012.
 # tuhaihe <1132321739qq gmail com>, 2012.
+#  甘露(Gan Lu) <rhythm gan gmail com>,2013
 #
-#: ../shell/main.c:568
+#: ../shell/main.c:555
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-08-03 15:40+0000\n"
-"PO-Revision-Date: 2012-05-22 22:03+0800\n"
-"Last-Translator: tuhaihe <1132321739qq gmail com>\n"
+"POT-Creation-Date: 2013-11-22 18:19+0000\n"
+"PO-Revision-Date: 2013-09-15 20:43+0700\n"
+"Last-Translator: 甘露(Gan Lu) <rhythm gan 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"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -98,7 +100,6 @@ msgid "Do _Not Delete"
 msgstr "不删除(_N)"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#| msgid "Delete address book '{0}'?"
 msgid "Delete remote address book &quot;{0}&quot;?"
 msgstr "删除远程地址簿“{0}”吗?"
 
@@ -109,8 +110,7 @@ msgid ""
 msgstr "这将从服务器永久删除地址簿“{0}”。您确定要继续吗?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:68
-#| msgid "Delegated From"
+#: ../calendar/calendar.error.xml.h:61
 msgid "_Delete From Server"
 msgstr "从服务器删除(_D)"
 
@@ -119,8 +119,9 @@ msgid "Category editor not available."
 msgstr "类别编辑器不可用。"
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "无法打开地址簿"
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "无法打开地址簿 '{0}'"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
@@ -178,83 +179,85 @@ msgid "Error saving {0} to {1}: {2}"
 msgstr "将{0}保存到 {1} 出错:{2}"
 
 #: ../addressbook/addressbook.error.xml.h:31
-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:33
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-
-#: ../addressbook/addressbook.error.xml.h:34
 msgid "Address '{0}' already exists."
 msgstr "地址“{0}”已经存在。"
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:32
 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:36
-#: ../mail/em-vfolder-editor-rule.c:388 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:33
+#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:393
+#: ../modules/mail/em-composer-prefs.c:444
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Some addresses already exist in this contact list."
 msgstr "有些地址已经在此联系人列表中。"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:35
 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:39
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Skip duplicates"
 msgstr "跳过重复"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Add with duplicates"
 msgstr "重复添加"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "List '{0}' is already in this contact list."
 msgstr "列表“{0}”已在联系人列表中。"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:39
 msgid ""
 "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:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
 msgid "Failed to delete contact"
 msgstr "删除联系人失败"
 
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "您没有足够的权限从地址簿中删除联系人。"
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "Cannot add new contact"
 msgstr "无法添加新联系人"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:44
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
 msgstr ""
 "“{0}”是只读的地址簿,无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
 
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "Cannot save a contact, address book is still opening"
+msgstr "无法保存联系人,地址簿仍在打开中"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:47
+msgid ""
+"Cannot save a contact to the address book '{0}', because it is still "
+"opening. Either wait till it's opened, or select a different address book."
+msgstr "无法将联系人保存到地址簿“{0}”,因为它仍在打开。请等待它打开,或选择其他地址簿。"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:651
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:673
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2954
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -278,7 +281,7 @@ 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
+#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
@@ -291,11 +294,10 @@ 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:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
+#: ../addressbook/gui/widgets/eab-contact-merging.c:409
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
 msgid "Email"
 msgstr "电子邮件"
 
@@ -308,7 +310,7 @@ msgid "Instant Messaging"
 msgstr "即时通讯"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:1003
 msgid "Contact"
 msgstr "联系人"
 
@@ -317,9 +319,9 @@ msgid "_Home Page:"
 msgstr "主页(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1819
+#: ../modules/itip-formatter/itip-view.c:1885
 msgid "_Calendar:"
 msgstr "日历(_C):"
 
@@ -336,7 +338,7 @@ msgid "Home Page:"
 msgstr "主页:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:98
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "日历:"
 
@@ -370,9 +372,9 @@ msgid "_Profession:"
 msgstr "职业(_P):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgctxt "Job"
 msgid "_Title:"
-msgstr "头衔(_T):"
+msgstr "职位头衔(_T):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Company:"
@@ -411,8 +413,8 @@ msgid "_Anniversary:"
 msgstr "周年(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
-#: ../calendar/gui/e-calendar-view.c:2150
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../calendar/gui/e-calendar-view.c:2278
 msgid "Anniversary"
 msgstr "纪念日"
 
@@ -422,14 +424,12 @@ msgstr "纪念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:131
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
 msgid "Birthday"
 msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
-#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 msgid "Miscellaneous"
 msgstr "杂项"
 
@@ -462,27 +462,28 @@ msgid "_Address:"
 msgstr "地址(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:357
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 msgid "Home"
 msgstr "家庭"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/e-contact-map.c:385
+#: ../addressbook/gui/widgets/eab-contact-display.c:354
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
 msgid "Work"
 msgstr "工作"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
-#: ../calendar/gui/e-cal-model.c:3564
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
+#: ../calendar/gui/e-cal-model.c:3958
 msgid "Other"
 msgstr "其它"
 
@@ -494,79 +495,79 @@ msgstr "邮政地址"
 msgid "Notes"
 msgstr "笔记"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "Twitter"
 msgstr "Twitter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:505
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error modifying contact"
 msgstr "修改联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:667
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2948
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3481
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3482
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3840
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -574,48 +575,48 @@ msgstr ""
 "联系人数据无效:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3846
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3854
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "“%s”不能是未来的日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3875
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3889
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3904
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
 msgid "E_mail"
 msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
 msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
@@ -672,6 +673,11 @@ msgstr "全名"
 msgid "_First:"
 msgstr "姓(_F):"
 
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "头衔(_T):"
+
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "中间名(_M):"
@@ -685,7 +691,7 @@ msgid "_Suffix:"
 msgstr "后缀(_S):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
@@ -721,52 +727,52 @@ msgstr "从地址簿中插入电子邮件地址"
 msgid "_Select..."
 msgstr "选择(_S)..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:943
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "成员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "复制检测到的联系人"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/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
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:4
 msgid "Conflicting Contact:"
 msgstr "冲突的联系人:"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:5
 msgid "Changed Contact:"
 msgstr "更改了的联系人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:342
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:364
 msgid "_Merge"
 msgstr "合并(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:3
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -774,363 +780,114 @@ msgstr ""
 "此联系人的姓名或地址已经在本文件夹中存在了。\n"
 "您一定要添加吗?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:5
 msgid "Original Contact:"
 msgstr "原联系人:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:6
 msgid "New Contact:"
 msgstr "新联系人:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:324
+#: ../addressbook/gui/widgets/eab-contact-merging.c:244
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:346
 msgid "Merge Contact"
 msgstr "合并联系人"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Name contains"
 msgstr "姓名含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1144
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../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:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../modules/calendar/e-cal-shell-view-actions.c:1771
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Any field contains"
 msgstr "任何域含有"
 
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
-msgid "evolution address book"
-msgstr "evolution 地址簿"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
-msgid "Copy _Email Address"
-msgstr "复制电子邮件地址(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:429
-msgid "Copy the email address to the clipboard"
-msgstr "复制电子邮件地址到剪贴板"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:305 ../widgets/misc/e-web-view-gtkhtml.c:434
-msgid "_Send New Message To..."
-msgstr "把新信息发送到(_S)..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:307 ../widgets/misc/e-web-view-gtkhtml.c:436
-msgid "Send a mail message to this address"
-msgstr "发送一个邮件信息到这个地址"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1088 ../widgets/misc/e-web-view-gtkhtml.c:973
-#, c-format
-msgid "Click to mail %s"
-msgstr "单击以给 %s 发送邮件"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
-msgid "Open map"
-msgstr "打开地图"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
-msgid "List Members:"
-msgstr "列出成员:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Nickname"
-msgstr "昵称"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Company"
-msgstr "公司"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Department"
-msgstr "部门"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
-msgid "Profession"
-msgstr "职业"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
-msgid "Position"
-msgstr "位置"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Manager"
-msgstr "经理"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Assistant"
-msgstr "助手"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-msgid "Video Chat"
-msgstr "视频聊天"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:631
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#: ../widgets/misc/e-send-options.c:546
-msgid "Calendar"
-msgstr "日历"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../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-formatter.c:675
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-msgid "Phone"
-msgstr "电话"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-msgid "Fax"
-msgstr "传真"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Address"
-msgstr "地址"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Home Page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Web Log"
-msgstr "Web 日志"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "移动电话"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Spouse"
-msgstr "配偶"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
-msgid "Personal"
-msgstr "个人"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Note"
-msgstr "注释"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
-msgid "List Members"
-msgstr "列出成员"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
-msgid "Job Title"
-msgstr "职称"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
-msgid "Home page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-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:143
-#, 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:156
-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:165
-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:173
-msgid "Detailed error message:"
-msgstr "详细错误信息:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-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:217
-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:225
-#, 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:230
-#, 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:236
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#, 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:264
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
-msgid "Select Address Book"
-msgstr "选择地址簿"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "list"
-msgstr "列表"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contact to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contact to"
-msgstr "将联系人复制到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Move contacts to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
-msgid "Copy contacts to"
-msgstr "将联系人复制到"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:164
+#: ../addressbook/gui/widgets/e-addressbook-model.c:163
 msgid "No contacts"
 msgstr "无联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:168
+#: ../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:371
+#: ../addressbook/gui/widgets/e-addressbook-model.c:373
 msgid "Error getting book view"
 msgstr "获取名簿视图出错"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:805
+#: ../addressbook/gui/widgets/e-addressbook-model.c:820
 msgid "Search Interrupted"
 msgstr "搜索中断了"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "将选联系人剪切到剪贴板"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "将选中联系人复制到剪贴板"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "从剪贴板中粘贴联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:668
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "选中全部可见联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "您确定要删除这些联系人列表吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete this contact list?"
 msgstr "您确定要删除这些联系人列表吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "您确定要删除联系人列表(%s)吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete these contacts?"
 msgstr "您确定要删除这些联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 msgid "Are you sure you want to delete this contact?"
 msgstr "您确定要删除这些联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 #, 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:1490
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1142,11 +899,11 @@ msgstr[0] ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "_Don't Display"
 msgstr "不显示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
 msgid "Display _All Contacts"
 msgstr "显示全部联系人(_A)"
 
@@ -1162,6 +919,11 @@ msgstr "名"
 msgid "Family Name"
 msgstr "姓"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+msgid "Nickname"
+msgstr "昵称"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "电子邮件 2"
@@ -1214,6 +976,11 @@ msgstr "家庭传真"
 msgid "ISDN Phone"
 msgstr "ISDN 电话"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+msgid "Mobile Phone"
+msgstr "移动电话"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "其它电话"
@@ -1248,6 +1015,11 @@ msgstr "电传"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+msgid "Company"
+msgstr "公司"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "单位"
@@ -1261,11 +1033,21 @@ msgid "Title"
 msgstr "头衔"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:657
+#: ../calendar/gui/e-meeting-list-view.c:667
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+msgid "Manager"
+msgstr "经理"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+msgid "Assistant"
+msgstr "助手"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "网站"
@@ -1278,54 +1060,25 @@ msgstr "日记"
 #: ../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
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 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:93
-msgid "Work Email"
-msgstr "工作电子邮件"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+msgid "Spouse"
+msgstr "配偶"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "家庭电子邮件"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
+msgid "Note"
+msgstr "注释"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:775
-msgid "Other Email"
-msgstr "其它电子邮件"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:374
+msgid "Contacts Map"
+msgstr "联系人地图"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1335,7 +1088,7 @@ msgstr ""
 "\n"
 "正在搜索联系人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1349,7 +1102,7 @@ msgstr ""
 "\n"
 "或在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1363,7 +1116,7 @@ msgstr ""
 "\n"
 "请在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1373,7 +1126,7 @@ msgstr ""
 "\n"
 "搜索联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1383,138 +1136,374 @@ msgstr ""
 "\n"
 "本视图中没有可显示的项。"
 
-#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
-msgid "Card View"
-msgstr "名片视图"
+#: ../addressbook/gui/widgets/e-minicard.c:93
+msgid "Work Email"
+msgstr "工作电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:94
+msgid "Home Email"
+msgstr "家庭电子邮件"
+
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
+msgid "Other Email"
+msgstr "其它电子邮件"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+msgid "evolution address book"
+msgstr "evolution 地址簿"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:544
-#: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:939
-#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
+#: ../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:177
+#, 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:160
+msgid "Contact List: "
+msgstr "联系人列表:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:161
+msgid "Contact: "
+msgstr "联系人:"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:188
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:150
+msgid "Copy _Email Address"
+msgstr "复制电子邮件地址(_E)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "复制电子邮件地址到剪贴板"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "把新信息发送到(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "发送一个邮件信息到这个地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:291
+#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:990
+#, c-format
+msgid "Click to mail %s"
+msgstr "单击以给 %s 发送邮件"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+msgid "Open map"
+msgstr "打开地图"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+msgid "List Members:"
+msgstr "列出成员:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+msgid "Department"
+msgstr "部门"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+msgid "Profession"
+msgstr "职业"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+msgid "Position"
+msgstr "位置"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+msgid "Video Chat"
+msgstr "视频聊天"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:591
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "日历"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "忙/闲"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "Phone"
+msgstr "电话"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+msgid "Fax"
+msgstr "传真"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+msgid "Home Page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+msgid "Web Log"
+msgstr "Web 日志"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+msgid "Personal"
+msgstr "个人"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
+msgid "List Members"
+msgstr "列出成员"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
+msgid "Job Title"
+msgstr "职称"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
+msgid "Home page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:123
+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:142
+#, 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:155
+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:164
+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:174
+msgid "Detailed error message:"
+msgstr "详细错误信息:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:213
+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:220
+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:228
+#, 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:233
+#, 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:239
+#: ../addressbook/gui/widgets/eab-gui-util.c:245
+#, 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:267
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+msgid "Select Address Book"
+msgstr "选择地址簿"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:400
+msgid "list"
+msgstr "列表"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Move contact to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:591
+msgid "Copy contact to"
+msgstr "将联系人复制到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Move contacts to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
+msgid "Copy contacts to"
+msgstr "将联系人复制到"
+
+#: ../addressbook/importers/evolution-csv-importer.c:747
+#: ../addressbook/importers/evolution-ldif-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:281
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Outlook 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1083
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Outlook 联系人 CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozilla 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1092
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilla 联系人 CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1102
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolution 联系人 CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1103
+#: ../addressbook/importers/evolution-csv-importer.c:1101
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolution 联系人 CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:805
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 数据交换格式(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:808
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:666
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:668
+#: ../addressbook/importers/evolution-vcard-importer.c:667
 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:717
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 页"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "OUTPUTFILE"
 msgstr "输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "List local address book folders"
 msgstr "列出本地地址簿文件夹"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:68
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "Show cards as vcard or csv file"
 msgstr "将名片显示为 vcard 还是 csv 文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:69
+#: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:72
-msgid "Export in asynchronous mode"
-msgstr "以异步模式导出"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:75
-msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
-msgstr "异步模式中一个输出文件中的名片数,默认大小为 100。"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:77
-msgid "NUMBER"
-msgstr "数字"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:149
+#: ../addressbook/tools/evolution-addressbook-export.c:134
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "命令行参数错误,请使用 --help 选项查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:148
 msgid "Only support csv or vcard format."
 msgstr "仅支持 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:172
-msgid "In async mode, output must be file."
-msgstr "在异步模式中,输出必须是文件。"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:180
-msgid "In normal mode, there is no need for the size option."
-msgstr "在普通模式中,不应该有大小选项。"
-
-#: ../addressbook/tools/evolution-addressbook-export.c:213
+#: ../addressbook/tools/evolution-addressbook-export.c:179
 msgid "Unhandled error"
 msgstr "未处理的错误"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:653
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:688
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
 msgid "Can not open file"
 msgstr "无法打开文件"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:74
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "打开客户端“%s”失败:%s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
@@ -1522,13 +1511,13 @@ 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:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:344
 msgid "Start time"
 msgstr "开始时间"
 
@@ -1544,17 +1533,16 @@ msgstr "全部错过(_A)"
 msgid "_Snooze"
 msgstr "午睡(_S)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
 msgid "_Dismiss"
 msgstr "错过(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1755
-#: ../calendar/alarm-notify/alarm-queue.c:1765
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1446
-#: ../modules/itip-formatter/itip-view.c:1546
+#: ../calendar/alarm-notify/alarm-queue.c:1836
+#: ../calendar/alarm-notify/alarm-queue.c:1846
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:206
+#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:1608
 msgid "Location:"
 msgstr "位置:"
 
@@ -1569,68 +1557,59 @@ 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 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 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 ../filter/filter.ui.h:7
-#: ../widgets/misc/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 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 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "分钟"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1604
-#: ../calendar/alarm-notify/alarm-queue.c:1736
+#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1816
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1613
-#: ../calendar/alarm-notify/alarm-queue.c:1615
+#: ../calendar/alarm-notify/alarm-queue.c:1688
+#: ../calendar/alarm-notify/alarm-queue.c:1690
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1669
+#: ../calendar/alarm-notify/alarm-queue.c:1703
+#: ../calendar/alarm-notify/alarm-queue.c:1807
+#: ../calendar/alarm-notify/alarm-queue.c:2148
+msgid "Evolution Reminders"
+msgstr "Evolution 提醒器"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1747
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 条提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1865
-#: ../calendar/alarm-notify/alarm-queue.c:1900
+#: ../calendar/alarm-notify/alarm-queue.c:1966
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1869
-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/alarm-notify/alarm-queue.c:1906
+#: ../calendar/alarm-notify/alarm-queue.c:1972
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1646,7 +1625,7 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1921
+#: ../calendar/alarm-notify/alarm-queue.c:1987
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
@@ -1699,7 +1678,7 @@ msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗?"
@@ -1716,7 +1695,7 @@ msgid ""
 msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗?"
@@ -1736,7 +1715,7 @@ msgid ""
 msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "您确信您要删除该备忘吗?"
@@ -1809,14 +1788,14 @@ msgid "You have changed this meeting, but not yet saved it."
 msgstr "您已经对此会议做出了更改,但尚未保存。"
 
 #: ../calendar/calendar.error.xml.h:30
+msgid "_Save Changes"
+msgstr "保存更改(_S)"
+
+#: ../calendar/calendar.error.xml.h:31
 #: ../composer/mail-composer.error.xml.h:16
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:31
-msgid "_Save Changes"
-msgstr "保存更改(_S)"
-
 #: ../calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗?"
@@ -1886,8 +1865,7 @@ msgid ""
 "loss of these attachments."
 msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3054
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -1912,229 +1890,217 @@ msgid ""
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
 #: ../calendar/calendar.error.xml.h:52
-msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution 任务异常退出。"
-
-#: ../calendar/calendar.error.xml.h:53
-msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-
-#: ../calendar/calendar.error.xml.h:54
-msgid "The Evolution calendar has 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: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 calendars have quit unexpectedly."
-msgstr "Evolution 日历异常退出。"
-
-#: ../calendar/calendar.error.xml.h:59
 msgid "Editor could not be loaded."
 msgstr "无法载入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:53
 msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:54
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:55
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:56
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete memo list '{0}'?"
 msgstr "删除备忘列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:58
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:66
-#| msgid "The reported error was &quot;{0}&quot;."
-msgid "Delete remote calendar &quot;{0}&quot;?"
-msgstr "删除远程日历“{0}”吗?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Delete remote calendar '{0}'?"
+msgstr "删除远端日历“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:60
 msgid ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr "这将从服务器永久删除日历“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:69
-#| msgid "Delete task list '{0}'?"
-msgid "Delete remote task list &quot;{0}&quot;?"
-msgstr "删除远程任务列表“{0}”吗?"
+#: ../calendar/calendar.error.xml.h:62
+msgid "Delete remote task list '{0}'?"
+msgstr "删除远端任务列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr "这将从服务器永久删除任务列表“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:71
-#| msgid "The reported error was &quot;{0}&quot;."
-msgid "Delete remote memo list &quot;{0}&quot;?"
-msgstr "删除远程备忘列表”{0}“吗?"
+#: ../calendar/calendar.error.xml.h:64
+msgid "Delete remote memo list '{0}'?"
+msgstr "删除远端备忘列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:65
 msgid ""
-"This will permanently remote the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr "这将从服务器永久删除备忘列表“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:66
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "您确定想要发送没有摘要的约会吗?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:67
 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:75
+#: ../calendar/calendar.error.xml.h:68
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "您确定想要发送没有摘要的任务吗?"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:69
 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:77
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "您确定想要保存没有摘要的备忘吗?"
 
-#: ../calendar/calendar.error.xml.h:78
-msgid "Error loading calendar"
-msgstr "载入日历时出错"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:72
+msgid "Error loading calendar '{0}'"
+msgstr "载入日历 '{0}' 时出错"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:73
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为离线使用。"
 
-#: ../calendar/calendar.error.xml.h:80
-msgid "Cannot create a new event"
-msgstr "无法创建新事件"
-
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:82
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"“{0}“是一个只读日历,不能被编辑。请从日历列表的侧边栏里选择一个不同的日历。"
-
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:74
 msgid "Cannot save event"
 msgstr "无法保存事件"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:76
 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:86
+#: ../calendar/calendar.error.xml.h:77
 msgid "Cannot save task"
 msgstr "无法保存任务"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:88
-#, fuzzy
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:79
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
-msgstr "“{0}”不支持分配的列表,请另选一个任务列表。"
+msgstr "“{0}”不支持分配的任务,请另选一个任务列表。"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Error loading task list"
-msgstr "载入任务列表出错"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:81
+msgid "Error loading task list '{0}'"
+msgstr "载入任务列表 '{0}' 出错"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:82
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为离线使用。"
 
-#: ../calendar/calendar.error.xml.h:91
-msgid "Error loading memo list"
-msgstr "载入备忘列表出错"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:84
+msgid "Error loading memo list '{0}'"
+msgstr "载入备忘列表 '{0}' 出错"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:85
 msgid "The memo list is not marked for offline usage."
 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:95
-msgid "Error on {0}: {1}"
-msgstr "{0} 出错:{1}"
-
-#: ../calendar/calendar.error.xml.h:96
-msgid "Could not perform this operation."
-msgstr "无法执行该操作。"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:87
+msgid "Failed to copy an event into the calendar '{0}'"
+msgstr "无法将事件复制到日历 '{0}'"
 
-#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
-msgid "You must be working online to complete this operation."
-msgstr "您必须上线以完成此操作。"
-
-#: ../calendar/gui/calendar-view-factory.c:88
-msgid "Day View"
-msgstr "日视图"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to copy a task into the task list '{0}'"
+msgstr "无法将任务复制到任务列表 '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:91
-msgid "Work Week View"
-msgstr "工作日视图"
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to copy a memo into the memo list '{0}'"
+msgstr "无法将备忘录复制到备忘录列表 '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:94
-msgid "Week View"
-msgstr "周视图"
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to move an event into the calendar '{0}'"
+msgstr "无法将事件移动到日历 '{0}'"
 
-#: ../calendar/gui/calendar-view-factory.c:97
-msgid "Month View"
-msgstr "月视图"
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to move a task into the task list '{0}'"
+msgstr "无法将任务移动到任务列表 '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to move a memo into the memo list '{0}'"
+msgstr "无法将备忘录移动到备忘录列表 '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Copying an event into the calendar '{0}'"
+msgstr "正在将事件复制到日历 '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Copying a task into the task list '{0}'"
+msgstr "正在将任务复制到任务列表 '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Copying a memo into the memo list '{0}'"
+msgstr "正在将一条备忘录复制到备忘录列表“{0}”"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Moving an event into the calendar '{0}'"
+msgstr "正在将事件移动到日历 '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Moving a task into the task list '{0}'"
+msgstr "正在将任务移动到任务列表 '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Moving a memo into the memo list '{0}'"
+msgstr "正在将备忘移动到备忘列表“{0}”"
 
 #: ../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:372
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
 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
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "含有"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 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
+#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "描述"
 
@@ -2148,30 +2114,35 @@ msgid "Classification"
 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
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 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
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
-#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
+#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公开"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
-#: ../calendar/gui/memotypes.xml.h:11
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "保密"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#. To Translators: This is task classification
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
+#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
+#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "机密"
 
@@ -2188,37 +2159,37 @@ 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:872
+#: ../plugins/publish-calendar/publish-calendar.c:904
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Location"
 msgstr "位置"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "类别"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:54
+#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 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
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "存在"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 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/event-editor.c:310
+#: ../calendar/gui/dialogs/event-editor.c:331
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "再现"
@@ -2249,30 +2220,46 @@ msgstr "概要含有"
 msgid "Description Contains"
 msgstr "描述含有"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:669
 msgid "Edit Reminder"
 msgstr "编辑提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "弹出警告"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "运行程序"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:900
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "发送电子邮件"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
+msgid "before"
+msgstr "之前"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:910
+msgid "after"
+msgstr "之后"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
+msgid "start of appointment"
+msgstr "约会开始"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:920
+msgid "end of appointment"
+msgstr "约会结束"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "minute(s)"
 msgstr "分钟"
@@ -2285,81 +2272,65 @@ msgstr "小时"
 msgid "day(s)"
 msgstr "天"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "before"
-msgstr "之前"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-msgid "after"
-msgstr "之后"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-msgid "start of appointment"
-msgstr "约会开始"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "end of appointment"
-msgstr "约会结束"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Add Reminder"
 msgstr "添加提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/event-editor.c:353
 msgid "Reminder"
 msgstr "提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Repeat"
 msgstr "重复"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 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
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "extra times every"
 msgstr "每个额外时间"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../mail/mail-config.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
 msgid "Options"
 msgstr "选项"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "Custom _message"
 msgstr "自定义信息(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "Mes_sage:"
 msgstr "信息(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom reminder sound"
 msgstr "自定义提醒声音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "_Sound:"
 msgstr "声音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Select A File"
 msgstr "选择一个文件"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Program:"
 msgstr "程序(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "_Arguments:"
 msgstr "参数(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "Send To:"
 msgstr "发送至:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:241
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
 msgid "Action/Trigger"
 msgstr "动作/触发器"
 
@@ -2385,306 +2356,307 @@ msgstr "此任务已经被删除。"
 msgid "This memo has been deleted."
 msgstr "此备注已经被删除。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改,关闭编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "此事件已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "此任务已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "此备注已经被更改。"
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改,更新编辑器吗?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:266
 msgid "Could not save attachments"
 msgstr "不能保存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:755
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:762
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分配的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:780
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:801
+#: ../calendar/gui/dialogs/comp-editor.c:793
 msgid "No Summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:914
 msgid "Keep original item?"
 msgstr "保留原始条目?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1077
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+msgid "Unable to synchronize with the server"
+msgstr "无法与服务器同步"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1219
 msgid "Close the current window"
 msgstr "关闭当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:327 ../widgets/misc/e-web-view.c:1414
-#: ../widgets/misc/e-web-view-gtkhtml.c:456
-#: ../widgets/misc/e-web-view-gtkhtml.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1226 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1296 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1305 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:888
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1408 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../calendar/gui/dialogs/comp-editor.c:1233 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
+#: ../e-util/e-web-view.c:1299 ../mail/e-mail-browser.c:143
+#: ../shell/e-shell-window-actions.c:895
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1240 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
 msgid "Delete the selection"
 msgstr "删除选中内容"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1247
 msgid "View help"
 msgstr "查看帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1420 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1254 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
+#: ../e-util/e-web-view.c:1311 ../mail/e-mail-browser.c:150
+#: ../shell/e-shell-window-actions.c:923
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1275
 msgid "Save current changes"
 msgstr "保存当前更改"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../e-util/e-mail-signature-editor.c:317
 msgid "Save and Close"
 msgstr "保存并关闭"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "Save current changes and close editor"
 msgstr "保存当前更改并关闭编辑器"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1289 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
+#: ../shell/e-shell-window-actions.c:1000
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../calendar/gui/dialogs/comp-editor.c:1296
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1303
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-browser.c:171
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../calendar/gui/dialogs/comp-editor.c:1310
+#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../shell/e-shell-window-actions.c:1042
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../composer/e-composer-actions.c:320
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1338 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1348
+#: ../composer/e-composer-actions.c:269
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1288
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:414
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "添加附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1358
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1360
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1304
+#: ../calendar/gui/dialogs/comp-editor.c:1366
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1368
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Classify as private"
 msgstr "分类为私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1391
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1393
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1401
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1355
+#: ../calendar/gui/dialogs/comp-editor.c:1417
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2208
+#: ../composer/e-composer-actions.c:488
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2647
-#: ../calendar/gui/dialogs/comp-editor.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:2538
+#: ../calendar/gui/dialogs/comp-editor.c:2748
+#: ../calendar/gui/dialogs/comp-editor.c:3761
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话,对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3615
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
+#: ../calendar/gui/dialogs/comp-editor.c:3723
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3683
+#: ../calendar/gui/dialogs/comp-editor.c:3793
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:439
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "校验错误:%s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:121
 msgid "Could not open destination"
 msgstr "无法打开目的"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:131
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
+#: ../calendar/gui/dialogs/copy-source-dialog.c:173
 msgid "Cannot create object"
 msgstr "无法创建对象"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:204
 msgid "Could not open source"
 msgstr "无法打开源"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "撤销评论(_R):"
 
@@ -2764,166 +2736,160 @@ msgstr "授权给:"
 msgid "Contacts..."
 msgstr "联系人..."
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:205
 msgid "_Reminders"
 msgstr "提醒(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:207
 msgid "Set or unset reminders for this event"
 msgstr "设置或取消此事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:215
 msgid "Show Time as _Busy"
 msgstr "将时间显示为忙(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "Toggles whether to show time as busy"
 msgstr "切换是否将时间显示为忙"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:226
 msgid "_Recurrence"
 msgstr "再现(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:228
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:235
+#: ../calendar/gui/dialogs/task-editor.c:96
 msgid "Insert advanced send options"
 msgstr "插入高级发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:243
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:245
 msgid "Toggles whether to have All Day Event"
 msgstr "切换是否有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:254
 msgid "_Free/Busy"
 msgstr "忙/闲(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:256
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
+#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3497
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:377
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:574
 msgid "Print this event"
 msgstr "打印此事件"
 
-#: ../calendar/gui/dialogs/event-page.c:570
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "事件开始时间在过去"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "因所选的日程为只读,您无法编辑该事件。"
 
-#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者,因此无法编辑全部事件。"
 
-#: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3138
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3167
 msgid "This event has reminders"
 msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:730
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "组织者(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1472
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1478
+#: ../calendar/gui/dialogs/memo-page.c:724
+#: ../calendar/gui/dialogs/task-page.c:1025
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1482
+#: ../calendar/gui/dialogs/event-page.c:1489
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/event-page.c:1513
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1512
+#: ../calendar/gui/dialogs/event-page.c:1521
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1675
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1685
+#: ../calendar/gui/dialogs/memo-page.c:763
+#: ../calendar/gui/dialogs/task-page.c:1079
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1709
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1720
+#: ../calendar/gui/dialogs/task-page.c:1114
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1916
+#: ../calendar/gui/dialogs/event-page.c:1926
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1918
+#: ../calendar/gui/dialogs/event-page.c:1928
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:2993
-#, c-format
-msgid "Unable to open the calendar '%s': %s"
-msgstr "无法打开日历“%s”:%s"
-
-#: ../calendar/gui/dialogs/event-page.c:3409
+#: ../calendar/gui/dialogs/event-page.c:3447
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:3415
+#: ../calendar/gui/dialogs/event-page.c:3453
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:3421
+#: ../calendar/gui/dialogs/event-page.c:3459
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:3440
+#: ../calendar/gui/dialogs/event-page.c:3480
 msgid "Customize"
 msgstr "自定义"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3446
+#: ../calendar/gui/dialogs/event-page.c:3487
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "无"
@@ -2964,8 +2930,8 @@ msgstr "位置(_L):"
 
 #: ../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
+#: ../calendar/gui/dialogs/task-page.ui.h:29
+#: ../e-util/e-attachment-dialog.c:357
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -2974,7 +2940,7 @@ msgid "_Time:"
 msgstr "时间(_T):"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:20
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
 msgid "Time _zone:"
 msgstr "时区(_Z):"
 
@@ -2987,8 +2953,8 @@ msgid "Event Description"
 msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "出席者(_N)..."
 
@@ -3053,66 +3019,47 @@ msgid "Select Date"
 msgstr "选择日期"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3501
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "打印此备忘录"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "备忘录开始时间在过去"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:469
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "您并非组织者,因此无法编辑全部备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:981
-#, c-format
-msgid "Unable to open memos in '%s': %s"
-msgstr "无法打开“%s”中的备忘:%s"
-
-#: ../calendar/gui/dialogs/memo-page.c:983
-#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:107
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
-#: ../em-format/e-mail-parser-multipart-encrypted.c:122
-#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:716 ../mail/e-mail-reader.c:1748
-#: ../mail/em-folder-tree.c:678 ../modules/itip-formatter/itip-view.c:4491
-#: ../modules/itip-formatter/itip-view.c:4889 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1370
-#: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
+#: ../calendar/gui/dialogs/memo-page.c:1158
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
 msgid "To"
 msgstr "收件人"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:346
-#: ../calendar/gui/dialogs/task-page.ui.h:9
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:31
 msgid "_List:"
 msgstr "列表(_L):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:354
-#: ../calendar/gui/dialogs/task-page.ui.h:2
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.ui.h:24
 msgid "Organi_zer:"
 msgstr "组织者(_Z):"
 
@@ -3121,12 +3068,12 @@ msgid "T_o:"
 msgstr "到(_O):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:26
 msgid "Sta_rt date:"
 msgstr "开始日期(_R):"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:23
 msgid "Su_mmary:"
 msgstr "概要(_M):"
 
@@ -3166,21 +3113,21 @@ msgstr "本次和以后各次"
 msgid "All Instances"
 msgstr "所有各次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
+#: ../calendar/gui/dialogs/recurrence-page.c:575
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的再现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:969
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 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:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1075
 msgid "on"
 msgstr "在"
 
@@ -3188,7 +3135,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:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1156
 msgid "first"
 msgstr "第一个"
 
@@ -3197,7 +3144,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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1162
 msgid "second"
 msgstr "第二"
 
@@ -3205,7 +3152,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:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1167
 msgid "third"
 msgstr "第三个"
 
@@ -3213,7 +3160,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:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
 msgid "fourth"
 msgstr "第四个"
 
@@ -3221,7 +3168,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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1177
 msgid "fifth"
 msgstr "第五个"
 
@@ -3229,13 +3176,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:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1182
 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:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -3243,7 +3190,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:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1212
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -3251,7 +3198,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:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1218
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -3259,73 +3206,73 @@ 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:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1224
 msgid "21st to 31st"
 msgstr "下旬"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
-#: ../modules/calendar/e-calendar-preferences.ui.h:1
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
-#: ../modules/calendar/e-calendar-preferences.ui.h:2
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
-#: ../modules/calendar/e-calendar-preferences.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "星期三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
-#: ../modules/calendar/e-calendar-preferences.ui.h:4
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
-#: ../modules/calendar/e-calendar-preferences.ui.h:5
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
-#: ../modules/calendar/e-calendar-preferences.ui.h:6
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
-#: ../modules/calendar/e-calendar-preferences.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.c:1257
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 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:1326
+#: ../calendar/gui/dialogs/recurrence-page.c:1388
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1505
+#: ../calendar/gui/dialogs/recurrence-page.c:1573
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2221
+#: ../calendar/gui/dialogs/recurrence-page.c:2343
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2385
 msgid "Could not get a selection to modify."
 msgstr "无法获得要修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2268
+#: ../calendar/gui/dialogs/recurrence-page.c:2391
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2312
+#: ../calendar/gui/dialogs/recurrence-page.c:2437
 msgid "Could not get a selection to delete."
 msgstr "无法获得要删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2451
+#: ../calendar/gui/dialogs/recurrence-page.c:2578
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -3387,248 +3334,219 @@ msgstr "例外"
 msgid "Preview"
 msgstr "预览"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:173
+#: ../calendar/gui/dialogs/send-comp.c:255
 msgid "Send my reminders with this event"
 msgstr "发送我有关此事件的提醒"
 
 # #####
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:175
+#: ../calendar/gui/dialogs/send-comp.c:257
 msgid "Notify new attendees _only"
 msgstr "只通知新的出席者(_O)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:355
-#: ../calendar/gui/dialogs/task-details-page.c:377
+#: ../calendar/gui/dialogs/task-editor.c:94
+msgid "_Send Options"
+msgstr "发送选项(_S)"
+
+#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3499
+#: ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "任务"
+
+#: ../calendar/gui/dialogs/task-editor.c:286
+msgid "Print this task"
+msgstr "打印此任务"
+
+#: ../calendar/gui/dialogs/task-page.c:330
+msgid "Task's start date is in the past"
+msgstr "任务的开始日期是在过去"
+
+#: ../calendar/gui/dialogs/task-page.c:331
+msgid "Task's due date is in the past"
+msgstr "任务的到期时间是在过去"
+
+#: ../calendar/gui/dialogs/task-page.c:364
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "任务不能被编辑,因为选择的任务列表是只读的"
+
+#: ../calendar/gui/dialogs/task-page.c:368
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "无法完全编辑任务,因为您不是组织者"
+
+#: ../calendar/gui/dialogs/task-page.c:372
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr "任务无法编辑,因为选定的任务列表不支持分配的任务"
+
+#: ../calendar/gui/dialogs/task-page.c:1006
+msgid "Due date is wrong"
+msgstr "到期日期错误"
+
+#: ../calendar/gui/dialogs/task-page.c:1174
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
-msgid "Web Page"
-msgstr "网页"
-
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:337
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:310
 msgid "High"
 msgstr "高"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/dialogs/task-page.ui.h:10
+#: ../calendar/gui/e-cal-component-preview.c:339
+#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:309
 msgid "Normal"
 msgstr "中"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:12
+#: ../calendar/gui/e-cal-component-preview.c:341
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:308
 msgid "Low"
 msgstr "低"
 
 #. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14
+#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未定义"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/dialogs/task-page.ui.h:16
+#: ../calendar/gui/e-cal-component-preview.c:322
+#: ../calendar/gui/e-cal-model-tasks.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3583 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "尚未开始"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
-#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3408
+#: ../calendar/gui/dialogs/task-page.ui.h:18
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:313
+#: ../calendar/gui/e-cal-model-tasks.c:555
+#: ../calendar/gui/e-cal-model-tasks.c:636 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3586
 msgid "In Progress"
 msgstr "进行中"
 
 #. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:324
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
+#: ../calendar/gui/dialogs/task-page.ui.h:20
+#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:315
+#: ../calendar/gui/e-cal-model-tasks.c:557
+#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3589
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:380
 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:327
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:869
+#: ../calendar/gui/dialogs/task-page.ui.h:22
+#: ../calendar/gui/e-cal-component-preview.c:318
+#: ../calendar/gui/e-cal-model-tasks.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
+#: ../calendar/gui/print.c:3592 ../mail/mail-send-recv.c:867
 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:17
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3618
-#: ../calendar/gui/e-meeting-list-view.c:684
-#: ../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 "状态"
-
-#: ../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
-#: ../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:23
-msgid "_Web Page:"
-msgstr "网页(_W):"
-
-#: ../calendar/gui/dialogs/task-editor.c:116
-msgid "_Status Details"
-msgstr "状态细节(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:118
-msgid "Click to change or view the status details of the task"
-msgstr "单击可更改或查看任务的状态细节"
-
-#: ../calendar/gui/dialogs/task-editor.c:126
-msgid "_Send Options"
-msgstr "发送选项(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
-#: ../widgets/misc/e-send-options.c:553
-msgid "Task"
-msgstr "任务"
-
-#: ../calendar/gui/dialogs/task-editor.c:307
-msgid "Task Details"
-msgstr "任务细节"
-
-#: ../calendar/gui/dialogs/task-editor.c:351
-msgid "Print this task"
-msgstr "打印此任务"
-
-#: ../calendar/gui/dialogs/task-page.c:259
-msgid "Task's start date is in the past"
-msgstr "任务的开始日期是在过去"
-
-#: ../calendar/gui/dialogs/task-page.c:260
-msgid "Task's due date is in the past"
-msgstr "任务的到期时间是在过去"
+#: ../calendar/gui/dialogs/task-page.ui.h:25
+msgid "D_ue date:"
+msgstr "到期日期(_U):"
 
-#: ../calendar/gui/dialogs/task-page.c:293
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "任务不能被编辑,因为选择的任务列表是只读的"
+#: ../calendar/gui/dialogs/task-page.ui.h:28
+msgid "Time zone:"
+msgstr "时区:"
 
-#: ../calendar/gui/dialogs/task-page.c:297
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "无法完全编辑任务,因为您不是组织者"
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+msgid "_Status:"
+msgstr "状态(_S):"
 
-#: ../calendar/gui/dialogs/task-page.c:301
-#, fuzzy
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr "任务无法编辑,因为选择的任务列表不支持分配的任务"
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+msgid "Date _completed:"
+msgstr "完成日期(_C):"
 
-#: ../calendar/gui/dialogs/task-page.c:834
-msgid "Due date is wrong"
-msgstr "到期日期错误"
+#: ../calendar/gui/dialogs/task-page.ui.h:34
+msgid "_Percent complete:"
+msgstr "完成百分比(_P):"
 
-#: ../calendar/gui/dialogs/task-page.c:1813
-#, c-format
-msgid "Unable to open tasks in '%s': %s"
-msgstr "无法打开“%s”中的任务:%s"
+#: ../calendar/gui/dialogs/task-page.ui.h:35
+msgid "Priorit_y:"
+msgstr "优先级(_Y):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:3
-msgid "D_ue date:"
-msgstr "到期日期(_U):"
+#: ../calendar/gui/dialogs/task-page.ui.h:36
+msgid "C_lassification:"
+msgstr "分类(_L):"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Time zone:"
-msgstr "时区:"
+#: ../calendar/gui/dialogs/task-page.ui.h:37
+msgid "_Web Page:"
+msgstr "网页(_W):"
 
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/ea-cal-view.c:321
+#: ../calendar/gui/ea-cal-view.c:325
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:322
+#: ../calendar/gui/ea-cal-view.c:326
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:327
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:328
 msgid "Go to Date"
 msgstr "转到日期"
 
-#: ../calendar/gui/ea-cal-view-event.c:291
+#: ../calendar/gui/ea-cal-view-event.c:298
 msgid "It has reminders."
 msgstr "有提醒。"
 
-#: ../calendar/gui/ea-cal-view-event.c:294
+#: ../calendar/gui/ea-cal-view-event.c:301
 msgid "It has recurrences."
 msgstr "有再现。"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:304
 msgid "It is a meeting."
 msgstr "为会议。"
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:311
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "日历事件:摘要为 %s。"
 
-#: ../calendar/gui/ea-cal-view-event.c:307
+#: ../calendar/gui/ea-cal-view-event.c:314
 msgid "Calendar Event: It has no summary."
 msgstr "日历事件:无摘要。"
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:569
 msgid "Grab Focus"
 msgstr "获得焦点"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3636,47 +3554,41 @@ 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
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 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
+#: ../calendar/gui/ea-day-view.c:169
 #, 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
+#: ../calendar/gui/ea-day-view.c:176
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图:%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:210
 msgid "calendar view for a work week"
 msgstr "工作日的日历视图"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:212
 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
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
 msgid "a table to view and select the current time range"
 msgstr "可查看并选择当前时间范围的表"
 
 #: ../calendar/gui/ea-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1086
+#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../modules/calendar/e-cal-shell-view-private.c:1191
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -3686,30 +3598,30 @@ msgstr "%Y年%-m月%-d日%A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1852
-#: ../calendar/gui/e-day-view-top-item.c:835
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../calendar/gui/ea-gnome-calendar.c:211 ../calendar/gui/e-day-view.c:2796
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:1195
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1093
-#: ../modules/calendar/e-cal-shell-view-private.c:1099
-#: ../modules/calendar/e-cal-shell-view-private.c:1102
+#: ../calendar/gui/ea-gnome-calendar.c:214
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../calendar/gui/ea-gnome-calendar.c:223
+#: ../modules/calendar/e-cal-shell-view-private.c:1198
+#: ../modules/calendar/e-cal-shell-view-private.c:1204
+#: ../modules/calendar/e-cal-shell-view-private.c:1207
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1119
-#: ../modules/calendar/e-cal-shell-view-private.c:1130
-#: ../modules/calendar/e-cal-shell-view-private.c:1137
-#: ../modules/calendar/e-cal-shell-view-private.c:1140
+#: ../calendar/gui/ea-gnome-calendar.c:250
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../calendar/gui/ea-gnome-calendar.c:260
+#: ../modules/calendar/e-cal-shell-view-private.c:1224
+#: ../modules/calendar/e-cal-shell-view-private.c:1235
+#: ../modules/calendar/e-cal-shell-view-private.c:1242
+#: ../modules/calendar/e-cal-shell-view-private.c:1245
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -3718,10 +3630,10 @@ msgstr "%Y年%-m月%-d日"
 #. 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:232 ../calendar/gui/e-day-view.c:1868
-#: ../calendar/gui/e-day-view-top-item.c:839
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1126
+#: ../calendar/gui/ea-gnome-calendar.c:247 ../calendar/gui/e-day-view.c:2812
+#: ../calendar/gui/e-day-view-top-item.c:863
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1231
 msgid "%d %b"
 msgstr "%B%-d日"
 
@@ -3751,124 +3663,130 @@ msgstr[0] "%d 周"
 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:440
+#: ../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:445
+#: ../calendar/gui/e-alarm-list.c:447
 #, 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:452
+#: ../calendar/gui/e-alarm-list.c:454
 #, 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:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, 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:468
+#: ../calendar/gui/e-alarm-list.c:472
 #, 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:475
+#: ../calendar/gui/e-alarm-list.c:479
 #, 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:499
+#: ../calendar/gui/e-alarm-list.c:503
 #, 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:507
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月视图:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "周视图:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "月日历视图"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:754
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Categories:"
 msgstr "类别:"
 
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Summary:"
 msgstr "概要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:272
 msgid "Start Date:"
 msgstr "开始日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:284
 msgid "End Date:"
 msgstr "结束日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:306
+#: ../calendar/gui/e-cal-component-preview.c:296
 msgid "Due Date:"
 msgstr "到期日期:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1449
-#: ../modules/itip-formatter/itip-view.c:1555
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1617
 msgid "Status:"
 msgstr "状态:"
 
-#: ../calendar/gui/e-cal-component-preview.c:343
+#: ../calendar/gui/e-cal-component-preview.c:335
 msgid "Priority:"
 msgstr "优先级:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:360
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-preview.c:397
+#: ../calendar/gui/e-cal-component-preview.c:391
 msgid "Web Page:"
 msgstr "网页:"
 
+#: ../calendar/gui/e-calendar-selector.c:358
+#: ../modules/calendar/e-cal-shell-view-private.c:1097
+#, c-format
+#| msgid "Copying an event into the calendar '{0}'"
+msgid "Copying an event into the calendar %s"
+msgstr "正在将事件复制到日历 %s"
+
+#: ../calendar/gui/e-calendar-selector.c:359
+#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#, c-format
+#| msgid "Moving an event into the calendar '{0}'"
+msgid "Moving an event into the calendar %s"
+msgstr "正在将事件移动到日历 %s"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
 msgstr "单击以添加任务"
@@ -3878,11 +3796,11 @@ msgid "Start date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:653
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
+#: ../e-util/e-attachment-tree-view.c:586
+#: ../mail/e-mail-account-tree-view.c:159
 msgid "Type"
 msgstr "类型"
 
@@ -3890,7 +3808,7 @@ msgstr "类型"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:871
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:869
 msgid "Complete"
 msgstr "完成"
 
@@ -3905,14 +3823,25 @@ msgstr "% 完成"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Priority"
 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/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-cal-model.c:4012
+#: ../calendar/gui/e-meeting-list-view.c:696
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../mail/message-list.etspec.h:1
+msgid "Status"
+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:377
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Created"
 msgstr "创建时间"
 
@@ -3922,37 +3851,37 @@ msgstr "创建时间"
 msgid "Last modified"
 msgstr "上次修改"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Cut selected events to the clipboard"
 msgstr "将选中事件剪切到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Copy selected events to the clipboard"
 msgstr "将选中事件复制到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Paste events from the clipboard"
 msgstr "从剪贴板中粘贴事件"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Delete selected events"
 msgstr "删除选中的事件"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:283
+#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
-#: ../calendar/gui/e-task-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1176
 msgid "Updating objects"
 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:1992 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:824
+#: ../calendar/gui/e-calendar-view.c:2084 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:840
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者:%s <%s>"
@@ -3960,20 +3889,21 @@ 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:1996 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:828
+#: ../calendar/gui/e-calendar-view.c:2088 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:844
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-meeting-time-sel.c:2668 ../calendar/gui/print.c:3537
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2135
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间:%s %s"
@@ -3987,86 +3917,81 @@ msgstr "开始日期"
 msgid "End Date"
 msgstr "结束日期"
 
-#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
-#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3438
-#: ../modules/itip-formatter/itip-view.c:5969
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
+#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
+#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3504
+#: ../modules/itip-formatter/itip-view.c:6091
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1668
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:1659
+#: ../calendar/gui/e-cal-model.c:1670
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1075
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:1024
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:211
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1166
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:189
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3114
-#, c-format
-msgid "Opening %s"
-msgstr "打开 %s"
-
-#: ../calendar/gui/e-cal-model.c:3559
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5957
+#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../modules/itip-formatter/itip-view.c:6079
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3560
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5963
+#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-cal-model.c:3561
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../calendar/gui/e-cal-model.c:3562
-#: ../calendar/gui/e-meeting-list-view.c:225
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5966
+#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
+#: ../modules/itip-formatter/itip-view.c:6088
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../calendar/gui/e-cal-model.c:3563
+#: ../calendar/gui/e-cal-model.c:3957
 msgid "Needs action"
 msgstr "需要动作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:633
+#: ../calendar/gui/e-cal-model-calendar.c:125
+#: ../calendar/gui/e-task-table.c:631
 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:634
+#: ../calendar/gui/e-cal-model-calendar.c:128
+#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
 msgid "Busy"
 msgstr "繁忙"
 
-#: ../calendar/gui/e-cal-model-tasks.c:720
+#: ../calendar/gui/e-cal-model-tasks.c:499
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4077,22 +4002,22 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:772
+#: ../calendar/gui/e-cal-model-tasks.c:551
 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:162
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4102,16 +4027,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
-#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1541
+#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2634 ../calendar/gui/print.c:2654
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
-#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1544
+#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2639 ../calendar/gui/print.c:2656
 msgid "pm"
 msgstr "下午"
 
@@ -4121,13 +4046,13 @@ msgstr "下午"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1835 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
+#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2090
 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:2670
+#: ../calendar/gui/e-day-view.c:3438
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
@@ -4138,191 +4063,203 @@ msgstr "第%d周"
 #. * 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:790
+#: ../calendar/gui/e-day-view-time-item.c:801
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:826
 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:832
-#: ../modules/calendar/e-calendar-preferences.c:185
-#: ../modules/calendar/e-calendar-preferences.c:237
-#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../calendar/gui/e-day-view-time-item.c:843
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/e-day-view-time-item.c:866
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:877
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "选择..."
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
+#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
+#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1157
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
+#: ../calendar/gui/print.c:1249
 msgid "Resource"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/print.c:1250
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1172
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/print.c:1264
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1174
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/print.c:1266
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
+#: ../calendar/gui/print.c:1267
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:1031
 msgid "Needs Action"
 msgstr "需要动作"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:627
 msgid "Attendee                          "
 msgstr "出席者                            "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:671
+#: ../calendar/gui/e-meeting-list-view.c:682
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "请回复"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
 msgid "In Process"
 msgstr "处理中"
 
-#: ../calendar/gui/e-meeting-store.c:1906
+#: ../calendar/gui/e-meeting-store.c:1910
 #, 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:1916
+#: ../calendar/gui/e-meeting-store.c:1920
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失败原因:%s"
 
-#: ../calendar/gui/e-meeting-store.c:1921
-#: ../plugins/publish-calendar/publish-calendar.c:335
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1925
+#: ../plugins/publish-calendar/publish-calendar.c:352
+#: ../smime/gui/component.c:64
 msgid "Enter password"
 msgstr "输入密码"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:528
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:530
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:590
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:684
+#: ../calendar/gui/e-meeting-time-sel.c:658
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:675
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:707
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:741
+#: ../calendar/gui/e-meeting-time-sel.c:718
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:751
+#: ../calendar/gui/e-meeting-time-sel.c:728
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:767
 msgid "_Start time:"
 msgstr "开始时间(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:843
+#: ../calendar/gui/e-meeting-time-sel.c:796
 msgid "_End time:"
 msgstr "结束时间(_E):"
 
+#: ../calendar/gui/e-meeting-time-sel.c:2664
+#, c-format
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"简要:%s\n"
+"位置:%s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2666 ../calendar/gui/print.c:3526
+#, c-format
+msgid "Summary: %s"
+msgstr "概要:%s"
+
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "单击此处添加出席者"
@@ -4347,46 +4284,46 @@ msgstr "通用名"
 msgid "Language"
 msgstr "语言"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:434
+#: ../modules/calendar/e-cal-shell-content.c:482
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view.c:307
 msgid "Memos"
 msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
 msgid "Start: "
 msgstr "开始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "将选中备忘剪切到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:745
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "将选中备忘复制到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "从剪贴板中粘贴备忘"
 
-#: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../calendar/gui/e-memo-table.c:760
+#: ../modules/calendar/e-memo-shell-view-actions.c:589
 msgid "Delete selected memos"
 msgstr "删除选中的备忘"
 
-#: ../calendar/gui/e-memo-table.c:763
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "选中所有可见的备忘"
 
@@ -4398,60 +4335,60 @@ 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:608
+#: ../calendar/gui/e-task-table.c:604
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1082
+#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2415
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1072
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../modules/calendar/e-cal-shell-content.c:439
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view.c:462
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1040
 msgid "Cut selected tasks to the clipboard"
 msgstr "将选中任务剪切到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1028
+#: ../calendar/gui/e-task-table.c:1046
 msgid "Copy selected tasks to the clipboard"
 msgstr "将选中任务复制到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1034
+#: ../calendar/gui/e-task-table.c:1052
 msgid "Paste tasks from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-#: ../calendar/gui/e-task-table.c:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../calendar/gui/e-task-table.c:1058
+#: ../modules/calendar/e-task-shell-view-actions.c:713
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1064
 msgid "Select all visible tasks"
 msgstr "选中所有可见的任务"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "选择时区"
 
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
+#: ../calendar/gui/e-week-view-main-item.c:227 ../calendar/gui/print.c:2069
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:2315
+#: ../calendar/gui/gnome-cal.c:2372
 msgid "Purging"
 msgstr "销毁"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
@@ -4459,23 +4396,23 @@ msgstr "必须设定组织者。"
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "日历信息"
 
@@ -4483,7 +4420,7 @@ msgstr "日历信息"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接受"
@@ -4492,7 +4429,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:962
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
@@ -4504,7 +4441,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:969 ../calendar/gui/itip-utils.c:1017
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒绝"
@@ -4513,7 +4450,7 @@ msgstr "拒绝"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -4521,7 +4458,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:989
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
@@ -4529,7 +4466,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:996
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -4537,7 +4474,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:1003
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -4545,252 +4482,257 @@ 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:1010
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1088
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:1123
+#: ../calendar/gui/itip-utils.c:1147
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "无法预约资源,新事件与其它事件冲突。"
 
-#: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "无法预约资源,错误:"
+#: ../calendar/gui/itip-utils.c:1155
+#, c-format
+msgid "Unable to book a resource, error: %s"
+msgstr "无法预约资源,错误:%s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1327
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:661
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:661
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:661
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:661
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:661
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:662
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:662
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:662
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:662
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:662
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:663
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:663
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:663
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:663
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:663
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:664
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:665
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:666
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:667
 msgid "31st"
 msgstr "31日"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:652
-msgid "Su"
-msgstr "日"
-
-#: ../calendar/gui/print.c:652
+#. Translators: These are workday abbreviations,
+#. * e.g. Su=Sunday and Th=thursday
+#. G_DATE_BAD_WEEKDAY
+#. G_DATE_MONDAY
+#: ../calendar/gui/print.c:727
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:652
+#. G_DATE_TUESDAY
+#: ../calendar/gui/print.c:728
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:652
+#. G_DATE_WEDNESDAY
+#: ../calendar/gui/print.c:729
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:653
+#. G_DATE_THURSDAY
+#: ../calendar/gui/print.c:730
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:653
+#. G_DATE_FRIDAY
+#: ../calendar/gui/print.c:731
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:653
+#. G_DATE_SATURDAY
+#: ../calendar/gui/print.c:732
 msgid "Sa"
 msgstr "六"
 
+#. G_DATE_SUNDAY
+#: ../calendar/gui/print.c:733
+msgid "Su"
+msgstr "日"
+
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3320
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3330
 msgid " (Completed "
 msgstr " (完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3169
+#: ../calendar/gui/print.c:3336
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3179
+#: ../calendar/gui/print.c:3346
 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:3186
+#: ../calendar/gui/print.c:3353
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/print.c:3351
-#, c-format
-msgid "Summary: %s"
-msgstr "概要:%s"
-
-#: ../calendar/gui/print.c:3378
+#: ../calendar/gui/print.c:3556
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../calendar/gui/print.c:3421
+#: ../calendar/gui/print.c:3600
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: ../calendar/gui/print.c:3436
+#: ../calendar/gui/print.c:3616
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级:%s"
 
-#: ../calendar/gui/print.c:3454
+#: ../calendar/gui/print.c:3634
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率:%i"
 
-#: ../calendar/gui/print.c:3465
+#: ../calendar/gui/print.c:3648
 #, c-format
 msgid "URL: %s"
 msgstr "URL:%s"
 
-#: ../calendar/gui/print.c:3478
+#: ../calendar/gui/print.c:3662
 #, c-format
 msgid "Categories: %s"
 msgstr "类别:%s"
 
-#: ../calendar/gui/print.c:3489
+#: ../calendar/gui/print.c:3673
 msgid "Contacts: "
 msgstr "联系人:"
 
@@ -4798,202 +4740,194 @@ msgstr "联系人:"
 msgid "In progress"
 msgstr "进行中"
 
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "已取消"
-
 #: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
 msgid "% Completed"
 msgstr "% 完成"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "大于"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "小于"
 
-#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:468
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5568
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:616
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:617
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:791
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 文件(.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:792
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:1119
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会议"
 
-#: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1190
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/importers/icalendar-importer.c:1193
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/importers/icalendar-importer.c:1202
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "有再现"
 
-#: ../calendar/importers/icalendar-importer.c:1207
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "本次和以前各次"
 
-#: ../calendar/importers/icalendar-importer.c:1212
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公开"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "保密"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1236
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "机密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1240
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "分类"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1245
-#: ../calendar/importers/icalendar-importer.c:1546
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "概要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1259
-#: ../calendar/importers/icalendar-importer.c:1542
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "开始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1270
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1282
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "结束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1292
+#: ../calendar/importers/icalendar-importer.c:1285
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "类别"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1324
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1335
-#: ../calendar/importers/icalendar-importer.c:1338
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "组织者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1358
-#: ../calendar/importers/icalendar-importer.c:1361
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1375
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "类型"
@@ -6546,483 +6480,203 @@ 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:74
-msgid "Please enter your full name."
-msgstr "请输入您的全名。"
-
-#: ../capplet/settings/mail-account-view.c:75
-msgid "Please enter your email address."
-msgstr "请输入您的电子邮件地址"
-
-#: ../capplet/settings/mail-account-view.c:76
-msgid "The email address you have entered is invalid."
-msgstr "您输入的电子邮件地址无效。"
-
-#: ../capplet/settings/mail-account-view.c:77
-msgid "Please enter your password."
-msgstr "请输入您的密码。"
-
-#: ../capplet/settings/mail-account-view.c:245
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../capplet/settings/mail-account-view.c:335
-#: ../capplet/settings/mail-account-view.c:378
-msgid "Google"
-msgstr "Google"
-
-#: ../capplet/settings/mail-account-view.c:454
-#: ../capplet/settings/mail-account-view.c:558
-msgid "Always (SSL)"
-msgstr "总是(SSL)"
-
-#: ../capplet/settings/mail-account-view.c:457
-#: ../capplet/settings/mail-account-view.c:561
-msgid "When possible (TLS)"
-msgstr "可用时(TLS)"
-
-#: ../capplet/settings/mail-account-view.c:460
-#: ../capplet/settings/mail-account-view.c:564
-#: ../mail/e-mail-config-defaults-page.c:729
-msgid "Never"
-msgstr "从不"
-
-#: ../capplet/settings/mail-account-view.c:468
-msgid "Personal details:"
-msgstr "个人详细信息:"
-
-#: ../capplet/settings/mail-account-view.c:475
-#: ../widgets/misc/e-source-config.c:683 ../widgets/misc/e-source-config.c:687
-msgid "Name:"
-msgstr "名称:"
-
-#: ../capplet/settings/mail-account-view.c:484
-msgid "Email address:"
-msgstr "电子邮件地址:"
-
-#: ../capplet/settings/mail-account-view.c:494
-msgid "Details:"
-msgstr "细节:"
-
-#: ../capplet/settings/mail-account-view.c:502
-#: ../mail/e-mail-config-summary-page.c:409
-msgid "Receiving"
-msgstr "接收"
-
-#: ../capplet/settings/mail-account-view.c:509
-msgid "Server type:"
-msgstr "服务器类型:"
-
-#: ../capplet/settings/mail-account-view.c:518
-msgid "Server address:"
-msgstr "服务器地址:"
-
-#: ../capplet/settings/mail-account-view.c:527
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
-msgid "Username:"
-msgstr "用户名:"
-
-#: ../capplet/settings/mail-account-view.c:536
-msgid "Use encryption:"
-msgstr "使用加密:"
-
-#: ../capplet/settings/mail-account-view.c:569
-#: ../mail/e-mail-config-summary-page.c:421
-msgid "Sending"
-msgstr "发送"
-
-#: ../capplet/settings/mail-account-view.c:615
-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:617
-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:619
-msgid "You can specify more options to configure the account."
-msgstr "您可以指定更多选项以配置此帐号。"
-
-#: ../capplet/settings/mail-account-view.c:621
-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:622
-msgid "You can specify your default settings for your account."
-msgstr "您可以为您的帐号指定默认设置。"
-
-#: ../capplet/settings/mail-account-view.c:623
-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:638
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "标识"
-
-#: ../capplet/settings/mail-account-view.c:638
-msgid "Next - Receiving mail"
-msgstr "前进 - 接收电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Receiving mail"
-msgstr "接收电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:639
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Next - Sending mail"
-msgstr "前进 - 发送电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Back - Identity"
-msgstr "后退 - 标识"
-
-#: ../capplet/settings/mail-account-view.c:639
-msgid "Next - Receiving options"
-msgstr "前进 - 接收选项"
-
-#: ../capplet/settings/mail-account-view.c:640
-msgid "Receiving options"
-msgstr "接收选项"
-
-#: ../capplet/settings/mail-account-view.c:640
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving mail"
-msgstr "后退 - 接收电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Sending mail"
-msgstr "发送电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:642
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Next - Review account"
-msgstr "前进 - 检查帐号"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Next - Defaults"
-msgstr "前进 - 默认值"
-
-#: ../capplet/settings/mail-account-view.c:642
-msgid "Back - Receiving options"
-msgstr "后退 - 接收选项"
-
-#: ../capplet/settings/mail-account-view.c:643
-#: ../mail/e-mail-config-defaults-page.c:812
-msgid "Defaults"
-msgstr "默认值"
-
-#: ../capplet/settings/mail-account-view.c:643
-msgid "Back - Sending mail"
-msgstr "后退 - 发送电子邮件"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Review account"
-msgstr "检查帐号"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Finish"
-msgstr "完成"
-
-#: ../capplet/settings/mail-account-view.c:645
-msgid "Back - Sending"
-msgstr "后退 - 发送"
-
-#: ../capplet/settings/mail-account-view.c:822
-msgid "Setup Google contacts with Evolution"
-msgstr "设置 Google 联系人到 Evolution"
-
-#: ../capplet/settings/mail-account-view.c:823
-msgid "Setup Google calendar with Evolution"
-msgstr "添加 Google 日历到 Evolution"
-
-#: ../capplet/settings/mail-account-view.c:828
-msgid "You may need to enable IMAP access."
-msgstr "您可能需要启用 IMAP 访问。"
-
-#: ../capplet/settings/mail-account-view.c:836
-msgid "Google account settings:"
-msgstr "Google 帐号设置:"
-
-#: ../capplet/settings/mail-account-view.c:862
-msgid "Setup Yahoo calendar with Evolution"
-msgstr "添加 Yahoo 日历到 Evolution"
-
-#: ../capplet/settings/mail-account-view.c:866
-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:875
-msgid "Yahoo account settings:"
-msgstr "Yahoo 帐号设置:"
-
-#: ../capplet/settings/mail-account-view.c:889
-msgid "Yahoo Calendar name:"
-msgstr "Yahoo 日历名称:"
-
-#: ../capplet/settings/mail-account-view.c:1088
-msgid "Password:"
-msgstr "密码:"
-
-#: ../capplet/settings/mail-account-view.c:1143
-#: ../capplet/settings/mail-settings-view.c:260
-msgid "Close Tab"
-msgstr "关闭标签"
-
-#: ../capplet/settings/mail-account-view.c:1155
-msgid "Account Wizard"
-msgstr "帐号向导"
-
-#: ../capplet/settings/mail-capplet-shell.c:209
-msgid "Evolution account assistant"
-msgstr "Evolution 帐号助手"
-
-#: ../capplet/settings/mail-settings-view.c:145
-#, c-format
-msgid "Modify %s..."
-msgstr "修改 %s..."
-
-#: ../capplet/settings/mail-settings-view.c:147
-msgid "Add a new account"
-msgstr "添加新帐号"
-
-#: ../capplet/settings/mail-settings-view.c:189
-msgid "Account management"
-msgstr "帐号管理"
-
-#: ../capplet/settings/mail-settings-view.c:272
-msgid "Settings"
-msgstr "设置"
-
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:203
 msgid "Save as..."
 msgstr "另存为..."
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../composer/e-composer-actions.c:276
+#: ../e-util/e-mail-signature-editor.c:308
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:278
 msgid "Close the current file"
 msgstr "关闭当前文件"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:283
 msgid "New _Message"
 msgstr "新建信息(_M)"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:285
 msgid "Open New Message window"
 msgstr "打开新建信息窗口"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
 msgid "Configure Evolution"
 msgstr "配置 Evolution"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:299
 msgid "Save the current file"
 msgstr "保存当前文件"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:304
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:306
 msgid "Save the current file with a different name"
 msgstr "用不同的文件名保存当前文件"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:313
 msgid "Character _Encoding"
 msgstr "字符编码(_E)"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:330
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:337
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:344
 msgid "Save as _Draft"
 msgstr "另存为草稿(_D)"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:346
 msgid "Save as draft"
 msgstr "另存为草稿"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
+#: ../composer/e-composer-actions.c:351
 msgid "S_end"
 msgstr "发送(_E)"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:353
 msgid "Send this message"
 msgstr "发送这条信息"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "用 PGP 加密该信息"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP 签名(_S)"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该信息"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:377
 msgid "_Picture Gallery"
 msgstr "图片画廊(_P)"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:379
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "显示一组图片,您可以将它们拖放到您的信息中"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:385
 msgid "_Prioritize Message"
 msgstr "标为优先(_P)"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:387
 msgid "Set the message priority to high"
 msgstr "将信息设定为高优先级"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:393
 msgid "Re_quest Read Receipt"
 msgstr "请求已读回执(_Q)"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:395
 msgid "Get delivery notification when your message is read"
 msgstr "当您的信息被阅读时得到投递通知"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 加密(_C)"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:403
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "用您的 S/MIME 加密证书加密该信息"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:409
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 签名(_N)"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:411
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该信息"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:417
 msgid "_Bcc Field"
 msgstr "密件抄送域(_B)"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the BCC field is displayed"
 msgstr "是否显示密件抄送域"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:425
 msgid "_Cc Field"
 msgstr "抄送域(_C)"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the CC field is displayed"
 msgstr "是否显示抄送域"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "回复至域(_R)"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:494
 msgid "Save Draft"
 msgstr "保存草稿"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "输入信息的收件人"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该信息副本的收件人地址"
 
-#: ../composer/e-composer-header-table.c:48
+#: ../composer/e-composer-header-table.c:44
 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:849
+#: ../composer/e-composer-header-table.c:772
 msgid "Fr_om:"
 msgstr "发件人(_O):"
 
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:779
 msgid "_Reply-To:"
 msgstr "回复到(_R):"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:784
 msgid "_To:"
 msgstr "收件人(_T):"
 
-#: ../composer/e-composer-header-table.c:867
+#: ../composer/e-composer-header-table.c:790
 msgid "_Cc:"
 msgstr "抄送(_C):"
 
-#: ../composer/e-composer-header-table.c:873
+#: ../composer/e-composer-header-table.c:796
 msgid "_Bcc:"
 msgstr "密件抄送(_B):"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:801
 msgid "_Post To:"
 msgstr "投递到(_P):"
 
-#: ../composer/e-composer-header-table.c:882
+#: ../composer/e-composer-header-table.c:805
 msgid "S_ubject:"
 msgstr "主题(_U):"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../composer/e-composer-header-table.c:813
+#: ../mail/e-mail-config-identity-page.c:489
 msgid "Si_gnature:"
 msgstr "签名(_G):"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "单击此处以使用地址簿"
 
@@ -7030,32 +6684,28 @@ msgstr "单击此处以使用地址簿"
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-composer-private.c:345
-msgid "Save draft"
-msgstr "保存草稿"
-
-#: ../composer/e-msg-composer.c:856
+#: ../composer/e-msg-composer.c:879
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
 
-#: ../composer/e-msg-composer.c:865
+#: ../composer/e-msg-composer.c:888
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
 
-#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
+#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:1971
 msgid "Compose Message"
 msgstr "新建消息"
 
-#: ../composer/e-msg-composer.c:4198
+#: ../composer/e-msg-composer.c:4233
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "编写器含有不可编辑的非文本信体。"
 
-#: ../composer/e-msg-composer.c:4875
+#: ../composer/e-msg-composer.c:4933
 msgid "Untitled Message"
 msgstr "无标题信息"
 
@@ -7177,7 +6827,7 @@ msgstr "报告的错误为“{0}”。信息很可能没有保存。"
 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:152
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "报告的错误为“{0}”。"
 
@@ -7199,12 +6849,12 @@ msgstr "把信息保存到发件箱中。"
 
 #: ../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."
+"The message will be saved to your local Outbox folder, because the "
+"destination service is currently unavailable. You can send the message by "
+"clicking the Send/Receive button in Evolution's toolbar."
 msgstr ""
-"由于您现在是离线工作,信息将保存到您的本地发件箱文件夹。在上线后,您可以通过"
-"点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
+"由于目标服务当前不可用,信息将保存到您的本地发件箱文件夹。在上线后,您可以通"
+"过点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -7214,13 +6864,27 @@ msgstr "Evolution 提醒通知"
 msgid "Calendar event notifications"
 msgstr "日历事件信息"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:935
-#: ../modules/mailto-handler/evolution-mailto-handler.c:215
+#: ../data/evolution.appdata.xml.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr "Evolution 是一款个人信息管理应用,提供集成的邮件、日历和地址簿功能。"
+
+#: ../data/evolution.appdata.xml.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr "Evolution 支持众多的工业标准数据格式和信息交换的网络协议,并强化了标准兼容性和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 
网络服务”(EWS) 扩展进行顺利集成。"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
+#: ../modules/mailto-handler/evolution-mailto-handler.c:212
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -7232,13 +6896,10 @@ msgstr "Evolution 邮件及日历"
 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/evolution.desktop.in.in.h:5
+#| msgid "mail;calendar;contact;addressbook;task;"
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "mail;calendar;contact;addressbook;task;邮件;日历;联系人;地址簿;任务;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -7318,14 +6979,13 @@ msgstr "是否在预览面板中显示地图"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
 msgid "Primary address book"
-msgstr "主地址薄"
+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。"
+msgstr "“联系人”视图中侧边栏中选择的(或“主”)地址簿的 UID。"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
 msgid "Show preview pane"
@@ -7359,31 +7019,28 @@ msgid "Birthday and anniversary reminder value"
 msgstr "生日和纪念日提醒值"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:4
-#, fuzzy
 msgid "Number of units for determining a birthday or anniversary reminder"
-msgstr "决定生日或周年纪念日提醒的单位数量。"
+msgstr "决定生日或周年纪念日提醒的单位数量"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:5
 msgid "Birthday and anniversary reminder units"
 msgstr "生日和纪念日提醒单位"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#, fuzzy
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\""
-msgstr "生日或周年纪念日提醒的单位,可为“minutes”,“hours”或“days”。"
+msgstr "生日或周年纪念日提醒的单位,可为“分钟”,“小时”或“天”"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:7
 msgid "Compress weekends in month view"
 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"
-msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
+msgstr "在月视图中是否压缩周末,压缩时将把周六和周日用一个单元格显示。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:9
 msgid "Ask for confirmation when deleting items"
@@ -7406,7 +7063,6 @@ 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"
@@ -7417,9 +7073,8 @@ 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"
-msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23。"
+msgstr "工作日结束的小时,以 24 小时格式表示,0 到 23"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:17
 msgid "Workday end minute"
@@ -7450,49 +7105,44 @@ 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"
-msgstr "如果被设定,在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
+msgstr "如果被设定,在日视图中显示第二时区。值和用于 'timezone' 中的键值类似"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
 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"
-msgstr "列出在日视图中最近使用过的第二时区。"
+msgstr "在日视图中最近使用过的第二时区列表"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
 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"
-msgstr "在 'day_second_zones' 列表中,最近使用过的时区最大记忆数目"
+msgstr "在 'day_second_zones' 列表中所记忆的最近用过时区的最大数目"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
 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"
-msgstr "确定默认提醒的单位数量。"
+msgstr "确定默认提醒的单位数量"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
 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\""
-msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
+msgstr "默认提醒的单位,可为“分钟“,“小时” 或 “天”。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
 msgid "Show categories field in the event/meeting/task editor"
@@ -7555,26 +7205,23 @@ 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\""
-msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
+msgstr "决定何时隐藏任务的单位,可为 “分钟”,“小时” 或 “天”。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 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"
-msgstr "决定何时隐藏任务的数字单位。"
+msgstr "决定何时隐藏任务的单位数"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 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"
@@ -7593,7 +7240,6 @@ 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"
 msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
 
@@ -7602,7 +7248,6 @@ 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)"
 msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
 
@@ -7611,7 +7256,6 @@ 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"
 msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
@@ -7621,16 +7265,14 @@ 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"
-msgstr "当水平定向时,任务预览面板的位置。"
+msgstr "当水平时,任务预览面板的位置。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 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 "
@@ -7644,30 +7286,27 @@ msgid "Memo preview pane position (vertical)"
 msgstr "备忘预览面板的竖直位置"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
-#, fuzzy
 msgid "Position of the memo preview pane when oriented vertically"
-msgstr "当竖直定向时,备忘预览面板的位置。"
+msgstr "当竖直时,备忘预览面板的位置"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 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"
-msgstr "月视图中视图和日期导航器日历之间水平面板的位置,以像素计。"
+msgstr ""
+"月视图中视图、日期导航器日历及任务列表之间水平面板的位置,以像素为单位。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
-#, fuzzy
 msgid "Scroll Month View by a week, not by a month"
-msgstr "是否按星期滚动一个月,而不是按照月份滚动。"
+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"
-msgstr "是否按星期滚动一个月,而不是按照月份滚动。"
+msgstr "是否按星期滚动月视图,而不是按照月份滚动。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid "Reminder programs"
@@ -7686,12 +7325,10 @@ 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 "首选的“新建”工具栏按钮项目的名称"
 
@@ -7700,45 +7337,42 @@ 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"
-msgstr "在“日历”视图侧边栏中选择的(或“主”)日历的 UID。"
+msgstr "在“日历”视图侧边栏中选定的(或“主”)日历的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 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"
-msgstr "在“备忘”视图侧边栏中选择的(或“主”)备忘列表的 UID。"
+msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘列表的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 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"
-msgstr "在“任务”视图侧边栏中选择的(或“主”)任务列表的 UID。"
+msgstr "在“任务”视图侧边栏中选定的(或“主”)任务列表的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid "Free/busy template URL"
 msgstr "忙/闲模板 URL"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#, fuzzy, no-c-format
+#, 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 将替换为域"
+"用作忙/闲数据退却的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
 "名。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
@@ -7746,7 +7380,6 @@ 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"
 msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
 
@@ -7814,7 +7447,8 @@ msgstr "今天到期的任务颜色"
 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 一起使用"
+msgstr ""
+"今天到期任务的背景颜色,“#rrggbb”格式;与 task-due-today-highlight 一起使用"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Task preview pane position (horizontal)"
@@ -7825,7 +7459,6 @@ msgid "Task layout style"
 msgstr "任务外观风格"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#, 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 "
@@ -7839,9 +7472,8 @@ msgid "Task preview pane position (vertical)"
 msgstr "任务预览面板的竖直位置"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
-#, fuzzy
 msgid "Position of the task preview pane when oriented vertically"
-msgstr "当竖直定向时,任务预览面板的位置。"
+msgstr "当竖直时,任务预览面板的位置。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
@@ -7857,33 +7489,32 @@ msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
-#, fuzzy
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
-msgstr "延期任务的背景颜色,以“#rrggbb”格式。"
+msgstr ""
+"延期任务的背景颜色,以“#rrggbb”格式。与 task-overdue-highlight(任务延期高亮)"
+"一道使用。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Time divisions"
 msgstr "时间分割"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
-#, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes"
-msgstr "日视图和工作日视图中显示的间隔,以分钟计。"
+msgstr "日视图和工作周视图中显示的间隔,以分钟计。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Timezone"
 msgstr "时区"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
-#, fuzzy
 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”。"
+"日历中日期和时间所使用的默认时区,以未翻译的 Olson 时区数据库位置表示,"
+"如“Asia/Chongqing”。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Twenty four hour time format"
@@ -7918,23 +7549,62 @@ msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
-msgid "Week start"
-msgstr "一周开始"
+msgid "First day of the week"
+msgstr "本周第一天"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
-msgstr "一周开始的日子,从星期日(0)到星期六(6)"
+msgid "Monday is a work day"
+msgstr "周一为工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
-msgid "Work days"
-msgstr "工作日"
+msgid "Tuesday is a work day"
+msgstr "周二为工作日"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-msgid "Days on which the start and end of work hours should be indicated"
-msgstr "应标出工作时段的日子"
+msgid "Wednesday is a work day"
+msgstr "周三为工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid "Thursday is a work day"
+msgstr "周四为工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Friday is a work day"
+msgstr "周五为工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+msgid "Saturday is a work day"
+msgstr "周六为工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+msgid "Sunday is a work day"
+msgstr "周日为工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
+msgstr "(已弃用)一周开始的日子,从星期日(0)到星期六(6)"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"week-start-day-name\" instead."
+msgstr ""
+"该键值已在版本 3.10 中弃用,不应当再使用。请使用 \"week-start-day-name\"。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+msgid "(Deprecated) Work days"
+msgstr "(已弃用)工作日"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+msgid ""
+"Days on which the start and end of work hours should be indicated. (This key "
+"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
+"day-monday\", \"work-day-tuesday\", etc. keys instead.)"
+msgstr ""
+"应当指定工作时间开始和结束的日子。(该键在 3.10 版本中已弃用,不应再使用。请转"
+"用 \"work-day-monday\",\"work-day-tuesday\" 等键。)"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:1
-#| msgid "Evolution Restore"
 msgid "Previous Evolution version"
 msgstr "上个 Evolution 版本"
 
@@ -7943,7 +7613,9 @@ msgid ""
 "The most recently used version of Evolution, expressed as \"major.minor.micro"
 "\". This is used for data and settings migration from older to newer "
 "versions."
-msgstr "最近使用的 Evolution 版本,以“主版本.次版本.小版本号”的形式表示。用于从旧版本向新版本进行数据和设置迁移。"
+msgstr ""
+"最近使用的 Evolution 版本,以“主版本.次版本.小版本号”的形式表示。用于从旧版本"
+"向新版本进行数据和设置迁移。"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:3
 msgid "List of disabled plugins"
@@ -8048,11 +7720,10 @@ 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 "在回复信息时插入的文本,附在回复来信的信息上"
+msgstr "在回复信息时插入的文本,附于原作者的信息之上"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Forward message"
@@ -8069,11 +7740,10 @@ 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 "在回复一封信时插入的文本(信息顶部),写着下面是原始信息"
+msgstr "在回复一封信时插入的文本(顶部回帖),写着下面是原始信息"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Group Reply replies to list"
@@ -8216,8 +7886,8 @@ msgid ""
 "standard."
 msgstr ""
 "以 Outlook 或 GMail 方式编码邮件头中的文件名,这样可以正确的显示由 Evolution "
-"发送的邮件带有的 UTF-8 字符的文件名,因为它们不符合 RFC 2231,而是使用了不正确"
-"的 RFC 2047 标准。"
+"发送的邮件带有的 UTF-8 字符的文件名,因为它们不符合 RFC 2231,而是使用了不正"
+"确的 RFC 2047 标准。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Put personalized signatures at the top of replies"
@@ -8272,6 +7942,8 @@ msgid ""
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 msgstr ""
+"当回复某个信息时,在主题中跳过的本地化的 “回复”缩写 列表,以逗号分隔。它们是标"
+"准 \"Re\" 前缀的补充。例如 'SV,AV'。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Save file format for drag-and-drop operation"
@@ -8282,22 +7954,10 @@ msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是“mbox”或“pdf”。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
-msgid "Save name format for drag-and-drop operation"
-msgstr "拖放操作时保存名称格式"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#, fuzzy
-msgid ""
-"Can be either 2 to use current date and time or any other value for sent "
-"date of the message. This has a meaning only when dropping just one message."
-msgstr "可设为 2 来使用当前的日期时间或任意其他值来使用信息发送时的日期。只在放置"
-"一条信息时有意义。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Show image animations"
 msgstr "显示图像动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8305,209 +7965,168 @@ msgstr ""
 "在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
 "是动态的。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Enable or disable type ahead search feature"
 msgstr "启用或禁用自动前进功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
-msgid "Disable or enable ellipsizing of folder names in side bar"
-msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
-msgid "Whether disable ellipsizing feature of folder names in side bar."
-msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "启用或禁用魔术空格键"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.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:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.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:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.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:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信息“预览”中标出引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信息“预览”中标出引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Citation highlight color"
 msgstr "引用突出颜色"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color."
 msgstr "引用突出颜色。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.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:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Default charset in which to display messages"
 msgstr "显示信息的默认字符集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages."
 msgstr "显示信息的默认字符集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
-msgid "Load images for HTML messages over HTTP"
-msgstr "在 HTML 信息中载入 HTTP 图像"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
-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:71
+msgid "Automatically load images for HTML messages over HTTP"
+msgstr "自动在 HTML 信息中载入 HTTP 图像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show all message headers"
 msgstr "显示全部信头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all the headers when viewing a messages."
 msgstr "查看信息时显示全部信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-msgid "List of custom headers and whether they are enabled."
-msgstr "自定义头及该头是否启用。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid "List of headers to show when viewing a message."
+msgstr "要在查看信息时显示的信头列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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."
+"Each header is represented as a pair: the header name, and a boolean "
+"indicating whether the header is enabled. Disabled headers are not shown "
+"when viewing a message, but are still listed in Preferences."
 msgstr ""
-"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
-"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
+"每个信头都成对出现:信头名,指示该信头是否启用的布尔值。当查看某个信息时,禁用"
+"的信头将不会显示,但仍然会列在“首选项”中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show photo of the sender"
 msgstr "显示发件人照片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在信息阅读面板中显示发件人照片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
-msgid "Search for the sender photo in local address books"
-msgstr "在本地地址薄中搜索发件人照片"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid "This option would help in improving the speed of fetching."
-msgstr "此选项能帮助提高获取信息的速度"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
-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:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Timeout for marking messages as seen"
 msgstr "将信息标为已看的超时时长"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "将信息标为已看的超时时长,单位为毫秒。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Sender email-address column in the message list"
 msgstr "在信息列表中显示 email 地址列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show deleted messages in the message-list"
 msgstr "在信息列表中显示删除了的信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在信息列表中显示删除了的信息(带有删除线)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
-#| msgid "Enable search folders"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Enable Unmatched search folder"
 msgstr "启用“无匹配”搜索文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr "启用搜索文件夹内的“无匹配”搜索文件夹。它在禁用搜索文件夹时不起作用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隐藏单文件夹预览并移除选择"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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."
@@ -8515,37 +8134,31 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Height of the message-list pane"
 msgstr "信息列表面板的高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane."
 msgstr "信息列表面板的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
-msgid "State of message headers in paned view"
-msgstr "窗格视图中信息头的状态"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
-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:96
+msgid "Whether message headers are collapsed in the user interface"
+msgstr "是否在用户界面中折叠信息头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Width of the message-list pane"
 msgstr "信息列表面板的高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane."
 msgstr "信息列表面板的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Layout style"
 msgstr "布局样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 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 "
@@ -8555,75 +8168,75 @@ msgstr ""
 "布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
 "息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "压缩 TO/CC/BCC 中地址的显示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "要在 TO/CC/BCC 中显示的地址数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信息列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default value for thread expand state"
 msgstr "话题的默认展开状态"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否以线索中的最新信息来排序线索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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 "
@@ -8632,40 +8245,41 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
 "启 Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在文件夹树中按字母顺序排列帐号"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 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,帐号按字母顺序排列,"
-"“在此计算机上”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
+msgstr ""
+"指出在邮件视图的文件夹树里如何排序帐号。若设为 true,帐号按字母顺序排列,“在"
+"此计算机上”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Flush Outbox after filtering"
 msgstr "在过滤之后清空输出窗口"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8674,86 +8288,90 @@ msgstr ""
 "在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
 "约一分钟后进行发件箱刷新。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default forward style"
 msgstr "默认转发方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+msgid "Default reply style"
+msgstr "默认回复样式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Prompt when emptying the trash"
 msgstr "清空废件箱时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "在用户试图清空废件箱时提示他/她。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "用户试图销毁文件夹时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "下列接收者不能被识别为有效的电子邮件地址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入密件抄送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是否发送意外的 HTML 时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过十封信时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt while marking multiple messages"
 msgstr "标记多封信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "禁用/启用对多条信息标记时的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除搜索文件夹中的信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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 "
@@ -8761,45 +8379,49 @@ msgid ""
 msgstr ""
 "禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "询问是否通过文件夹树的拖放操作复制文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
-msgstr "可取的值有:“never” - 不允许在文件夹树中拖放复制文件夹;“always” - 允许复制,无须询问;“ask” - (或其他任意值) 询问用户。"
+msgstr ""
+"可取的值有:“never” - 不允许在文件夹树中拖放复制文件夹;“always” - 允许复制,"
+"无须询问;“ask” - (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "询问是否通过文件夹树的拖放操作移动文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
 "folders in folder tree without asking, or 'ask' - (or any other value) will "
 "ask user."
-msgstr "可取的值有:“never” - 不允许在文件夹树中拖放移动文件夹;“always” - 允许移动,无须询问;“ask” - (或其他任意值) 询问用户。"
+msgstr ""
+"可取的值有:“never” - 不允许在文件夹树中拖放移动文件夹;“always” - 允许移动,"
+"无须询问;“ask” - (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when replying privately to list messages"
 msgstr "当对邮件列表作私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "当邮件列表劫持私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 "
@@ -8808,74 +8430,66 @@ msgstr ""
 "当您正要发送一个通过邮件列表收到的信息的私人回复,而邮件头的 Reply-To: 重定向"
 "到了列表时,禁用或启用反复的警告提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when replying to many recipients"
 msgstr "当向多个收件人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:164
-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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 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” - (或"
-"任何其他值)将询问用户。"
+"Policy for automatically closing the message browser window when forwarding "
+"or replying to the displayed message."
+msgstr "当转发或回复当前显示的信息时,自动关闭信息浏览器窗口的策略。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空废件箱"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空废件箱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空废件箱的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "退出时清空废件箱的最少天数。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Last time Empty Trash was run"
 msgstr "上次清空废件箱的时间为:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的信息会被记录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Show original \"Date\" header value."
 msgstr "显示原始的邮件头日期值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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 "
@@ -8884,11 +8498,11 @@ msgstr ""
 "显示原始的邮件头“Date” 值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
 "式和本地时区显示邮件头“Date” 值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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."
@@ -8896,44 +8510,44 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Check incoming mail being junk"
 msgstr "检查收到的邮件是否是垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件运行垃圾信息测试。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty Junk folders on exit"
 msgstr "退出时清空垃圾信息文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "退出 Evolution 时清空垃圾信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信息的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "退出时清空垃圾信息的最少时间,以天计。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾信息的时间为:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信息钩子插件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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 "
@@ -8942,11 +8556,11 @@ msgstr ""
 "这是默认的垃圾信息插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
 "缺省到其它可用的插件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "决定是否在地址簿中查找发件人电子邮件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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 "
@@ -8957,13 +8571,13 @@ msgstr ""
 "为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
 "比较慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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 "
@@ -8972,11 +8586,11 @@ msgstr ""
 "此选项与 lookup_addressbook 键值相关,用于决定是否查询本地地址簿以避免您认识"
 "的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "决定是否使用自定义信头检测垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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 "
@@ -8985,51 +8599,51 @@ msgstr ""
 "决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话,将提高"
 "垃圾信息检测速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Custom headers to use while checking for junk."
 msgstr "自定义用以检查垃圾信息的信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "UID string of the default account."
 msgstr "默认帐号的 UID 字符串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Save directory"
 msgstr "保存目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Directory for saving mail component files."
 msgstr "保存邮件组件文件的目录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Composer load/attach directory"
 msgstr "编辑器加载/附件目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Directory for loading/attaching files to composer."
 msgstr "邮件写作器用来加载/附加文件的目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Check for new messages on start"
 msgstr "启动时检查新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Check for new messages in all active accounts"
 msgstr "检查所有活动帐号的新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 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 "
@@ -9038,22 +8652,78 @@ msgstr ""
 "在 Evolution 启动时,是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
 "动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Server synchronization interval"
 msgstr "服务器同步间隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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.mail.gschema.xml.in.h:198
+msgid "(Deprecated) Default forward style"
+msgstr "(已弃用) 默认转发方式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"forward-style-name\" instead."
+msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"forward-style-name\"。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+msgid "(Deprecated) Default reply style"
+msgstr "(已弃用) 默认回复样式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"reply-style-name\" instead."
+msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"reply-style-name\"。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+msgid "(Deprecated) List of custom headers and whether they are enabled."
+msgstr "(已弃用)自定义信头及是否启用。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"show-headers\" instead."
+msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"show-headers\"。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+msgid "(Deprecated) Load images for HTML messages over HTTP"
+msgstr "(已弃用) 在 HTML 信息中载入 HTTP 图像"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"image-loading-policy\" instead."
+msgstr ""
+"该键已在 3.10 版本中弃用,不应再使用。请转用 \"image-loading-policy\"。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid ""
+"(Deprecated) 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:207
+msgid ""
+"This key was deprecated in version 3.10 and should no longer be used. Use "
+"\"browser-close-on-reply-policy\" instead."
+msgstr ""
+"该键已在 3.10 版本中弃用,不应再使用。请转用 \"browser-close-on-reply-policy"
+"\"。"
+
 #. Translators: This is the a list of words for the attach reminder plugin to look
 #. for in a message body. Please use any number of words here in your language that might
 #. indicate that an attachment should have been attached to the message.
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
 msgid "['attachment','attaching','attached','enclosed']"
-msgstr "['attachment','attaching','attached','enclosed','附件','附上','已附','奉上']"
+msgstr ""
+"['attachment','attaching','attached','enclosed','附件','附上','已附','奉上']"
 
 #: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:5
 msgid ""
@@ -9147,12 +8817,10 @@ 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/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 "在邮件编辑器中按键时自动启动编辑器。"
 
@@ -9217,8 +8885,9 @@ msgid ""
 "Whether to make a sound of any kind when new messages arrive. If \"false\", "
 "the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
 "and \"notify-sound-use-theme\" keys are disregarded."
-msgstr "是否在新消息到来时发出某种声音。如果为“false”,“notify-sound-beep”、“notify-sound-file”"
-"“notify-sound-play-file”和“notify-sound-use-theme”键会忽略。"
+msgstr ""
+"是否在新消息到来时发出某种声音。如果为“false”,“notify-sound-beep”、“notify-"
+"sound-file”“notify-sound-play-file”和“notify-sound-use-theme”键会忽略。"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
 msgid "Whether to emit a beep."
@@ -9246,7 +8915,8 @@ msgstr "是否播放声音文件。"
 msgid ""
 "Whether to play a sound file when new messages arrive. The name of the sound "
 "file is given by the 'notify-sound-file' key."
-msgstr "是否在新消息到达时是否播放声音文件。声音文件名由“notify-sound-file”键给定。"
+msgstr ""
+"是否在新消息到达时是否播放声音文件。声音文件名由“notify-sound-file”键给定。"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 msgid "Use sound theme"
@@ -9265,15 +8935,16 @@ 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 只显示纯文字"
+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.publish-calendar.gschema.xml.in.h:1
-#| msgid "List of server URLs for free/busy publishing."
 msgid "List of Destinations for publishing"
 msgstr "发布目标位置列表"
 
@@ -9281,7 +8952,9 @@ 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 文件。"
+msgstr ""
+"此键指定发布日历的目标位置的列表。每个值指定一个带有发布到某个目标位置的相应"
+"设置的 XML 文件。"
 
 #: ../data/org.gnome.evolution.plugin.templates.gschema.xml.in.h:1
 msgid ""
@@ -9316,7 +8989,7 @@ msgstr "初始文件选择器文件夹"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 对话框的起始文件夹。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:314
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "以离线模式启动"
 
@@ -9406,269 +9079,195 @@ msgstr "只使用本地垃圾信息测试。"
 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
-msgid "Use SpamAssassin daemon and client"
-msgstr "使用垃圾克星守护程序和客户端"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-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/e-mail-formatter-attachment.c:363
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
-#: ../widgets/misc/e-attachment-bar.c:106
-#: ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
+#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:369
-#| msgctxt "iCalImp"
-#| msgid "has attachments"
+#: ../em-format/e-mail-formatter-attachment.c:398
 msgid "Display as attachment"
 msgstr "以附件显示"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-headers.c:103
+#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
 msgid "From"
 msgstr "发件人"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "回复至"
-
-#: ../em-format/e-mail-formatter.c:1371
-#: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../modules/mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "抄送"
-
-#: ../em-format/e-mail-formatter.c:1372
-#: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../modules/mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "密件抄送"
-
-#: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:166
-#: ../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:72
-#: ../smime/lib/e-cert.c:1125
-msgid "Subject"
-msgstr "主题"
-
-#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
-msgid "Date"
-msgstr "日期"
-
-#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
-#: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid "Face"
-msgstr "头像"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../em-format/e-mail-formatter-headers.c:114
-#: ../plugins/mail-notification/mail-notification.c:396
-#, c-format
-msgid "From: %s"
-msgstr "来自:%s"
-
-#: ../em-format/e-mail-formatter-headers.c:134
-#: ../em-format/e-mail-formatter-headers.c:139
+#: ../em-format/e-mail-formatter-headers.c:129
 msgid "(no subject)"
 msgstr "(无主题)"
 
-#: ../em-format/e-mail-formatter-headers.c:340
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "此信息由 %s 代表 %s 的身份发送"
 
 #: ../em-format/e-mail-formatter-image.c:152
-#| msgid "Save Image"
 msgid "Regular Image"
 msgstr "常规图像"
 
-#: ../em-format/e-mail-formatter-image.c:158
-#| msgid "Display the next message"
+#: ../em-format/e-mail-formatter-image.c:153
 msgid "Display part as an image"
 msgstr "以图像显示部分"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:237
-#| msgid "Forward message"
+#: ../em-format/e-mail-formatter-message-rfc822.c:246
 msgid "RFC822 message"
 msgstr "RFC822 信息"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:243
-#| msgid "Formatting message"
+#: ../em-format/e-mail-formatter-message-rfc822.c:247
 msgid "Format part as an RFC822 message"
 msgstr "将部分格式化为 RFC822 信息"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1238
-#: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1328
+#: ../modules/cal-config-google/e-google-chooser.c:237
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "姓名"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:54
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
-#. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:130
-#: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:130
-msgid "Security"
-msgstr "安全"
-
-#: ../em-format/e-mail-formatter-print-headers.c:147
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG signed"
 msgstr "已经 GPG 签名"
 
-#: ../em-format/e-mail-formatter-print-headers.c:152
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "GPG encrpyted"
 msgstr "已经 GPG 加密"
 
-#: ../em-format/e-mail-formatter-print-headers.c:158
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME signed"
 msgstr "已经 S/MIME 签名"
 
-#: ../em-format/e-mail-formatter-print-headers.c:164
+#: ../em-format/e-mail-formatter-print-headers.c:162
 msgid "S/MIME encrpyted"
 msgstr "已经 S/MIME 加密"
 
+#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../mail/e-mail-config-security-page.c:645
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+msgid "Security"
+msgstr "安全"
+
+#: ../em-format/e-mail-formatter-quote-headers.c:168
+#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:69
+msgid "Subject"
+msgstr "主题"
+
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:177
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1048
+#: ../em-format/e-mail-formatter-quote-headers.c:187
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "邮件程序"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
-#: ../em-format/e-mail-formatter-text-enriched.c:115
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "富文本"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
-#: ../em-format/e-mail-formatter-text-enriched.c:121
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "以富文本显示部分"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:338
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:349
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:344
-#| msgid "For_mat messages in HTML"
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:350
 msgid "Format part as HTML"
 msgstr "将部分格式化为 HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
-#| msgid "Plain Text Mode"
+#: ../em-format/e-mail-formatter-quote-text-plain.c:115
+#: ../em-format/e-mail-formatter-text-plain.c:185
 msgid "Plain Text"
 msgstr "纯文字"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
-#| msgid "Only ever show plain text"
+#: ../em-format/e-mail-formatter-quote-text-plain.c:116
+#: ../em-format/e-mail-formatter-text-plain.c:186
 msgid "Format part as plain text"
 msgstr "将部分格式化为纯文字"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信息未签名。无法保证这封信是可信的。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此信息已签名,而且签名是有效的。这意味着这封信应该是可信的。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "签名有效,但是无法校验发送者"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "签名已存在,但需要公钥"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "这封信的签名有效,但是没有相应的公钥。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 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 "
@@ -9677,21 +9276,21 @@ msgstr ""
 "这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
 "定时间进行暴力破解,这很困难但并不是不可能。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 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 "
@@ -9700,135 +9299,818 @@ msgstr ""
 "这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
 "量时间进行暴力破解,这十分困难。"
 
-#: ../em-format/e-mail-formatter-secure-button.c:190
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:187
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../em-format/e-mail-formatter-secure-button.c:205
+#: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../em-format/e-mail-formatter-source.c:139
+#: ../em-format/e-mail-formatter-source.c:115
 msgid "Source"
 msgstr "来源"
 
-#: ../em-format/e-mail-formatter-source.c:145
+#: ../em-format/e-mail-formatter-source.c:116
 msgid "Display source of a MIME part"
 msgstr "显示 MIME 部分的源内容"
 
-#: ../em-format/e-mail-parser-application-mbox.c:108
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+msgid "Cc"
+msgstr "抄送"
+
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+msgid "Bcc"
+msgstr "密件抄送"
+
+#: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "解析 MBOX 部分出错:%s"
 
-#: ../em-format/e-mail-parser-application-smime.c:104
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, c-format
-#| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse S/MIME message: %s"
 msgstr "无法解析 S/MIME 信息:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
 #, c-format
-#| msgid "Could not parse PGP message: "
 msgid "Could not parse PGP message: %s"
 msgstr "无法解析 PGP 信息:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
-#: ../em-format/e-mail-parser-multipart-signed.c:144
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:136
 #, c-format
-#| msgid "Error verifying signature"
 msgid "Error verifying signature: %s"
 msgstr "校验签名出错:%s"
 
-#: ../em-format/e-mail-parser-message-external.c:86
+#: ../em-format/e-mail-parser-message-external.c:69
 msgid "Malformed external-body part"
 msgstr "损坏的 external-body 部分"
 
-#: ../em-format/e-mail-parser-message-external.c:118
+#: ../em-format/e-mail-parser-message-external.c:102
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:129
+#: ../em-format/e-mail-parser-message-external.c:113
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: ../em-format/e-mail-parser-message-external.c:131
+#: ../em-format/e-mail-parser-message-external.c:115
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:134
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:167
+#: ../em-format/e-mail-parser-message-external.c:152
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:95
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:84
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 信息。显示源文本。"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "不支持 multipart/encrypted 的加密类型"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
 #, c-format
-#| msgid "Could not parse PGP/MIME message"
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "无法解析 PGP/MIME 信息:%s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:129
+#: ../em-format/e-mail-parser-multipart-signed.c:122
 msgid "Unsupported signature format"
 msgstr "不支持的签名格式"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+msgid "Reply-To"
+msgstr "回复至"
+
+#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
+#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:70
+msgid "Date"
+msgstr "日期"
+
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid "Face"
+msgstr "头像"
+
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "标准"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "优先级"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "机密"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "绝密"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "独家"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "无"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "已读回执"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "请求回复(_E)"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "少于(_T)"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "方便时(_W)"
+
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:844
+msgid "Replies"
+msgstr "回复"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "推迟信息投递(_D)"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "经过(_A)"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "设置过期时间(_S)"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "直到(_U)"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "发送选项"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "优先级(_P):"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "分类(_C):"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "常规选项(_R)"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "创建一个已发送项以跟踪信息(_E)"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "已投递(_D)"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "已发送和已打开(_V)"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "全部信息(_A)"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "自动删除已发项目(_U)"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "状态跟踪"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "打开时(_W):"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "拒绝时(_N):"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "完成时(_M):"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "接受时(_P):"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "返回通知"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "状态跟踪(_T)"
+
+#: ../e-util/e-table-config.ui.h:1
+msgid "_Sort..."
+msgstr "排序(_S)..."
+
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Group By..."
+msgstr "分组依据(_G)..."
+
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Fields Shown..."
+msgstr "显示的域(_F)..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../e-util/e-table-config.ui.h:7
+msgid "_Show field in View"
+msgstr "在视图中显示域(_S)"
+
+#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1754
+msgid "Ascending"
+msgstr "升序"
+
+#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1754
+msgid "Descending"
+msgstr "降序"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "Group Items By"
+msgstr "分组依据"
+
+#: ../e-util/e-table-config.ui.h:11
+msgid "Show _field in View"
+msgstr "在视图中显示域(_F)"
+
+#: ../e-util/e-table-config.ui.h:12
+msgid "Then By"
+msgstr "然后按"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show field i_n View"
+msgstr "在视图中显示域(_N)"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show field in _View"
+msgstr "在视图中显示域(_V)"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Sort"
+msgstr "排序"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Sort Items By"
+msgstr "排序依据"
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "选择一个时区"
+
+#: ../e-util/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"
+"Use the right mouse button to zoom out."
+msgstr ""
+"用鼠标左键放大地图的某个区域并选择时区。\n"
+"用鼠标右键缩小。"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "时区"
+
+#: ../e-util/e-timezone-dialog.ui.h:5
+msgid "_Selection"
+msgstr "选择(_S)"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "时区下拉组合框"
+
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../mail/em-utils.c:231
+msgid "Incoming"
+msgstr "接收"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "当前时间"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:76
+msgid "seconds"
+msgstr "秒"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "周"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "月"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "年"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "过去"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "未来"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "显示邮件过滤器:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+msgid "_Filter Rules"
+msgstr "过滤规则(_F)"
+
+#: ../e-util/filter.ui.h:17
+msgid "Compare against"
+msgstr "比较对象"
+
+#: ../e-util/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
+
+#: ../e-util/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr "信息的日期将会与指定日期的午夜12:00进行比较。"
+
+#: ../e-util/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "创建新视图(_C)"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "名称(_N):"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "替换现有视图(_R)"
+
+#: ../e-util/e-activity-proxy.c:310
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
+msgid "Cancel"
+msgstr "取消"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s(取消的)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
+#: ../e-util/e-activity.c:262
 #, c-format
 msgid "%s (completed)"
 msgstr "%s(完成的)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
+#: ../e-util/e-activity.c:265
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (等待中)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
+#: ../e-util/e-activity.c:269
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (正在取消)"
 
-#: ../e-util/e-activity.c:260
+#: ../e-util/e-activity.c:271
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:276
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#. Translators: Escape is a keyboard binding.
+#: ../e-util/e-alert-bar.c:121
+msgid "Close this message (Escape)"
+msgstr "关闭该信息 (Escape 键)"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "图标视图"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "列表视图"
+
+#: ../e-util/e-attachment-dialog.c:318
+msgid "Attachment Properties"
+msgstr "附件属性"
+
+#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "文件名(_I):"
+
+#: ../e-util/e-attachment-dialog.c:375
+msgid "MIME Type:"
+msgstr "MIME  类型:"
+
+#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+msgid "_Suggest automatic display of attachment"
+msgstr "建议自动显示附件(_S)"
+
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr "不能设置为背景"
+
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "设为背景(_B)"
+
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "载入"
+
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "保存"
+
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "隐藏附件栏(_B)"
+
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "显示附件栏(_B)"
+
+#: ../e-util/e-attachment-store.c:463
+msgid "Add Attachment"
+msgstr "添加附件"
+
+#: ../e-util/e-attachment-store.c:466
+msgid "A_ttach"
+msgstr "附件(_T)"
+
+#: ../e-util/e-attachment-store.c:537
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "保存附件"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2056
+#: ../e-util/e-attachment.c:2719
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr "用其他应用程序打开..."
+
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "全部保存(_A)"
+
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "添加附件(_D)..."
+
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "隐藏(_H)"
+
+#: ../e-util/e-attachment-view.c:442
+msgid "Hid_e All"
+msgstr "全部隐藏(_E)"
+
+#: ../e-util/e-attachment-view.c:449
+msgid "_View Inline"
+msgstr "嵌入查看(_V)"
+
+#: ../e-util/e-attachment-view.c:456
+msgid "Vie_w All Inline"
+msgstr "嵌入查看(_W)"
+
+#: ../e-util/e-attachment-view.c:786
+#, c-format
+msgid "Open With \"%s\""
+msgstr "使用“%s”打开"
+
+#: ../e-util/e-attachment-view.c:789
+#, 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.
+#: ../e-util/e-attachment.c:1106
+msgid "Attached message"
+msgstr "附加的信息"
+
+#: ../e-util/e-attachment.c:2137 ../e-util/e-attachment.c:3025
+msgid "A load operation is already in progress"
+msgstr "一个已经加载的操作正在进行"
+
+#: ../e-util/e-attachment.c:2145 ../e-util/e-attachment.c:3033
+msgid "A save operation is already in progress"
+msgstr "个已经保存的操作正在进行"
+
+#: ../e-util/e-attachment.c:2265
+#, c-format
+msgid "Could not load '%s'"
+msgstr "不能加载“%s”"
+
+#: ../e-util/e-attachment.c:2268
+#, c-format
+msgid "Could not load the attachment"
+msgstr "不能加载附件"
+
+#: ../e-util/e-attachment.c:2572
+#, c-format
+msgid "Could not open '%s'"
+msgstr "不能打开“%s”"
+
+#: ../e-util/e-attachment.c:2575
+#, c-format
+msgid "Could not open the attachment"
+msgstr "不能打开附件"
+
+#: ../e-util/e-attachment.c:3042
+msgid "Attachment contents not loaded"
+msgstr "附件内容未载入"
+
+#: ../e-util/e-attachment.c:3122
+#, c-format
+msgid "Could not save '%s'"
+msgstr "不能保存“%s”"
+
+#: ../e-util/e-attachment.c:3125
+#, c-format
+msgid "Could not save the attachment"
+msgstr "无法保存附件"
+
+#: ../e-util/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "标记为默认地址簿"
+
+#: ../e-util/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "用此地址簿自动完成"
+
+#: ../e-util/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "将地址簿内容复制到本地以进行离线操作"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
+#: ../e-util/e-buffer-tagger.c:410
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl 加单击来打开一个链接"
+
+#: ../e-util/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "标为默认日历"
+
+#: ../e-util/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "标为默认任务列表"
+
+#: ../e-util/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "标为默认备忘列表"
+
+#: ../e-util/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "颜色:"
+
+#: ../e-util/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "将日历内容复制到本地以进行离线操作"
+
+#: ../e-util/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "将任务列表内容复制到本地以进行离线操作"
+
+#: ../e-util/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "将备忘列表内容复制到本地以进行离线操作"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1329
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1366
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%Y %B"
+
+#: ../e-util/e-calendar.c:190
+msgid "Previous month"
+msgstr "上个月"
+
+#: ../e-util/e-calendar.c:215
+msgid "Next month"
+msgstr "下个月"
+
+#: ../e-util/e-calendar.c:241
+msgid "Previous year"
+msgstr "上一年"
+
+#: ../e-util/e-calendar.c:266
+msgid "Next year"
+msgstr "下一年"
+
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "月历"
+
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr "当前使用的分类(_U):"
+
+#: ../e-util/e-categories-editor.c:235
+msgid "_Available Categories:"
+msgstr "可用类别(_A):"
+
+#: ../e-util/e-categories-selector.c:323
+msgid "Icon"
+msgstr "图标"
+
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "创建分类 \"%s\""
+
+#: ../e-util/e-category-editor.c:137
+msgid "Category Icon"
+msgstr "类别图标"
+
+#: ../e-util/e-category-editor.c:141
+msgid "_No Image"
+msgstr "无图像(_N)"
+
+#: ../e-util/e-category-editor.c:178
+msgid "Category _Name"
+msgstr "类别名字(_N)"
+
+#: ../e-util/e-category-editor.c:190
+msgid "Category _Icon"
+msgstr "类别图标(_I)"
+
+#: ../e-util/e-category-editor.c:216
+msgid "Category Properties"
+msgstr "类别属性"
+
+#: ../e-util/e-category-editor.c:277
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "在配置中已经有分类 '%s' 。请尝试用另外的名字。"
+
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "弹出列表"
+
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "现在"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1900
+#: ../modules/itip-formatter/itip-view.c:226
+msgid "Today"
+msgstr "今天"
+
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "无"
+
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "确定"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "时间必须采用格式:%s"
+
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1840
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
+
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "字符编码"
+
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "输入要使用的字符集"
+
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "其它..."
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "阿拉伯语"
@@ -9906,27 +10188,74 @@ msgstr "乌克兰语"
 msgid "Visual"
 msgstr "可视"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
-#: ../modules/itip-formatter/itip-view.c:235
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "今天"
+#: ../e-util/e-client-cache.c:1162
+#, c-format
+msgid "Cannot create a client object from extension name '%s'"
+msgstr "无法从名为 '%s' 的扩展创建客户端对象"
+
+#: ../e-util/e-dateedit.c:524
+msgid "Date and Time"
+msgstr "日期和时间"
+
+#: ../e-util/e-dateedit.c:549
+msgid "Text entry to input date"
+msgstr "输入日期的文本框"
+
+#: ../e-util/e-dateedit.c:572
+msgid "Click this button to show a calendar"
+msgstr "单击此按钮可显示日历"
+
+#: ../e-util/e-dateedit.c:626
+msgid "Drop-down combination box to select time"
+msgstr "选择时间的组合框"
+
+#: ../e-util/e-dateedit.c:627
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Time"
+msgstr "时间"
+
+#: ../e-util/e-dateedit.c:701
+msgid "No_w"
+msgstr "现在(_W)"
+
+#: ../e-util/e-dateedit.c:708
+msgid "_Today"
+msgstr "今天(_T)"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:717
+msgid "_None"
+msgstr "无(_N)"
+
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+msgctxt "date"
+msgid "None"
+msgstr "无"
+
+#: ../e-util/e-dateedit.c:1953
+msgid "Invalid Date Value"
+msgstr "无效的日期值"
+
+#: ../e-util/e-dateedit.c:1998
+msgid "Invalid Time Value"
+msgstr "无效的时间值"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:254
 msgid "Tomorrow"
 msgstr "明天"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "下周一"
@@ -9934,7 +10263,7 @@ msgstr "下周一"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "下周二"
@@ -9942,7 +10271,7 @@ msgstr "下周二"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "下周三"
@@ -9950,7 +10279,7 @@ msgstr "下周三"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "下周四"
@@ -9958,7 +10287,7 @@ msgstr "下周四"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "下周五"
@@ -9966,7 +10295,7 @@ msgstr "下周五"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "下周六"
@@ -9974,231 +10303,162 @@ msgstr "下周六"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "下周日"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "使用本地默认值"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "格式:"
 
-#: ../e-util/e-file-utils.c:150
+#: ../e-util/e-file-utils.c:121
 msgid "(Unknown Filename)"
 msgstr "(未知文件名)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:154
+#: ../e-util/e-file-utils.c:125
 #, 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:159
+#: ../e-util/e-file-utils.c:130
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "把“%s”写入到 %s"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "打印时发生了错误"
-
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "打印系统报告了下列错误细节:"
-
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr "打印系统未报告关于错误的任何额外细节。"
-
-#: ../e-util/e-system.error.xml.h: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 ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
-msgstr "文件已存在于“{0}”中。若替换它会覆盖其内容。"
-
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "替换(_R)"
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "无法保存文件“{0}”。"
-
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "原因是“{1}”。"
-
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "无法打开文件“{0}”。"
-
-#: ../e-util/e-system.error.xml.h:7
-#| msgid "Could not read signature file &quot;{0}&quot;."
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "无法移除数据源“{0}”。"
-
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-#| msgid "The reported error was &quot;{0}&quot;."
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "报告的错误为“{1}”。"
-
-#: ../e-util/e-system.error.xml.h:9
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "无法更新数据源“{0}”。"
-
-#: ../e-util/e-system.error.xml.h:10
-#| msgid "Bad regular expression &quot;{0}&quot;."
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "无法删除资源“{0}”。"
-
-#: ../e-util/e-util.c:243
-msgid "Could not open the link."
-msgstr "无法打开链接。"
-
-#: ../e-util/e-util.c:290
-msgid "Could not display help for Evolution."
-msgstr "无法显示 Evolution 的帮助。"
-
 #. 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:69
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d 秒内"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d 分钟内"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d 小时内"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d 内"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 周前"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d 周内"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月前"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 个月内"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../e-util/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d 年内"
 
-#: ../filter/e-filter-datespec.c:132
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<单击此处以选择日期>"
 
-#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
-#: ../filter/e-filter-datespec.c:157
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 msgid "now"
 msgstr "现在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:142
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "选择文件"
 
-#: ../filter/e-filter-rule.c:741
+#: ../e-util/e-filter-rule.c:747
 msgid "R_ule name:"
 msgstr "规则名(_U):"
 
-#: ../filter/e-filter-rule.c:791
-#| msgid "Find items that meet the following conditions"
+#: ../e-util/e-filter-rule.c:797
 msgid "all the following conditions"
 msgstr "下列所有条件"
 
-#: ../filter/e-filter-rule.c:792
-#| msgid "Find items that meet the following conditions"
+#: ../e-util/e-filter-rule.c:798
 msgid "any of the following conditions"
 msgstr "下列条件之一"
 
-#: ../filter/e-filter-rule.c:798
-#| msgid "_Find items:"
+#: ../e-util/e-filter-rule.c:804
 msgid "_Find items which match:"
 msgstr "查找匹配的项目(_F):"
 
-#: ../filter/e-filter-rule.c:820
+#: ../e-util/e-filter-rule.c:827
 msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
@@ -10206,335 +10466,1186 @@ msgstr "查找符合下列条件的项目"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../e-util/e-filter-rule.c:842 ../e-util/e-mail-identity-combo-box.c:474
+#: ../e-util/e-mail-signature-combo-box.c:369 ../e-util/e-proxy-editor.c:550
+#: ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-#: ../widgets/misc/e-mail-signature-combo-box.c:318
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "无"
 
-#: ../filter/e-filter-rule.c:836
+#: ../e-util/e-filter-rule.c:843
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "回复"
-
-#: ../filter/e-filter-rule.c:838
+#: ../e-util/e-filter-rule.c:845
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:846
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../filter/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:849
 msgid "I_nclude threads:"
 msgstr "包含线索(_N):"
 
-#: ../filter/e-filter-rule.c:919
+#: ../e-util/e-filter-rule.c:926
 msgid "A_dd Condition"
 msgstr "添加动作(_D)"
 
-#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:302
-msgid "Incoming"
-msgstr "接收"
-
-#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:232
 msgid "Outgoing"
 msgstr "寄出"
 
-#: ../filter/e-rule-editor.c:273
+#: ../e-util/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 的文件,并从列表中选择文件的类型。"
+
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "选择一个文件"
+
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "文件类型(_T):"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+msgid "Choose the destination for this import"
+msgstr "选择此导入的目的位置"
+
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr "选择要运行的导入器类型:"
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "从旧版程序中导入数据和设置(_O)"
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "导入单个文件(_S)"
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+msgid "Please select the information that you would like to import:"
+msgstr "请选择您希望导入的信息:"
+
+#: ../e-util/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 "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution 检查了从以下程序导入的设置:Pine、Netscape、Elm、iCalendar。并未发"
+"现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
+
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "从 %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "取消导入(_C)"
+
+#: ../e-util/e-import-assistant.c:920
+msgid "Preview data to be imported"
+msgstr "预览要导入的信息"
+
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
+msgid "Import Data"
+msgstr "导入数据"
+
+#: ../e-util/e-import-assistant.c:934
+msgid "Select what type of file you want to import from the list."
+msgstr "选择您想从列表导入的类型"
+
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+msgid "Evolution Import Assistant"
+msgstr "Evolution 导入助手"
+
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "导入位置"
+
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"欢迎使用 Evolution 导入助手。\n"
+"本助手将全程指导您将外部文件导入 Evolution。"
+
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "导入器类型"
+
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "选择要导入的信息"
+
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "选择一个文件"
+
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "单击“应用”以便开始将文件导入到 Evolution。"
+
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "自动生成的"
+
+#: ../e-util/e-mail-signature-editor.c:310
+msgid "Close"
+msgstr "关闭"
+
+#: ../e-util/e-mail-signature-editor.c:315
+msgid "_Save and Close"
+msgstr "保存并关闭(_S)"
+
+#: ../e-util/e-mail-signature-editor.c:529
+msgid "Edit Signature"
+msgstr "编辑签名"
+
+#: ../e-util/e-mail-signature-editor.c:549
+msgid "_Signature Name:"
+msgstr "签名(_S):"
+
+#: ../e-util/e-mail-signature-editor.c:595
+msgid "Unnamed"
+msgstr "未命名"
+
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "添加脚本(_S)"
+
+#: ../e-util/e-mail-signature-manager.c:422
+msgid "Add Signature Script"
+msgstr "添加签名脚本"
+
+#: ../e-util/e-mail-signature-manager.c:492
+msgid "Edit Signature Script"
+msgstr "编辑签名脚本"
+
+#: ../e-util/e-mail-signature-script-dialog.c:395
+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"
+"用于显示。"
+
+#: ../e-util/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "脚本(_C):"
+
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "脚本文件必须可执行。"
+
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "世界地图"
+
+#: ../e-util/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."
+msgstr ""
+"基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
+"区。"
+
+#: ../e-util/e-misc-utils.c:243
+msgid "Could not open the link."
+msgstr "无法打开链接。"
+
+#: ../e-util/e-misc-utils.c:290
+msgid "Could not display help for Evolution."
+msgstr "无法显示 Evolution 的帮助。"
+
+#: ../e-util/e-name-selector-dialog.c:279
+msgid "Show Contacts"
+msgstr "显示联系人"
+
+#: ../e-util/e-name-selector-dialog.c:311
+msgid "Address B_ook:"
+msgstr "地址簿(_O)"
+
+#: ../e-util/e-name-selector-dialog.c:318
+msgid "Cat_egory:"
+msgstr "类别(_E)"
+
+#: ../e-util/e-name-selector-dialog.c:342
+msgid "_Search:"
+msgstr "搜索(_S):"
+
+#: ../e-util/e-name-selector-dialog.c:368
+#: ../e-util/e-name-selector-dialog.c:1276
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:938
+msgid "Any Category"
+msgstr "任何类别"
+
+#: ../e-util/e-name-selector-dialog.c:370
+msgid "Co_ntacts"
+msgstr "联系人(_N)"
+
+#: ../e-util/e-name-selector-dialog.c:447
+msgid "Search"
+msgstr "搜索"
+
+#: ../e-util/e-name-selector-dialog.c:450
+#: ../mail/importers/pine-importer.c:423
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../e-util/e-name-selector-dialog.c:453
+#: ../modules/addressbook/e-book-shell-backend.c:304
+#: ../modules/addressbook/e-book-shell-view.c:372
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../e-util/e-name-selector-dialog.c:578
+msgid "Select Contacts from Address Book"
+msgstr "从地址簿选择联系人"
+
+#: ../e-util/e-name-selector-dialog.c:1001
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3040
+#, c-format
+msgid "E_xpand %s Inline"
+msgstr "在行内展开 %s (_X)"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3056
+#, c-format
+msgid "Cop_y %s"
+msgstr "复制 %s (_Y)"
+
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3067
+#, c-format
+msgid "C_ut %s"
+msgstr "剪切 %s (_U)"
+
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3085
+#, c-format
+msgid "_Edit %s"
+msgstr "编辑 %s(_E)"
+
+#: ../e-util/e-name-selector-list.c:584
+#, c-format
+msgid "_Delete %s"
+msgstr "删除 %s(_D)"
+
+#: ../e-util/e-online-button.c:31
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution 目前在线。单击该按钮可离线工作。"
+
+#: ../e-util/e-online-button.c:34
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution 目前离线。单击该按钮可在线工作。"
+
+#: ../e-util/e-online-button.c:37
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "因为网络不可用,所以 Evolution 目前离线。"
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr "密匙环键不可用:无用户或主机名"
+
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr "您的大写锁定键打开着。"
+
+#: ../e-util/e-passwords.c:578
+msgid "_Remember this passphrase"
+msgstr "记住该密码短语(_R)"
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "在该会话内记住该提醒器的密码短语(_R)"
+
+#: ../e-util/e-passwords.c:584
+msgid "_Remember this password"
+msgstr "记住该密码(_R)"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr "在该会话内记住该提醒器的密码(_R)"
+
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Evolution 首选项"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "打印时发生了错误"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "打印系统报告了下列错误细节:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "打印系统未报告关于错误的任何额外细节。"
+
+#: ../e-util/e-proxy-editor.c:315
+#| msgid "Method:"
+msgid "_Method:"
+msgstr "方法(_M):"
+
+#: ../e-util/e-proxy-editor.c:337
+msgid "Defer to Desktop Settings"
+msgstr "随桌面设置"
+
+#: ../e-util/e-proxy-editor.c:341
+#| msgid "Junk Settings"
+msgid "_Open Desktop Settings"
+msgstr "打开桌面设置(_O)"
+
+#: ../e-util/e-proxy-editor.c:367
+#| msgid "January"
+msgid "Manual"
+msgstr "手册"
+
+#: ../e-util/e-proxy-editor.c:386
+#| msgid "H_TTP Proxy:"
+msgid "_HTTP Proxy:"
+msgstr "_HTTP 代理:"
+
+#: ../e-util/e-proxy-editor.c:417
+#| msgid "H_TTP Proxy:"
+msgid "H_TTPS Proxy:"
+msgstr "H_TTPS 代理:"
+
+#: ../e-util/e-proxy-editor.c:448
+#| msgid "SOC_KS Proxy:"
+msgid "_Socks Proxy:"
+msgstr "_Socks 代理:"
+
+#: ../e-util/e-proxy-editor.c:479
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "忽略 Hosts(_I):"
+
+#: ../e-util/e-proxy-editor.c:505
+#| msgid "Automatic Contacts"
+msgid "Automatic"
+msgstr "自动"
+
+#: ../e-util/e-proxy-editor.c:524
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr "配置 _URL:"
+
+#: ../e-util/e-proxy-editor.c:553
+msgid "Use a direct connection, no proxying required."
+msgstr "直接连接,不需要代理。"
+
+#: ../e-util/e-proxy-preferences.c:178
+msgid "Switch to Basic Proxy Preferences"
+msgstr "切换到基本代理首选项"
+
+#: ../e-util/e-proxy-preferences.c:180
+msgid "Switch to Advanced Proxy Preferences"
+msgstr "切换到高级代理首选项"
+
+#: ../e-util/e-proxy-preferences.c:464
+msgid "Apply custom proxy settings to these accounts:"
+msgstr "将自定义代理设置应用到这些帐户:"
+
+#: ../e-util/e-proxy-preferences.c:499
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+msgstr "<b>高级代理设置</b>可以用来定义备选的网络代理并将它们应用到特定的帐户"
+
+#: ../e-util/e-proxy-selector.c:86
+#| msgid "_Custom binary:"
+msgid "Custom Proxy"
+msgstr "自定义代理"
+
+#: ../e-util/e-proxy-selector.c:488
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "创建新的代理配置"
+
+#: ../e-util/e-proxy-selector.c:493
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "重命名选中的代理配置"
+
+#: ../e-util/e-rule-editor.c:185
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: ../filter/e-rule-editor.c:366
+#: ../e-util/e-rule-editor.c:287
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-#: ../filter/filter.error.xml.h:1
+#: ../e-util/e-search-bar.c:81
+#, c-format
+msgid "Matches: %u"
+msgstr "匹配:%u"
+
+#: ../e-util/e-search-bar.c:565
+msgid "Close the find bar"
+msgstr "关闭查找栏"
+
+#: ../e-util/e-search-bar.c:573
+msgid "Fin_d:"
+msgstr "查找(_D):"
+
+#: ../e-util/e-search-bar.c:585
+msgid "Clear the search"
+msgstr "清除搜索"
+
+#: ../e-util/e-search-bar.c:609
+msgid "_Previous"
+msgstr "上一项(_P)"
+
+#: ../e-util/e-search-bar.c:615
+msgid "Find the previous occurrence of the phrase"
+msgstr "寻找该词句出现的前一个位置"
+
+#: ../e-util/e-search-bar.c:624
+msgid "_Next"
+msgstr "下一项(_N)"
+
+#: ../e-util/e-search-bar.c:630
+msgid "Find the next occurrence of the phrase"
+msgstr "寻找该词句出现的下一个位置"
+
+#: ../e-util/e-search-bar.c:639
+msgid "Mat_ch case"
+msgstr "大小写匹配(_C)"
+
+#: ../e-util/e-search-bar.c:667
+msgid "Reached bottom of page, continued from top"
+msgstr "到达页面底部,移到顶部继续"
+
+#: ../e-util/e-search-bar.c:689
+msgid "Reached top of page, continued from bottom"
+msgstr "到达页面顶部,移到底部继续"
+
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:328
+#: ../mail/importers/pine-importer.c:416
+#: ../modules/mail/e-mail-shell-view.c:1098
+msgid "Mail"
+msgstr "邮件"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr "删除时(_L):"
+
+#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+msgid "Type:"
+msgstr "类型:"
+
+#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+msgid "Name:"
+msgstr "名称:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1302
+msgid "Refresh every"
+msgstr "刷新间隔"
+
+#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+msgid "Use a secure connection"
+msgstr "使用安全连接"
+
+#: ../e-util/e-source-config.c:1428
+msgid "Unset _trust for SSL certificate"
+msgstr "不再信任 SSL 证书(_T)"
+
+#: ../e-util/e-source-config.c:1464
+msgid "User"
+msgstr "用户"
+
+#: ../e-util/e-source-selector-dialog.c:229
+msgid "_Destination"
+msgstr "目标位置(_D)"
+
+#: ../e-util/e-source-selector-dialog.c:342
+msgid "Select destination"
+msgstr "选择目标位置"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:384
+msgid "(no suggestions)"
+msgstr "(无建议)"
+
+#: ../e-util/e-spell-entry.c:408
+msgid "More..."
+msgstr "更多..."
+
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:479
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "添加 “%s” 到字典"
+
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:530
+msgid "Ignore All"
+msgstr "忽略全部"
+
+#: ../e-util/e-spell-entry.c:558
+msgid "Spelling Suggestions"
+msgstr "拼写建议"
+
+#: ../e-util/e-system.error.xml.h: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 ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr "文件已存在于“{0}”中。若替换它会覆盖其内容。"
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "替换(_R)"
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "无法保存文件“{0}”。"
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}”。"
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "无法打开文件“{0}”。"
+
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "无法移除数据源“{0}”。"
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "报告的错误为“{1}”。"
+
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "无法更新数据源“{0}”。"
+
+#: ../e-util/e-system.error.xml.h:10
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "无法删除资源“{0}”。"
+
+#: ../e-util/e-system.error.xml.h:11
+msgid ""
+"The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "地址簿后端服务 &quot;{0}&quot; 异常退出。"
+
+#: ../e-util/e-system.error.xml.h:12
+msgid ""
+"Some of your contacts may not be available until Evolution is restarted."
+msgstr "在您重新启动 Evolution 之前某些联系人可能无法使用。"
+
+#: ../e-util/e-system.error.xml.h:13
+msgid "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "日历后端服务 &quot;{0}&quot; 异常退出。"
+
+#: ../e-util/e-system.error.xml.h:14
+msgid ""
+"Some of your appointments may not be available until Evolution is restarted."
+msgstr "在您重新启动 Evolution 之前某些备忘录可能无法使用。"
+
+#: ../e-util/e-system.error.xml.h:15
+msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "备忘录列表后端服务 &quot;{0}&quot; 异常退出。"
+
+#: ../e-util/e-system.error.xml.h:16
+msgid "Some of your memos may not be available until Evolution is restarted."
+msgstr "在您重新启动 Evolution 之前某些备忘录可能无法使用。"
+
+#: ../e-util/e-system.error.xml.h:17
+msgid "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
+msgstr "任务后端服务 &quot;{0}&quot; 异常退出。"
+
+#: ../e-util/e-system.error.xml.h:18
+msgid "Some of your tasks may not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution,否则某些任务可能无法使用。"
+
+#: ../e-util/e-system.error.xml.h:19
+msgid ""
+"The address book backend servicing &quot;{0}&quot; encountered an error."
+msgstr "地址簿后端服务 &quot;{0}&quot; 遇到一个错误。"
+
+#: ../e-util/e-system.error.xml.h:20
+msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
+msgstr "日历后端服务 &quot;{0}&quot; 遇到一个错误。"
+
+#: ../e-util/e-system.error.xml.h:21
+msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
+msgstr "备忘录列表后端服务 &quot;{0}&quot; 遇到一个错误。"
+
+#: ../e-util/e-system.error.xml.h:22
+msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
+msgstr "任务列表后端服务 &quot;{0}&quot; 遇到一个错误。"
+
+#: ../e-util/e-table-click-to-add.c:681
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "单击可添加"
+
+#: ../e-util/e-table-column-selector.c:266
+msgid "Move selected column names to top"
+msgstr "把选定的栏名移至顶端"
+
+#: ../e-util/e-table-column-selector.c:271
+msgid "Move selected column names up one row"
+msgstr "把选中的栏名上移一行"
+
+#: ../e-util/e-table-column-selector.c:276
+msgid "Move selected column names down one row"
+msgstr "把选中的联系人移至其它地址簿"
+
+#: ../e-util/e-table-column-selector.c:281
+msgid "Move selected column names to bottom"
+msgstr "把选定的栏名移至底端"
+
+#: ../e-util/e-table-column-selector.c:286
+msgid "Select all column names"
+msgstr "选中所有栏名"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Ascending)"
+msgstr "(升序)"
+
+#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+msgid "(Descending)"
+msgstr "(降序)"
+
+#: ../e-util/e-table-config.c:396
+msgid "Not sorted"
+msgstr "未排序"
+
+#: ../e-util/e-table-config.c:441
+msgid "No grouping"
+msgstr "未分组"
+
+#: ../e-util/e-table-config.c:546
+msgid "Show Fields"
+msgstr "显示域"
+
+#: ../e-util/e-table-config.c:562
+msgid "Choose the order of information to appear in the message list."
+msgstr "选择显示在信息列表的信息顺序。"
+
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "添加一列"
+
+#: ../e-util/e-table-field-chooser.c:167
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
+
+#: ../e-util/e-table-group-container.c:369
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s:%s (%d 项)"
+
+#: ../e-util/e-table-group-container.c:383
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d 项)"
+
+#: ../e-util/e-table-header-item.c:1577
+msgid "Customize Current View"
+msgstr "自定义当前视图"
+
+#: ../e-util/e-table-header-item.c:1600
+msgid "Sort _Ascending"
+msgstr "升序排序(_A)"
+
+#: ../e-util/e-table-header-item.c:1603
+msgid "Sort _Descending"
+msgstr "降序排序(_D)"
+
+#: ../e-util/e-table-header-item.c:1606
+msgid "_Unsort"
+msgstr "未排序(_U)"
+
+#: ../e-util/e-table-header-item.c:1609
+msgid "Group By This _Field"
+msgstr "按该域分组(_F)"
+
+#: ../e-util/e-table-header-item.c:1612
+msgid "Group By _Box"
+msgstr "按方框分组(_B)"
+
+#: ../e-util/e-table-header-item.c:1616
+msgid "Remove This _Column"
+msgstr "删除该列(_C)"
+
+#: ../e-util/e-table-header-item.c:1619
+msgid "Add a C_olumn..."
+msgstr "添加一列(_O)..."
+
+#: ../e-util/e-table-header-item.c:1623
+msgid "A_lignment"
+msgstr "对齐(_L)"
+
+#: ../e-util/e-table-header-item.c:1626
+msgid "B_est Fit"
+msgstr "最佳匹配(_E)"
+
+#: ../e-util/e-table-header-item.c:1629
+msgid "Format Column_s..."
+msgstr "格式化列(_S)..."
+
+#: ../e-util/e-table-header-item.c:1633
+msgid "Custo_mize Current View..."
+msgstr "自定义当前视图(_M)..."
+
+#: ../e-util/e-table-header-item.c:1704
+msgid "_Sort By"
+msgstr "排序方式(_S)"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1727
+msgid "_Custom"
+msgstr "自定义(_C)"
+
+#: ../e-util/e-text.c:2102
+msgid "Select All"
+msgstr "全选"
+
+#: ../e-util/e-text.c:2115
+msgid "Input Methods"
+msgstr "输入法"
+
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:805
+msgid "UTC"
+msgstr "UTC"
+
+#: ../e-util/e-url-entry.c:109
+msgid "Click here to open the URL"
+msgstr "单击此处打开该 URL 地址"
+
+#: ../e-util/e-url-entry.c:111
+msgid "Enter a URL here"
+msgstr "在此输入 URL 地址"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
+
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+msgid "Copy the link to the clipboard"
+msgstr "将链接复制到剪贴板"
+
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
+
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+msgid "Open the link in a web browser"
+msgstr "在浏览器中打开链接"
+
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+msgid "_Copy Email Address"
+msgstr "复制电子邮件地址(_C)"
+
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+msgid "_Copy Image"
+msgstr "复制图像(_C)"
+
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+msgid "Copy the image to the clipboard"
+msgstr "将图像复制到剪贴板"
+
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1317
+msgid "Select all text and images"
+msgstr "选中全部文本和图像"
+
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
+#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:992
+#: ../e-util/e-web-view.c:994 ../e-util/e-web-view.c:996
+#, c-format
+msgid "Click to call %s"
+msgstr "单击以呼叫 %s"
+
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:998
+msgid "Click to hide/unhide addresses"
+msgstr "单击可隐藏/显示地址"
+
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1000
+#, c-format
+msgid "Click to open %s"
+msgstr "单击以打开 %s"
+
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "保存图像(_I)..."
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "保存该图像为文件"
+
+#: ../e-util/e-web-view.c:2894
+msgid "Copying image to clipboard"
+msgstr "正在将图像复制到剪贴板"
+
+#: ../e-util/e-web-view.c:3082
+msgid "Save Image"
+msgstr "保存图像"
+
+#: ../e-util/e-web-view.c:3118
+#, c-format
+msgid "Saving image to '%s'"
+msgstr "正在保存图像至 %s"
+
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%Y年%-m月%-d日"
+
+#: ../e-util/ea-calendar-item.c:327
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "日历:从 %s 到 %s"
+
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
+msgstr "Evolution 日历项目"
+
+#: ../e-util/evolution-source-viewer.c:635
+msgid "Evolution Source Viewer"
+msgstr "Evolution 源查看器"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+msgid "Display Name"
+msgstr "显示名称"
+
+#: ../e-util/evolution-source-viewer.c:674
+msgid "Flags"
+msgstr "标志"
+
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:678
+msgid "Identity"
+msgstr "标识"
+
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "缺少日期。"
 
-#: ../filter/filter.error.xml.h:2
+#: ../e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "您忘记选择日期了。"
 
-#: ../filter/filter.error.xml.h:3
+#: ../e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "缺少文件名。"
 
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "您必须指定一个文件名。"
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "文件“{0}”不存在或不是普通文件。"
 
-#: ../filter/filter.error.xml.h:6
+#: ../e-util/filter.error.xml.h:6
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "无效的正则表达式“{0}”。"
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:7
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "无法编译正则表达式“{1}”。"
 
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "缺少名称。"
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "您必须为该过滤规则命名。"
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "名称“{0}”已使用。"
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "请另选一个名称。"
 
-#: ../filter/filter.ui.h:2
-msgid "the current time"
-msgstr "当前时间"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr "弹出子对象"
 
-#: ../filter/filter.ui.h:3
-msgid "the time you specify"
-msgstr "您指定的时间"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr "切换单元格"
 
-#: ../filter/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:214
+msgid "expands the row in the ETree containing this cell"
+msgstr "在包含此单元格的 ETree 中展开行"
 
-#: ../filter/filter.ui.h:5
-msgid "seconds"
-msgstr "秒"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:222
+msgid "collapses the row in the ETree containing this cell"
+msgstr "在包含此单元格的 ETree 中折叠行"
 
-#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "周"
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "表格单元格"
 
-#: ../filter/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "月"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "单击"
 
-#: ../filter/filter.ui.h:11
-msgid "years"
-msgstr "年"
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "排序"
 
-#: ../filter/filter.ui.h:12
-msgid "ago"
-msgstr "过去"
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "保存当前视图"
 
-#: ../filter/filter.ui.h:13
-msgid "in the future"
-msgstr "未来"
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "您希望保存更改吗?"
 
-#: ../filter/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "显示邮件过滤器:"
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "签名已经更改,但尚未保存。"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "过滤规则(_F)"
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "丢弃更改(_D)"
 
-#: ../filter/filter.ui.h:17
-msgid "Compare against"
-msgstr "比较对象"
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "空签名"
 
-#: ../filter/filter.ui.h:18
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+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进行比较。"
+#: ../e-util/widgets.error.xml.h:6
+msgid "Unable to copy image to clipboard."
+msgstr "无法将图像复制到剪贴板。"
 
-#: ../filter/filter.ui.h:22
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
+#: ../e-util/widgets.error.xml.h:7
+msgid "Unable to save image."
+msgstr "无法保存图像。"
+
+#: ../e-util/widgets.error.xml.h:8
+msgid "Could not load signature."
+msgstr "无法加载签名。"
+
+#: ../e-util/widgets.error.xml.h:9
+msgid "Could not save signature."
+msgstr "无法保存签名。"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+msgid "OAuth2"
+msgstr "OAuth2"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr "该选项将使用 OAuth 2.0 访问令牌连接到服务器。"
 
 #: ../libemail-engine/e-mail-authenticator.c:182
 #, c-format
-#| msgid "Invalid authentication"
 msgid "Invalid authentication result code (%d)"
 msgstr "无效的认证结果代码(%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:112
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "把信息保存到文件夹 %s 中"
 
-#: ../libemail-engine/e-mail-folder-utils.c:557
+#: ../libemail-engine/e-mail-folder-utils.c:572
 msgid "Forwarded messages"
 msgstr "转发的信息"
 
-#: ../libemail-engine/e-mail-folder-utils.c:667
-#: ../libemail-engine/e-mail-folder-utils.c:918
+#: ../libemail-engine/e-mail-folder-utils.c:682
+#: ../libemail-engine/e-mail-folder-utils.c:933
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收取 %d 封信"
 
-#: ../libemail-engine/e-mail-folder-utils.c:761
+#: ../libemail-engine/e-mail-folder-utils.c:776
 msgid "Scanning messages for duplicates"
 msgstr "扫描信息中的重复信息?"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1169
+#: ../libemail-engine/e-mail-folder-utils.c:1183
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "删除文件夹 %s"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1306
+#: ../libemail-engine/e-mail-folder-utils.c:1320
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "已经删除了“%s”文件。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1310
+#: ../libemail-engine/e-mail-folder-utils.c:1324
 msgid "File has been removed."
 msgstr "文件已移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1369
+#: ../libemail-engine/e-mail-folder-utils.c:1383
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1533
+#: ../libemail-engine/e-mail-folder-utils.c:1547
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "保存 %d 封信"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1889 ../mail/em-folder-utils.c:609
+#: ../libemail-engine/e-mail-folder-utils.c:1925
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "无效的文件夹 URI:“%s”"
 
-#: ../libemail-engine/e-mail-session.c:113 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1033
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../libemail-engine/e-mail-session-utils.c:540
+msgid "No mail transport service available"
+msgstr "没有可用的邮件传送服务"
+
+#: ../libemail-engine/e-mail-session-utils.c:640
+#: ../libemail-engine/mail-ops.c:730
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "应用寄出过滤器失败:%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:689
+#: ../libemail-engine/mail-ops.c:774
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"追加到 %s:%s 失败\n"
+"转而追加到本地“已发”文件夹。"
+
+#: ../libemail-engine/e-mail-session-utils.c:715
+#: ../libemail-engine/mail-ops.c:798
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "追加到本地“已发”文件夹失败:%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:916
+#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+msgid "Sending message"
+msgstr "发送信息"
+
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:409
+#: ../mail/em-folder-tree-model.c:1139
+#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1084
 msgid "Inbox"
 msgstr "收件箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:114 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1132
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:115 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1035
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1143
+#: ../modules/mail/e-mail-shell-view-private.c:1075
 msgid "Outbox"
 msgstr "发件箱"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1037
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1147
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Sent"
 msgstr "已发箱"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1039
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1135
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1049 ../plugins/templates/templates.c:1349
-#: ../plugins/templates/templates.c:1359
+#: ../plugins/templates/templates.c:1079 ../plugins/templates/templates.c:1378
+#: ../plugins/templates/templates.c:1388
 msgid "Templates"
 msgstr "模板"
 
-#: ../libemail-engine/e-mail-session.c:1326
+#: ../libemail-engine/e-mail-session.c:1465
 #, c-format
-#| msgid "User canceled operation."
 msgid "User cancelled operation"
 msgstr "用户己取消操作"
 
-#: ../libemail-engine/e-mail-session.c:1451
-#, c-format
-#| msgid ""
-#| "No destination address provided, forward of the message has been "
-#| "cancelled."
-msgid ""
-"No destination address provided, forwarding of the message has been "
-"cancelled."
-msgstr "缺少发送目标地址,信息转发被取消。"
-
-#: ../libemail-engine/e-mail-session.c:1464
-#, c-format
-#| msgid "No account found to use, forward of the message has been cancelled."
-msgid "No identity found to use, forwarding of the message has been cancelled."
-msgstr "无可用身份,信息转发被取消。"
-
-#: ../libemail-engine/e-mail-session.c:1626
+#: ../libemail-engine/e-mail-session.c:1629
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 认证失败"
 
-#: ../libemail-engine/e-mail-session.c:1671
+#: ../libemail-engine/e-mail-session.c:1679
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "未找到对应 UID “%s”的数据源"
 
-#: ../libemail-engine/e-mail-session-utils.c:420
-#, c-format
-msgid "Cannot get transport for account '%s'"
-msgstr "无法完成帐号“%s”的传输"
-
-#: ../libemail-engine/e-mail-session-utils.c:508
-#: ../libemail-engine/mail-ops.c:694
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "应用寄出过滤器失败:%s"
-
-#: ../libemail-engine/e-mail-session-utils.c:537
-#: ../libemail-engine/e-mail-session-utils.c:571
-#: ../libemail-engine/mail-ops.c:711 ../libemail-engine/mail-ops.c:747
+#: ../libemail-engine/e-mail-session.c:1742
 #, c-format
 msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"追加到 %s:%s 失败\n"
-"转而追加到本地“已发”文件夹。"
+"No destination address provided, forwarding of the message has been "
+"cancelled."
+msgstr "缺少发送目标地址,信息转发被取消。"
 
-#: ../libemail-engine/e-mail-session-utils.c:591
-#: ../libemail-engine/mail-ops.c:769
+#: ../libemail-engine/e-mail-session.c:1755
 #, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "追加到本地“已发”文件夹失败:%s"
-
-#: ../libemail-engine/e-mail-session-utils.c:821
-#: ../libemail-engine/mail-ops.c:897 ../libemail-engine/mail-ops.c:998
-msgid "Sending message"
-msgstr "发送信息"
+msgid "No identity found to use, forwarding of the message has been cancelled."
+msgstr "无可用身份,信息转发被取消。"
 
-#: ../libemail-engine/e-mail-store-utils.c:171
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "断开与 %s 的连接"
 
-#: ../libemail-engine/e-mail-store-utils.c:263
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新连接到 %s"
 
-#: ../libemail-engine/e-mail-store-utils.c:340
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备离线使用帐号“%s”"
 
-#: ../libemail-engine/mail-folder-cache.c:884
+#: ../libemail-engine/mail-folder-cache.c:1247
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
@@ -10543,58 +11654,80 @@ msgstr "查验 %s"
 msgid "Filtering Selected Messages"
 msgstr "过滤选中的信息"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "收取邮件"
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"无法过滤选定的信息。一个原因可能是一个或多个过滤器的文件夹位置设定无效。请"
+"通过“编辑”->“信息过滤器”检查您的过滤器。\n"
+"原错误为:%s"
+
+#: ../libemail-engine/mail-ops.c:233
+#, c-format
+msgid "Fetching mail from '%s'"
+msgstr "正在从 '%s' 收取邮件"
+
+#: ../libemail-engine/mail-ops.c:724
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"无法应用发送过滤器。一个原因可能是一个或多个过滤器的文件夹位置设定无效。请"
+"通过“编辑”->“信息过滤器”检查您的过滤器。\n"
+"原错误为:%s"
 
-#: ../libemail-engine/mail-ops.c:908
+#: ../libemail-engine/mail-ops.c:940
 #, 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:959
+#: ../libemail-engine/mail-ops.c:992
 #, 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:965
+#: ../libemail-engine/mail-ops.c:998
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:967
+#: ../libemail-engine/mail-ops.c:1000
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1079
+#: ../libemail-engine/mail-ops.c:1112
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "正在移动信息至 %s"
 
-#: ../libemail-engine/mail-ops.c:1080
+#: ../libemail-engine/mail-ops.c:1113
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "把信息复制到 %s"
 
-#: ../libemail-engine/mail-ops.c:1197
+#: ../libemail-engine/mail-ops.c:1232
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../libemail-engine/mail-ops.c:1270
+#: ../libemail-engine/mail-ops.c:1360
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储帐号“%s”"
 
-#: ../libemail-engine/mail-ops.c:1271
+#: ../libemail-engine/mail-ops.c:1361
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储帐号“%s”"
 
-#: ../libemail-engine/mail-ops.c:1345
+#: ../libemail-engine/mail-ops.c:1435
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的废件箱"
@@ -10604,26 +11737,26 @@ msgstr "清空“%s”中的废件箱"
 msgid "Could not create spool directory '%s': %s"
 msgstr "无法创建离线目录“%s”:%s"
 
-#: ../libemail-engine/mail-tools.c:112
+#: ../libemail-engine/mail-tools.c:111
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "试图将邮件移至非 mbox 源 %s"
 
-#: ../libemail-engine/mail-tools.c:224
+#: ../libemail-engine/mail-tools.c:237
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "转发的信息 - %s"
 
-#: ../libemail-engine/mail-tools.c:226
+#: ../libemail-engine/mail-tools.c:239
 msgid "Forwarded message"
 msgstr "转发的信息"
 
-#: ../libemail-engine/mail-vfolder.c:129
+#: ../libemail-engine/mail-vfolder.c:152
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "设置搜索文件夹:%s"
 
-#: ../libemail-engine/mail-vfolder.c:282
+#: ../libemail-engine/mail-vfolder.c:305
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "更新搜索文件夹:“%s” - %s"
@@ -10633,7 +11766,7 @@ msgstr "更新搜索文件夹:“%s” - %s"
 #. * 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:647
+#: ../libemail-engine/mail-vfolder.c:669
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10648,22 +11781,30 @@ msgstr[0] ""
 "%s 已经修改,以用于删除文件夹\n"
 "“%s”。"
 
-#: ../mail/e-mail-account-manager.c:446
-msgid "_Restore Default"
-msgstr "恢复默认值(_R)"
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
+msgid "Open _Online Accounts"
+msgstr "打开在线帐号(_O)"
 
-#: ../mail/e-mail-account-manager.c:459
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
+msgid "This account was created through the Online Accounts service."
+msgstr "该帐号通过在线帐号服务创建"
+
+#: ../mail/e-mail-account-manager.c:690
+msgid "_Reset Order"
+msgstr "重置顺序(_R)"
+
+#: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
 msgstr "您可以拖放帐号名来重新排序。"
 
-#: ../mail/e-mail-account-manager.c:504
+#: ../mail/e-mail-account-manager.c:746
 msgid "De_fault"
 msgstr "默认(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:866
+#: ../modules/mail/em-composer-prefs.c:1192
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:897
 msgid "Enabled"
 msgstr "已启用"
 
@@ -10671,64 +11812,44 @@ msgstr "已启用"
 msgid "Account Name"
 msgstr "帐号名"
 
-#: ../mail/e-mail-account-tree-view.c:134
-#: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3664
-#: ../mail/mail-config.ui.h:44
+#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3534
+#: ../mail/mail-config.ui.h:59
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/e-mail-autoconfig.c:194
-#, c-format
-msgid "No mail exchanger record for '%s'"
-msgstr "没有对应“%s”的邮件往来记录"
-
-#: ../mail/e-mail-autoconfig.c:201
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr "暂时无法解析“%s”"
-
-#: ../mail/e-mail-autoconfig.c:208
-#, c-format
-#| msgid "Error removing list"
-msgid "Error resolving '%s'"
-msgstr "解析“%s”出错"
-
-#: ../mail/e-mail-autoconfig.c:264
-#, c-format
-msgid "No authoritative name server for '%s'"
-msgstr "“%s”没有权威的名字服务器"
-
-#: ../mail/e-mail-autoconfig.c:661
-#| msgid "No password was provided"
+#: ../mail/e-mail-autoconfig.c:578
 msgid "No email address provided"
 msgstr "没有提供电子邮件地址"
 
-#: ../mail/e-mail-autoconfig.c:670
-#| msgid "Using email address"
+#: ../mail/e-mail-autoconfig.c:587
 msgid "Missing domain in email address"
 msgstr "电子邮件地址中缺少域"
 
-#: ../mail/e-mail-backend.c:726
+#: ../mail/e-mail-backend.c:734
 msgid "Unknown background operation"
 msgstr "未知的后台操作"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
+#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../mail/e-mail-browser.c:284
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(无主题)"
 
-#: ../mail/e-mail-config-assistant.c:501
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr "跳过查找(_S)"
+
+#: ../mail/e-mail-config-assistant.c:562
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-#: ../mail/e-mail-config-auth-check.c:347
-#| msgid "Ch_eck for Supported Types"
+#: ../mail/e-mail-config-auth-check.c:352
 msgid "Check for Supported Types"
 msgstr "检查支持的类型"
 
@@ -10750,81 +11871,87 @@ msgstr ""
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/e-mail-config-defaults-page.c:527
+#: ../mail/e-mail-config-defaults-page.c:550
 msgid "Special Folders"
 msgstr "特殊文件夹"
 
-#: ../mail/e-mail-config-defaults-page.c:536
-#| msgid "Sent _Messages Folder:"
+#: ../mail/e-mail-config-defaults-page.c:559
 msgid "Draft Messages _Folder:"
 msgstr "草稿信息文件夹(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:546
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:569
 msgid "Choose a folder for saving draft messages."
 msgstr "选择保存草稿信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:560
+#: ../mail/e-mail-config-defaults-page.c:583
 msgid "Sent _Messages Folder:"
 msgstr "已发送信息文件夹(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:570
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:593
 msgid "Choose a folder for saving sent messages."
 msgstr "选择保存已发送信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:584
-#| msgid "_Restore Default"
+#: ../mail/e-mail-config-defaults-page.c:612
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr "将回复邮件保存在被回复信息所在的文件夹"
+
+#: ../mail/e-mail-config-defaults-page.c:629
 msgid "_Restore Defaults"
 msgstr "恢复默认值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:598
+#: ../mail/e-mail-config-defaults-page.c:643
 msgid "Use a Real Folder for _Trash:"
 msgstr "使用真实文件夹作为废件箱(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:599
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:644
 msgid "Choose a folder for deleted messages."
 msgstr "选择已删除信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:608
+#: ../mail/e-mail-config-defaults-page.c:653
 msgid "Use a Real Folder for _Junk:"
 msgstr "使用真实文件夹存放垃圾信息(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:609
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:654
 msgid "Choose a folder for junk messages."
 msgstr "选择垃圾信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:626
+#: ../mail/e-mail-config-defaults-page.c:671
 msgid "Composing Messages"
 msgstr "撰写信息"
 
-#: ../mail/e-mail-config-defaults-page.c:635
+#: ../mail/e-mail-config-defaults-page.c:680
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "总是抄送到(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:660
+#: ../mail/e-mail-config-defaults-page.c:705
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "总是密件抄送到(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:695
+#: ../mail/e-mail-config-defaults-page.c:740
 msgid "Message Receipts"
 msgstr "已读回执"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:749
 msgid "S_end message receipts:"
 msgstr "发送信息收条(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:735
+#: ../mail/e-mail-config-defaults-page.c:774
+msgid "Never"
+msgstr "从不"
+
+#: ../mail/e-mail-config-defaults-page.c:780
 msgid "Always"
 msgstr "总是"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:786
 msgid "Ask for each message"
 msgstr "每条信息都询问"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-defaults-page.c:857
+msgid "Defaults"
+msgstr "默认值"
+
+#: ../mail/e-mail-config-identity-page.c:266
 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 "
@@ -10833,16 +11960,13 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:294
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "帐号信息"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:303
 #: ../mail/e-mail-config-summary-page.c:333
-#| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example: \"Work\" or \"Personal\""
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -10850,50 +11974,40 @@ msgstr ""
 "输入您想要给此帐号起的名字。\n"
 "如:“工作”或“私人”。"
 
-#: ../mail/e-mail-config-identity-page.c:299
-#: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
-msgid "_Name:"
-msgstr "名称(_N):"
-
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:348
 msgid "Required Information"
 msgstr "需要的信息"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:357
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:384
 msgid "Email _Address:"
 msgstr "电子邮件地址(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:431
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "可选信息"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:440
 msgid "Re_ply-To:"
 msgstr "回复到(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:467
 msgid "Or_ganization:"
 msgstr "组织(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:522
 msgid "Add Ne_w Signature..."
 msgstr "添加新签名(_W)..."
 
 #: ../mail/e-mail-config-lookup-page.c:68
-#| msgid "Loading accounts..."
 msgid "Looking up account details..."
 msgstr "正在查找帐号详情..."
 
 #: ../mail/e-mail-config-provider-page.c:485
-#| msgid "Checking for new mail"
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
@@ -10910,99 +12024,92 @@ msgid "Receiving Email"
 msgstr "接收电子邮件"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:257 ../mail/mail-config.ui.h:19
+#: ../mail/em-folder-properties.c:333 ../mail/mail-config.ui.h:24
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "常规"
 
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../mail/e-mail-config-security-page.c:290
-#| msgid "Pretty Good Privacy (PGP/GPG)"
+#: ../mail/e-mail-config-security-page.c:291
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "GNU 安全卫士(OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:298
-#| msgid "PGP/GPG _Key ID:"
+#: ../mail/e-mail-config-security-page.c:300
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _Key ID:"
 
-#: ../mail/e-mail-config-security-page.c:320
+#: ../mail/e-mail-config-security-page.c:322
 msgid "Si_gning algorithm:"
 msgstr "签名函数(_N):"
 
-#: ../mail/e-mail-config-security-page.c:336
-#: ../mail/e-mail-config-security-page.c:475 ../mail/mail-config.ui.h:45
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:60
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:339
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:46
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:61
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:342
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:47
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:62
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:345
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:48
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:63
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:361
+#: ../mail/e-mail-config-security-page.c:363
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息(_W)"
 
-#: ../mail/e-mail-config-security-page.c:373
+#: ../mail/e-mail-config-security-page.c:375
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "当发送加密邮件时总是对自身加密(_M)"
 
-#: ../mail/e-mail-config-security-page.c:385
+#: ../mail/e-mail-config-security-page.c:387
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../mail/e-mail-config-security-page.c:409
+#: ../mail/e-mail-config-security-page.c:411
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME(S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:417
+#: ../mail/e-mail-config-security-page.c:420
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N):"
 
-#: ../mail/e-mail-config-security-page.c:441
-#: ../mail/e-mail-config-security-page.c:547
-#| msgid "Selected"
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
 msgid "Select"
 msgstr "选择"
 
-#: ../mail/e-mail-config-security-page.c:459
+#: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "签名函数(_A):"
 
-#: ../mail/e-mail-config-security-page.c:500
-#| msgid "Al_ways sign outgoing messages when using this account"
+#: ../mail/e-mail-config-security-page.c:503
 msgid "Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:523
-#| msgid "Encry_ption certificate:"
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Encryption certificate:"
 msgstr "加密证书:"
 
-#: ../mail/e-mail-config-security-page.c:565
-#| msgid "Al_ways sign outgoing messages when using this account"
+#: ../mail/e-mail-config-security-page.c:568
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:585
-#| msgid "Always encrypt to _myself when sending encrypted messages"
+#: ../mail/e-mail-config-security-page.c:588
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "当发送加密信息时总是对自身加密"
 
@@ -11028,35 +12135,40 @@ msgid ""
 msgstr "这是将用于访问您邮件的设置汇总。"
 
 #: ../mail/e-mail-config-summary-page.c:372
-#| msgid "Personal Details:"
 msgid "Personal Details"
 msgstr "个人详细信息"
 
 #: ../mail/e-mail-config-summary-page.c:381
-#| msgid "Full Nam_e:"
 msgid "Full Name:"
 msgstr "全名:"
 
 #: ../mail/e-mail-config-summary-page.c:395
-#| msgid "Email _Address:"
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
+#: ../mail/e-mail-config-summary-page.c:409
+msgid "Receiving"
+msgstr "接收"
+
+#: ../mail/e-mail-config-summary-page.c:421
+msgid "Sending"
+msgstr "发送"
+
 #: ../mail/e-mail-config-summary-page.c:433
-#| msgid "Server _Type:"
 msgid "Server Type:"
 msgstr "服务器类型:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
-#| msgid "_Server:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Server:"
 msgstr "服务器:"
 
+#: ../mail/e-mail-config-summary-page.c:475
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+msgid "Username:"
+msgstr "用户名:"
+
 #: ../mail/e-mail-config-summary-page.c:496
-#| msgctxt "email-custom-header-Security"
-#| msgid "Security:"
 msgid "Security:"
 msgstr "安全:"
 
@@ -11075,49 +12187,41 @@ msgstr ""
 "单击“继续”开始。"
 
 #: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:150
+#: ../modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../mail/e-mail-config-window.c:329
+#: ../mail/e-mail-config-window.c:327
 msgid "Account Editor"
 msgstr "帐号编辑器"
 
-#: ../mail/e-mail-display.c:121
+#: ../mail/e-mail-display.c:96
 msgid "_Add to Address Book..."
 msgstr "添加到地址簿(_A)..."
 
-#: ../mail/e-mail-display.c:128
+#: ../mail/e-mail-display.c:103
 msgid "_To This Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/e-mail-display.c:135
+#: ../mail/e-mail-display.c:110
 msgid "_From This Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:117
 msgid "Send _Reply To..."
 msgstr "发送回复给(_R)..."
 
-#: ../mail/e-mail-display.c:144
+#: ../mail/e-mail-display.c:119
 msgid "Send a reply message to this address"
 msgstr "发送一条回复信息到这个地址"
 
-#: ../mail/e-mail-display.c:151
+#: ../mail/e-mail-display.c:126
 msgid "Create Search _Folder"
 msgstr "创建搜索文件夹(_F)"
 
-#: ../mail/e-mail-display.c:161
-msgid "Save _Image..."
-msgstr "保存图像(_I)..."
-
-#: ../mail/e-mail-display.c:163
-msgid "Save the image to a file"
-msgstr "保存该图像为文件"
-
 #. 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
+#: ../mail/e-mail-junk-options.c:250
 msgid "Junk filtering software:"
 msgstr "垃圾过滤软件:"
 
@@ -11125,32 +12229,32 @@ msgstr "垃圾过滤软件:"
 msgid "_Label name:"
 msgstr "标签名称(_L):"
 
-#: ../mail/e-mail-label-list-store.c:49
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "重要(_M)"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:50
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "工作(_W)"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:51
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "个人(_P)"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:52
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "待办(_T)"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:53
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "稍候(_L)"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:718
+#: ../modules/mail/e-mail-shell-view-actions.c:1029
 msgid "Add Label"
 msgstr "添加标签"
 
@@ -11168,678 +12272,639 @@ msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
 msgid "Color"
 msgstr "颜色"
 
-#: ../mail/e-mail-migrate.c:646
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "无法在“%s”创建本地邮件文件夹:%s"
+#: ../mail/e-mail-print-config-headers.c:167
+msgid "Move selected headers to top"
+msgstr "把选中的信头移到顶部"
 
-#: ../mail/e-mail-notebook-view.c:627
-msgid "Please select a folder"
-msgstr "请选择一个文件夹"
+#: ../mail/e-mail-print-config-headers.c:172
+msgid "Move selected headers up one row"
+msgstr "把选中的信头上移一行"
 
-#: ../mail/e-mail-printer.c:124
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d 页,共 %d 页"
+#: ../mail/e-mail-print-config-headers.c:177
+msgid "Move selected headers down one row"
+msgstr "把选中的信头下移一行"
 
-#: ../mail/e-mail-printer.c:536
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-msgid "Print"
-msgstr "打印"
+#: ../mail/e-mail-print-config-headers.c:182
+msgid "Move selected headers to bottom"
+msgstr "把选中的信头移到底部"
+
+#: ../mail/e-mail-print-config-headers.c:187
+msgid "Select all headers"
+msgstr "选中所有信头"
 
-#: ../mail/e-mail-printer.c:542
+#: ../mail/e-mail-print-config-headers.c:206
 msgid "Header Name"
 msgstr "信头名称"
 
-#: ../mail/e-mail-printer.c:548
+#: ../mail/e-mail-print-config-headers.c:215
 msgid "Header Value"
 msgstr "信头值"
 
-#: ../mail/e-mail-printer.c:596 ../mail/mail-config.ui.h:100
+#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:99
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/e-mail-reader.c:357
-msgid "Save Image"
-msgstr "保存图像"
+#: ../mail/e-mail-printer.c:167
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d 页,共 %d 页"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:344 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: ../mail/e-mail-reader.c:440 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:344 ../mail/em-folder-utils.c:506
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:844 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:974 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:844 ../mail/em-folder-utils.c:506
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:1335 ../mail/e-mail-reader.c:1517
-#: ../mail/e-mail-reader.c:1557
+#: ../mail/e-mail-reader.c:1170 ../mail/e-mail-reader.c:1382
+#: ../mail/e-mail-reader.c:1422
 msgid "_Do not ask me again."
 msgstr "不再询问(_D)。"
 
-#: ../mail/e-mail-reader.c:1563
+#: ../mail/e-mail-reader.c:1428
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
 
-#: ../mail/e-mail-reader.c:1747
+#: ../mail/e-mail-reader.c:1630
 msgid "Failed to retrieve message:"
 msgstr "获取信息失败:"
 
-#: ../mail/e-mail-reader.c:1793 ../mail/e-mail-reader.c:2882
+#: ../mail/e-mail-reader.c:1670 ../mail/e-mail-reader.c:2776
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "收取信息 %s"
 
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1858
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1860
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1865
 msgid "Check for _Junk"
 msgstr "检查垃圾信息(_J)"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1867
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1872
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1874
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信息复制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1879
 msgid "_Delete Message"
 msgstr "删除信息(_D)"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1881
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信息做删除标记"
 
-#: ../mail/e-mail-reader.c:1997
-#| msgid "Filter on Mailing _List..."
+#: ../mail/e-mail-reader.c:1886
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "为邮件列表创建一条过滤规则(_L)..."
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:1888
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信息的规则"
 
-#: ../mail/e-mail-reader.c:2004
-#| msgid "Filter on _Recipients..."
+#: ../mail/e-mail-reader.c:1893
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "为收件人创建一条过滤规则(_R)..."
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:1895
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信息的规则"
 
-#: ../mail/e-mail-reader.c:2011
-#| msgid "Filter on Se_nder..."
+#: ../mail/e-mail-reader.c:1900
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "为发件人创建一条过滤规则(_N)..."
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:1902
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信息的规则"
 
-#: ../mail/e-mail-reader.c:2018
-#| msgid "Filter on _Subject..."
+#: ../mail/e-mail-reader.c:1907
 msgid "Create a Filter Rule for _Subject..."
 msgstr "为主题创建一条过滤规则(_S)..."
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:1909
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信息的规则"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1914
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:1916
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信息"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1921
 msgid "_Find in Message..."
 msgstr "在信息中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:1923
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信息的主体中搜索文本"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:1928
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:1930
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "删除选中信息的跟随标志"
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:1935
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:1937
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置选中信息的跟随标志为已完成"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:1942
 msgid "Follow _Up..."
 msgstr "跟随(_U)..."
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:1944
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信息添加跟随标志"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:1949
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:1951 ../mail/e-mail-reader.c:1958
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信息作为附件转发给某人"
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:1956
 msgid "Forward As _Attached"
 msgstr "作为附件转发(_A)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:1963
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信息"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:1970
 msgid "Forward As _Inline"
 msgstr "嵌入正文转发(_I)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:1977
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信息"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:1984
 msgid "Forward As _Quoted"
 msgstr "作文引用转发(_Q)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:1991
 msgid "_Load Images"
 msgstr "载入图像(_L)"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:1993
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制载入 HTML 邮件中的图像"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:1998
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2000
 msgid "Mark the selected messages as important"
 msgstr "把选中信息标记为重要邮件"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2005
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2007
 msgid "Mark the selected messages as junk"
 msgstr "把选中信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2012
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2014
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信息标记为非垃圾信息"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2019
 msgid "_Read"
 msgstr "读取(_R)"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2021
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信息标记为已读"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2026
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2028
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信息标记为不重要"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2033
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2035
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信息标记为未读"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2040
 msgid "_Edit as New Message..."
 msgstr "作为新信息进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2042
 msgid "Open the selected messages in the composer for editing"
 msgstr "在编辑器中打开选中的信息以便编辑"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2047
 msgid "Compose _New Message"
 msgstr "撰写新信息(_N)"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2049
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信息"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2054
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2056
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信息"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2061
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2063
 msgid "Move selected messages to another folder"
 msgstr "把选中的信息移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:2179
-msgid "_Switch to Folder"
-msgstr "切换到文件夹(_S)"
-
-#: ../mail/e-mail-reader.c:2181
-msgid "Display the parent folder"
-msgstr "显示上层文件夹"
-
-#: ../mail/e-mail-reader.c:2186
-msgid "Switch to _next tab"
-msgstr "切换到下一个标签(_N)"
-
-#: ../mail/e-mail-reader.c:2188
-msgid "Switch to the next tab"
-msgstr "切换到下一个标签"
-
-#: ../mail/e-mail-reader.c:2193
-msgid "Switch to _previous tab"
-msgstr "切换到上一个标签(_P)"
-
-#: ../mail/e-mail-reader.c:2195
-msgid "Switch to the previous tab"
-msgstr "切换到上一个标签"
-
-#: ../mail/e-mail-reader.c:2200
-msgid "Cl_ose current tab"
-msgstr "关闭当前标签(_O)"
-
-#: ../mail/e-mail-reader.c:2202
-msgid "Close current tab"
-msgstr "关闭当前标签"
-
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2068
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2070
 msgid "Display the next message"
 msgstr "显示下一封信息"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2075
 msgid "Next _Important Message"
 msgstr "下一封重要信息(_I)"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2077
 msgid "Display the next important message"
 msgstr "显示下一封重要信息"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2082
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2084
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2089
 msgid "Next _Unread Message"
 msgstr "下一封未读信息(_U)"
 
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2091
 msgid "Display the next unread message"
 msgstr "显示下一封未读信息"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2096
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2098
 msgid "Display the previous message"
 msgstr "显示上一封信息"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2103
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信息(_E)"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2105
 msgid "Display the previous important message"
 msgstr "显示上一封重要信息"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2110
 msgid "Previous T_hread"
 msgstr "上一条线索(_H)"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2112
 msgid "Display the previous thread"
 msgstr "显示上一条线索"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2117
 msgid "P_revious Unread Message"
 msgstr "上一封未读信息(_R)"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2119
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信息"
 
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2126
 msgid "Print this message"
 msgstr "打印该信息"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2133
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信息"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2138
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2140
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信息重发(退回)给某人"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2145
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2147
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2152
 msgid "Remove Du_plicate Messages"
 msgstr "移除重复的信息(_P)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2154
 msgid "Checks selected messages for duplicates"
 msgstr "检查所选信息中的重复信息?"
 
-#: ../mail/e-mail-reader.c:2298 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:182
+#: ../mail/e-mail-reader.c:2159 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-attachment-handler.c:214
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2300
+#: ../mail/e-mail-reader.c:2161
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信息的所有收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2305 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:2307
+#: ../mail/e-mail-reader.c:2168
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信息的邮件列表撰写回复"
 
-#: ../mail/e-mail-reader.c:2312
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:2173
+#: ../modules/mail/e-mail-attachment-handler.c:221
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/e-mail-reader.c:2314
+#: ../mail/e-mail-reader.c:2175
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信息的发件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2319
+#: ../mail/e-mail-reader.c:2180
 msgid "_Save as mbox..."
 msgstr "另存为 mbox 格式(_S)..."
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2182
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信息另存为 mbox 格式文件"
 
-#: ../mail/e-mail-reader.c:2326
+#: ../mail/e-mail-reader.c:2187
 msgid "_Message Source"
 msgstr "信息源代码(_M)"
 
-#: ../mail/e-mail-reader.c:2328
+#: ../mail/e-mail-reader.c:2189
 msgid "Show the raw email source of the message"
 msgstr "显示信息的原始邮件源代码"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2201
 msgid "_Undelete Message"
 msgstr "取消删除信息(_U)"
 
-#: ../mail/e-mail-reader.c:2342
+#: ../mail/e-mail-reader.c:2203
 msgid "Undelete the selected messages"
 msgstr "取消选中信息的删除"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2208
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../mail/e-mail-reader.c:2349
+#: ../mail/e-mail-reader.c:2210
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2215
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2217
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2222
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2224
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2231
 msgid "Cre_ate"
 msgstr "创建(_A)"
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2238
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2245
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../mail/e-mail-reader.c:2391
+#: ../mail/e-mail-reader.c:2252
 msgid "_Group Reply"
 msgstr "回复全部(_G)"
 
-#: ../mail/e-mail-reader.c:2398
+#: ../mail/e-mail-reader.c:2259
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:2405
+#: ../mail/e-mail-reader.c:2266
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2273
 msgid "_Message"
 msgstr "信息(_M)"
 
-#: ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2280
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:2429
-#| msgid "Search Folder from Mailing _List..."
+#: ../mail/e-mail-reader.c:2290
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "从邮件列表创建搜索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2292
 msgid "Create a search folder for this mailing list"
 msgstr "为此邮件列表创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2436
-#| msgid "Search Folder from Recipien_ts..."
+#: ../mail/e-mail-reader.c:2297
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "从收件人创建搜索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:2438
+#: ../mail/e-mail-reader.c:2299
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2443
-#| msgid "Search Folder from Sen_der..."
+#: ../mail/e-mail-reader.c:2304
 msgid "Create a Search Folder from Sen_der..."
 msgstr "从发件人创建搜索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:2445
+#: ../mail/e-mail-reader.c:2306
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2450
-#| msgid "Search Folder from S_ubject..."
+#: ../mail/e-mail-reader.c:2311
 msgid "Create a Search Folder from S_ubject..."
 msgstr "从主题创建搜索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:2452
+#: ../mail/e-mail-reader.c:2313
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2336
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2344
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/e-mail-reader.c:2487
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2491
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2495
+#: ../mail/e-mail-reader.c:2356
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2360
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2503
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:2547
+#: ../mail/e-mail-reader.c:2408
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../mail/e-mail-reader.c:2549
+#: ../mail/e-mail-reader.c:2410
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信息的信体中显示闪烁光标"
 
-#: ../mail/e-mail-reader.c:2555
+#: ../mail/e-mail-reader.c:2416
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:2557
+#: ../mail/e-mail-reader.c:2418
 msgid "Show messages with all email headers"
 msgstr "显示信息时显示所有信头"
 
-#: ../mail/e-mail-reader.c:2888
+#: ../mail/e-mail-reader.c:2782
 msgid "Retrieving message"
 msgstr "正在获取信息"
 
-#: ../mail/e-mail-reader.c:3860
-#: ../modules/mail/e-mail-attachment-handler.c:175
+#: ../mail/e-mail-reader.c:3704
+#: ../modules/mail/e-mail-attachment-handler.c:207
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/e-mail-reader.c:3861
+#: ../mail/e-mail-reader.c:3705
 msgid "Forward the selected message to someone"
 msgstr "把选中信息转发给某人"
 
-#: ../mail/e-mail-reader.c:3880
+#: ../mail/e-mail-reader.c:3724
 msgid "Group Reply"
 msgstr "回复全部"
 
-#: ../mail/e-mail-reader.c:3881
+#: ../mail/e-mail-reader.c:3725
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为选中信息的邮件列表或全部收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:3938 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3791 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:3971
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../mail/e-mail-reader.c:3803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:3975
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../mail/e-mail-reader.c:3807
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:3984 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3816 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "回复"
 
-#: ../mail/e-mail-reader.c:4714
-#, c-format
-msgid "Folder '%s'"
-msgstr "文件夹 %s"
-
-#: ../mail/e-mail-reader-utils.c:154
+#: ../mail/e-mail-reader-utils.c:148
 msgid "Do not warn me again"
 msgstr "不要再警告我"
 
-#: ../mail/e-mail-reader-utils.c:949
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:171
+#: ../smime/gui/certificate-manager.c:330
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "正在打印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1130
+#: ../mail/e-mail-reader-utils.c:1211
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -11849,7 +12914,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗?"
 
-#: ../mail/e-mail-reader-utils.c:1534
+#: ../mail/e-mail-reader-utils.c:2026
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "保存信息"
@@ -11859,21 +12924,20 @@ 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:1555
+#: ../mail/e-mail-reader-utils.c:2047
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "信息"
 
-#: ../mail/e-mail-reader-utils.c:2010
+#: ../mail/e-mail-reader-utils.c:2416
 msgid "Parsing message"
 msgstr "正在解析信息"
 
-#: ../mail/e-mail-request.c:152
-#, c-format
-msgid "Failed to load part '%s'"
-msgstr "无法载入“%s” 部分"
+#: ../mail/e-mail-request.c:197
+msgid "The message has no text content."
+msgstr "该信息没有文本内容。"
 
-#: ../mail/e-mail-tag-editor.c:293
+#: ../mail/e-mail-tag-editor.c:238
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
@@ -11881,7 +12945,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:1287
+#: ../mail/em-composer-utils.c:1455
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11889,27 +12953,27 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone},${Sender}写道:"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1461
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的信息 --------"
 
-#: ../mail/em-composer-utils.c:1298
+#: ../mail/em-composer-utils.c:1466
 msgid "-----Original Message-----"
 msgstr "-------- 原始信息 --------"
 
-#: ../mail/em-composer-utils.c:2578
+#: ../mail/em-composer-utils.c:2616
 msgid "an unknown sender"
 msgstr "未知发件人"
 
-#: ../mail/em-composer-utils.c:2996
+#: ../mail/em-composer-utils.c:3041
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:2997
+#: ../mail/em-composer-utils.c:3042
 msgid "Choose folders to post the message to."
 msgstr "选择要将信息投递到哪个文件夹。"
 
-#: ../mail/em-filter-editor-folder-element.c:156
+#: ../mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "选择文件夹"
 
@@ -11919,438 +12983,446 @@ msgid "Adjust Score"
 msgstr "调整计分"
 
 #: ../mail/em-filter-i18n.h:3
+msgid "Any header"
+msgstr "任意信头"
+
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Color"
 msgstr "分配颜色"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 msgid "Assign Score"
 msgstr "分配计分"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "响铃"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "完成于"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "接收日期"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "发送日期"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "不结尾于"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "不存在"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:20
 msgid "does not have words"
 msgstr "不包含词语"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "不含有"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "发音不像"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "不开始于"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "草稿"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "结束于"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Expression"
 msgstr "表达式"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Follow Up"
 msgstr "跟随"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
 msgid "Forward to"
 msgstr "转发至"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "has words"
 msgstr "包含词语"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "重要"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "之后"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "之前"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:37
 msgid "is Flagged"
 msgstr "已标志"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:41
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "未设置"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "已设置"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:107
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:106
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "标签"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "全部匹配"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "信体"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
 msgid "Message Header"
 msgstr "信头"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is Junk"
 msgstr "是垃圾信息"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:52
 msgid "Message is not Junk"
 msgstr "不是垃圾信息"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:53
 msgid "Message Location"
 msgstr "信息位置"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:55
 msgid "Pipe to Program"
 msgstr "管道到程序"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "播放声音"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "收件人"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "正则表达式匹配"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
 msgstr "已回复到"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "返回"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "返回小于"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "运行程序"
 
-#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "分数"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "发送者"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "发送者或接收者"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "设置标签"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "设置状态"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "大小(kB)"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "发音类似"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "指定信头"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "开始于"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:76
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Color"
 msgstr "取消颜色"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "取消状态"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:581
+#: ../mail/em-filter-rule.c:586
 msgid "Then"
 msgstr "然后"
 
-#: ../mail/em-filter-rule.c:646
+#: ../mail/em-filter-rule.c:651
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未读信息数:"
 
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "总信息数:"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:210
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "配额使用(%s):"
 
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:212
 #, c-format
 msgid "Quota usage"
 msgstr "配额使用"
 
-#: ../mail/em-folder-properties.c:338
+#: ../mail/em-folder-properties.c:285
+msgid "_Send Account Override:"
+msgstr "发送帐户覆盖(_S):"
+
+#: ../mail/em-folder-properties.c:414
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:77
 msgid "<click here to select a folder>"
 msgstr "<单击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:390
+#: ../mail/em-folder-selector.c:388
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:396
+#: ../mail/em-folder-selector.c:394
 msgid "Folder _name:"
 msgstr "文件夹名称(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:628
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹名不能含有字符“/”"
 
-#: ../mail/em-folder-tree.c:783
+#: ../mail/em-folder-tree.c:765
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1608
+#: ../mail/em-folder-tree.c:1588
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:2134 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2136 ../mail/em-folder-utils.c:101
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:2137 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2139 ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2269
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信息移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2148 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2150 ../mail/message-list.c:2271
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信息复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2167
+#: ../mail/em-folder-tree.c:2169
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信息放到顶级文件夹存储"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:431 ../mail/em-folder-tree-model.c:433
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
+#: ../mail/em-folder-tree-model.c:1223 ../mail/em-folder-tree-model.c:1607
 msgid "Loading..."
 msgstr "正在载入..."
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:507
 msgid "Move Folder To"
 msgstr "移动文件夹到"
 
-#: ../mail/em-folder-utils.c:489
+#: ../mail/em-folder-utils.c:507
 msgid "Copy Folder To"
 msgstr "复制文件夹到"
 
-#: ../mail/em-folder-utils.c:586
+#: ../mail/em-folder-utils.c:605
 msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:587
+#: ../mail/em-folder-utils.c:606
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹:"
 
-#: ../mail/em-subscription-editor.c:869
+#: ../mail/em-subscription-editor.c:856
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: ../mail/em-subscription-editor.c:878
+#: ../mail/em-subscription-editor.c:865
 msgid "Su_bscribe To Shown"
 msgstr "要显示的订阅(_B)"
 
-#: ../mail/em-subscription-editor.c:886
+#: ../mail/em-subscription-editor.c:873
 msgid "Subscribe To _All"
 msgstr "订阅全部(_A)"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1844
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1864
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: ../mail/em-subscription-editor.c:995
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "退订隐藏列表(_B)"
 
-#: ../mail/em-subscription-editor.c:1003
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "退订全部(_A)"
 
-#: ../mail/em-subscription-editor.c:1679
+#: ../mail/em-subscription-editor.c:1701
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../mail/em-subscription-editor.c:1719
+#: ../mail/em-subscription-editor.c:1740
 msgid "_Account:"
 msgstr "帐号(_A):"
 
-#: ../mail/em-subscription-editor.c:1734
+#: ../mail/em-subscription-editor.c:1753
 msgid "Clear Search"
 msgstr "清除搜索"
 
-#: ../mail/em-subscription-editor.c:1752
+#: ../mail/em-subscription-editor.c:1770
 msgid "Sho_w items that contain:"
 msgstr "显示包含以下内容的项目(_W):"
 
-#: ../mail/em-subscription-editor.c:1797
+#: ../mail/em-subscription-editor.c:1817
 msgid "Subscribe to the selected folder"
 msgstr "订阅选定的文件夹"
 
-#: ../mail/em-subscription-editor.c:1798
+#: ../mail/em-subscription-editor.c:1818
 msgid "Su_bscribe"
 msgstr "订阅(_B)"
 
-#: ../mail/em-subscription-editor.c:1843
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Unsubscribe from the selected folder"
 msgstr "取消对选定文件夹的订阅"
 
-#: ../mail/em-subscription-editor.c:1883
+#: ../mail/em-subscription-editor.c:1903
 msgid "Collapse all folders"
 msgstr "折叠所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1884
+#: ../mail/em-subscription-editor.c:1904
 msgid "C_ollapse All"
 msgstr "全部折叠(_O)"
 
-#: ../mail/em-subscription-editor.c:1894
+#: ../mail/em-subscription-editor.c:1914
 msgid "Expand all folders"
 msgstr "展开所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1895
+#: ../mail/em-subscription-editor.c:1915
 msgid "E_xpand All"
 msgstr "全部展开(_X)"
 
-#: ../mail/em-subscription-editor.c:1905
+#: ../mail/em-subscription-editor.c:1925
 msgid "Refresh the folder list"
 msgstr "刷新文件夹列表"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1937
 msgid "Stop the current operation"
 msgstr "停止当前操作"
 
@@ -12358,22 +13430,22 @@ 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:106
+#: ../mail/em-utils.c:77
 #, 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:162
-#: ../modules/mailto-handler/evolution-mailto-handler.c:154
+#: ../mail/em-utils.c:133
+#: ../modules/mailto-handler/evolution-mailto-handler.c:150
 msgid "_Do not show this message again"
 msgstr "不再显示此信息(_D)"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:243
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:1064
+#: ../mail/em-utils.c:972
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信息"
@@ -12382,147 +13454,136 @@ msgstr "来自 %s 的信息"
 msgid "Search _Folders"
 msgstr "搜索文件夹(_F)"
 
-#: ../mail/em-vfolder-editor-rule.c:388
+#: ../mail/em-vfolder-editor-rule.c:393
 msgid "Add Folder"
 msgstr "添加文件夹"
 
-#: ../mail/em-vfolder-editor-rule.c:514
+#: ../mail/em-vfolder-editor-rule.c:519
 msgid "Search Folder Sources"
 msgstr "搜索文件夹来源"
 
-#: ../mail/em-vfolder-editor-rule.c:544
+#: ../mail/em-vfolder-editor-rule.c:551
 msgid "Automatically update on any _source folder change"
 msgstr "在源文件夹更改时自动更新(_S)"
 
-#: ../mail/em-vfolder-editor-rule.c:556
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All local folders"
 msgstr "全部本地文件夹"
 
-#: ../mail/em-vfolder-editor-rule.c:557
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "All active remote folders"
 msgstr "全部活跃远程文件夹"
 
-#: ../mail/em-vfolder-editor-rule.c:558
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local and active remote folders"
 msgstr "全部本地和活跃远程文件夹"
 
-#: ../mail/em-vfolder-editor-rule.c:559
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "Specific folders"
 msgstr "指定文件夹"
 
-#: ../mail/em-vfolder-editor-rule.c:594
-#| msgid "Enable search folders"
+#: ../mail/em-vfolder-editor-rule.c:604
 msgid "include subfolders"
 msgstr "包括子文件夹"
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr "导入 Elm 数据"
 
-#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1071
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "邮件"
-
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:375
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:376
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
+#: ../mail/importers/evolution-mbox-importer.c:135
+#: ../plugins/dbx-import/dbx-importer.c:247
 msgid "_Destination folder:"
 msgstr "目的文件夹(_D):"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../mail/importers/evolution-mbox-importer.c:142
+#: ../plugins/dbx-import/dbx-importer.c:254
+#: ../plugins/pst-import/pst-importer.c:543
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:438
+#: ../mail/importers/evolution-mbox-importer.c:436
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "主题"
 
-#: ../mail/importers/evolution-mbox-importer.c:443
+#: ../mail/importers/evolution-mbox-importer.c:441
 msgctxt "mboxImp"
 msgid "From"
 msgstr "来自"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../shell/e-shell-utils.c:172
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
+#: ../mail/importers/evolution-mbox-importer.c:495
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入 Berkeley 邮箱格式文件夹"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/mail-importer.c:56
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:784
+#: ../mail/importers/mail-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:761
 #, c-format
 msgid "Importing '%s'"
 msgstr "正在导入“%s”"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:311
 #, c-format
 msgid "Scanning %s"
 msgstr "正在扫描 %s"
 
-#: ../mail/importers/pine-importer.c:251
+#: ../mail/importers/pine-importer.c:243
 msgid "Importing Pine data"
 msgstr "导入 Pine 数据"
 
-#: ../mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "地址簿"
-
-#: ../mail/importers/pine-importer.c:478
+#: ../mail/importers/pine-importer.c:471
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:479
+#: ../mail/importers/pine-importer.c:472
 msgid "Import mail from Pine."
 msgstr "从 Pine 导入邮件。"
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:64
 #, c-format
 msgid "Mail to %s"
 msgstr "发送给 %s"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:220 ../mail/mail-autofilter.c:263
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:255
+#: ../mail/mail-autofilter.c:246
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:287
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: ../mail/mail-autofilter.c:406
+#: ../mail/mail-autofilter.c:397
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
@@ -12531,7 +13592,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:513
+#: ../mail/mail-autofilter.c:506
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12608,12 +13669,10 @@ msgid "_Keep signature above the original message on replying"
 msgstr "回复时保留原始信息的签名(_K)"
 
 #: ../mail/mail-config.ui.h:16
-#, fuzzy
 msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "忽略邮件列表的“回复至”参数"
+msgstr "忽略邮件列表的“Reply-To”(_N)"
 
 #: ../mail/mail-config.ui.h:17
-#, fuzzy
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "如果可能,组回复只回复给邮件列表(_U)"
 
@@ -12621,203 +13680,208 @@ msgstr "如果可能,组回复只回复给邮件列表(_U)"
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
 
+#: ../mail/mail-config.ui.h:19
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
 #: ../mail/mail-config.ui.h:20
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "内嵌(Outlook 风格)"
+
+#: ../mail/mail-config.ui.h:21
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引用"
+
+#: ../mail/mail-config.ui.h:22
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不引用"
+
+#: ../mail/mail-config.ui.h:23
+msgctxt "ReplyForward"
+msgid "Inline"
+msgstr "内嵌"
+
+#: ../mail/mail-config.ui.h:25
 msgid "Sig_natures"
 msgstr "签名(_N)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:26
 msgid "Signatures"
 msgstr "签名"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:27
 msgid "_Languages"
 msgstr "语言(_L)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:28
+msgid "Languages Table"
+msgstr "语言表"
+
+#: ../mail/mail-config.ui.h:29
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "在此列出的语言反映了您所安装的字典。"
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "语言表"
-
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:31
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Color for _misspelled words:"
 msgstr "给错误拼写的单词着色(_M):"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 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:32
+#: ../mail/mail-config.ui.h:37
 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:34
+#: ../mail/mail-config.ui.h:39
 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:36
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a _private reply to a mailing list message"
 msgstr "向邮件列表邮箱发送私人回复时(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:43
 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:40
+#: ../mail/mail-config.ui.h:45
 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:42
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "发送只填写了密件抄送收件人的信息时(_B)"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:48
 msgid "Confirmations"
 msgstr "配置"
 
-#: ../mail/mail-config.ui.h:49 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
+#: ../mail/mail-config.ui.h:49
+#| msgid "_Add"
+msgid "Add"
+msgstr "添加"
 
-#: ../mail/mail-config.ui.h:50 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
+#: ../mail/mail-config.ui.h:50
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "删除"
 
 #: ../mail/mail-config.ui.h:51
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
+#| msgid "Search Folders"
+msgid " Use for Folders "
+msgstr " 用于文件夹 "
 
 #: ../mail/mail-config.ui.h:52
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "内嵌(Outlook 风格)"
+msgid "Edit"
+msgstr "编辑"
 
 #: ../mail/mail-config.ui.h:53
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引用"
+#| msgid "Sender or Recipients"
+msgid " Use for Recipients "
+msgstr " 用于接收者 "
 
 #: ../mail/mail-config.ui.h:54
-msgctxt "ReplyForward"
-msgid "Do not quote"
-msgstr "不引用"
+#| msgid "_Account:"
+msgid " Account "
+msgstr " 帐号 "
 
 #: ../mail/mail-config.ui.h:55
-msgctxt "ReplyForward"
-msgid "Inline"
-msgstr "内嵌"
+msgid "Send account overrides"
+msgstr "发送帐户覆盖"
 
 #: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "代理设置"
+msgid ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
+msgstr "针对某些文件夹或收件人指定发送帐户,而不是通常检测的发送帐户。收件人列表可以包含部分地址或姓名。姓名和地址将分别比较。"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "使用默认值(_U)"
+msgid "Folder override has precedence over Recipient override"
+msgstr "文件夹覆盖 比 收件人覆盖 优先"
 
 #: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "直接连接到 Internet(_D)"
-
-#: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "手动代理服务器配置(_M):"
-
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "HTTP 代理服务器(_T):"
+#| msgid "Source Account"
+msgid "Send Account"
+msgstr "发送帐号"
 
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "安全 HTTP 代理(_S):"
-
-#: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "SOC_KS 代理:"
-
-#: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "不使用代理的情况(_P):"
-
-#: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
-msgid "Port:"
-msgstr "端口:"
+#: ../mail/mail-config.ui.h:64 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "使用身份验证(_N)"
+#: ../mail/mail-config.ui.h:65 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
 #: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "用户名(_E):"
-
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "密码(_W):"
-
-#: ../mail/mail-config.ui.h:68
 msgid "Start up"
 msgstr "启动"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:67
 msgid "Check for new _messages on start"
 msgstr "启动时自动检查新信息(_M)"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:68
 msgid "Check for new messa_ges in all active accounts"
 msgstr "检查所有活动帐号的新信息(_G)"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:69
 msgid "Message Display"
 msgstr "信息显示"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:70
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:71
 msgid "S_tandard Font:"
 msgstr "标准字体(_T):"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:72
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:73
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:74
 msgid "Fix_ed Width Font:"
 msgstr "等宽字体(_E):"
 
+#: ../mail/mail-config.ui.h:75
+msgid "_Mark messages as read after"
+msgstr "把信息标记为已读前等(_M)"
+
 #: ../mail/mail-config.ui.h:77
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
@@ -12843,8 +13907,8 @@ msgid "Delete Mail"
 msgstr "删除邮件"
 
 #: ../mail/mail-config.ui.h:83
-msgid "Empty trash folders on e_xit"
-msgstr "退出时清空已删除邮件(_X)"
+msgid "Empty _trash folders"
+msgstr "清空已删除邮件(_T)"
 
 #: ../mail/mail-config.ui.h:84
 msgid "Confirm _when expunging a folder"
@@ -12892,58 +13956,54 @@ msgid "_Show the photograph of sender in the message preview"
 msgstr "在信息预览中显示发送者的照片(_S)"
 
 #: ../mail/mail-config.ui.h:96
-msgid "S_earch for sender photograph only in local address books"
-msgstr "仅在本地地址簿中搜索发件人照片(_E)"
-
-#: ../mail/mail-config.ui.h:97
 msgid "Displayed Message Headers"
 msgstr "显示信头"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:97
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.ui.h:99
-#: ../modules/addressbook/autocompletion-config.c:90
+#: ../mail/mail-config.ui.h:98
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "日期/时间格式"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:100
 msgid "Check incoming _messages for junk"
 msgstr "检查收到的邮件是否是垃圾信息(_M)"
 
-#: ../mail/mail-config.ui.h:102
-msgid "Delete junk messages on e_xit"
-msgstr "退出时删除垃圾信息(_X)"
+#: ../mail/mail-config.ui.h:101
+msgid "_Delete junk messages"
+msgstr "删除垃圾信息(_D)"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:102
 msgid "Check cu_stom headers for junk"
 msgstr "检查自定义信头以判别垃圾信息(_S)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:103
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:104
 msgid "_Lookup in local address book only"
 msgstr "仅在本地地址簿中查阅(_L)"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:105
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
 
-#: ../mail/mail-config.ui.h:108 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:160
+#: ../mail/mail-config.ui.h:107
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "不加密"
 
-#: ../mail/mail-config.ui.h:109 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:108
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:109
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -13207,7 +14267,7 @@ msgid ""
 msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "_Empty Trash"
 msgstr "清空废件箱(_E)"
 
@@ -13287,12 +14347,10 @@ msgid ""
 msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
 
 #: ../mail/mail.error.xml.h:60
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "擦除文件夹“{0}”失败。"
 
 #: ../mail/mail.error.xml.h:62
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "刷新文件夹“{0}”失败。"
 
@@ -13345,12 +14403,12 @@ msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”移至“{1}”。"
 
 #: ../mail/mail.error.xml.h:74
-msgid "Cannot open source \"{2}\"."
-msgstr "无法打开源“{2}”。"
+msgid "Cannot open source folder. Error: {2}"
+msgstr "无法打开源文件夹。错误:{2}"
 
 #: ../mail/mail.error.xml.h:75
-msgid "Cannot open target \"{2}\"."
-msgstr "无法打开目标“{2}”。"
+msgid "Cannot open target folder. Error: {2}"
+msgstr "无法打开目标文件夹。错误:{2}"
 
 #: ../mail/mail.error.xml.h:76
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -13361,8 +14419,8 @@ msgid "Cannot create folder \"{0}\"."
 msgstr "无法创建文件夹“{0}”。"
 
 #: ../mail/mail.error.xml.h:78
-msgid "Cannot open source \"{1}\"."
-msgstr "无法打开源“{1}”"
+msgid "Cannot open folder. Error: {1}"
+msgstr "无法打开文件夹。错误:{1}"
 
 #: ../mail/mail.error.xml.h:79
 msgid "Cannot save changes to account."
@@ -13408,7 +14466,7 @@ msgid "Do _Not Disable"
 msgstr "不禁用(_N)"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:628
+#: ../plugins/publish-calendar/publish-calendar.c:656
 msgid "_Disable"
 msgstr "禁用(_D)"
 
@@ -13452,8 +14510,8 @@ msgid "You must name this Search Folder."
 msgstr "您必须为此搜索文件夹命名。"
 
 #: ../mail/mail.error.xml.h:102
-msgid "No sources selected."
-msgstr "没有选中源。"
+msgid "No folder selected."
+msgstr "没有选定文件夹。"
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
@@ -13570,34 +14628,34 @@ msgid "This will mark all messages as read in the selected folder."
 msgstr "这将把选中文件夹中的全部信息标记为已读。"
 
 #: ../mail/mail.error.xml.h:129
-msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
-msgstr "这将把选中文件夹及其子文件夹中的全部信息标记为已读。"
+msgid "Also mark messages in subfolders?"
+msgstr "也标记的子文件夹中的信息吗?"
 
 #: ../mail/mail.error.xml.h:130
-msgid "Close message window."
-msgstr "关闭信息窗口。"
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr "您是想要只标记当前文件夹中的信息,还是也包括子文件夹中的信息?"
 
 #: ../mail/mail.error.xml.h:131
-msgid "Would you like to close the message window?"
-msgstr "您想关闭信息窗口吗?"
+msgid "In Current Folder and _Subfolders"
+msgstr "在当前文件夹和子文件夹(_S)"
 
 #: ../mail/mail.error.xml.h:132
-msgid "_Yes"
-msgstr "是(_Y)"
+msgid "In Current _Folder Only"
+msgstr "只在当前文件夹(_F)"
 
 #: ../mail/mail.error.xml.h:133
-msgid "_No"
-msgstr "否(_N)"
+msgid "Should Evolution close this window when replying or forwarding?"
+msgstr "当回复或转发时 Evolution 是否关闭该窗口?"
 
 #: ../mail/mail.error.xml.h:134
-msgid "_Always"
-msgstr "总是(_A)"
+msgid "_Yes, Always"
+msgstr "是,总是如此(_Y)"
 
 #: ../mail/mail.error.xml.h:135
-msgid "N_ever"
-msgstr "从不(_E)"
+msgid "_No, Never"
+msgstr "不,永不(_N)"
 
 #: ../mail/mail.error.xml.h:136
 msgid "Copy folder in folder tree."
@@ -13608,252 +14666,270 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "您确定要将文件夹“{0}”复制到文件夹“{1}”吗?"
 
 #: ../mail/mail.error.xml.h:138
+msgid "_Yes"
+msgstr "是(_Y)"
+
+#: ../mail/mail.error.xml.h:139
+msgid "_No"
+msgstr "否(_N)"
+
+#: ../mail/mail.error.xml.h:140
+msgid "_Always"
+msgstr "总是(_A)"
+
+#: ../mail/mail.error.xml.h:141
+msgid "N_ever"
+msgstr "从不(_E)"
+
+#: ../mail/mail.error.xml.h:142
 msgid "Move folder in folder tree."
 msgstr "移动文件夹树中的文件夹。"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:143
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "您确定要将文件夹“{0}”移动到文件夹“{1}”中吗?"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "无法发送此信息,因为您所选择用来发送的帐号未启用"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:145
 msgid "Please enable the account or send using another account."
 msgstr "请启用帐号或者使用其它帐号发送。"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid "Mail Deletion Failed"
 msgstr "邮件删除失败"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您没有足够的权限删除此邮件。"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "\"Check Junk\" Failed"
 msgstr "检查垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid "\"Report Junk\" Failed"
 msgstr "报告垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "\"Report Not Junk\" Failed"
 msgstr "报告非垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Remove duplicate messages?"
 msgstr "移除重复的信息?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "No duplicate messages found."
 msgstr "没有找到重复信息。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "“{0}”文件夹中没有重复信息。"
 
-#: ../mail/mail.error.xml.h:151
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:155
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "断开帐号“{0}”失败。"
 
-#: ../mail/mail.error.xml.h:153
-#| msgid "Failed to unsubscribe from folder."
+#: ../mail/mail.error.xml.h:157
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "无法退订文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:158
 msgid "Unable to retrieve message."
 msgstr "无法获取信息。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to open folder."
 msgstr "打开文件夹失败。"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to find duplicate messages."
 msgstr "查找重复信息失败。"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to retrieve messages."
 msgstr "获取信息失败。"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
+msgid "Failed to mark messages as read."
+msgstr "无法将信息标记为已读。"
+
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to remove attachments from messages."
 msgstr "移除信息里的附件失败。"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to download messages for offline viewing."
 msgstr "无法下载信息以离线查看。"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to save messages to disk."
 msgstr "保存信息到磁盘失败。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:167
 msgid "Hidden file is attached."
 msgstr "附加了隐藏文件。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:168
 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:164
+#: ../mail/mail.error.xml.h:169
 msgid "Printing failed."
 msgstr "打印失败。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:170
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "打印机返回 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:171
 msgid "Could not perform this operation on {0}."
 msgstr "无法对 {0} 执行该操作。"
 
-#: ../mail/mail-send-recv.c:203
+#: ../mail/mail.error.xml.h:172
+msgid "You must be working online to complete this operation."
+msgstr "您必须上线以完成此操作。"
+
+#: ../mail/mail-send-recv.c:189
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:537
+#: ../mail/mail-send-recv.c:533
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:549
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:1030
+#: ../mail/mail-send-recv.c:643 ../mail/mail-send-recv.c:1036
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:646 ../mail/mail-send-recv.c:727
+#: ../mail/mail-send-recv.c:643 ../mail/mail-send-recv.c:725
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:1010
+#: ../mail/mail-send-recv.c:1009
 #, c-format
-msgid "Checking for new mail"
-msgstr "检查新邮件"
+msgid "Checking for new mail at '%s'"
+msgstr "正在检查 '%s' 处的新邮件"
 
-#: ../mail/mail-vfolder-ui.c:79
+#: ../mail/mail-vfolder-ui.c:67
 msgid "Search Folders"
 msgstr "搜索文件夹"
 
-#: ../mail/mail-vfolder-ui.c:159
+#: ../mail/mail-vfolder-ui.c:147
 msgid "Edit Search Folder"
 msgstr "编辑搜索文件夹"
 
-#: ../mail/mail-vfolder-ui.c:280
+#: ../mail/mail-vfolder-ui.c:268
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:288
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1273
+#: ../mail/message-list.c:289
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1274
+#: ../mail/message-list.c:290
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1275
+#: ../mail/message-list.c:291
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:292
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信息"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:293
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1281
+#: ../mail/message-list.c:306
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1282
+#: ../mail/message-list.c:307
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1286
+#: ../mail/message-list.c:311
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1287
+#: ../mail/message-list.c:312
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1909 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
+#: ../mail/message-list.c:456 ../mail/message-list.c:5706
+msgid "Generating message list"
+msgstr "生成信息列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1847 ../modules/itip-formatter/itip-view.c:240
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1925
+#: ../mail/message-list.c:1856
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1937
+#: ../mail/message-list.c:1868
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1945
+#: ../mail/message-list.c:1876
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1947
+#: ../mail/message-list.c:1878
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2777
+#: ../mail/message-list.c:2756
 msgid "Select all visible messages"
 msgstr "选中所有可见的信息"
 
-#: ../mail/message-list.c:2913 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3384 ../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:4140
+#: ../mail/message-list.c:4750
 msgid "Follow-up"
 msgstr "跟随"
 
-#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4699 ../mail/message-list.c:5119
-msgid "Generating message list"
-msgstr "生成信息列表"
-
-#: ../mail/message-list.c:4933
-#, fuzzy
+#: ../mail/message-list.c:5644
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
 "running a new search either by clearing it with Search->Clear menu item or "
 "by changing the query above."
-msgstr "没有满足您搜索条件的信息。请改变搜索条件:从上方的下拉列表中选择一个新的“显示”信息过滤器;或"
-"通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜索。"
+msgstr ""
+"没有满足您搜索条件的信息。请改变搜索条件:从上方的下拉列表中选择一个新的“显"
+"示”信息过滤器;或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
+"索。"
 
-#: ../mail/message-list.c:4938
+#: ../mail/message-list.c:5652
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信息。"
 
@@ -13878,8 +14954,8 @@ msgid "Due By"
 msgstr "延期"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "已发送信息"
+msgid "Messages To"
+msgstr "发信息给"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -13890,49 +14966,49 @@ msgid "Subject or Addresses contains"
 msgstr "主题或地址包含"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:2011
 msgid "Recipients contain"
 msgstr "收件人含有"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "Message contains"
 msgstr "信息含有"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:2025
 msgid "Subject contains"
 msgstr "主题含有"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Sender contains"
 msgstr "发件人含有"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1997
 msgid "Body contains"
 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:96
-#: ../modules/mail/em-mailer-prefs.c:1069
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "表列(T):"
 
-#: ../modules/addressbook/autocompletion-config.c:99
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "地址格式化"
 
-#: ../modules/addressbook/autocompletion-config.c:102
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "根据目的地国家标准格式化地址(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:111
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自动补全"
 
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "总是显示自动补全的联系人的地址(_S)"
 
@@ -13956,439 +15032,328 @@ msgstr "联系人信息"
 msgid "Contact information for %s"
 msgstr "%s 的联系人信息"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
+#: ../modules/addressbook/e-book-shell-backend.c:259
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "新地址簿"
 
-#: ../modules/addressbook/e-book-shell-backend.c:238
+#: ../modules/addressbook/e-book-shell-backend.c:268
 msgctxt "New"
 msgid "_Contact"
 msgstr "联系人(_C)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-backend.c:270
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
-#: ../modules/addressbook/e-book-shell-backend.c:245
+#: ../modules/addressbook/e-book-shell-backend.c:275
 msgctxt "New"
 msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-backend.c:277
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
-#: ../modules/addressbook/e-book-shell-backend.c:255
+#: ../modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Address _Book"
 msgstr "地址簿(_B)"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-backend.c:287
+#: ../modules/addressbook/e-book-shell-view-actions.c:902
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:315
 msgid "Certificates"
 msgstr "证书"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:386
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:476
+#: ../modules/addressbook/e-book-shell-view-actions.c:772
 msgid "Save as vCard"
 msgstr "另存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:879
 msgid "Co_py All Contacts To..."
 msgstr "将全部联系人复制到(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:881
 msgid "Copy the contacts of the selected address book to another"
 msgstr "把选中地址簿中的联系人复制到其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:886
 msgid "D_elete Address Book"
 msgstr "删除地址簿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
+#: ../modules/addressbook/e-book-shell-view-actions.c:888
 msgid "Delete the selected address book"
-msgstr "删除选中的地址薄"
+msgstr "删除选中的地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:893
 msgid "Mo_ve All Contacts To..."
 msgstr "将全部联系人移至(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:895
 msgid "Move the contacts of the selected address book to another"
 msgstr "把选中的地址簿中的联系人移至其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:900
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:907
 msgid "Address _Book Properties"
 msgstr "地址簿属性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:909
 msgid "Show properties of the selected address book"
-msgstr "更改选中地址薄的属性"
+msgstr "显示选中地址簿的属性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:914
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-task-shell-view-actions.c:760
+msgid "Re_fresh"
+msgstr "刷新(_F)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:916
+msgid "Refresh the selected address book"
+msgstr "重命名选中地址簿"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
 msgid "Address Book _Map"
 msgstr "地址簿地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Show map with all contacts from selected address book"
 msgstr "显示选中地址簿中所有联系人的地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/addressbook/e-book-shell-view-actions.c:928
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Rename the selected address book"
-msgstr "重命名选中地址薄"
+msgstr "重命名选中的地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Stop loading"
 msgstr "停止载入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
 msgid "_Copy Contact To..."
 msgstr "复制联系人到(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy selected contacts to another address book"
-msgstr "把选中的联系人复制到其它地址薄"
+msgstr "把选中的联系人复制到其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
 msgid "_Delete Contact"
 msgstr "删除联系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:956
 msgid "_Find in Contact..."
 msgstr "在联系人查找(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 msgid "Search for text in the displayed contact"
 msgstr "在显示的联系人中搜索文本"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:963
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Send selected contacts to another person"
 msgstr "把选中的联系人发送给其他人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_Move Contact To..."
 msgstr "移动联系人至(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Move selected contacts to another address book"
-msgstr "把选中的联系人移至其它地址薄"
+msgstr "把选中的联系人移至其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:977
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "_Open Contact"
 msgstr "打开联系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:998
 msgid "_Send Message to Contact..."
 msgstr "给联系人发送信息(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Send a message to the selected contacts"
 msgstr "给选中的联系人发送信息"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-task-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/calendar/e-cal-shell-view-actions.c:1577
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "_Actions"
 msgstr "操作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
-#: ../modules/calendar/e-memo-shell-view-actions.c:702
-#: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1473
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:845
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Address Book Map"
 msgstr "地址簿地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Contact _Preview"
 msgstr "联系人预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1069
 msgid "Show contact preview window"
 msgstr "显示联系人预览窗口"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:1075
 msgid "Show _Maps"
 msgstr "显示地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:1077
 msgid "Show maps in contact preview window"
 msgstr "在联系人预览窗口中显示地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/addressbook/e-book-shell-view-actions.c:1096
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/mail/e-mail-shell-view-actions.c:1914
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../modules/addressbook/e-book-shell-view-actions.c:1098
 msgid "Show contact preview below the contact list"
 msgstr "在联系人列表下方显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1606
+#: ../modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "_Vertical View"
 msgstr "竖直视图(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Show contact preview alongside the contact list"
 msgstr "在联系人列表旁显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-msgid "Any Category"
-msgstr "任何类别"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1120
+#: ../modules/calendar/e-cal-shell-view-actions.c:1754
+#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1130
+#: ../modules/calendar/e-cal-shell-view-actions.c:1764
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
+#: ../shell/e-shell-content.c:658
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1084
+#: ../modules/addressbook/e-book-shell-view-actions.c:1163
 msgid "Print all shown contacts"
 msgstr "打印全部显示的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:1170
 msgid "Preview the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1177
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1192
 msgid "S_ave Address Book as vCard"
 msgstr "保存地址簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1194
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "把选中地址薄中的的联系人保存为 VCard"
+msgstr "把选中地址簿中的的联系人保存为 VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/addressbook/e-book-shell-view-actions.c:1210
 msgid "_Save as vCard..."
 msgstr "另存为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1202
 msgid "Save selected contacts as a vCard"
 msgstr "把选中的联系人保存为 vCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:300
+#: ../modules/addressbook/e-book-shell-view.c:312
 msgid "_Forward Contacts"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:302
+#: ../modules/addressbook/e-book-shell-view.c:314
 msgid "_Forward Contact"
 msgstr "转发联系人(_F)"
 
-#: ../modules/addressbook/e-book-shell-view.c:333
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Send Message to Contacts"
 msgstr "给联系人发送信息(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:335
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Send Message to List"
 msgstr "给列表发送信息(_S)"
 
-#: ../modules/addressbook/e-book-shell-view.c:337
+#: ../modules/addressbook/e-book-shell-view.c:349
 msgid "_Send Message to Contact"
 msgstr "给联系人发送信息(_M)"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "匿名"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
-msgid "Using email address"
-msgstr "使用电子邮件地址"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
-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:8
-msgid "One"
-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:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:112
-msgid "_Port:"
-msgstr "端口(_P):"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "服务器(_V):"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "使用安全连接(_C):"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "登录方式(_L):"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "登录(_G):"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "搜索基础(_B):"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-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 "S_earch filter:"
-msgstr "搜索过滤器(_E):"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "搜索过滤器"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-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 "1"
-msgstr "1"
-
-#. 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
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-msgid "contacts"
-msgstr "联系人"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "超时(_T):"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-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/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio.c:316
 msgid "Audio Player"
 msgstr "音乐播放器"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+#: ../modules/audio-inline/e-mail-formatter-audio.c:317
 msgid "Play the attachment in embedded audio player"
 msgstr "在嵌入式音乐播放器中播放附件"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:167
-#| 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."
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14398,21 +15363,18 @@ msgstr ""
 "\n"
 "这会恢复您所有的个人数据、设置、邮件过滤器等。"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:182
-#| msgid "Restore from backup"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
 msgid "_Restore from a backup file:"
 msgstr "从备份文件恢复(_R):"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:193
-#| msgid "Choose a file to restore"
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
 msgid "Choose a backup file to restore"
 msgstr "选择要恢复的备份文件"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
-#| msgid "Restore from backup"
 msgid "Restore from Backup"
 msgstr "从备份中恢复"
 
@@ -14448,104 +15410,104 @@ msgstr "恢复 Evolution 数据(_E)..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "从归档文件备份及恢复 Evolution 的数据和设置"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:81
+#: ../modules/backup-restore/evolution-backup-tool.c:84
 msgid "Back up Evolution directory"
 msgstr "备份 Evolution 目录"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:86
 msgid "Restore Evolution directory"
 msgstr "恢复 Evolution 目录"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:88
 msgid "Check Evolution Back up"
 msgstr "检查 Evolution 备份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:90
 msgid "Restart Evolution"
 msgstr "重新启动 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:92
 msgid "With Graphical User Interface"
 msgstr "带图形用户界面"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:312
-#: ../modules/backup-restore/evolution-backup-tool.c:441
+#: ../modules/backup-restore/evolution-backup-tool.c:322
+#: ../modules/backup-restore/evolution-backup-tool.c:516
 msgid "Shutting down Evolution"
 msgstr "关闭 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:331
 msgid "Backing Evolution accounts and settings"
 msgstr "备份 Evolution 的帐号及设置"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:338
+#: ../modules/backup-restore/evolution-backup-tool.c:348
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:354
+#: ../modules/backup-restore/evolution-backup-tool.c:364
 msgid "Back up complete"
 msgstr "备份完成"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:361
-#: ../modules/backup-restore/evolution-backup-tool.c:608
+#: ../modules/backup-restore/evolution-backup-tool.c:371
+#: ../modules/backup-restore/evolution-backup-tool.c:703
 msgid "Restarting Evolution"
 msgstr "重新启动 Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:447
+#: ../modules/backup-restore/evolution-backup-tool.c:522
 msgid "Back up current Evolution data"
 msgstr "备份当前 Evolution 数据"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:455
+#: ../modules/backup-restore/evolution-backup-tool.c:529
 msgid "Extracting files from back up"
 msgstr "从备份中提取文件"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:524
+#: ../modules/backup-restore/evolution-backup-tool.c:611
 msgid "Loading Evolution settings"
 msgstr "载入 Evolution 的设置"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:578
+#: ../modules/backup-restore/evolution-backup-tool.c:677
 msgid "Removing temporary back up files"
 msgstr "删除临时备份文件"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:590
+#: ../modules/backup-restore/evolution-backup-tool.c:688
 msgid "Reloading registry service"
 msgstr "重新加载注册服务"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:815
+#: ../modules/backup-restore/evolution-backup-tool.c:917
 msgid "Evolution Back Up"
 msgstr "Evolution 备份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:816
+#: ../modules/backup-restore/evolution-backup-tool.c:918
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:820
+#: ../modules/backup-restore/evolution-backup-tool.c:922
 msgid "Evolution Restore"
 msgstr "Evolution 恢复"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:821
+#: ../modules/backup-restore/evolution-backup-tool.c:923
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "正在从文件夹 %s 中恢复"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:889
+#: ../modules/backup-restore/evolution-backup-tool.c:993
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数据"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:890
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请稍候,Evolution 正在备份您的数据。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:892
+#: ../modules/backup-restore/evolution-backup-tool.c:996
 msgid "Restoring Evolution Data"
 msgstr "正在恢复 Evolution 数据"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:893
+#: ../modules/backup-restore/evolution-backup-tool.c:997
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请稍候,Evolution 正在恢复您的数据。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:911
+#: ../modules/backup-restore/evolution-backup-tool.c:1019
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这可能要花一点时间,取决于您帐号中的数据总量。"
 
@@ -14600,137 +15562,131 @@ msgstr "权限不够"
 msgid "The selected folder is not writable."
 msgstr "选中的文件夹不可写。"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
-msgstr ""
+msgstr "无法生成 Bogofilter (%s):"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "无法将邮件信息内容通过流传送给 Bogofilter:"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter 可能崩溃了或无法处理邮件信息"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Bogofilter 选项"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "将信息文本转换为 _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
-#| msgid "S_tandard Font:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
 msgid "Standard LDAP Port"
 msgstr "标准 LDAP 端口"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
 msgid "LDAP over SSL (deprecated)"
 msgstr "通过 SSL 的 LDAP(已废弃)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 全局目录服务"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
 msgid "Microsoft Global Catalog over SSL"
 msgstr "通过 SSL 的 Microsoft 全局目录服务"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
-#| msgid "Reconnecting to '%s'"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
 msgid "Connecting to LDAP"
 msgstr "重新连接到 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
-#| msgid "(Not Recommended)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
+msgid "Port:"
+msgstr "端口:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (推荐)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:181
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
-#| msgid "Anonymously"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
-#| msgid "Input Methods"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+msgid "Using email address"
+msgstr "使用电子邮件地址"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
+msgstr "使用已识别的姓名(DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
 msgid "Method:"
 msgstr "方法:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that "
-#| "setting this to \"Email Address\" requires anonymous access to your LDAP "
-#| "server."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
 "LDAP server."
 msgstr ""
-"这是 Evolution 用来认证您的方法。注意若设为“使用电子邮件地址”则需要"
-"对您的 LDAP 服务器匿名访问。"
+"这是 Evolution 用来认证您的方法。注意若设为“使用电子邮件地址”则需要对您的 "
+"LDAP 服务器匿名访问。"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
 #: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "搜索"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
-#| msgid "Search _base:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
 msgid "Search Base:"
 msgstr "搜索基础:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
-#| msgid "_Find Possible Search Bases"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
 msgid "Find Possible Search Bases"
 msgstr "查找可能的搜索基础"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
-#| msgid "Log Level"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
 msgid "One Level"
 msgstr "一级"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Subtree"
 msgstr "子树"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
-#| msgid "_Search scope:"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Search Scope:"
 msgstr "搜索范围:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
-#| msgid ""
-#| "The search scope defines how deep you would like the search to extend "
-#| "down the directory tree. A search scope of \"sub\" will include all "
-#| "entries below your search base. A search scope of \"one\" will only "
-#| "include the entries one level beneath your base."
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -14741,303 +15697,294 @@ msgstr ""
 "搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
 "级的项目。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
-#| msgid "Search Filter"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
 msgid "Search Filter:"
 msgstr "搜索过滤器:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
 msgid "Downloading"
 msgstr "下载"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
-#| msgid "B_rowse this book until limit reached"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+msgid "contacts"
+msgstr "联系人"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
 msgid "Browse until limit is reached"
 msgstr "浏览直到达到极限"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:133
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
-#| msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:400
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
 #, c-format
-#| msgid "GConf error: %s"
 msgid "HTTP Error: %s"
 msgstr "HTTP 错误:%s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:430
-#| msgid "Could not parse PGP message: "
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
 msgid "Could not parse response"
 msgstr "无法解析响应"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:439
-#| msgid "_Empty Trash"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
 msgid "Empty response"
 msgstr "空响应"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
 msgid "Unexpected reply from server"
 msgstr "服务器响应异常"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1034
-#| msgid "Could not find any user calendar."
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
 msgid "Could not locate user's calendars"
 msgstr "无法定位用户的日历"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1258
-#| msgid "_Path:"
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
 msgid "Path"
 msgstr "路径"
 
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
 #: ../modules/cal-config-google/e-google-chooser-dialog.c:200
-#| msgid "Choose calendar file"
 msgid "Choose a Calendar"
 msgstr "选择日历"
 
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
-#| msgid "New Memo List"
 msgid "Choose a Memo List"
 msgstr "选择备忘列表"
 
 #: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
-#| msgid "Select a Task List"
 msgid "Choose a Task List"
 msgstr "选择一个任务列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
-#| msgid "Web Calendars"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
 msgid "Find Calendars"
 msgstr "查找日历"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
-#| msgid "Memo List"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
 msgid "Find Memo Lists"
 msgstr "查找备忘列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
-#| msgid "Task List"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
 msgid "Find Task Lists"
 msgstr "查找任务列表"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-#| msgid "_Path:"
-msgid "Path:"
-msgstr "路径:"
-
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
 msgid "Email:"
 msgstr "电子邮件:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
-#| msgid "Server _handles meeting invitations"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
 msgid "Server handles meeting invitations"
 msgstr "服务器处理会议邀请"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
-#| msgid "Add local address books to Evolution."
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "选择使用哪个地址簿。"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
-#| msgid "U_se in Birthday & Anniversaries calendar"
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "在生日和纪念日日历中使用"
 
 #: ../modules/cal-config-google/e-google-chooser-button.c:127
-#| msgid "D_elete Calendar"
 msgid "Default User Calendar"
 msgstr "删除用户日历"
 
-#: ../modules/cal-config-google/e-google-chooser.c:508
+#: ../modules/cal-config-google/e-google-chooser.c:515
 #, c-format
-#| msgid "Enter the password for '%s'"
 msgid "Enter Google password for user '%s'."
 msgstr "输入“%s”的 Google 密码。"
 
-#: ../modules/cal-config-google/e-google-chooser.c:525
+#: ../modules/cal-config-google/e-google-chooser.c:532
 msgid "User declined to provide a password"
 msgstr "用户拒绝提供密码"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
 msgid "Use an existing iCalendar (ics) file"
 msgstr "使用已有的 iCalendar (ics) 文件"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:186
-#| msgid "iCalendar (.ics)"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
 msgid "iCalendar File"
 msgstr "iCalendar 文件"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
-#| msgid "Choose calendar file"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
 msgid "Choose an iCalendar file"
 msgstr "选择 iCalendar 文件"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:201
-#| msgid "_File:"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
 msgid "File:"
 msgstr "文件:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:216
-#| msgid "Allows Evolution to display text part of limited size"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
 msgid "Allow Evolution to update the file"
 msgstr "允许 Evolution 更新该文件"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
+#. TRANSLATOR: This is the temperature in degrees Fahrenheit (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:215
+msgid "Fahrenheit (°F)"
+msgstr "华氏(°F)"
+
+#. TRANSLATOR: This is the temperature in degrees Celsius (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:219
+msgid "Centigrade (°C)"
+msgstr "摄氏(°C)"
+
+#. TRANSLATOR: This is the temperature in kelvin
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:223
+msgid "Kelvin (K)"
+msgstr "开氏(K)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:225
+#| msgid "_Units:"
+msgid "Units:"
+msgstr "单位:"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:320
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "导入(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:409
+#: ../modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Calendar"
 msgstr "选择一个日历"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:436
+#: ../modules/calendar/e-cal-attachment-handler.c:433
 msgid "Select a Task List"
 msgstr "选择一个任务列表"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:446
+#: ../modules/calendar/e-cal-attachment-handler.c:443
 msgid "I_mport to Calendar"
 msgstr "导入到日历(_M)"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:453
+#: ../modules/calendar/e-cal-attachment-handler.c:450
 msgid "I_mport to Tasks"
 msgstr "导入到任务(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.c:406
-#| msgid "Selected Calendars for Reminders"
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
-#: ../modules/calendar/e-calendar-preferences.c:828
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "时间和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "仅日期(_D):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Minutes"
 msgstr "分钟"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Hours"
 msgstr "小时"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:10
+#: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Days"
 msgstr "天"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:11
+#: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "60 minutes"
 msgstr "60 分钟"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "30 minutes"
 msgstr "30 分钟"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
+#: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "15 minutes"
 msgstr "15 分钟"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:14
+#: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "10 minutes"
 msgstr "10 分钟"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:15
+#: ../modules/calendar/e-calendar-preferences.ui.h:8
 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
+#: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Se_cond zone:"
 msgstr "第二时区(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:19
+#: ../modules/calendar/e-calendar-preferences.ui.h:12
 msgid "(Shown in a Day View)"
 msgstr "(在日视图中显示)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:21
+#: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "显示系统时区(_Y)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:22
+#: ../modules/calendar/e-calendar-preferences.ui.h:15
 msgid "Time format:"
 msgstr "时间格式:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:23
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小时(上/下午)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "_24 hour"
 msgstr "_24 小时"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-calendar-preferences.ui.h:18
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Work Week"
 msgstr "工作日"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Wee_k starts on:"
 msgstr "一周开始于(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:21
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
+#: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "_Day begins:"
 msgstr "一天开始(_D):"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
 msgid "_Mon"
 msgstr "周一(_M)"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "周二(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "周三(_W)"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "周四(_H)"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "周五(_F)"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "周六(_S)"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "周日(_U)"
 
@@ -15142,72 +16089,72 @@ msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
 msgid "Publishing Information"
 msgstr "发布信息"
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
+#: ../modules/calendar/e-cal-shell-backend.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
+#: ../modules/calendar/e-cal-shell-backend.c:322
 msgctxt "New"
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-backend.c:324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1521
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
+#: ../modules/calendar/e-cal-shell-backend.c:329
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
+#: ../modules/calendar/e-cal-shell-backend.c:331
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
+#: ../modules/calendar/e-cal-shell-backend.c:336
 msgctxt "New"
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
+#: ../modules/calendar/e-cal-shell-backend.c:338
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
+#: ../modules/calendar/e-cal-shell-backend.c:346
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-backend.c:348
+#: ../modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: ../modules/calendar/e-cal-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:703
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:209
-msgid "Loading calendars"
-msgstr "载入日历"
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "打开日历“%s”"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:715
+#: ../modules/calendar/e-cal-shell-sidebar.c:590
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1074
-#, c-format
-#| msgid "Opening calendar at %s"
-msgid "Opening calendar '%s'"
-msgstr "打开日历“%s”"
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+msgid "Print"
+msgstr "打印"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -15217,361 +16164,358 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "销毁较早的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "复制项目"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:878
 msgid "Moving Items"
 msgstr "移动项目"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1218
+#: ../modules/calendar/e-cal-shell-view-actions.c:1211
 msgid "event"
 msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-actions.c:1213
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:549
-#: ../modules/calendar/e-task-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:527
+#: ../modules/calendar/e-task-shell-view-actions.c:644
 msgid "Save as iCalendar"
 msgstr "保存为 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "D_elete Calendar"
 msgstr "删除日历(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Delete the selected calendar"
 msgstr "删除选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1367
 msgid "Go Back"
 msgstr "后退"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1374
 msgid "Go Forward"
 msgstr "前进"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1381
 msgid "Select today"
 msgstr "选择今天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select _Date"
 msgstr "选择日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1388
 msgid "Select a specific date"
 msgstr "选择特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Purg_e"
 msgstr "销毁(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Purge old appointments and meetings"
 msgstr "销毁旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
-msgid "Re_fresh"
-msgstr "刷新(_F)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1416
 msgid "Refresh the selected calendar"
 msgstr "刷新选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Rename the selected calendar"
 msgstr "重命名选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
-msgid "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#| msgid "Find _next"
+msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1430
 msgid "Find next occurrence of the current search string"
 msgstr "寻找搜索字符串出现的下一个位置"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
-msgid "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#| msgid "Find _previous"
+msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Find previous occurrence of the current search string"
 msgstr "寻找该搜索字符串出现的上一个位置"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
-msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#| msgid "Stop _running search"
+msgid "Stop _Running Search"
 msgstr "停止正在运行的搜索(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1444
 msgid "Stop currently running search"
 msgstr "停止当前正在运行的搜索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Show _Only This Calendar"
 msgstr "只显示此日历(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Delegate Meeting..."
 msgstr "代理会议(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Delete Appointment"
 msgstr "删除约会(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-actions.c:1472
 msgid "Delete selected appointments"
 msgstr "删除选中的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete This _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
 msgid "Delete this occurrence"
 msgstr "删除此次发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete All Occ_urrences"
 msgstr "删除所有出现(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Delete all occurrences"
 msgstr "删除全部发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "New All Day _Event..."
 msgstr "新建全天事件(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Create a new all day event"
 msgstr "创建一个新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "New _Meeting..."
 msgstr "新建会议(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1507
 msgid "Create a new meeting"
 msgstr "创建一个新的会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Make this Occurrence _Movable"
 msgstr "将此次发生变为可移动(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "View the current appointment"
 msgstr "查看当前约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1554
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Converts an appointment to a meeting"
 msgstr "转换约会为会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Conv_ert to Appointment..."
 msgstr "转换到约会(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../modules/calendar/e-cal-shell-view-actions.c:1563
 msgid "Converts a meeting to an appointment"
 msgstr "转换会议为约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
 msgid "Quit"
 msgstr "退出"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Show one day"
 msgstr "显示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "List"
 msgstr "列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Show as list"
 msgstr "显示为列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1704
 msgid "Show one month"
 msgstr "显示一个月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Week"
 msgstr "周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1711
 msgid "Show one week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Show one work week"
 msgstr "显示一个工作周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
+#: ../modules/calendar/e-cal-shell-view-actions.c:1747
 msgid "Occurs Less Than 5 Times"
 msgstr "发生不到 5 次"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1778
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1785
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
 msgid "Print this calendar"
 msgstr "打印此日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1831
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
 msgid "Preview the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1826
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
+#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-task-shell-view-actions.c:1045
 msgid "_Save as iCalendar..."
 msgstr "保存为 iCalendar(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1930
+#: ../modules/calendar/e-cal-shell-view-actions.c:1903
 msgid "Go To"
 msgstr "转到"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:547
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
 msgid "memo"
 msgstr "备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "New _Memo"
 msgstr "新建备忘(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:204
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "_Open Memo"
 msgstr "打开备忘(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:688
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "View the selected memo"
 msgstr "查看选中的备忘"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:853
+#: ../modules/calendar/e-memo-shell-view-actions.c:831
 msgid "Print the selected memo"
 msgstr "打印选中的备忘"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1457
+#: ../modules/calendar/e-cal-shell-view-private.c:1562
 msgid "Searching next matching event"
 msgstr "正在搜索下一个匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1458
+#: ../modules/calendar/e-cal-shell-view-private.c:1563
 msgid "Searching previous matching event"
 msgstr "正在搜索上一个匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1476
+#: ../modules/calendar/e-cal-shell-view-private.c:1584
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "无法在接下来的 %d 年中找到匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1479
+#: ../modules/calendar/e-cal-shell-view-private.c:1588
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "无法在过去的 %d 年中找到匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1500
+#: ../modules/calendar/e-cal-shell-view-private.c:1613
 msgid "Cannot search with no active calendar"
 msgstr "无活动日历,无法搜索"
 
@@ -15580,22 +16524,22 @@ msgstr "无活动日历,无法搜索"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "task"
 msgstr "任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:704
 msgid "_Assign Task"
 msgstr "分配任务(_A)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Mark selected tasks as complete"
 msgstr "把选中任务标记为完成"
 
@@ -15604,221 +16548,211 @@ msgid "_Mark as Incomplete"
 msgstr "标记为未完成(_M)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Mark selected tasks as incomplete"
 msgstr "把选中任务标记为未完成"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:201
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-view-actions.c:797
 msgid "Create a new task"
 msgstr "创建新任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Open Task"
 msgstr "打开任务(_O)"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "View the selected task"
 msgstr "查看选中的任务"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1052
+#: ../modules/calendar/e-task-shell-view-actions.c:1030
 msgid "Print the selected task"
 msgstr "打印选中的任务"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
-#: ../modules/calendar/e-memo-shell-backend.c:202
+#: ../modules/calendar/e-memo-shell-backend.c:217
 msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:209
+#: ../modules/calendar/e-memo-shell-backend.c:224
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共享的备忘(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:211
+#: ../modules/calendar/e-memo-shell-backend.c:226
 msgid "Create a new shared memo"
 msgstr "创建一个新的共享备忘"
 
-#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-backend.c:234
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "备忘列表(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-backend.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:204
-msgid "Loading memos"
-msgstr "载入备忘"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:647
-msgid "Memo List Selector"
-msgstr "备忘列表选择器"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:959
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
-#| msgid "Opening memos at %s"
 msgid "Opening memo list '%s'"
 msgstr "打开备忘列表“%s”"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-sidebar.c:546
+msgid "Memo List Selector"
+msgstr "备忘列表选择器"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:212
+#: ../modules/calendar/e-memo-shell-view-actions.c:227
 msgid "Print Memos"
 msgstr "打印备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:268
 msgid "Memo List Properties"
 msgstr "备忘列表属性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "_Delete Memo"
 msgstr "删除备忘(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "_Find in Memo..."
 msgstr "在备忘中查找(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-memo-shell-view-actions.c:596
 msgid "Search for text in the displayed memo"
 msgstr "在显示备忘的主体中搜索文本"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "D_elete Memo List"
 msgstr "删除备忘列表(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Delete the selected memo list"
 msgstr "重命名选中备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "_New Memo List"
 msgstr "新建备忘列表(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Refresh the selected memo list"
 msgstr "重命名选中备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Rename the selected memo list"
 msgstr "重命名选中备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-memo-shell-view-actions.c:650
 msgid "Show _Only This Memo List"
 msgstr "只显示此备忘列表(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Memo _Preview"
 msgstr "备忘预览(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:753
+#: ../modules/calendar/e-memo-shell-view-actions.c:731
 msgid "Show memo preview pane"
 msgstr "显示备忘预览面板"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview below the memo list"
 msgstr "在备忘列表下方显示备忘预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Show memo preview alongside the memo list"
 msgstr "在备忘列表下方显示备忘预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Print the list of memos"
 msgstr "打印备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Preview the list of memos to be printed"
 msgstr "预览要打印的备忘列表"
 
-#: ../modules/calendar/e-memo-shell-view.c:236
+#: ../modules/calendar/e-memo-shell-view.c:239
 msgid "Delete Memos"
 msgstr "删除备忘"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:241
 msgid "Delete Memo"
 msgstr "删除备忘"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:427
+#: ../modules/calendar/e-memo-shell-view-private.c:538
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:431
-#: ../modules/calendar/e-task-shell-view-private.c:612
+#: ../modules/calendar/e-memo-shell-view-private.c:542
+#: ../modules/calendar/e-task-shell-view-private.c:748
 #, c-format
 msgid "%d selected"
 msgstr "选中 %d 个"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
+#: ../modules/calendar/e-task-shell-backend.c:205
+#: ../modules/calendar/e-task-shell-view-actions.c:219
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: ../modules/calendar/e-task-shell-backend.c:199
+#: ../modules/calendar/e-task-shell-backend.c:214
 msgctxt "New"
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:206
+#: ../modules/calendar/e-task-shell-backend.c:221
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分配的任务(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:208
+#: ../modules/calendar/e-task-shell-backend.c:223
 msgid "Create a new assigned task"
 msgstr "创建新分配的任务"
 
-#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-backend.c:231
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "任务列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-backend.c:233
+#: ../modules/calendar/e-task-shell-view-actions.c:748
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:204
-msgid "Loading tasks"
-msgstr "载入任务"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:647
-msgid "Task List Selector"
-msgstr "任务列表选择器"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:959
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
-#| msgid "Opening tasks at %s"
 msgid "Opening task list '%s'"
 msgstr "正在打开任务列表“%s”"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-sidebar.c:546
+msgid "Task List Selector"
+msgstr "任务列表选择器"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view-actions.c:250
 msgid "Print Tasks"
 msgstr "打印任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
+#: ../modules/calendar/e-task-shell-view-actions.c:291
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:586
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15829,831 +16763,786 @@ msgstr ""
 "\n"
 "确实删除这些任务吗?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../modules/calendar/e-task-shell-view-actions.c:593
 msgid "Do not ask me again"
 msgstr "不要再次询问"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "_Delete Task"
 msgstr "删除任务(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "_Find in Task..."
 msgstr "在任务中查找(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:720
 msgid "Search for text in the displayed task"
 msgstr "在显示的任务中搜索文本"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "Copy..."
 msgstr "复制..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "D_elete Task List"
 msgstr "删除任务列表(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Delete the selected task list"
 msgstr "重命名选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Refresh the selected task list"
 msgstr "更新选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Rename the selected task list"
 msgstr "重命名选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Show _Only This Task List"
 msgstr "只显示此任务列表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:810
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mar_k as Incomplete"
 msgstr "标记为未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:840
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Delete completed tasks"
 msgstr "删除已完成的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Task _Preview"
 msgstr "任务预览(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Show task preview pane"
 msgstr "显示任务预览面板"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview below the task list"
 msgstr "在任务列表下方显示任务预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:923
 msgid "Show task preview alongside the task list"
 msgstr "在任务列表下方显示任务预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:945
 msgid "Completed Tasks"
 msgstr "已完成任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
 msgid "Print the list of tasks"
 msgstr "打印任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Preview the list of tasks to be printed"
 msgstr "预览要打印的任务列表"
 
-#: ../modules/calendar/e-task-shell-view.c:371
+#: ../modules/calendar/e-task-shell-view.c:374
 msgid "Delete Tasks"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:376
 msgid "Delete Task"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view-private.c:501
+#: ../modules/calendar/e-task-shell-view-private.c:633
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../modules/calendar/e-task-shell-view-private.c:608
+#: ../modules/calendar/e-task-shell-view-private.c:744
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
-msgid "IMAP Headers"
-msgstr "IMAP 信头"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
-msgid ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
-msgstr "选择要获取的预定义 IMAP 信头集合。\n"
-"注意,较大的信头集合下载需要更长时间。"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
-msgid "_Fetch All Headers"
-msgstr "获取全部信头(_F)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
-#| msgid "Mail Headers Table"
-msgid "_Basic Headers (fastest)"
-msgstr "基本信头(最快)(_B)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
-#| msgid ""
-#| "_Basic Headers (Fastest) \n"
-#| "Use this if you do not have filters based on mailing lists"
-msgid "Use this if you are not filtering any mailing lists."
-msgstr "如果您没有基于邮件列表的过滤器,请使用此项。"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
-#| msgid "Basic and _Mailing List Headers (Default)"
-msgid "Basic and _Mailing List Headers (default)"
-msgstr "基本和邮件列表信头(默认)(_M)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
-msgid "Custom Headers"
-msgstr "自定义信头"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
-msgid ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
-msgstr ""
-
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:135
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:141
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
 msgid "Display part as an invitation"
 msgstr "以邀请方式显示部分"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:231
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
+#: ../modules/itip-formatter/itip-view.c:235
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:253
+#: ../modules/itip-formatter/itip-view.c:244
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p%l:%M:%S"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:259
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:263
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:277
+#: ../modules/itip-formatter/itip-view.c:268
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:281
+#: ../modules/itip-formatter/itip-view.c:272
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:291
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:296
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:314
+#: ../modules/itip-formatter/itip-view.c:305
 msgid "%A %l:%M %p"
 msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:318
+#: ../modules/itip-formatter/itip-view.c:309
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:327
+#: ../modules/itip-formatter/itip-view.c:318
 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.
-#: ../modules/itip-formatter/itip-view.c:333
+#: ../modules/itip-formatter/itip-view.c:324
 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.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:328
 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.
-#: ../modules/itip-formatter/itip-view.c:342
+#: ../modules/itip-formatter/itip-view.c:333
 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.
-#: ../modules/itip-formatter/itip-view.c:346
+#: ../modules/itip-formatter/itip-view.c:337
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:343
 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.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../modules/itip-formatter/itip-view.c:348
 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.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:352
 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.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../modules/itip-formatter/itip-view.c:357
 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.
-#: ../modules/itip-formatter/itip-view.c:370
+#: ../modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:409
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:499
-#: ../modules/itip-formatter/itip-view.c:588
+#: ../modules/itip-formatter/itip-view.c:399
+#: ../modules/itip-formatter/itip-view.c:400
+#: ../modules/itip-formatter/itip-view.c:489
+#: ../modules/itip-formatter/itip-view.c:490
+#: ../modules/itip-formatter/itip-view.c:579
 msgid "An unknown person"
 msgstr "未知的人"
 
-#: ../modules/itip-formatter/itip-view.c:413
-#: ../modules/itip-formatter/itip-view.c:503
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:404
+#: ../modules/itip-formatter/itip-view.c:494
+#: ../modules/itip-formatter/itip-view.c:583
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "请以 %s 的身份回应"
 
-#: ../modules/itip-formatter/itip-view.c:415
-#: ../modules/itip-formatter/itip-view.c:505
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "以 %s 的身份接收"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:411
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s 通过 %s 发布了会议信息:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s 发布了会议信息:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s 为您代理了下列会议:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:421
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s 通过 %s 请求您参加下列会议:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:423
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s 请求您参加下列会议:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:429
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s 通过 %s 希望加入到已有的会议:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:431
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s 希望加入到已有的会议:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:435
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s 通过 %s 希望接收到下列会议的最新信息:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:437
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s 希望接收到下列会议的最新信息:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:441
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s 通过 %s 发回了下列会议请求的响应:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s 发回了下列会议请求的响应:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:447
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 通过 %s 取消了下列会议:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s 已取消下列会议:"
 
-#: ../modules/itip-formatter/itip-view.c:462
+#: ../modules/itip-formatter/itip-view.c:453
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s 通过 %s 提议了下列会议变更。"
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../modules/itip-formatter/itip-view.c:455
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s 已提议了下列会议变更:"
 
-#: ../modules/itip-formatter/itip-view.c:468
+#: ../modules/itip-formatter/itip-view.c:459
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s 通过 %s 拒绝了下列会议变更:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../modules/itip-formatter/itip-view.c:461
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s 拒绝了下列会议变更:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:501
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s 通过 %s 发布了下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s 发布了下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s 请求给 %s 分配下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:511
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s 通过 %s 为您分配了下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:513
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s 为您分配了一个任务:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:519
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s 通过 %s 希望加入到已有的任务:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:521
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s 希望加入到已存在的任务:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:525
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "%s 通过 %s 想要收到所分配的下列任务的最新信息:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:527
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s 想要收到所分配的下列任务的最新信息:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:531
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s 通过 %s 发回了下列分配任务的回应:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:533
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s 发回了下列分配任务的回应:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:537
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s 通过 %s 取消了下列任务分配:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s 取消分配的下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:552
+#: ../modules/itip-formatter/itip-view.c:543
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s 通过 %s 提议了下列任务分配变更:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../modules/itip-formatter/itip-view.c:545
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s 提议了下列任务分配变更:"
 
-#: ../modules/itip-formatter/itip-view.c:558
+#: ../modules/itip-formatter/itip-view.c:549
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s 通过 %s 拒绝了下列任务分配:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../modules/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s 拒绝了分配的下列任务:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:590
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s 通过 %s 发布了下列备忘:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s 发布了下列备忘:"
 
-#: ../modules/itip-formatter/itip-view.c:606
+#: ../modules/itip-formatter/itip-view.c:597
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s 通过 %s 希望加入到已有的备忘:"
 
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../modules/itip-formatter/itip-view.c:599
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入到已有的备忘中:"
 
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../modules/itip-formatter/itip-view.c:603
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 通过 %s 取消了下列共享备忘:"
 
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../modules/itip-formatter/itip-view.c:605
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 取消了下列共享备忘:"
 
-#: ../modules/itip-formatter/itip-view.c:687
+#: ../modules/itip-formatter/itip-view.c:678
 msgid "All day:"
 msgstr "全天:"
 
-#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:684
 msgid "Start day:"
 msgstr "开始日期:"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1447
+#: ../modules/itip-formatter/itip-view.c:684
+#: ../modules/itip-formatter/itip-view.c:1498
 msgid "Start time:"
 msgstr "开始时间:"
 
-#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:693
 msgid "End day:"
 msgstr "结束日期:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1448
+#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:1499
 msgid "End time:"
 msgstr "结束时间:"
 
-#: ../modules/itip-formatter/itip-view.c:1008
-msgid "_Open Calendar"
-msgstr "打开日历(_O)"
+#: ../modules/itip-formatter/itip-view.c:1024
+msgid "Ope_n Calendar"
+msgstr "打开日历(_N)"
 
-#: ../modules/itip-formatter/itip-view.c:1011
+#: ../modules/itip-formatter/itip-view.c:1027
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1014
+#: ../modules/itip-formatter/itip-view.c:1030
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../modules/itip-formatter/itip-view.c:1017
+#: ../modules/itip-formatter/itip-view.c:1033
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../modules/itip-formatter/itip-view.c:1023
-msgid "A_ccept all"
-msgstr "全部接受(_C)"
+#: ../modules/itip-formatter/itip-view.c:1039
+msgid "Acce_pt all"
+msgstr "全部接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1026
-msgid "A_ccept"
-msgstr "接受(_C)"
+#: ../modules/itip-formatter/itip-view.c:1042
+msgid "Acce_pt"
+msgstr "接受(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1029
-msgid "_Send Information"
-msgstr "发送信息(_S)"
+#: ../modules/itip-formatter/itip-view.c:1045
+msgid "Send _Information"
+msgstr "发送信息(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Update"
 msgstr "更新(_U)"
 
-#: ../modules/itip-formatter/itip-view.c:1450
-#: ../modules/itip-formatter/itip-view.c:1492
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1501
+#: ../modules/itip-formatter/itip-view.c:1549
+#: ../modules/itip-formatter/itip-view.c:1620
 msgid "Comment:"
 msgstr "注释:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1481
+#: ../modules/itip-formatter/itip-view.c:1537
 msgid "Send reply to sender"
 msgstr "回复发件人"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:1552
 msgid "Send _updates to attendees"
 msgstr "给出席者发送更新(_U)"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1498
+#: ../modules/itip-formatter/itip-view.c:1555
 msgid "_Apply to all instances"
 msgstr "应用到全部实例(_A)"
 
-#: ../modules/itip-formatter/itip-view.c:1499
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Show time as _free"
 msgstr "将时间显示为空闲(_F)"
 
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1557
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../modules/itip-formatter/itip-view.c:1501
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "_Inherit reminder"
 msgstr "继承提醒(_I)"
 
-#: ../modules/itip-formatter/itip-view.c:1822
+#: ../modules/itip-formatter/itip-view.c:1888
 msgid "_Tasks:"
 msgstr "任务(_T):"
 
-#: ../modules/itip-formatter/itip-view.c:1825
+#: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Memos:"
 msgstr "备忘(_M):"
 
-#. Translators: The first '%s' is replaced with a calendar name,
-#. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3469
-#, c-format
-msgid "Failed to load the calendar '%s' (%s)"
-msgstr "载入日历“%s”失败(%s)"
+#: ../modules/itip-formatter/itip-view.c:3119
+msgid "Sa_ve"
+msgstr "保存(_V)"
+
+#: ../modules/itip-formatter/itip-view.c:3579
+#: ../modules/itip-formatter/itip-view.c:5026
+msgid "Attendee status updated"
+msgstr "出席者状态已更新"
 
-#: ../modules/itip-formatter/itip-view.c:3626
+#: ../modules/itip-formatter/itip-view.c:3758
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s”中的一个约会与此会议冲突"
 
-#: ../modules/itip-formatter/itip-view.c:3650
+#: ../modules/itip-formatter/itip-view.c:3787
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../modules/itip-formatter/itip-view.c:3745
+#: ../modules/itip-formatter/itip-view.c:3900
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../modules/itip-formatter/itip-view.c:3753
+#: ../modules/itip-formatter/itip-view.c:3908
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../modules/itip-formatter/itip-view.c:3758
+#: ../modules/itip-formatter/itip-view.c:3913
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../modules/itip-formatter/itip-view.c:3763
+#: ../modules/itip-formatter/itip-view.c:3918
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../modules/itip-formatter/itip-view.c:4103
+#: ../modules/itip-formatter/itip-view.c:4262
 msgid "Opening the calendar. Please wait..."
 msgstr "正在打开日历,请稍候..."
 
-#: ../modules/itip-formatter/itip-view.c:4108
+#: ../modules/itip-formatter/itip-view.c:4267
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../modules/itip-formatter/itip-view.c:4490
+#: ../modules/itip-formatter/itip-view.c:4662
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4505
+#: ../modules/itip-formatter/itip-view.c:4677
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4510
+#: ../modules/itip-formatter/itip-view.c:4682
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../modules/itip-formatter/itip-view.c:4516
+#: ../modules/itip-formatter/itip-view.c:4688
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../modules/itip-formatter/itip-view.c:4522
+#: ../modules/itip-formatter/itip-view.c:4694
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../modules/itip-formatter/itip-view.c:4592
-#: ../modules/itip-formatter/itip-view.c:5026
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:4715
+#: ../modules/itip-formatter/itip-view.c:5172
+#: ../modules/itip-formatter/itip-view.c:5278
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在保存日历更改,请稍候..."
 
-#: ../modules/itip-formatter/itip-view.c:4631
+#: ../modules/itip-formatter/itip-view.c:4756
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:4949
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:4966
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../modules/itip-formatter/itip-view.c:4839
+#: ../modules/itip-formatter/itip-view.c:4970
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../modules/itip-formatter/itip-view.c:4888
+#: ../modules/itip-formatter/itip-view.c:5018
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4895
-msgid "Attendee status updated"
-msgstr "出席者状态已更新"
-
-#: ../modules/itip-formatter/itip-view.c:4918
+#: ../modules/itip-formatter/itip-view.c:5061
 msgid "The meeting is invalid and cannot be updated"
 msgstr "会议无效,无法更新"
 
-#: ../modules/itip-formatter/itip-view.c:4991
+#: ../modules/itip-formatter/itip-view.c:5137
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新,原因是状态无效"
 
-#: ../modules/itip-formatter/itip-view.c:5063
-#: ../modules/itip-formatter/itip-view.c:5103
+#: ../modules/itip-formatter/itip-view.c:5209
+#: ../modules/itip-formatter/itip-view.c:5248
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5311
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5171
+#: ../modules/itip-formatter/itip-view.c:5316
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5176
+#: ../modules/itip-formatter/itip-view.c:5321
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5332
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息,会议不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5192
+#: ../modules/itip-formatter/itip-view.c:5337
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息,任务不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5197
+#: ../modules/itip-formatter/itip-view.c:5342
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法发送备忘信息,备忘不存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5262
+#: ../modules/itip-formatter/itip-view.c:5407
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5267
+#: ../modules/itip-formatter/itip-view.c:5412
 msgid "Save Calendar"
 msgstr "保存日历"
 
-#: ../modules/itip-formatter/itip-view.c:5319
-#: ../modules/itip-formatter/itip-view.c:5331
+#: ../modules/itip-formatter/itip-view.c:5461
+#: ../modules/itip-formatter/itip-view.c:5474
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../modules/itip-formatter/itip-view.c:5320
-#: ../modules/itip-formatter/itip-view.c:5332
+#: ../modules/itip-formatter/itip-view.c:5462
+#: ../modules/itip-formatter/itip-view.c:5475
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信息声明其包含日历,但日历不是有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5373
-#: ../modules/itip-formatter/itip-view.c:5402
-#: ../modules/itip-formatter/itip-view.c:5500
+#: ../modules/itip-formatter/itip-view.c:5517
+#: ../modules/itip-formatter/itip-view.c:5547
+#: ../modules/itip-formatter/itip-view.c:5648
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../modules/itip-formatter/itip-view.c:5374
-#: ../modules/itip-formatter/itip-view.c:5403
-#: ../modules/itip-formatter/itip-view.c:5501
+#: ../modules/itip-formatter/itip-view.c:5518
+#: ../modules/itip-formatter/itip-view.c:5548
+#: ../modules/itip-formatter/itip-view.c:5649
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "信息的确包含日历,但是日历不包含事件、任务或忙/闲信息"
 
-#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5563
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5564
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要处理这些全部项目,应该保存文件并导入日历"
 
-#: ../modules/itip-formatter/itip-view.c:5944
+#: ../modules/itip-formatter/itip-view.c:6066
 msgctxt "cal-itip"
 msgid "None"
 msgstr "无"
 
-#: ../modules/itip-formatter/itip-view.c:5960
+#: ../modules/itip-formatter/itip-view.c:6082
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: ../modules/itip-formatter/itip-view.c:6103
+#: ../modules/itip-formatter/itip-view.c:6242
 msgid "This meeting recurs"
 msgstr "此会议重现"
 
-#: ../modules/itip-formatter/itip-view.c:6106
+#: ../modules/itip-formatter/itip-view.c:6245
 msgid "This task recurs"
 msgstr "此任务重现"
 
-#: ../modules/itip-formatter/itip-view.c:6109
+#: ../modules/itip-formatter/itip-view.c:6248
 msgid "This memo recurs"
 msgstr "此备忘重现"
 
@@ -16697,33 +17586,27 @@ msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:252
-#| msgid "GroupWise Features"
 msgid "Google Features"
 msgstr "Google 特性"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:261
-#| msgid "Add Google Calendars to Evolution."
 msgid "Add Google Ca_lendar to this account"
 msgstr "添加 Google Ca_lendar 到此帐。"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:269
-#| msgid "Add Google Calendars to Evolution."
 msgid "Add Google Con_tacts to this account"
 msgstr "添加 Google Con_tacts 到此帐号"
 
 #: ../modules/mail-config/e-mail-config-google-summary.c:277
-#| msgid "You may need to enable IMAP access."
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要启用 IMAP 访问"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:246
 #: ../modules/mail-config/e-mail-config-local-accounts.c:292
-#| msgid "Module Directory"
 msgid "Mail _Directory:"
 msgstr "邮件目录(_D):"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:247
-#| msgid "Choose a file to restore"
 msgid "Choose a MH mail directory"
 msgstr "选择 MH 邮件目录"
 
@@ -16732,556 +17615,616 @@ msgid "Local Delivery _File:"
 msgstr "本地分发文件(_F):"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:270
-#| msgid "Choose calendar file"
 msgid "Choose a local delivery file"
 msgstr "选择本地分发文件"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:293
-#| msgid "Choose a file to restore"
 msgid "Choose a Maildir mail directory"
 msgstr "选择 Maildir 邮件目录"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:315
-#| msgid "_File:"
 msgid "Spool _File:"
 msgstr "池文件(_F):"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:316
-#| msgid "Choose a File"
 msgid "Choose a mbox spool file"
 msgstr "选择 mbox 池(spool)文件"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:338
-#| msgid "Module Directory"
 msgid "Spool _Directory:"
 msgstr "池目录(_D):"
 
 #: ../modules/mail-config/e-mail-config-local-accounts.c:339
-#| msgid "Choose a file to restore"
 msgid "Choose a mbox spool directory"
 msgstr "选择 mbox 池目录"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:81
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
 msgstr "配置"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:99
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:228
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "端口(_P):"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
 msgid "User_name:"
 msgstr "用户名(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:149
-#| msgid "Encryption:"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:164
-#| msgid "_Secure connection"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "STARTTLS after connecting"
 msgstr "连接后进行 STARTTLS"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:168
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
 msgid "SSL on a dedicated port"
 msgstr "专用端口上的 SSL"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "使用自定义二进制程序,而不是 'sendmail' (_U)"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+msgid "_Custom binary:"
+msgstr "自定义命令(_C):"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+msgid "U_se custom arguments"
+msgstr "使用自定义参数(_S)"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+msgid "Cus_tom arguments:"
+msgstr "自定义参数(_T):"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+"默认参数是 '-i -f %F -- %R',其中\n"
+"   %F - 表示来源地址\n"
+"   %R - 表示收件人地址"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+msgid "Send mail also when in offline _mode"
+msgstr "脱机模式下也可发送邮件(_M)"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:210
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
 msgid "T_ype:"
 msgstr "类型(_Y):"
 
 #: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
-#| msgid "IMAP Features"
 msgid "Yahoo! Features"
 msgstr "Yahoo! 特性"
 
 #: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
-#| msgid "Add Google Calendars to Evolution."
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "添加 Yahoo! 日历和任务到此帐号(_L) "
 
-#: ../modules/mail/e-mail-attachment-handler.c:390
+#: ../modules/mail/e-mail-attachment-handler.c:425
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 个附加的信息"
 
-#: ../modules/mail/e-mail-shell-backend.c:248
+#: ../modules/mail/e-mail-shell-backend.c:315
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "信息(_M)"
 
-#: ../modules/mail/e-mail-shell-backend.c:250
+#: ../modules/mail/e-mail-shell-backend.c:317
 msgid "Compose a new mail message"
 msgstr "撰写一封新信"
 
-#: ../modules/mail/e-mail-shell-backend.c:258
+#: ../modules/mail/e-mail-shell-backend.c:325
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "邮件帐号(_U)"
 
-#: ../modules/mail/e-mail-shell-backend.c:260
+#: ../modules/mail/e-mail-shell-backend.c:327
 msgid "Create a new mail account"
 msgstr "创建新邮件帐号"
 
-#: ../modules/mail/e-mail-shell-backend.c:265
+#: ../modules/mail/e-mail-shell-backend.c:332
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: ../modules/mail/e-mail-shell-backend.c:267
+#: ../modules/mail/e-mail-shell-backend.c:334
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:563
+#: ../modules/mail/e-mail-shell-backend.c:645
 msgid "Mail Accounts"
 msgstr "邮件帐号"
 
-#: ../modules/mail/e-mail-shell-backend.c:572
+#: ../modules/mail/e-mail-shell-backend.c:654
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:581
+#: ../modules/mail/e-mail-shell-backend.c:663
 msgid "Composer Preferences"
 msgstr "编写器首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:590
+#: ../modules/mail/e-mail-shell-backend.c:673
 msgid "Network Preferences"
 msgstr "网络首选项"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
-#: ../modules/mail/e-mail-shell-view.c:972
+#. Translators: The first item in the list, to be
+#. * able to set rule: [Label] [is/is-not] [None]
+#: ../modules/mail/e-mail-shell-backend.c:965
+msgctxt "label"
+msgid "None"
+msgstr "无"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:671
+msgid "Marking messages as read..."
+msgstr "正在把信息标记为已读..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "_Disable Account"
 msgstr "禁用帐号(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
+#: ../modules/mail/e-mail-shell-view-actions.c:1523
 msgid "Disable this account"
 msgstr "禁用这个帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1530
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/mail/e-mail-shell-view-actions.c:1537
 msgid "Edit properties of this account"
 msgstr "编辑该帐号的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1544
+msgid "Refresh list of folders of this account"
+msgstr "刷新该帐号的文件夹列表"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信息以离线使用(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1551
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下载标记为离线使用的帐号和文件夹的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Fl_ush Outbox"
 msgstr "清空发件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1565
 msgid "Copy the selected folder into another folder"
 msgstr "把选中的文件夹复制到其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1572
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
 msgid "E_xpunge"
 msgstr "销毁(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1579
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "从该文件夹永久删除所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Mar_k All Messages as Read"
 msgstr "把全部信息标记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Mark all messages in the folder as read"
 msgstr "将此文件夹中的所有信息标记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "Move the selected folder into another folder"
 msgstr "把选中的文件夹移至其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Create a new folder for storing mail"
 msgstr "创建存储邮件的新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Change the properties of this folder"
 msgstr "更改此文件夹的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的名称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Select Message _Thread"
 msgstr "选择信息线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Select all messages in the same thread as the selected message"
 msgstr "把同一线索中的所有信息选择为选中信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Select Message S_ubthread"
 msgstr "选择信息子线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Select all replies to the currently selected message"
 msgstr "选择当前选中信息的所有回复"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Empty _Trash"
 msgstr "清空废件箱(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久删除所有帐号中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1373
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 msgid "_Manage Subscriptions"
 msgstr "管理订阅(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
+#: ../modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程服务器上的文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
 msgid "Receive new items from all accounts"
 msgstr "接收所有帐号中的新条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "_Send All"
 msgstr "全部发送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1707
 msgid "Send queued items in all accounts"
 msgstr "发送所有帐号的队列中的条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "取消"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
+#: ../modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Cancel the current mail operation"
 msgstr "取消当前邮件操作"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Collapse All _Threads"
 msgstr "折叠全部线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1742
 msgid "Collapse all message threads"
 msgstr "折叠全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1436
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "E_xpand All Threads"
 msgstr "展开全部线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1749
 msgid "Expand all message threads"
 msgstr "展开全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "_Message Filters"
 msgstr "信息过滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1756
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1450
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "_Subscriptions..."
 msgstr "订阅(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
 msgid "F_older"
 msgstr "文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1466
+#: ../modules/mail/e-mail-shell-view-actions.c:1777
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1490
+#: ../modules/mail/e-mail-shell-view-actions.c:1801
 msgid "Search F_olders"
 msgstr "搜索文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 msgid "Create or edit search folder definitions"
 msgstr "创建或编辑搜索文件夹定义"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1842
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1870
 msgid "Show Message _Preview"
 msgstr "显示信息预览(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Show message preview pane"
 msgstr "显示信息预览窗口"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1878
 msgid "Show _Deleted Messages"
 msgstr "显示删除的信息(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
 msgid "Show deleted messages with a line through them"
 msgstr "在信息列表中显示删除了的信息(带有删除线)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1886
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "Threaded message list"
 msgstr "按线索排列信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1894
 msgid "_Unmatched Folder Enabled"
 msgstr "“未匹配”文件夹已启用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
-#| msgid "Toggles whether the From chooser is displayed"
+#: ../modules/mail/e-mail-shell-view-actions.c:1896
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "开关“未匹配”搜索文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1916
 msgid "Show message preview below the message list"
 msgstr "在信息列表下方显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1923
 msgid "Show message preview alongside the message list"
 msgstr "在信息列表旁显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1931
 msgid "All Messages"
 msgstr "全部信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1938
 msgid "Important Messages"
 msgstr "重要信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1630
+#: ../modules/mail/e-mail-shell-view-actions.c:1945
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1637
+#: ../modules/mail/e-mail-shell-view-actions.c:1952
 msgid "Messages Not Junk"
 msgstr "不是垃圾信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1644
+#: ../modules/mail/e-mail-shell-view-actions.c:1959
 msgid "Messages with Attachments"
 msgstr "有附件的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1651
+#: ../modules/mail/e-mail-shell-view-actions.c:1966
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1658
+#: ../modules/mail/e-mail-shell-view-actions.c:1973
 msgid "Read Messages"
 msgstr "已读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1665
+#: ../modules/mail/e-mail-shell-view-actions.c:1980
 msgid "Unread Messages"
 msgstr "未读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "Subject or Addresses contain"
 msgstr "主题或地址含有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1727
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "All Accounts"
 msgstr "全部帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Current Account"
 msgstr "当前帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Current Folder"
 msgstr "当前文件夹"
 
-#: ../modules/mail/e-mail-shell-view.c:613
+#: ../modules/mail/e-mail-shell-view.c:637
 msgid "All Account Search"
 msgstr "全部帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view.c:709
+#: ../modules/mail/e-mail-shell-view.c:745
 msgid "Account Search"
 msgstr "帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view.c:970
-msgid "Proxy _Logout"
-msgstr "代理服务器注销(_L)"
-
-#: ../modules/mail/e-mail-shell-view-private.c:961
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:994
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:985
+#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:991
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 封草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1003
+#: ../modules/mail/e-mail-shell-view-private.c:1045
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1015
+#: ../modules/mail/e-mail-shell-view-private.c:1057
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] ",%d 封未读,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1018
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1081
 msgid "Trash"
 msgstr "回收站"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1454
+#: ../modules/mail/e-mail-shell-view-private.c:1518
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:444
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "选择要添加的文件夹"
+
+#: ../modules/mail/em-composer-prefs.c:871
+#| msgid "_Account:"
+msgid "Account"
+msgstr "帐号"
+
+#: ../modules/mail/em-composer-prefs.c:889
+msgid "Folder"
+msgstr "文件夹"
+
+#: ../modules/mail/em-composer-prefs.c:925
+#| msgid "Recipients"
+msgid "Recipient"
+msgstr "收件人"
+
+#: ../modules/mail/em-composer-prefs.c:1196
 msgid "Language(s)"
 msgstr "语言"
 
-#: ../modules/mail/em-mailer-prefs.c:86
-msgid "Every time"
-msgstr "每次"
+#: ../modules/mail/em-mailer-prefs.c:81
+msgid "On exit, every time"
+msgstr "退出时,每次"
 
-#: ../modules/mail/em-mailer-prefs.c:87
-msgid "Once per day"
-msgstr "每天一次"
+#: ../modules/mail/em-mailer-prefs.c:82
+msgid "On exit, once per day"
+msgstr "退出时,每天一次"
 
-#: ../modules/mail/em-mailer-prefs.c:88
-msgid "Once per week"
-msgstr "每周一次"
+#: ../modules/mail/em-mailer-prefs.c:83
+msgid "On exit, once per week"
+msgstr "退出时,每周一次"
 
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Once per month"
-msgstr "每月一次"
+#: ../modules/mail/em-mailer-prefs.c:84
+msgid "On exit, once per month"
+msgstr "退出时,每月一次"
 
-#: ../modules/mail/em-mailer-prefs.c:286
+#: ../modules/mail/em-mailer-prefs.c:85
+msgid "Immediately, on folder leave"
+msgstr "立即,一离开文件夹"
+
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "页眉"
 
-#: ../modules/mail/em-mailer-prefs.c:290
+#: ../modules/mail/em-mailer-prefs.c:360
 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:1071
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "日期头:(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1072
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "显示原始邮件头值(_o)"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#: ../modules/mailto-handler/evolution-mailto-handler.c:142
 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:318
+#: ../modules/mdn/evolution-mdn.c:308
 #, 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:385
+#: ../modules/mdn/evolution-mdn.c:375
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "“%s”的邮件通知"
@@ -17322,109 +18265,90 @@ msgid ""
 "established."
 msgstr "一旦建立了网络连接,Evolution 将返回在线模式。"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
-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:504
-msgid "OAuth"
-msgstr "OAuth"
-
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
-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:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "插件管理器"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意:某些更改直到重新启动后才生效"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "概览"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "插件"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "插件(_P)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "启用和禁用插件"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:134
-#| msgid "Display the next message"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version"
 msgstr "显示纯文字版本"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:136
-#| msgid "Display the next important message"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
 msgid "Display plain text version of multipart/alternative message"
 msgstr "显示多部分/可选信息的纯文字版本"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version"
 msgstr "显示 HTML 版本"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:144
-#| msgid "Display the previous important message"
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
 msgid "Display HTML version of multipart/alternative message"
 msgstr "显示多部分/可选信息的 HTML 版本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:46
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
 msgid "Let Evolution choose the best part to show."
 msgstr "让Evolution选择最好的部分显示。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:50
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text if present"
 msgstr "如果可用则显示纯文本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "如果提出,那么显示纯文本部分,否则让Evolution选择好的部分显示,"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:55
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Only ever show plain text"
 msgstr "仅显示纯文本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
-#: ../modules/prefer-plain/plugin/config-ui.c:56
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "如果请求,总是显示文本部分而把其他部分作为附件"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
+#: ../modules/prefer-plain/plugin/config-ui.c:105
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "显示支持的HTML部分作为附件(_s)"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
+#: ../modules/prefer-plain/plugin/config-ui.c:127
 msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
@@ -17441,58 +18365,47 @@ msgstr "纯文字模式"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "作为纯文本来查看邮件信息,甚至在它们包含 HTML 内容时。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:151
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr ""
+msgstr "无法生成 SpamAssassin (%s):"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:174
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "无法将邮件信息内容通过流传送给 SpamAssassin:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:193
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "无法将“%s”写入 SpamAssassin:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:221
 msgid "Failed to read output from SpamAssassin: "
 msgstr "读取 SpamAssassin 输出失败:"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:276
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin 崩溃了,或无法处理邮件信息"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:356
 msgid "SpamAssassin Options"
 msgstr "垃圾克星选项"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:371
 msgid "I_nclude remote tests"
 msgstr "包含远程测试(_N)"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:385
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "这将让 SpamAssassin 更可靠,但稍慢。"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:559
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:204
-#: ../widgets/misc/e-import-assistant.c:403
-msgid "Please select the information that you would like to import:"
-msgstr "请选择您希望导入的信息:"
-
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "从 %s:"
-
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "导入文件"
@@ -17505,11 +18418,7 @@ msgstr "导入已取消。"
 msgid "Import complete."
 msgstr "导入完成。"
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
-#| msgid ""
-#| "Welcome to Evolution. The next few screens will allow Evolution to "
-#| "connect to your email accounts, and to import files from other "
-#| "applications."
+#: ../modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -17520,31 +18429,27 @@ msgstr ""
 "\n"
 "下面几屏将配置 Evolution 连接到您的电子邮件帐号,并从其他应用程序导入文件。"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:259
+#: ../modules/startup-wizard/evolution-startup-wizard.c:229
 msgid "Loading accounts..."
 msgstr "正在载入..."
 
 #: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
-#| msgid "Format Column_s..."
 msgid "_Format as..."
 msgstr "格式化为(_F)..."
 
 #: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
-#| msgid "_Languages"
 msgid "_Other languages"
 msgstr "其他语言(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:324
-#| msgid "Text height"
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
 msgid "Text Highlight"
 msgstr "文字高度"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:330
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:338
 msgid "Syntax highlighting of mail parts"
 msgstr "邮件部分的语法高亮"
 
 #: ../modules/text-highlight/languages.c:32
-#| msgid "Plain Text Mode"
 msgid "_Plain text"
 msgstr "纯文字(_P)"
 
@@ -17577,7 +18482,6 @@ msgid "_Java"
 msgstr "_Java"
 
 #: ../modules/text-highlight/languages.c:87
-#| msgid "_Script:"
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
@@ -17586,7 +18490,6 @@ msgid "_Patch/diff"
 msgstr "_Patch/diff"
 
 #: ../modules/text-highlight/languages.c:99
-#| msgid "_Personal"
 msgid "_Perl"
 msgstr "_Perl"
 
@@ -17595,7 +18498,6 @@ msgid "_PHP"
 msgstr "_PHP"
 
 #: ../modules/text-highlight/languages.c:123
-#| msgid "Hello Python"
 msgid "_Python"
 msgstr "_Python"
 
@@ -17616,7 +18518,6 @@ msgid "_Vala"
 msgstr "_Vala"
 
 #: ../modules/text-highlight/languages.c:152
-#| msgid "Visual"
 msgid "_Visual Basic"
 msgstr "_Visual Basic"
 
@@ -17625,7 +18526,6 @@ msgid "_XML"
 msgstr "_XML"
 
 #: ../modules/text-highlight/languages.c:177
-#| msgid "_Actions"
 msgid "_ActionScript"
 msgstr "_ActionScript"
 
@@ -17670,7 +18570,6 @@ msgid "_F#"
 msgstr "_F#"
 
 #: ../modules/text-highlight/languages.c:235
-#| msgid "_No"
 msgid "_Go"
 msgstr "_Go"
 
@@ -17683,7 +18582,6 @@ msgid "_JSP"
 msgstr "_JSP"
 
 #: ../modules/text-highlight/languages.c:250
-#| msgid "_List:"
 msgid "_Lisp"
 msgstr "_Lisp"
 
@@ -17712,7 +18610,6 @@ msgid "_Oberon"
 msgstr "_Oberon"
 
 #: ../modules/text-highlight/languages.c:288
-#| msgid "Object Signer"
 msgid "_Objective C"
 msgstr "_Objective C"
 
@@ -17725,7 +18622,6 @@ msgid "_Octave"
 msgstr "_Octave"
 
 #: ../modules/text-highlight/languages.c:304
-#| msgid "Object Signer"
 msgid "_Object Script"
 msgstr "_Object Script"
 
@@ -17738,12 +18634,10 @@ msgid "_POV-Ray"
 msgstr "_POV-Ray"
 
 #: ../modules/text-highlight/languages.c:319
-#| msgid "_Program:"
 msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:324
-#| msgid "_Script:"
 msgid "_PostScript"
 msgstr "_PostScript"
 
@@ -17771,60 +18665,48 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
-#| msgid "Show Full vCard"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
+#: ../modules/vcard-inline/e-mail-part-vcard.c:152
 msgid "Show F_ull vCard"
 msgstr "显示完整 vCard(_U)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
-#| msgid "Show Compact vCard"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
+#: ../modules/vcard-inline/e-mail-part-vcard.c:170
 msgid "Show Com_pact vCard"
 msgstr "显示紧凑 vCard(_P)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
-#| msgid "Save To Addressbook"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
 msgid "Save _To Addressbook"
 msgstr "保存至地址簿(_T)"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
 msgid "There is one other contact."
 msgstr "有另外 1 个联系人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "有另外 %d 个联系人。"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
-#| msgid "Address book source"
-msgid "Addressbok Contact"
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+msgid "Addressbook Contact"
 msgstr "地址簿联系人"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
 msgid "Display the part as an addressbook contact"
 msgstr "将该部分显示为地址簿联系人"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:88
-msgid "_Inspect..."
-msgstr "审查(_I)..."
-
-#: ../modules/web-inspector/evolution-web-inspector.c:90
-msgid "Inspect the HTML content (debugging feature)"
-msgstr "审查 HTML 内容(调试功能)"
-
-#: ../modules/web-inspector/evolution-web-inspector.c:102
+#: ../modules/web-inspector/evolution-web-inspector.c:96
 msgid "Evolution Web Inspector"
 msgstr "Evolution 网络审查器"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:470
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:477
 msgid "Keywords"
 msgstr "关键字"
 
@@ -17854,35 +18736,35 @@ msgstr "附件提醒"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "当您忘记为邮件信息添加附件时提醒您。"
 
-#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:637 ../plugins/bbdb/bbdb.c:646
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:674
+#: ../plugins/bbdb/bbdb.c:661
 msgid "Create _address book entries when sending mails"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_a)"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:668
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:685
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:714
+#: ../plugins/bbdb/bbdb.c:700
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像(_S)"
 
-#: ../plugins/bbdb/bbdb.c:722
+#: ../plugins/bbdb/bbdb.c:707
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:720
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -17903,7 +18785,7 @@ msgstr ""
 "在您回复邮件时自动用姓名和电子邮件地址填入您的地址簿。同时还将填入您好友列表"
 "的即时通讯联系信息。"
 
-#: ../plugins/dbx-import/dbx-importer.c:287
+#: ../plugins/dbx-import/dbx-importer.c:279
 msgid "Importing Outlook Express data"
 msgstr "导入 Outlook Express 数据"
 
@@ -17919,52 +18801,52 @@ msgstr "Outlook 个人文件夹(.dbx)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "从 DBX 文件中导入 Outlook 邮件"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:292
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "安全:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "个人"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "未分类"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "受保护的"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "机密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "机密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "绝密"
 
-#: ../plugins/email-custom-header/email-custom-header.c:357
+#: ../plugins/email-custom-header/email-custom-header.c:361
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "无"
 
-#: ../plugins/email-custom-header/email-custom-header.c:530
+#: ../plugins/email-custom-header/email-custom-header.c:537
 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:799
+#: ../plugins/email-custom-header/email-custom-header.c:807
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -17972,12 +18854,12 @@ msgstr ""
 "指定头和头值的格式为:\n"
 "自定义头的名称,值,头与头之间以“;”分割。"
 
-#: ../plugins/email-custom-header/email-custom-header.c:851
+#: ../plugins/email-custom-header/email-custom-header.c:860
 msgid "Key"
 msgstr "键"
 
-#: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:478
+#: ../plugins/email-custom-header/email-custom-header.c:877
+#: ../plugins/templates/templates.c:486
 msgid "Values"
 msgstr "值"
 
@@ -18006,8 +18888,12 @@ msgstr ""
 "XEmacs 应使用“xemacs”\n"
 "Vim 应使用“gvim -f”"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
+#: ../plugins/external-editor/external-editor.c:125
+msgid "_Automatically launch when a new mail is edited"
+msgstr "在编辑新邮件时自动启动(_A)"
+
+#: ../plugins/external-editor/external-editor.c:417
+#: ../plugins/external-editor/external-editor.c:419
 msgid "Compose in External Editor"
 msgstr "在外部编辑器中写作"
 
@@ -18049,23 +18935,23 @@ msgid ""
 "closed as long as the editor is active."
 msgstr "外部编辑器仍在运行。邮件编辑器窗口无法在外部文本编辑器活动时关闭。"
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:289
 msgid "Select a Face Picture"
 msgstr "选择一个文件"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 msgid "Image files"
 msgstr "图像文件"
 
-#: ../plugins/face/face.c:361
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr "按默认方式插入头像图片(_I)"
 
-#: ../plugins/face/face.c:374
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr "加载新头像图片(_F)"
 
-#: ../plugins/face/face.c:435
+#: ../plugins/face/face.c:432
 msgid "Include _Face"
 msgstr "包含头像(_F)"
 
@@ -18239,57 +19125,63 @@ msgstr ""
 "\n"
 "头:{0}"
 
-#: ../plugins/mail-notification/mail-notification.c:385
-#: ../plugins/mail-notification/mail-notification.c:421
+#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d 封新邮件。"
 
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:394
+#, c-format
+msgid "From: %s"
+msgstr "来自:%s"
+
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:410
+#: ../plugins/mail-notification/mail-notification.c:408
 #, c-format
 msgid "Subject: %s"
 msgstr "主题:%s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
-#| msgid "Restarting Evolution"
+#: ../plugins/mail-notification/mail-notification.c:425
 msgid "New email in Evolution"
 msgstr "Evolution 中有新邮件"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:460
 #, c-format
 msgid "Show %s"
 msgstr "显示 %s"
 
-#: ../plugins/mail-notification/mail-notification.c:658
+#: ../plugins/mail-notification/mail-notification.c:662
 msgid "_Play sound when a new message arrives"
 msgstr "新信息到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:694
 msgid "_Beep"
 msgstr "响铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:707
 msgid "Use sound _theme"
 msgstr "使用声音主题(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:722
+#: ../plugins/mail-notification/mail-notification.c:726
 msgid "Play _file:"
 msgstr "播放文件(_F):"
 
-#: ../plugins/mail-notification/mail-notification.c:731
+#: ../plugins/mail-notification/mail-notification.c:735
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:787
+#: ../plugins/mail-notification/mail-notification.c:791
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件箱中的新信息(_I)"
 
-#: ../plugins/mail-notification/mail-notification.c:797
+#: ../plugins/mail-notification/mail-notification.c:801
 msgid "Show _notification when a new message arrives"
 msgstr "新信息到达时在通知区显示通知(_N)"
 
@@ -18302,34 +19194,33 @@ 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:239
+#: ../plugins/mail-to-task/mail-to-task.c:230
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "被%s从邮件创建"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:614
 #, 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:625
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, 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:628
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr "选定的备忘列表已经包含“%s”备忘。您想编辑旧的备忘吗?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#: ../plugins/mail-to-task/mail-to-task.c:640
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18339,8 +19230,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:647
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18350,8 +19240,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:659
+#: ../plugins/mail-to-task/mail-to-task.c:654
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18361,15 +19250,15 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:680
+#: ../plugins/mail-to-task/mail-to-task.c:675
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "您想继续转换剩下的邮件吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:755
+#: ../plugins/mail-to-task/mail-to-task.c:751
 msgid "[No Summary]"
 msgstr "[没有概要]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:767
+#: ../plugins/mail-to-task/mail-to-task.c:764
 msgid "Invalid object returned from a server"
 msgstr "从一个服务器上返回了无效的对象"
 
@@ -18378,67 +19267,59 @@ msgstr "从一个服务器上返回了无效的对象"
 msgid "An error occurred during processing: %s"
 msgstr "在处理时出现了一个错误:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
+#: ../plugins/mail-to-task/mail-to-task.c:853
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#: ../plugins/mail-to-task/mail-to-task.c:851
+#: ../plugins/mail-to-task/mail-to-task.c:857
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
-msgstr "选中的源是只读的,因此不能在此创建事件。请选择其它的源。"
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
+msgstr "选中的日历是只读的,因此不能在此创建事件。请选择其它的日历。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:860
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
-msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
+msgstr "选中的任务列表是只读的,因此不能在此创建任务。请选择其它的任务列表。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:863
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
-msgstr "选中的源是只读的,因此不能在此创建备忘录。请选择其它的源。"
-
-#: ../plugins/mail-to-task/mail-to-task.c:1187
-msgid "No writable calendar is available."
-msgstr "没有可写的日历。"
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
+msgstr ""
+"选中的备忘录列表是只读的,因此不能在此创建备忘录。请选择其它的备忘录列表。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
-#| msgid "Create a new appointment"
+#: ../plugins/mail-to-task/mail-to-task.c:1262
 msgid "Create an _Appointment"
 msgstr "创建新约会(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1264
 msgid "Create a new event from the selected message"
 msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create a Mem_o"
 msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new memo from the selected message"
 msgstr "用所选邮件创建新备忘"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a _Task"
 msgstr "创建一个任务(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new task from the selected message"
 msgstr "用所选邮件创建新任务"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1286
 msgid "Create a _Meeting"
 msgstr "创建一个会议(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1297
+#: ../plugins/mail-to-task/mail-to-task.c:1288
 msgid "Create a new meeting from the selected message"
 msgstr "用所选邮件创建新会议"
 
@@ -18446,36 +19327,6 @@ msgstr "用所选邮件创建新会议"
 msgid "Convert a mail message to a task."
 msgstr "转换一个邮件信息成为一个任务。"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
-msgid "Also mark messages in subfolders?"
-msgstr "也标记的子文件夹中的信息吗?"
-
-#: ../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:185
-msgid "In Current Folder and _Subfolders"
-msgstr "在当前文件夹和子文件夹(_S)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:199
-msgid "In Current _Folder Only"
-msgstr "只在当前文件夹(_F)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:545
-msgid "Mark Me_ssages as Read"
-msgstr "把信息标记为已读(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-msgid "Mark All Read"
-msgstr "全部标为已读"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark all messages in a folder as read."
-msgstr "将此文件夹中的所有信息标记为已读。"
-
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 导入"
@@ -18488,37 +19339,37 @@ msgstr "Outlook 个人文件夹(.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "从 PST 文件中导入 Outlook 邮件"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:527
 msgid "_Mail"
 msgstr "邮件(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:556
 msgid "Destination folder:"
 msgstr "目的文件夹:"
 
-#: ../plugins/pst-import/pst-importer.c:594
+#: ../plugins/pst-import/pst-importer.c:566
 msgid "_Address Book"
 msgstr "地址簿(_A)"
 
-#: ../plugins/pst-import/pst-importer.c:599
+#: ../plugins/pst-import/pst-importer.c:571
 msgid "A_ppointments"
 msgstr "约会(_P)"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:576 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "任务(_T)"
 
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:581
 msgid "_Journal entries"
 msgstr "日记项(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:721
+#: ../plugins/pst-import/pst-importer.c:698
 msgid "Importing Outlook data"
 msgstr "导入 Outlook 数据"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:145
-#: ../plugins/publish-calendar/publish-calendar.c:152
+#: ../plugins/publish-calendar/publish-calendar.c:141
+#: ../plugins/publish-calendar/publish-calendar.c:148
 msgid "Calendar Publishing"
 msgstr "日历发布"
 
@@ -18530,49 +19381,44 @@ msgstr "位置"
 msgid "Publish calendars to the web."
 msgstr "将日历发布到 Web。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:465
+#: ../plugins/publish-calendar/publish-calendar.c:218
+#: ../plugins/publish-calendar/publish-calendar.c:485
 #, c-format
 msgid "Could not open %s:"
 msgstr "无法打开 %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:213
-#, c-format
-msgid "Could not open %s: Unknown error"
-msgstr "无法打开 %s:未知错误"
-
-#: ../plugins/publish-calendar/publish-calendar.c:233
+#: ../plugins/publish-calendar/publish-calendar.c:237
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "发布到%s时出现错误"
 
-#: ../plugins/publish-calendar/publish-calendar.c:235
+#: ../plugins/publish-calendar/publish-calendar.c:243
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "发布到%s成功完成"
 
-#: ../plugins/publish-calendar/publish-calendar.c:279
+#: ../plugins/publish-calendar/publish-calendar.c:291
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "加载 %s 失败:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:628
+#: ../plugins/publish-calendar/publish-calendar.c:656
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "启用(_N)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:776
+#: ../plugins/publish-calendar/publish-calendar.c:806
 msgid "Are you sure you want to remove this location?"
 msgstr "您确定您想要删除此位置吗?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1106
+#: ../plugins/publish-calendar/publish-calendar.c:1145
 msgid "Could not create publish thread."
 msgstr "无法创建发布索引。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1114
+#: ../plugins/publish-calendar/publish-calendar.c:1155
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
@@ -18664,17 +19510,17 @@ msgstr "记住密码(_R)"
 msgid "Publishing Location"
 msgstr "发布位置"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:97
-#: ../plugins/publish-calendar/publish-format-ical.c:95
+#: ../plugins/publish-calendar/publish-format-fb.c:100
+#: ../plugins/publish-calendar/publish-format-ical.c:103
 #, c-format
-msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "不能发布日历:日历后端已经不存在了"
+msgid "Invalid source UID '%s'"
+msgstr "无效的源 UID “%s”"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:539
+#: ../plugins/publish-calendar/url-editor-dialog.c:545
 msgid "New Location"
 msgstr "新建位置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:541
+#: ../plugins/publish-calendar/url-editor-dialog.c:547
 msgid "Edit Location"
 msgstr "编辑位置"
 
@@ -18685,79 +19531,79 @@ msgstr "编辑位置"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Description List"
 msgstr "描述列表"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Categories List"
 msgstr "类别列表"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Comment List"
 msgstr "注释列表"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Start"
 msgstr "开始"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "End"
 msgstr "结束"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Due"
 msgstr "到期"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "percent Done"
 msgstr "完成百分比"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Attendees List"
 msgstr "出席者列表"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../plugins/save-calendar/csv-format.c:562
+#: ../plugins/save-calendar/csv-format.c:564
 msgid "A_dvanced options for the CSV format"
 msgstr "CSV 格式的高级选项(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Prepend a _header"
 msgstr "预置标头(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:579
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "_Value delimiter:"
 msgstr "数值分隔符(_V):"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:592
 msgid "_Record delimiter:"
 msgstr "记录分隔符(_R):"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:603
 msgid "_Encapsulate values with:"
 msgstr "封装数值使用(_E):"
 
-#: ../plugins/save-calendar/csv-format.c:627
+#: ../plugins/save-calendar/csv-format.c:629
 msgid "Comma separated values (.csv)"
 msgstr "逗号分隔的值(.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18774,31 +19620,31 @@ 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:146
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:385
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:123
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "格式(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:185
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "选择目的文件"
 
-#: ../plugins/save-calendar/save-calendar.c:340
+#: ../plugins/save-calendar/save-calendar.c:348
 msgid "Save the selected calendar to disk"
 msgstr "保存选中的日历到磁盘"
 
-#: ../plugins/save-calendar/save-calendar.c:371
+#: ../plugins/save-calendar/save-calendar.c:379
 msgid "Save the selected memo list to disk"
 msgstr "保存选中的备忘列表到磁盘"
 
-#: ../plugins/save-calendar/save-calendar.c:402
+#: ../plugins/save-calendar/save-calendar.c:410
 msgid "Save the selected task list to disk"
 msgstr "保存选中的任务列表到磁盘"
 
@@ -18811,35 +19657,39 @@ msgstr ""
 "基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
 "$ORIG[body] 这样的变量,它们将替换为您所回复邮件中对应的值。"
 
-#: ../plugins/templates/templates.c:1113
+#: ../plugins/templates/templates.c:1145
 msgid "No Title"
 msgstr "无标题"
 
-#: ../plugins/templates/templates.c:1225
+#: ../plugins/templates/templates.c:1254
 msgid "Save as _Template"
 msgstr "另存为模板(_T)"
 
-#: ../plugins/templates/templates.c:1227
+#: ../plugins/templates/templates.c:1256
 msgid "Save as Template"
 msgstr "另存为模板"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:279
 msgid "Preparing to go offline..."
 msgstr "正在准备离线..."
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:332
 msgid "Preparing to go online..."
 msgstr "正在准备上线..."
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:413
+msgid "Preparing to quit"
+msgstr "正在准备退出"
+
+#: ../shell/e-shell.c:419
 msgid "Preparing to quit..."
 msgstr "正在准备退出..."
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
 msgid "Searches"
 msgstr "搜索"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:765
 msgid "Save Search"
 msgstr "保存搜索"
 
@@ -18847,38 +19697,38 @@ 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:940
+#: ../shell/e-shell-searchbar.c:938
 msgid "Sho_w:"
 msgstr "显示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:963
 msgid "Sear_ch:"
 msgstr "搜索(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1031
 msgid "i_n"
 msgstr "在(_N) "
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:175
 msgid "vCard (.vcf)"
 msgstr "vCard (.vff)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:199
 msgid "All Files (*)"
 msgstr "全部文件(*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "保存用户界面状态"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:642
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Wang Li <charles linux net cn>, 2002, 2003\n"
@@ -18889,282 +19739,282 @@ msgstr ""
 "Aron Xu <aronxu gnome org>, 2010\n"
 "du baodao <centerpoint 139 com>, 2010"
 
-#: ../shell/e-shell-window-actions.c:653
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-actions.c:891
+#: ../shell/e-shell-window-actions.c:341
 msgid "Categories Editor"
 msgstr "类别编辑器"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:672
 msgid "Bug Buddy is not installed."
 msgstr "未安装 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:673
 msgid "Bug Buddy could not be run."
 msgstr "无法运行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:853
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:879
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:881
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指南"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:907
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:909
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:914
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:916
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗口来显示这个视图"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:928
 msgid "Available Cate_gories"
 msgstr "可用类别(_G)"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:930
 msgid "Manage available categories"
 msgstr "管理可用类别"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:942
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:944
 msgid "Show Evolution's shortcut keys"
 msgstr "显示 Evolution 的快捷键"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:951
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:956
 msgid "_Advanced Search..."
 msgstr "高级搜索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:958
 msgid "Construct a more advanced search"
 msgstr "构造一个更高级的搜索"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:965
 msgid "Clear the current search parameters"
-msgstr "清楚当前搜索参数"
+msgstr "清除当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:970
 msgid "_Edit Saved Searches..."
 msgstr "编辑保存的搜索(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:972
 msgid "Manage your saved searches"
 msgstr "管理您保存的搜索"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:979
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:986
 msgid "Execute the current search parameters"
 msgstr "执行当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:991
 msgid "_Save Search..."
 msgstr "保存搜索(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:993
 msgid "Save the current search parameters"
 msgstr "保存当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1005
 msgid "Submit _Bug Report..."
 msgstr "提交错误报告(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1007
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1012
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1014
 msgid "Put Evolution into offline mode"
 msgstr "将 Evolution 转入离线模式"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1019
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1021
 msgid "Put Evolution into online mode"
 msgstr "将 Evolution 转入在线模式"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Lay_out"
 msgstr "布局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1070
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1084
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Show Side _Bar"
 msgstr "显示侧边栏(_B)"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Show the side bar"
 msgstr "显示侧边栏"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1121
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1123
 msgid "Show the switcher buttons"
 msgstr "显示切换器按钮"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1129
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1131
 msgid "Show the status bar"
 msgstr "显示状态栏"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1137
 msgid "Show _Tool Bar"
 msgstr "显示工具栏(_T)"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1139
 msgid "Show the tool bar"
 msgstr "显示工具栏"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1161
 msgid "_Icons Only"
 msgstr "只有图标(_I)"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons only"
 msgstr "显示只有图标的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1168
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Display window buttons with text only"
 msgstr "显示只有文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1177
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Tool_bar Style"
 msgstr "工具栏样式(_B)"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1184
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具栏设置显示窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1750
-msgid "Define Views..."
-msgstr "定义视图..."
-
-#: ../shell/e-shell-window-actions.c:1752
-msgid "Create or edit views"
-msgstr "创建或编辑视图"
+#: ../shell/e-shell-window-actions.c:1192
+msgid "Delete Current View"
+msgstr "保存当前视图"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1199
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1201
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1208
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1230
 msgid "Change the page settings for your current printer"
 msgstr "更改当前打印机的页面设置"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:1591
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:1714
 #, c-format
 msgid "Select view: %s"
 msgstr "选择视图:%s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:1731
+#, c-format
+msgid "Delete view: %s"
+msgstr "删除视图:%s"
+
+#: ../shell/e-shell-window-actions.c:1825
 msgid "Execute these search parameters"
 msgstr "执行这些搜索参数"
 
-#: ../shell/e-shell-window.c:494
+#: ../shell/e-shell-window.c:504
 msgid "New"
 msgstr "新建"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:585
+#: ../shell/e-shell-window-private.c:580
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:186
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19196,7 +20046,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
 
-#: ../shell/main.c:210
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19204,13 +20054,13 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:217
+#: ../shell/main.c:213
 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:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19218,48 +20068,50 @@ msgstr ""
 "启动 Evolution 后显示特定组件。可用的选项"
 "有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "应用给定的几何参数到主窗口"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "忽略网络是否可用"
 
-#: ../shell/main.c:320
-msgid "Start in \"express\" mode"
-msgstr "以“快速”模式启动"
-
-#: ../shell/main.c:323
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "禁止载入任何插件。"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:332
-#, fuzzy
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
-msgstr "导入 URI 或者剩余参数给定的文件名。"
+msgstr "导入 URI 或者给定文件名作为剩余参数。"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "请求正在运行的 Evolution 进程退出"
 
-#: ../shell/main.c:508 ../shell/main.c:516
+#: ../shell/main.c:403
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr "无法启动 Evolution。也许有另外的 Evolution 实例没有响应。系统错误:%s"
+
+#: ../shell/main.c:497 ../shell/main.c:502
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:581
+#: ../shell/main.c:569
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19268,7 +20120,7 @@ msgstr ""
 "%s:不能同时使用 --online 和 --offline。\n"
 "  运行 %s --help 了解更多信息。\n"
 
-#: ../shell/main.c:587
+#: ../shell/main.c:575
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19313,88 +20165,7 @@ msgstr ""
 "Evolution不再支持从版本{0}直接升级。然而您可以尝试先升级到Evolution 2,然后再"
 "升级到Evolution 3。"
 
-#: ../shell/test/e-test-shell-backend.c:52
-msgctxt "New"
-msgid "_Test Item"
-msgstr "测试条目(_T)"
-
-#: ../shell/test/e-test-shell-backend.c:54
-msgid "Create a new test item"
-msgstr "创建新测试项"
-
-#: ../shell/test/e-test-shell-backend.c:62
-msgctxt "New"
-msgid "Test _Source"
-msgstr "测试来源(_S)"
-
-#: ../shell/test/e-test-shell-backend.c:64
-msgid "Create a new test source"
-msgstr "创建一个新的测试来源"
-
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "文件不是一个有效的 .desktop 文件"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "无法识别的桌面文件版本“%s”"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "启动 %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "应用程序在命令行上不接受文档"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "无法识别的调用选项:%d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "不能传递文档的URIs(统一资源定位符)到一个'类型=链接'桌面项目"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "不是一个可加载的条目"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "指定包含了保存的配置的文件。"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "文件"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "特殊的会话管理ID"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "ID"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "会话管理选项:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "显示会话管理选项"
-
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19405,133 +20176,135 @@ msgstr ""
 "\n"
 "编辑信任设置:"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organization"
 msgstr "授予组织"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
 msgid "Issued To Organizational Unit"
 msgstr "授予组织单元"
 
-#: ../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:542
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Serial Number"
 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 "Purposes"
 msgstr "用途"
 
-#: ../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
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By"
 msgstr "颁发者"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organization"
 msgstr "颁发组织"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued By Organizational Unit"
 msgstr "颁发组织单元"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued"
 msgstr "已颁发"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Expires"
 msgstr "到期时间"
 
-#: ../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
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../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
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:121
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: ../smime/gui/certificate-manager.c:589
+#: ../smime/gui/certificate-manager.c:622
 msgid "Select a certificate to import..."
 msgstr "选择要导入的证书..."
 
-#: ../smime/gui/certificate-manager.c:602
+#: ../smime/gui/certificate-manager.c:636
 msgid "All files"
 msgstr "全部文件"
 
-#: ../smime/gui/certificate-manager.c:637
+#: ../smime/gui/certificate-manager.c:672
 msgid "Failed to import certificate"
 msgstr "导入证书失败"
 
-#: ../smime/gui/certificate-manager.c:1013
+#: ../smime/gui/certificate-manager.c:1054
 msgid "All PKCS12 files"
 msgstr "全部 PKCS12 文件"
 
-#: ../smime/gui/certificate-manager.c:1030
+#: ../smime/gui/certificate-manager.c:1071
 msgid "All email certificate files"
 msgstr "所有电子邮件证书文件"
 
-#: ../smime/gui/certificate-manager.c:1047
+#: ../smime/gui/certificate-manager.c:1088
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
-#: ../smime/gui/certificate-viewer.c:349
-#, c-format
-msgid "Certificate Viewer: %s"
-msgstr "证书查看器:%s"
-
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:153
 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
+#: ../smime/gui/cert-trust-dialog.c:158
 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
+#: ../smime/gui/component.c:56
+#, c-format
+msgid "Enter the password for '%s', token '%s'"
+msgstr "输入“%s”的密码,令牌 '%s'"
+
+#: ../smime/gui/component.c:58
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "输入“%s”的密码"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:86
 msgid "Enter new password for certificate database"
 msgstr "输入证书数据库的新密码"
 
-#: ../smime/gui/component.c:79
+#: ../smime/gui/component.c:89
 msgid "Enter new password"
 msgstr "输入新密码"
 
@@ -19558,354 +20331,112 @@ msgstr ""
 msgid "Select certificate"
 msgstr "选择证书"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
-msgid "SSL Client Certificate"
-msgstr "SSL 客户证书"
-
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
-msgid "SSL Server Certificate"
-msgstr "SSL 服务器证书"
-
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Email Signer Certificate"
-msgstr "电子邮件签名者证书"
-
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Email Recipient Certificate"
-msgstr "电子邮件收件人证书"
-
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "This certificate has been verified for the following uses:"
-msgstr "此证书已经被下列用户所验证:"
-
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Issued To"
-msgstr "颁发给"
-
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Common Name (CN)"
-msgstr "通用名(CN)"
-
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Organization (O)"
-msgstr "组织(O)"
-
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Organizational Unit (OU)"
-msgstr "组织单元(OU)"
-
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Issued On"
-msgstr "发行日期"
-
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Expires On"
-msgstr "到期"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Fingerprints"
-msgstr "指纹"
-
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "<Not Part of Certificate>"
-msgstr "<不是证书的一部分>"
-
-#: ../smime/gui/smime-ui.ui.h:20
-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 "Field Value"
-msgstr "域值"
-
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "细节"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
 msgstr "您拥有这些组织证明您身份的证书:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
 msgstr "证书表"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
 msgstr "备份(_B)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
 msgstr "全部备份(_A)"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "You have certificates on file that identify these people:"
 msgstr "您拥有证明这些人的文件型证书:"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "联系人证书"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "您拥有证明这些颁发机构的文件型证书:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "证书颁发机构"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "证书颁发机构信任"
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Trust this CA to identify _websites."
 msgstr "信任此颁发机构标识的网站(_W)。"
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Trust this CA to identify _email users."
 msgstr "信任此颁发机构标识的电子邮件用户(_E)。"
 
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _software developers."
 msgstr "信任此颁发机构标识的软件开发者(_S)。"
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:19
 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:44 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Certificate"
 msgstr "证书"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Certificate details"
 msgstr "证书细节"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "电子邮件证书信任设置"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此证书的颁发机构"
 
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Do not trust the authenticity of this certificate"
 msgstr "不信任此证书的颁发机构"
 
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:390
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:391
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:503
-msgid "Version"
-msgstr "版本"
-
-#: ../smime/lib/e-cert.c:518
-msgid "Version 1"
-msgstr "版本 1"
-
-#: ../smime/lib/e-cert.c:521
-msgid "Version 2"
-msgstr "版本 2"
-
-#: ../smime/lib/e-cert.c:524
-msgid "Version 3"
-msgstr "版本 3"
-
-#: ../smime/lib/e-cert.c:607
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 MD2"
-
-#: ../smime/lib/e-cert.c:610
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 MD5"
-
-#: ../smime/lib/e-cert.c:613
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 SHA-1"
-
-#: ../smime/lib/e-cert.c:616
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 SHA-256"
-
-#: ../smime/lib/e-cert.c:619
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 SHA-384"
-
-#: ../smime/lib/e-cert.c:622
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "带 RSA 加密的 PKCS #1 SHA-512"
-
-#: ../smime/lib/e-cert.c:649
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA 加密"
-
-#: ../smime/lib/e-cert.c:652
-msgid "Certificate Key Usage"
-msgstr "证书密钥用途"
-
-#: ../smime/lib/e-cert.c:655
-msgid "Netscape Certificate Type"
-msgstr "Netscape 证书类型"
-
-#: ../smime/lib/e-cert.c:658
-msgid "Certificate Authority Key Identifier"
-msgstr "证书颁发密钥身份"
-
-#: ../smime/lib/e-cert.c:670
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "对象标识符(%s)"
-
-#: ../smime/lib/e-cert.c:722
-msgid "Algorithm Identifier"
-msgstr "算法标识符"
-
-#: ../smime/lib/e-cert.c:730
-msgid "Algorithm Parameters"
-msgstr "算法参数"
-
-#: ../smime/lib/e-cert.c:752
-msgid "Subject Public Key Info"
-msgstr "主题公钥信息"
-
-#: ../smime/lib/e-cert.c:757
-msgid "Subject Public Key Algorithm"
-msgstr "主题公钥算法"
-
-#: ../smime/lib/e-cert.c:772
-msgid "Subject's Public Key"
-msgstr "主题公钥"
-
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
-msgid "Error: Unable to process extension"
-msgstr "错误:无法处理扩展"
-
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
-msgid "Object Signer"
-msgstr "对象签名者"
-
-#: ../smime/lib/e-cert.c:818
-msgid "SSL Certificate Authority"
-msgstr "SSL 证书颁发机构"
-
-#: ../smime/lib/e-cert.c:822
-msgid "Email Certificate Authority"
-msgstr "电子邮件证书颁发机构"
-
-#: ../smime/lib/e-cert.c:851
-msgid "Signing"
-msgstr "签名"
-
-#: ../smime/lib/e-cert.c:855
-msgid "Non-repudiation"
-msgstr "不可抵赖"
-
-#: ../smime/lib/e-cert.c:859
-msgid "Key Encipherment"
-msgstr "密钥编码器"
-
-#: ../smime/lib/e-cert.c:863
-msgid "Data Encipherment"
-msgstr "数据编码器"
-
-#: ../smime/lib/e-cert.c:867
-msgid "Key Agreement"
-msgstr "密钥协议"
-
-#: ../smime/lib/e-cert.c:871
-msgid "Certificate Signer"
-msgstr "证书签名者"
-
-#: ../smime/lib/e-cert.c:875
-msgid "CRL Signer"
-msgstr "CRL 签名者"
-
-#: ../smime/lib/e-cert.c:924
-msgid "Critical"
-msgstr "关键"
-
-#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
-msgid "Not Critical"
-msgstr "非关键"
-
-#: ../smime/lib/e-cert.c:950
-msgid "Extensions"
-msgstr "扩展"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1029
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
-msgid "Certificate Signature Algorithm"
-msgstr "证书签名算法"
-
-#: ../smime/lib/e-cert.c:1094
-msgid "Issuer"
-msgstr "发行者"
-
-#: ../smime/lib/e-cert.c:1149
-msgid "Issuer Unique ID"
-msgstr "发行者唯一 ID"
-
-#: ../smime/lib/e-cert.c:1168
-msgid "Subject Unique ID"
-msgstr "主题唯一 ID"
-
-#: ../smime/lib/e-cert.c:1214
-msgid "Certificate Signature Value"
-msgstr "证书签名值"
-
-#: ../smime/lib/e-cert-db.c:860
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "输入 PKCS12 文件的密码:"
 
@@ -19985,1203 +20516,936 @@ msgstr "到期日期(_D)"
 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: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"
+#~| msgid "Disable or enable ellipsizing of folder names in side bar"
+#~ msgid "Ellipsize mode for folder names in side bar"
+#~ msgstr "侧边栏中文件夹名的省略显示模式"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "选择一个时区"
+#~ msgid "_Restore Default"
+#~ msgstr "恢复默认值(_R)"
 
-#: ../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"
-"Use the right mouse button to zoom out."
-msgstr ""
-"用鼠标左键放大地图的某个区域并选择时区。\n"
-"用鼠标右键缩小。"
+#~ msgid "Proxy Settings"
+#~ msgstr "代理设置"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "时区"
+#~ msgid "_Use system defaults"
+#~ msgstr "使用默认值(_U)"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "选择(_S)"
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "直接连接到 Internet(_D)"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "时区下拉组合框"
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "手动代理服务器配置(_M):"
 
-#: ../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 的视图"
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "安全 HTTP 代理(_S):"
 
-#: ../widgets/menus/gal-define-views-dialog.c:372
-#: ../widgets/menus/gal-define-views-dialog.c:374
-msgid "Define Views"
-msgstr "定义视图"
+#~ msgid "No _Proxy for:"
+#~ msgstr "不使用代理的情况(_P):"
 
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "定义“%s”的视图"
+#~ msgid "Use Authe_ntication"
+#~ msgstr "使用身份验证(_N)"
 
-#: ../widgets/menus/gal-view-factory-etable.c:115
-msgid "Table"
-msgstr "表格"
+#~ msgid "Us_ername:"
+#~ msgstr "用户名(_E):"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
-msgid "Save Current View"
-msgstr "保存当前视图"
+#~ msgid "Pass_word:"
+#~ msgstr "密码(_W):"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "创建新视图(_C)"
+#~ msgid "No writable calendar is available."
+#~ msgstr "没有可写的日历。"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "替换现有视图(_R)"
+#~ msgid "Could not open %s: Unknown error"
+#~ msgstr "无法打开 %s:未知错误"
 
-#: ../widgets/menus/gal-view-new-dialog.c:172
-msgid "Define New View"
-msgstr "定义新视图"
+#~| msgid "<Not Part of Certificate>"
+#~ msgid "Not part of certificate"
+#~ msgstr "非证书的一部分"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "新视图的名称:"
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "此证书已经被下列用户所验证:"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "视图类型:"
+#~ msgid "SSL Client Certificate"
+#~ msgstr "SSL 客户证书"
 
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "视图类型"
+#~ msgid "SSL Server Certificate"
+#~ msgstr "SSL 服务器证书"
 
-#: ../widgets/misc/ea-calendar-item.c:308
-#: ../widgets/misc/ea-calendar-item.c:317
-msgid "%d %B %Y"
-msgstr "%Y年%-m月%-d日"
+#~ msgid "Email Signer Certificate"
+#~ msgstr "电子邮件签名者证书"
 
-#: ../widgets/misc/ea-calendar-item.c:320
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "日历:从 %s 到 %s"
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "电子邮件收件人证书"
 
-#: ../widgets/misc/ea-calendar-item.c:356
-msgid "evolution calendar item"
-msgstr "Evolution 日历项目"
+#~ msgid "Issued To"
+#~ msgstr "颁发给"
 
-#: ../widgets/misc/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "关闭该信息"
+#~ msgid "Common Name (CN)"
+#~ msgstr "通用名(CN)"
 
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "图标视图"
+#~ msgid "Organization (O)"
+#~ msgstr "组织(O)"
 
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "列表视图"
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "组织单元(OU)"
 
-#. 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 "附加的信息"
+#~ msgid "Validity"
+#~ msgstr "有效性"
 
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
-#: ../widgets/misc/e-attachment-store.c:525
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#~ msgid "Issued On"
+#~ msgstr "发行日期"
 
-#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
-msgid "A load operation is already in progress"
-msgstr "一个已经加载的操作正在进行"
+#~ msgid "Expires On"
+#~ msgstr "到期"
 
-#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
-msgid "A save operation is already in progress"
-msgstr "个已经保存的操作正在进行"
+#~ msgid "Fingerprints"
+#~ msgstr "指纹"
 
-#: ../widgets/misc/e-attachment.c:1989
-#, c-format
-msgid "Could not load '%s'"
-msgstr "不能加载“%s”"
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "证书层次"
 
-#: ../widgets/misc/e-attachment.c:1992
-#, c-format
-msgid "Could not load the attachment"
-msgstr "不能加载附件"
+#~ msgid "Certificate Fields"
+#~ msgstr "证书域"
 
-#: ../widgets/misc/e-attachment.c:2265
-#, c-format
-msgid "Could not open '%s'"
-msgstr "不能打开“%s”"
+#~ msgid "Field Value"
+#~ msgstr "域值"
 
-#: ../widgets/misc/e-attachment.c:2268
-#, c-format
-msgid "Could not open the attachment"
-msgstr "不能打开附件"
+#~ msgid "Details"
+#~ msgstr "细节"
 
-#: ../widgets/misc/e-attachment.c:2702
-msgid "Attachment contents not loaded"
-msgstr "附件内容未载入"
+#~ msgid "Version"
+#~ msgstr "版本"
 
-#: ../widgets/misc/e-attachment.c:2778
-#, c-format
-msgid "Could not save '%s'"
-msgstr "不能保存“%s”"
+#~ msgid "Version 1"
+#~ msgstr "版本 1"
 
-#: ../widgets/misc/e-attachment.c:2781
-#, c-format
-msgid "Could not save the attachment"
-msgstr "无法保存附件"
+#~ msgid "Version 2"
+#~ msgstr "版本 2"
 
-#: ../widgets/misc/e-attachment-dialog.c:311
-msgid "Attachment Properties"
-msgstr "附件属性"
+#~ msgid "Version 3"
+#~ msgstr "版本 3"
 
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "文件名(_I):"
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 MD2"
 
-#: ../widgets/misc/e-attachment-dialog.c:368
-msgid "MIME Type:"
-msgstr "MIME  类型:"
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 MD5"
 
-#: ../widgets/misc/e-attachment-dialog.c:376
-#: ../widgets/misc/e-attachment-store.c:442
-msgid "_Suggest automatic display of attachment"
-msgstr "建议自动显示附件(_S)"
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
-#: ../widgets/misc/e-attachment-handler-image.c:99
-msgid "Could not set as background"
-msgstr "不能设置为背景"
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 SHA-256"
 
-#: ../widgets/misc/e-attachment-handler-image.c:149
-msgid "Set as _Background"
-msgstr "设为背景(_B)"
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 SHA-384"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "不能发送附件"
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "带 RSA 加密的 PKCS #1 SHA-512"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "发送到(_S)..."
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA 加密"
 
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "发送某个选中的附件"
+#~ msgid "Certificate Key Usage"
+#~ msgstr "证书密钥用途"
 
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
-msgid "Loading"
-msgstr "载入"
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Netscape 证书类型"
 
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
-msgid "Saving"
-msgstr "保存"
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "证书颁发密钥身份"
 
-#: ../widgets/misc/e-attachment-paned.c:104
-msgid "Hide Attachment _Bar"
-msgstr "隐藏附件栏(_B)"
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "对象标识符(%s)"
 
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
-msgid "Show Attachment _Bar"
-msgstr "显示附件栏(_B)"
+#~ msgid "Algorithm Identifier"
+#~ msgstr "算法标识符"
 
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "Add Attachment"
-msgstr "添加附件"
+#~ msgid "Algorithm Parameters"
+#~ msgstr "算法参数"
 
-#: ../widgets/misc/e-attachment-store.c:433
-msgid "A_ttach"
-msgstr "附件(_T)"
+#~ msgid "Subject Public Key Info"
+#~ msgstr "主题公钥信息"
 
-#: ../widgets/misc/e-attachment-store.c:496
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "保存附件"
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "主题公钥算法"
 
-#: ../widgets/misc/e-attachment-view.c:379
-msgid "Open With Other Application..."
-msgstr "用其他应用程序打开..."
+#~ msgid "Subject's Public Key"
+#~ msgstr "主题公钥"
 
-#: ../widgets/misc/e-attachment-view.c:386
-msgid "S_ave All"
-msgstr "全部保存(_A)"
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "错误:无法处理扩展"
 
-#: ../widgets/misc/e-attachment-view.c:412
-msgid "A_dd Attachment..."
-msgstr "添加附件(_D)..."
+#~ msgid "Object Signer"
+#~ msgstr "对象签名者"
 
-#: ../widgets/misc/e-attachment-view.c:436
-msgid "_Hide"
-msgstr "隐藏(_H)"
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "SSL 证书颁发机构"
 
-#: ../widgets/misc/e-attachment-view.c:443
-msgid "Hid_e All"
-msgstr "全部隐藏(_E)"
+#~ msgid "Email Certificate Authority"
+#~ msgstr "电子邮件证书颁发机构"
 
-#: ../widgets/misc/e-attachment-view.c:450
-msgid "_View Inline"
-msgstr "嵌入查看(_V)"
+#~ msgid "Signing"
+#~ msgstr "签名"
 
-#: ../widgets/misc/e-attachment-view.c:457
-msgid "Vie_w All Inline"
-msgstr "嵌入查看(_W)"
+#~ msgid "Non-repudiation"
+#~ msgstr "不可抵赖"
 
-#: ../widgets/misc/e-attachment-view.c:778
-#, c-format
-msgid "Open With \"%s\""
-msgstr "使用“%s”打开"
+#~ msgid "Key Encipherment"
+#~ msgstr "密钥编码器"
 
-#: ../widgets/misc/e-attachment-view.c:781
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "在 %s 中打开附件"
+#~ msgid "Data Encipherment"
+#~ msgstr "数据编码器"
 
-#: ../widgets/misc/e-book-source-config.c:98
-#| msgid "Mark as _default address book"
-msgid "Mark as default address book"
-msgstr "标记为默认地址簿"
+#~ msgid "Key Agreement"
+#~ msgstr "密钥协议"
 
-#: ../widgets/misc/e-book-source-config.c:103
-#| msgid "A_utocomplete with this address book"
-msgid "Autocomplete with this address book"
-msgstr "用此地址薄自动完成"
+#~ msgid "Certificate Signer"
+#~ msgstr "证书签名者"
 
-#: ../widgets/misc/e-book-source-config.c:277
-#| msgid "Copy _book content locally for offline operation"
-msgid "Copy book content locally for offline operation"
-msgstr "将地址簿内容复制到本地以进行离线操作"
+#~ msgid "CRL Signer"
+#~ msgstr "CRL 签名者"
 
-#. 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:389
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl 加单击来打开一个链接"
+#~ msgid "Critical"
+#~ msgstr "关键"
 
-#: ../widgets/misc/e-calendar.c:187
-msgid "Previous month"
-msgstr "上个月"
+#~ msgid "Not Critical"
+#~ msgstr "非关键"
 
-#: ../widgets/misc/e-calendar.c:211
-msgid "Next month"
-msgstr "下个月"
+#~ msgid "Extensions"
+#~ msgstr "扩展"
 
-#: ../widgets/misc/e-calendar.c:233
-msgid "Previous year"
-msgstr "上一年"
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
 
-#: ../widgets/misc/e-calendar.c:254
-msgid "Next year"
-msgstr "下一年"
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "证书签名算法"
 
-#: ../widgets/misc/e-calendar.c:278
-msgid "Month Calendar"
-msgstr "月历"
+#~ msgid "Issuer"
+#~ msgstr "发行者"
 
-#. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1283
-#: ../widgets/misc/e-calendar-item.c:2136
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
+#~ msgid "Issuer Unique ID"
+#~ msgstr "发行者唯一 ID"
 
-#. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1285
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
+#~ msgid "Subject Unique ID"
+#~ msgstr "主题唯一 ID"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1322
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%Y %B"
+#~ msgid "Certificate Signature Value"
+#~ msgstr "证书签名值"
 
-#: ../widgets/misc/e-cal-source-config.c:170
-#| msgid "Mark as _default calendar"
-msgid "Mark as default calendar"
-msgstr "标为默认日历"
+#~ msgid "Card View"
+#~ msgstr "名片视图"
 
-#: ../widgets/misc/e-cal-source-config.c:173
-#| msgid "Mark as _default task list"
-msgid "Mark as default task list"
-msgstr "标为默认任务列表"
+#~ msgid "Export in asynchronous mode"
+#~ msgstr "以异步模式导出"
 
-#: ../widgets/misc/e-cal-source-config.c:176
-#| msgid "Mark as _default memo list"
-msgid "Mark as default memo list"
-msgstr "标为默认备忘列表"
+#~ msgid ""
+#~ "The number of cards in one output file in asynchronous mode, default size "
+#~ "100."
+#~ msgstr "异步模式中一个输出文件中的名片数,默认大小为 100。"
 
-#: ../widgets/misc/e-cal-source-config.c:201
-#| msgid "Colo_r:"
-msgid "Color:"
-msgstr "颜色:"
+#~ msgid "NUMBER"
+#~ msgstr "数字"
 
-#: ../widgets/misc/e-cal-source-config.c:406
-#| msgid "Cop_y calendar contents locally for offline operation"
-msgid "Copy calendar contents locally for offline operation"
-msgstr "将日历内容复制到本地以进行离线操作"
+#~ msgid "In async mode, output must be file."
+#~ msgstr "在异步模式中,输出必须是文件。"
 
-#: ../widgets/misc/e-cal-source-config.c:410
-#| msgid "Cop_y task list contents locally for offline operation"
-msgid "Copy task list contents locally for offline operation"
-msgstr "将任务列表内容复制到本地以进行离线操作"
+#~ msgid "In normal mode, there is no need for the size option."
+#~ msgstr "在普通模式中,不应该有大小选项。"
 
-#: ../widgets/misc/e-cal-source-config.c:414
-#| msgid "Cop_y memo list contents locally for offline operation"
-msgid "Copy memo list contents locally for offline operation"
-msgstr "将备忘列表内容复制到本地以进行离线操作"
+#~ 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"
+#~ "显示普通提醒对话框代替。"
 
-#: ../widgets/misc/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "字符编码"
+#~ msgid "The Evolution tasks have quit unexpectedly."
+#~ msgstr "Evolution 任务异常退出。"
 
-#: ../widgets/misc/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "输入要使用的字符集"
+#~ msgid "Your calendars will not be available until Evolution is restarted."
+#~ msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
 
-#: ../widgets/misc/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "其它..."
+#~ msgid "The Evolution memo has quit unexpectedly."
+#~ msgstr "Evolution 备忘异常退出。"
 
-#: ../widgets/misc/e-contact-map-window.c:356
-msgid "Contacts Map"
-msgstr "联系人地图"
+#~ msgid "The Evolution calendars have quit unexpectedly."
+#~ msgstr "Evolution 日历异常退出。"
 
-#: ../widgets/misc/e-dateedit.c:504
-msgid "Date and Time"
-msgstr "日期和时间"
+#~| msgid "The reported error was &quot;{0}&quot;."
+#~ msgid "Delete remote calendar &quot;{0}&quot;?"
+#~ msgstr "删除远程日历“{0}”吗?"
 
-#: ../widgets/misc/e-dateedit.c:525
-msgid "Text entry to input date"
-msgstr "输入日期的文本框"
+#~| msgid "Delete task list '{0}'?"
+#~ msgid "Delete remote task list &quot;{0}&quot;?"
+#~ msgstr "删除远程任务列表“{0}”吗?"
 
-#: ../widgets/misc/e-dateedit.c:547
-msgid "Click this button to show a calendar"
-msgstr "单击此按钮可显示日历"
+#~| msgid "The reported error was &quot;{0}&quot;."
+#~ msgid "Delete remote memo list &quot;{0}&quot;?"
+#~ msgstr "删除远程备忘列表”{0}“吗?"
 
-#: ../widgets/misc/e-dateedit.c:594
-msgid "Drop-down combination box to select time"
-msgstr "选择时间的组合框"
+#~ msgid "Cannot create a new event"
+#~ msgstr "无法创建新事件"
 
-#: ../widgets/misc/e-dateedit.c:666
-msgid "No_w"
-msgstr "现在(_W)"
+#~ msgid ""
+#~ "'{0}' is a read-only calendar and cannot be modified. Please select a "
+#~ "different calendar from the side bar in the Calendar view."
+#~ msgstr ""
+#~ "“{0}“是一个只读日历,不能被编辑。请从日历列表的侧边栏里选择一个不同的日"
+#~ "历。"
 
-#: ../widgets/misc/e-dateedit.c:673
-msgid "_Today"
-msgstr "今天(_T)"
+#~ msgid "Error on {0}: {1}"
+#~ msgstr "{0} 出错:{1}"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:682
-msgid "_None"
-msgstr "无(_N)"
+#~ msgid "Could not perform this operation."
+#~ msgstr "无法执行该操作。"
 
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
-msgctxt "date"
-msgid "None"
-msgstr "无"
+#~ msgid "Day View"
+#~ msgstr "日视图"
 
-#: ../widgets/misc/e-dateedit.c:1824
-msgid "Invalid Date Value"
-msgstr "无效的日期值"
+#~ msgid "Work Week View"
+#~ msgstr "工作日视图"
 
-#: ../widgets/misc/e-dateedit.c:1868
-msgid "Invalid Time Value"
-msgstr "无效的时间值"
+#~ msgid "Week View"
+#~ msgstr "周视图"
 
-#: ../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 的文件,并从列表中选择文件的类型。"
+#~ msgid "Month View"
+#~ msgstr "月视图"
 
-#: ../widgets/misc/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "选择一个文件"
+#~ msgid "Unable to open the calendar '%s': %s"
+#~ msgstr "无法打开日历“%s”:%s"
 
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
-msgid "File _type:"
-msgstr "文件类型(_T):"
+#~ msgid "Unable to open memos in '%s': %s"
+#~ msgstr "无法打开“%s”中的备忘:%s"
 
-#: ../widgets/misc/e-import-assistant.c:340
-#: ../widgets/misc/e-import-assistant.c:920
-msgid "Choose the destination for this import"
-msgstr "选择此导入的目的位置"
+#~ msgid "Web Page"
+#~ msgstr "网页"
 
-#: ../widgets/misc/e-import-assistant.c:365
-msgid "Choose the type of importer to run:"
-msgstr "选择要运行的导入器类型:"
+#~ msgid "Stat_us:"
+#~ msgstr "状态(_U):"
 
-#: ../widgets/misc/e-import-assistant.c:373
-msgid "Import data and settings from _older programs"
-msgstr "从旧版程序中导入数据和设置(_O)"
+#~ msgid "_Status Details"
+#~ msgstr "状态细节(_S)"
 
-#: ../widgets/misc/e-import-assistant.c:381
-msgid "Import a _single file"
-msgstr "导入单个文件(_S)"
+#~ msgid "Click to change or view the status details of the task"
+#~ msgstr "单击可更改或查看任务的状态细节"
 
-#: ../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 "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolution 检查了从以下程序导入的设置:Pine、Netscape、Elm、iCalendar。并未发"
-"现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
+#~ msgid "Task Details"
+#~ msgstr "任务细节"
 
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:775
-msgid "_Cancel Import"
-msgstr "取消导入(_C)"
+#~ msgid "Unable to open tasks in '%s': %s"
+#~ msgstr "无法打开“%s”中的任务:%s"
 
-#: ../widgets/misc/e-import-assistant.c:919
-msgid "Preview data to be imported"
-msgstr "预览要导入的信息"
+#~ msgid "Opening %s"
+#~ msgstr "打开 %s"
 
-#: ../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 "导入数据"
+#~ msgid "ID of the socket to embed in"
+#~ msgstr "要内嵌的端口 ID"
 
-#: ../widgets/misc/e-import-assistant.c:933
-msgid "Select what type of file you want to import from the list."
-msgstr "选择您想从列表导入的类型"
+#~ msgid "socket"
+#~ msgstr "套接字"
 
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1316
-msgid "Evolution Import Assistant"
-msgstr "Evolution 导入助手"
+#~ msgid "Please enter your full name."
+#~ msgstr "请输入您的全名。"
 
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
-msgid "Import Location"
-msgstr "导入位置"
+#~ msgid "Please enter your email address."
+#~ msgstr "请输入您的电子邮件地址"
 
-#: ../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 "
-"external files into Evolution."
-msgstr ""
-"欢迎使用 Evolution 导入助手。\n"
-"本助手将全程指导您将外部文件导入 Evolution。"
+#~ msgid "The email address you have entered is invalid."
+#~ msgstr "您输入的电子邮件地址无效。"
 
-#: ../widgets/misc/e-import-assistant.c:1326
-msgid "Importer Type"
-msgstr "导入器类型"
+#~ msgid "Please enter your password."
+#~ msgstr "请输入您的密码。"
 
-#: ../widgets/misc/e-import-assistant.c:1336
-msgid "Select Information to Import"
-msgstr "选择要导入的信息"
+#~ msgid "CalDAV"
+#~ msgstr "CalDAV"
 
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "选择一个文件"
+#~ msgid "Google"
+#~ msgstr "Google"
 
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "单击“应用”以便开始将文件导入到 Evolution。"
+#~ msgid "Always (SSL)"
+#~ msgstr "总是(SSL)"
 
-#: ../widgets/misc/e-mail-signature-combo-box.c:327
-msgid "Autogenerated"
-msgstr "自动生成的"
+#~ msgid "When possible (TLS)"
+#~ msgstr "可用时(TLS)"
 
-#: ../widgets/misc/e-mail-signature-editor.c:287
-#| msgid "_Close"
-msgid "Close"
-msgstr "关闭"
+#~ msgid "Personal details:"
+#~ msgstr "个人详细信息:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:292
-msgid "_Save and Close"
-msgstr "保存并关闭(_S)"
+#~ msgid "Email address:"
+#~ msgstr "电子邮件地址:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:506
-msgid "Edit Signature"
-msgstr "编辑签名"
+#~ msgid "Details:"
+#~ msgstr "细节:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:526
-msgid "_Signature Name:"
-msgstr "签名(_S):"
+#~ msgid "Server type:"
+#~ msgstr "服务器类型:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:572
-msgid "Unnamed"
-msgstr "未命名"
+#~ msgid "Server address:"
+#~ msgstr "服务器地址:"
 
-#: ../widgets/misc/e-mail-signature-manager.c:337
-msgid "Add _Script"
-msgstr "添加脚本(_S)"
+#~ msgid "Use encryption:"
+#~ msgstr "使用加密:"
 
-#: ../widgets/misc/e-mail-signature-manager.c:421
-msgid "Add Signature Script"
-msgstr "添加签名脚本"
+#~ msgid ""
+#~ "To use the email application you'll need to setup an account. Put your "
+#~ "email address and password in below and we'll try and work out all the "
+#~ "settings. If we can't do it automatically you'll need your server details "
+#~ "as well."
+#~ msgstr ""
+#~ "您必须设定一个帐号才能使用这个电子邮件程序。在下面填入您的电子邮件地址和密"
+#~ "码,我会尝试并且完成所有设定。如果我不能自动设定所有细节,您还需要提供您的"
+#~ "电子邮件服务器的详细信息。"
 
-#: ../widgets/misc/e-mail-signature-manager.c:491
-msgid "Edit Signature Script"
-msgstr "编辑签名脚本"
+#~ msgid ""
+#~ "Sorry, we can't work out the settings to get your mail automatically. "
+#~ "Please enter them below. We've tried to make a start with the details you "
+#~ "just entered but you may need to change them."
+#~ msgstr ""
+#~ "对不起,我们不能自动完成设置来获取您的电子邮件。请完成下面的设置。我们尝试"
+#~ "根据您刚才输入的信息工作但是或许您需要更改它们。"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:395
-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 "You can specify more options to configure the account."
+#~ msgstr "您可以指定更多选项以配置此帐号。"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
-msgid "S_cript:"
-msgstr "脚本(_C):"
+#~ 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 ""
+#~ "现在我们需要您设置发送邮件,我们会尽量自动完成,但是您需要检查设置来确保正"
+#~ "确。"
 
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
-msgid "Script file must be executable."
-msgstr "脚本文件必须可执行。"
+#~ msgid "You can specify your default settings for your account."
+#~ msgstr "您可以为您的帐号指定默认设置。"
 
-#: ../widgets/misc/e-map.c:886
-msgid "World Map"
-msgstr "世界地图"
+#~ msgid ""
+#~ "Time to check things over before we try and connect to the server and "
+#~ "fetch your mail."
+#~ msgstr ""
+#~ "在我们尝试连接服务器并获取您的电子邮件之前,请检查一遍您的配置信息。"
 
-#: ../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."
-msgstr ""
-"基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
-"区。"
+#~ msgid "Next - Receiving mail"
+#~ msgstr "前进 - 接收电子邮件"
 
-#: ../widgets/misc/e-online-button.c:31
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolution 目前在线。单击该按钮可离线工作。"
+#~ msgid "Receiving mail"
+#~ msgstr "接收电子邮件"
 
-#: ../widgets/misc/e-online-button.c:34
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolution 目前离线。单击该按钮可在线工作。"
+#~ msgid "Next - Sending mail"
+#~ msgstr "前进 - 发送电子邮件"
 
-#: ../widgets/misc/e-online-button.c:37
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "因为网络不可用,所以 Evolution 目前离线。"
+#~ msgid "Back - Identity"
+#~ msgstr "后退 - 标识"
 
-#: ../widgets/misc/e-preferences-window.c:317
-msgid "Evolution Preferences"
-msgstr "Evolution 首选项"
+#~ msgid "Next - Receiving options"
+#~ msgstr "前进 - 接收选项"
 
-#: ../widgets/misc/e-search-bar.c:79
-#, c-format
-msgid "Matches: %u"
-msgstr "匹配:%u"
+#~ msgid "Receiving options"
+#~ msgstr "接收选项"
 
-#: ../widgets/misc/e-search-bar.c:527
-msgid "Close the find bar"
-msgstr "关闭查找栏"
+#~ msgid "Back - Receiving mail"
+#~ msgstr "后退 - 接收电子邮件"
 
-#: ../widgets/misc/e-search-bar.c:535
-msgid "Fin_d:"
-msgstr "查找(_D):"
+#~ msgid "Sending mail"
+#~ msgstr "发送电子邮件"
 
-#: ../widgets/misc/e-search-bar.c:547
-msgid "Clear the search"
-msgstr "清除搜索"
+#~ msgid "Next - Review account"
+#~ msgstr "前进 - 检查帐号"
 
-#: ../widgets/misc/e-search-bar.c:571
-msgid "_Previous"
-msgstr "上一项(_P)"
+#~ msgid "Next - Defaults"
+#~ msgstr "前进 - 默认值"
 
-#: ../widgets/misc/e-search-bar.c:577
-msgid "Find the previous occurrence of the phrase"
-msgstr "寻找该词句出现的前一个位置"
+#~ msgid "Back - Receiving options"
+#~ msgstr "后退 - 接收选项"
 
-#: ../widgets/misc/e-search-bar.c:590
-msgid "_Next"
-msgstr "下一项(_N)"
+#~ msgid "Back - Sending mail"
+#~ msgstr "后退 - 发送电子邮件"
 
-#: ../widgets/misc/e-search-bar.c:596
-msgid "Find the next occurrence of the phrase"
-msgstr "寻找该词句出现的下一个位置"
+#~ msgid "Review account"
+#~ msgstr "检查帐号"
 
-#: ../widgets/misc/e-search-bar.c:609
-msgid "Mat_ch case"
-msgstr "大小写匹配(_C)"
+#~ msgid "Finish"
+#~ msgstr "完成"
 
-#: ../widgets/misc/e-search-bar.c:637
-msgid "Reached bottom of page, continued from top"
-msgstr "到达页面底部,移到顶部继续"
+#~ msgid "Back - Sending"
+#~ msgstr "后退 - 发送"
 
-#: ../widgets/misc/e-search-bar.c:659
-msgid "Reached top of page, continued from bottom"
-msgstr "到达页面顶部,移到底部继续"
+#~ msgid "Setup Google contacts with Evolution"
+#~ msgstr "设置 Google 联系人到 Evolution"
 
-#: ../widgets/misc/e-send-options.c:570
-msgid "When de_leted:"
-msgstr "删除时(_L):"
+#~ msgid "Setup Google calendar with Evolution"
+#~ msgstr "添加 Google 日历到 Evolution"
 
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "标准"
+#~ msgid "You may need to enable IMAP access."
+#~ msgstr "您可能需要启用 IMAP 访问。"
 
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "优先级"
+#~ msgid "Google account settings:"
+#~ msgstr "Google 帐号设置:"
 
-#: ../widgets/misc/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "机密"
+#~ msgid "Setup Yahoo calendar with Evolution"
+#~ msgstr "添加 Yahoo 日历到 Evolution"
 
-#: ../widgets/misc/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "绝密"
+#~ 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 日历命名为 名字_姓氏。我们尝试着生成这种日历名称。请确认名字是否正"
+#~ "确,如果不正确,请重新输入日历名称。"
 
-#: ../widgets/misc/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "独家"
+#~ msgid "Yahoo account settings:"
+#~ msgstr "Yahoo 帐号设置:"
 
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "无"
+#~ msgid "Yahoo Calendar name:"
+#~ msgstr "Yahoo 日历名称:"
 
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "已读回执"
+#~ msgid "Password:"
+#~ msgstr "密码:"
 
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "请求回复(_E)"
+#~ msgid "Close Tab"
+#~ msgstr "关闭标签"
 
-#: ../widgets/misc/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "少于(_T)"
+#~ msgid "Account Wizard"
+#~ msgstr "帐号向导"
 
-#: ../widgets/misc/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "天"
+#~ msgid "Evolution account assistant"
+#~ msgstr "Evolution 帐号助手"
 
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "方便时(_W)"
+#~ msgid "Modify %s..."
+#~ msgstr "修改 %s..."
 
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "推迟信息投递(_D)"
+#~ msgid "Add a new account"
+#~ msgstr "添加新帐号"
 
-#: ../widgets/misc/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "经过(_A)"
+#~ msgid "Account management"
+#~ msgstr "帐号管理"
 
-#: ../widgets/misc/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "天"
+#~ msgid "Settings"
+#~ msgstr "设置"
 
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "设置过期时间(_S)"
+#~ msgid "Save draft"
+#~ msgstr "保存草稿"
 
-#: ../widgets/misc/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "直到(_U)"
+#~ msgid "Email Settings"
+#~ msgstr "电子邮件设置"
 
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "发送选项"
+#~ msgid "Configure email accounts"
+#~ msgstr "配置电子邮件帐号"
 
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "分类(_C):"
+#~ msgid "Week start"
+#~ msgstr "一周开始"
 
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "常规选项(_R)"
+#~ msgid "Work days"
+#~ msgstr "工作日"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "创建一个已发送项以跟踪信息(_E)"
+#~ msgid "Days on which the start and end of work hours should be indicated"
+#~ msgstr "应标出工作时段的日子"
 
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "已投递(_D)"
+#~ msgid "Save name format for drag-and-drop operation"
+#~ msgstr "拖放操作时保存名称格式"
 
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "已发送和已打开(_V)"
+#, fuzzy
+#~ msgid ""
+#~ "Can be either 2 to use current date and time or any other value for sent "
+#~ "date of the message. This has a meaning only when dropping just one "
+#~ "message."
+#~ msgstr ""
+#~ "可设为 2 来使用当前的日期时间或任意其他值来使用信息发送时的日期。只在放置"
+#~ "一条信息时有意义。"
 
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "全部信息(_A)"
+#~ msgid "Whether disable ellipsizing feature of folder names in side bar."
+#~ msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "自动删除已发项目(_U)"
+#~ 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 - 总是从网上载入图像。"
 
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "状态跟踪"
+#~ 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 则在邮件视图中显示该邮件"
+#~ "头。"
 
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "打开时(_W):"
+#~ msgid "Search for the sender photo in local address books"
+#~ msgstr "在本地地址簿中搜索发件人照片"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "拒绝时(_N):"
+#~ msgid "This option would help in improving the speed of fetching."
+#~ msgstr "此选项能帮助提高获取信息的速度"
 
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "完成时(_M):"
+#~ msgid "List of MIME types to check for Bonobo component viewers"
+#~ msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
 
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "接受时(_P):"
+#~ 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 组件查看器将被用来显示"
+#~ "其内容。"
 
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "返回通知"
+#~ msgid "State of message headers in paned view"
+#~ msgstr "窗格视图中信息头的状态"
 
-#: ../widgets/misc/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "状态跟踪(_T)"
+#~ msgid ""
+#~ "Describes whether message headers in paned view should be collapsed or "
+#~ "expanded by default. \"0\" = expanded and \"1\" = collapsed"
+#~ msgstr "描述了在窗格视图中信息头默认折叠还是展开。“0”为展开,“1”为折叠"
 
-#: ../widgets/misc/e-source-config.c:671 ../widgets/misc/e-source-config.c:675
-msgid "Type:"
-msgstr "类型:"
+#~ 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” - (或任何其他值)将询问用户。"
 
-#. Translators: This is the first of a sequence of widgets:
-#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1285
-#| msgid "Refresh the folder"
-msgid "Refresh every"
-msgstr "刷新间隔"
+#~ msgid "Socket path for SpamAssassin"
+#~ msgstr "SpamAssassin 的套接字路径"
 
-#: ../widgets/misc/e-source-config.c:1315
-#: ../widgets/misc/e-source-config.c:1343
-#| msgid "Use _secure connection"
-msgid "Use a secure connection"
-msgstr "使用安全连接"
+#~ msgid "Use SpamAssassin daemon and client"
+#~ msgstr "使用垃圾克星守护程序和客户端"
 
-#: ../widgets/misc/e-source-config.c:1357
-#| msgid "_Ignore invalid SSL certificate"
-msgid "Ignore invalid SSL certificate"
-msgstr "忽略无效的 SSL 证书"
+#~ msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+#~ msgstr "使用垃圾克星守护程序和客户端(spamc/spamd)。"
 
-#: ../widgets/misc/e-source-config.c:1394
-#| msgid "Users"
-msgid "User"
-msgstr "用户"
+#~ msgid "SpamAssassin client binary"
+#~ msgstr "垃圾克星客户端二进制文件"
 
-#. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:351
-msgid "(no suggestions)"
-msgstr "(无建议)"
+#~ msgid "SpamAssassin daemon binary"
+#~ msgstr "垃圾克星守护程序二进制文件"
 
-#: ../widgets/misc/e-spell-entry.c:375
-msgid "More..."
-msgstr "更多..."
+#~ msgid "Cannot get transport for account '%s'"
+#~ msgstr "无法完成帐号“%s”的传输"
 
-#. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:444
-#, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "添加 “%s” 到字典"
+#~ msgid "No mail exchanger record for '%s'"
+#~ msgstr "没有对应“%s”的邮件往来记录"
 
-#. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:487
-msgid "Ignore All"
-msgstr "忽略全部"
+#~ msgid "Temporarily unable to resolve '%s'"
+#~ msgstr "暂时无法解析“%s”"
 
-#: ../widgets/misc/e-spell-entry.c:513
-msgid "Spelling Suggestions"
-msgstr "拼写建议"
+#~| msgid "Error removing list"
+#~ msgid "Error resolving '%s'"
+#~ msgstr "解析“%s”出错"
 
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr "单击此处转到 URL"
+#~ msgid "No authoritative name server for '%s'"
+#~ msgstr "“%s”没有权威的名字服务器"
 
-#: ../widgets/misc/e-web-view.c:278 ../widgets/misc/e-web-view-gtkhtml.c:407
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
+#~ msgid "Unable to create local mail folders at '%s': %s"
+#~ msgstr "无法在“%s”创建本地邮件文件夹:%s"
 
-#: ../widgets/misc/e-web-view.c:280 ../widgets/misc/e-web-view-gtkhtml.c:409
-msgid "Copy the link to the clipboard"
-msgstr "将链接复制到剪贴板"
+#~ msgid "Please select a folder"
+#~ msgstr "请选择一个文件夹"
 
-#: ../widgets/misc/e-web-view.c:288 ../widgets/misc/e-web-view-gtkhtml.c:417
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
+#~ msgid "_Switch to Folder"
+#~ msgstr "切换到文件夹(_S)"
 
-#: ../widgets/misc/e-web-view.c:290 ../widgets/misc/e-web-view-gtkhtml.c:419
-msgid "Open the link in a web browser"
-msgstr "在浏览器中打开链接"
+#~ msgid "Display the parent folder"
+#~ msgstr "显示上层文件夹"
 
-#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:427
-msgid "_Copy Email Address"
-msgstr "复制电子邮件地址(_C)"
+#~ msgid "Switch to _next tab"
+#~ msgstr "切换到下一个标签(_N)"
 
-#: ../widgets/misc/e-web-view.c:315 ../widgets/misc/e-web-view-gtkhtml.c:444
-msgid "_Copy Image"
-msgstr "复制图像(_C)"
+#~ msgid "Switch to the next tab"
+#~ msgstr "切换到下一个标签"
 
-#: ../widgets/misc/e-web-view.c:317 ../widgets/misc/e-web-view-gtkhtml.c:446
-msgid "Copy the image to the clipboard"
-msgstr "将图像复制到剪贴板"
+#~ msgid "Switch to _previous tab"
+#~ msgstr "切换到上一个标签(_P)"
 
-#: ../widgets/misc/e-web-view.c:337 ../widgets/misc/e-web-view.c:1426
-#: ../widgets/misc/e-web-view-gtkhtml.c:466
-#: ../widgets/misc/e-web-view-gtkhtml.c:1311
-msgid "Select all text and images"
-msgstr "选中全部文本和图像"
+#~ msgid "Switch to the previous tab"
+#~ msgstr "切换到上一个标签"
 
-#: ../widgets/misc/e-web-view.c:1090 ../widgets/misc/e-web-view.c:1092
-#: ../widgets/misc/e-web-view.c:1094 ../widgets/misc/e-web-view-gtkhtml.c:975
-#: ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#, c-format
-msgid "Click to call %s"
-msgstr "单击以呼叫 %s"
+#~ msgid "Cl_ose current tab"
+#~ msgstr "关闭当前标签(_O)"
 
-#: ../widgets/misc/e-web-view.c:1096 ../widgets/misc/e-web-view-gtkhtml.c:981
-msgid "Click to hide/unhide addresses"
-msgstr "单击可隐藏/显示地址"
+#~ msgid "Close current tab"
+#~ msgstr "关闭当前标签"
 
-#: ../widgets/misc/e-web-view.c:1098 ../widgets/misc/e-web-view-gtkhtml.c:983
-#, c-format
-msgid "Click to open %s"
-msgstr "单击以打开 %s"
+#~ msgid "Folder '%s'"
+#~ msgstr "文件夹 %s"
 
-#: ../widgets/misc/widgets.error.xml.h:1
-msgid "Do you wish to save your changes?"
-msgstr "您希望保存更改吗?"
+#~ msgid "Failed to load part '%s'"
+#~ msgstr "无法载入“%s” 部分"
 
-#: ../widgets/misc/widgets.error.xml.h:2
-msgid "This signature has been changed, but has not been saved."
-msgstr "签名已经更改,但尚未保存。"
+#~ msgid "S_earch for sender photograph only in local address books"
+#~ msgstr "仅在本地地址簿中搜索发件人照片(_E)"
 
-#: ../widgets/misc/widgets.error.xml.h:3
-msgid "_Discard changes"
-msgstr "丢弃更改(_D)"
+#~ msgid "Cannot open source \"{1}\"."
+#~ msgstr "无法打开源“{1}”"
 
-#: ../widgets/misc/widgets.error.xml.h:4
-msgid "Blank Signature"
-msgstr "空签名"
+#~ msgid ""
+#~ "This will mark all messages as read in the selected folder and its "
+#~ "subfolders."
+#~ msgstr "这将把选中文件夹及其子文件夹中的全部信息标记为已读。"
 
-#: ../widgets/misc/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "请提供此签名的唯一标识名称。"
+#~ msgid "Close message window."
+#~ msgstr "关闭信息窗口。"
 
-#: ../widgets/misc/widgets.error.xml.h:6
-#| msgid "Could not save signature file."
-msgid "Could not load signature."
-msgstr "无法加载签名。"
+#~ msgid "Would you like to close the message window?"
+#~ msgstr "您想关闭信息窗口吗?"
 
-#: ../widgets/misc/widgets.error.xml.h:7
-#| msgid "Could not save signature file."
-msgid "Could not save signature."
-msgstr "无法保存签名。"
+#~ msgid "Sent Messages"
+#~ msgstr "已发送信息"
 
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "弹出列表"
+#~ msgid "Anonymously"
+#~ msgstr "匿名"
 
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "现在"
+#~ msgid "One"
+#~ msgstr "一次"
 
-#. 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 "无"
+#~ msgid "Sub"
+#~ msgstr "子"
 
-#: ../widgets/table/e-cell-date-edit.c:325
-msgid "OK"
-msgstr "确定"
+#~ msgid "Supported Search Bases"
+#~ msgstr "支持的搜索起点"
 
-#: ../widgets/table/e-cell-date-edit.c:873
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "时间必须采用格式:%s"
+#~ msgid "Ser_ver:"
+#~ msgstr "服务器(_V):"
 
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
+#~ msgid "Use secure _connection:"
+#~ msgstr "使用安全连接(_C):"
 
-#: ../widgets/table/e-table-click-to-add.c:609
-#: ../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"
-msgstr "单击可添加"
+#~ msgid "_Login method:"
+#~ msgstr "登录方式(_L):"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(升序)"
+#~ msgid "Lo_gin:"
+#~ msgstr "登录(_G):"
 
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(降序)"
+#~ msgid "Search _base:"
+#~ msgstr "搜索基础(_B):"
 
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "未排序"
+#~ msgid "_Search scope:"
+#~ msgstr "搜索范围(_S):"
 
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "未分组"
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "查找可能的搜索基础(_F)"
 
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "Show Fields"
-msgstr "显示域"
+#~ msgid "S_earch filter:"
+#~ msgstr "搜索过滤器(_E):"
 
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "可用域"
+#~ msgid "Search Filter"
+#~ msgstr "搜索过滤器"
 
-#: ../widgets/table/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "可用域(_V):"
+#~ 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 ""
+#~ "搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话,默认情况下搜"
+#~ "索将会在“个人”类型的对象类型。"
 
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "按顺序显示这些域(_S):"
+#~ msgid "1"
+#~ msgstr "1"
 
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "上移(_U)"
+#~ msgid "5"
+#~ msgstr "5"
 
-#: ../widgets/table/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "下移(_D)"
+#~ msgid "_Timeout:"
+#~ msgstr "超时(_T):"
 
-#: ../widgets/table/e-table-config.ui.h:7
-msgid "_Remove"
-msgstr "删除(_R)"
+#~ msgid "_Download limit:"
+#~ msgstr "下载限制(_D):"
 
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "_Show field in View"
-msgstr "在视图中显示域(_S)"
+#~ msgid "B_rowse this book until limit reached"
+#~ msgstr "浏览此地址簿直到达到极限(_R)"
 
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Ascending"
-msgstr "升序"
+#~| msgid "_Path:"
+#~ msgid "Path:"
+#~ msgstr "路径:"
 
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Descending"
-msgstr "降序"
+#~ msgid "Loading calendars"
+#~ msgstr "载入日历"
 
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "分组依据"
+#~ msgid "Loading memos"
+#~ msgstr "载入备忘"
 
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "在视图中显示域(_F)"
+#~ msgid "Loading tasks"
+#~ msgstr "载入任务"
 
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "然后按"
+#~ msgid "IMAP Headers"
+#~ msgstr "IMAP 信头"
 
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "在视图中显示域(_N)"
+#~ msgid ""
+#~ "Select a predefined set of IMAP headers to fetch.\n"
+#~ "Note, larger sets of headers take longer to download."
+#~ msgstr ""
+#~ "选择要获取的预定义 IMAP 信头集合。\n"
+#~ "注意,较大的信头集合下载需要更长时间。"
 
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "在视图中显示域(_V)"
+#~ msgid "_Fetch All Headers"
+#~ msgstr "获取全部信头(_F)"
 
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "全部清除(_A)"
+#~| msgid "Mail Headers Table"
+#~ msgid "_Basic Headers (fastest)"
+#~ msgstr "基本信头(最快)(_B)"
 
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "排序"
+#~| msgid ""
+#~| "_Basic Headers (Fastest) \n"
+#~| "Use this if you do not have filters based on mailing lists"
+#~ msgid "Use this if you are not filtering any mailing lists."
+#~ msgstr "如果您没有基于邮件列表的过滤器,请使用此项。"
 
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "排序依据"
+#~| msgid "Basic and _Mailing List Headers (Default)"
+#~ msgid "Basic and _Mailing List Headers (default)"
+#~ msgstr "基本和邮件列表信头(默认)(_M)"
 
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "全部清除"
+#~ msgid "Custom Headers"
+#~ msgstr "自定义信头"
 
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "排序(_S)..."
+#~ msgid "A_ccept"
+#~ msgstr "接受(_C)"
 
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "分组依据(_G)..."
+#~ msgid "Proxy _Logout"
+#~ msgstr "代理服务器注销(_L)"
 
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "显示的域(_F)..."
+#~ msgid ""
+#~ "Cannot find a corresponding account in the org.gnome.OnlineAccounts "
+#~ "service from which to obtain an authentication token."
+#~ msgstr "在 org.gnome.OnlineAccounts 服务找不到对应的帐号来获取认证令牌。"
 
-#: ../widgets/table/e-table-field-chooser.c:152
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
+#~ msgid "_Inspect..."
+#~ msgstr "审查(_I)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
-msgid "Add a Column"
-msgstr "添加一列"
+#~ msgid "Inspect the HTML content (debugging feature)"
+#~ msgstr "审查 HTML 内容(调试功能)"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:360
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s:%s (%d 项)"
+#~ msgid "Unknown error."
+#~ msgstr "未知错误。"
 
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:372
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d 项)"
+#~ msgid "Mark All Read"
+#~ msgstr "全部标为已读"
 
-#: ../widgets/table/e-table-header-item.c:1574
-msgid "Customize Current View"
-msgstr "自定义当前视图"
+#~ msgid "Mark all messages in a folder as read."
+#~ msgstr "将此文件夹中的所有信息标记为已读。"
 
-#: ../widgets/table/e-table-header-item.c:1596
-msgid "Sort _Ascending"
-msgstr "升序排序(_A)"
+#~ msgid "Could not publish calendar: Calendar backend no longer exists"
+#~ msgstr "不能发布日历:日历后端已经不存在了"
 
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Sort _Descending"
-msgstr "降序排序(_D)"
+#~ msgid "Define Views..."
+#~ msgstr "定义视图..."
 
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "_Unsort"
-msgstr "未排序(_U)"
+#~ msgid "Create or edit views"
+#~ msgstr "创建或编辑视图"
 
-#: ../widgets/table/e-table-header-item.c:1605
-msgid "Group By This _Field"
-msgstr "按该域分组(_F)"
+#~ msgid "Start in \"express\" mode"
+#~ msgstr "以“快速”模式启动"
 
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Group By _Box"
-msgstr "按方框分组(_B)"
+#~ msgctxt "New"
+#~ msgid "_Test Item"
+#~ msgstr "测试条目(_T)"
 
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Remove This _Column"
-msgstr "删除该列(_C)"
+#~ msgid "Create a new test item"
+#~ msgstr "创建新测试项"
 
-#: ../widgets/table/e-table-header-item.c:1615
-msgid "Add a C_olumn..."
-msgstr "添加一列(_O)..."
+#~ msgctxt "New"
+#~ msgid "Test _Source"
+#~ msgstr "测试来源(_S)"
 
-#: ../widgets/table/e-table-header-item.c:1619
-msgid "A_lignment"
-msgstr "对齐(_L)"
+#~ msgid "Create a new test source"
+#~ msgstr "创建一个新的测试来源"
 
-#: ../widgets/table/e-table-header-item.c:1622
-msgid "B_est Fit"
-msgstr "最佳匹配(_E)"
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "文件不是一个有效的 .desktop 文件"
 
-#: ../widgets/table/e-table-header-item.c:1625
-msgid "Format Column_s..."
-msgstr "格式化列(_S)..."
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "无法识别的桌面文件版本“%s”"
 
-#: ../widgets/table/e-table-header-item.c:1629
-msgid "Custo_mize Current View..."
-msgstr "自定义当前视图(_M)..."
+#~ msgid "Starting %s"
+#~ msgstr "启动 %s"
 
-#: ../widgets/table/e-table-header-item.c:1691
-msgid "_Sort By"
-msgstr "排序方式(_S)"
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "应用程序在命令行上不接受文档"
 
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1709
-msgid "_Custom"
-msgstr "自定义(_C)"
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "无法识别的调用选项:%d"
 
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "表格单元格"
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr "不能传递文档的URIs(统一资源定位符)到一个'类型=链接'桌面项目"
 
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "弹出子对象"
+#~ msgid "Not a launchable item"
+#~ msgstr "不是一个可加载的条目"
 
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "切换单元格"
+#~ msgid "Disable connection to session manager"
+#~ msgstr "禁止连接到会话管理器"
 
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr "在包含此单元格的 ETree 中展开行"
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "指定包含了保存的配置的文件。"
 
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "在包含此单元格的 ETree 中折叠行"
+#~ msgid "FILE"
+#~ msgstr "文件"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "单击"
+#~ msgid "Specify session management ID"
+#~ msgstr "特殊的会话管理ID"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
-msgid "sort"
-msgstr "排序"
+#~ msgid "ID"
+#~ msgstr "ID"
 
-#: ../widgets/text/e-text.c:2074
-msgid "Select All"
-msgstr "全选"
+#~ msgid "Session management options:"
+#~ msgstr "会话管理选项:"
 
-#: ../widgets/text/e-text.c:2087
-msgid "Input Methods"
-msgstr "输入法"
+#~ msgid "Show session management options"
+#~ msgstr "显示会话管理选项"
+
+#~ msgid "Certificate Viewer: %s"
+#~ msgstr "证书查看器:%s"
+
+#~ msgid "Define Views for %s"
+#~ msgstr "定义 %s 的视图"
+
+#~ msgid "Define Views"
+#~ msgstr "定义视图"
+
+#~ msgid "Define Views for \"%s\""
+#~ msgstr "定义“%s”的视图"
+
+#~ msgid "Table"
+#~ msgstr "表格"
+
+#~ msgid "Define New View"
+#~ msgstr "定义新视图"
+
+#~ msgid "Name of new view:"
+#~ msgstr "新视图的名称:"
+
+#~ msgid "Type of view:"
+#~ msgstr "视图类型:"
+
+#~ msgid "Type of View"
+#~ msgstr "视图类型"
+
+#~ msgid "Could not send attachment"
+#~ msgid_plural "Could not send attachments"
+#~ msgstr[0] "不能发送附件"
+
+#~ msgid "_Send To..."
+#~ msgstr "发送到(_S)..."
+
+#~ msgid "Send the selected attachments somewhere"
+#~ msgstr "发送某个选中的附件"
+
+#~ msgid "Available Fields"
+#~ msgstr "可用域"
+
+#~ msgid "A_vailable Fields:"
+#~ msgstr "可用域(_V):"
+
+#~ msgid "_Show these fields in order:"
+#~ msgstr "按顺序显示这些域(_S):"
+
+#~ msgid "Move _Up"
+#~ msgstr "上移(_U)"
+
+#~ msgid "Move _Down"
+#~ msgstr "下移(_D)"
 
 #~ msgid "Some features may not work properly with your current server"
 #~ msgstr "某些特性可能无法在您目前的服务器下工作"
@@ -21306,9 +21570,6 @@ msgstr "输入法"
 #~ msgid "Enter Passphrase for %s"
 #~ msgstr "输入 %s 的密码"
 
-#~ msgid "Enter Passphrase"
-#~ msgstr "输入密码"
-
 #~ msgid "Enter Password for %s"
 #~ msgstr "为 %s 输入密码"
 
@@ -21517,9 +21778,6 @@ msgstr "输入法"
 #~ "as the user resizes the window horizontally."
 #~ msgstr "“文件夹订阅”窗口的初始宽度。这个值会在用户调整窗口水平大小时更新。"
 
-#~ msgid "Default reply style"
-#~ msgstr "默认回复样式"
-
 #~ msgid ""
 #~ "Possible values are: never - to never close browser window always - to "
 #~ "always close browser window ask - (or any other value) will ask user"
@@ -21732,9 +21990,6 @@ msgstr "输入法"
 #~ msgid "The script file must exist and be executable."
 #~ msgstr "脚本文件必须存在且可执行。"
 
-#~ msgid "Unable to connect to the GroupWise server."
-#~ msgstr "无法连接到 GroupWise 服务器。"
-
 #~ msgid "Please check your account settings and try again."
 #~ msgstr "请检查您的帐号设置,然后再试一次。"
 
@@ -21785,7 +22040,7 @@ msgstr "输入法"
 #~ msgid ""
 #~ "The UID of the selected (or \"primary\") address book in the sidebar of "
 #~ "the \"Contacts\" view."
-#~ msgstr "“联系人”视图中侧边栏中选择的(或“主”)地址薄的 UID。"
+#~ msgstr "“联系人”视图中侧边栏中选择的(或“主”)地址簿的 UID。"
 
 #~ msgid "Whether to show maps in preview pane."
 #~ msgstr "是否在预览面板中显示地图。"
@@ -22209,9 +22464,6 @@ msgstr "输入法"
 #~ msgid "None"
 #~ msgstr "无"
 
-#~ msgid "_Units:"
-#~ msgstr "单位(_U):"
-
 #~ msgid "Metric (Celsius, cm, etc)"
 #~ msgstr "公制(摄氏、厘米等等)"
 
@@ -22228,7 +22480,7 @@ msgstr "输入法"
 #~ msgstr "默认源"
 
 #~ msgid "Mark your preferred address book and calendar as default."
-#~ msgstr "把您首选的地址薄和日历设为默认。"
+#~ msgstr "把您首选的地址簿和日历设为默认。"
 
 #~ msgid "Automatically launch editor when key is pressed in the mail composer"
 #~ msgstr "在邮件编辑器中按键时自动启动文本编辑器"
@@ -22580,9 +22832,6 @@ msgstr "输入法"
 #~ msgid "O_pen With"
 #~ msgstr "打开方式(_P)"
 
-#~ msgid "No HTML stream available"
-#~ msgstr "没有可用的 HTML 流。"
-
 #~ msgid "C_haracter set:"
 #~ msgstr "字符集(_H):"
 
@@ -22660,9 +22909,6 @@ msgstr "输入法"
 #~ msgid "None"
 #~ msgstr "无"
 
-#~ msgid "Custom Alarm:"
-#~ msgstr "自定义提醒:"
-
 #~ msgid "_Alarm"
 #~ msgstr "提醒(_A)"
 
@@ -22804,9 +23050,6 @@ msgstr "输入法"
 #~ msgid "Retract Mail"
 #~ msgstr "收回邮件"
 
-#~ msgid "Accept"
-#~ msgstr "接受"
-
 #~ msgid "Accept Tentatively"
 #~ msgstr "暂时接受"
 
@@ -22848,9 +23091,6 @@ msgstr "输入法"
 #~ msgid "Shared Folder Installation"
 #~ msgstr "共享文件夹安装"
 
-#~ msgid "Junk Settings"
-#~ msgstr "垃圾信息设置"
-
 #~ msgid "Junk Mail Settings"
 #~ msgstr "垃圾信息设置"
 
@@ -23118,9 +23358,6 @@ msgstr "输入法"
 #~ "like to create new memos anyway?"
 #~ msgstr[0] "选定的备忘列表已经包含给定邮件的备忘。您仍然要创建一个新备忘吗?"
 
-#~ msgid "Evolution Profiler"
-#~ msgstr "Evolution 配置器"
-
 #~ msgid "Profile data events in Evolution (for developers only)."
 #~ msgstr "分析 Evolution 中的数据时间(仅开发者)。"
 
@@ -23606,9 +23843,6 @@ msgstr "输入法"
 #~ msgid "This store does not support subscriptions, or they are not enabled."
 #~ msgstr "此存储不支持订阅,或订阅未启用。"
 
-#~ msgid "Folder"
-#~ msgstr "文件夹"
-
 #~ msgid "Please select a server."
 #~ msgstr "请选择服务器。"
 
@@ -23695,9 +23929,6 @@ msgstr "输入法"
 #~ msgid "V_ariable-width:"
 #~ msgstr "变宽(_A):"
 
-#~ msgid "_Mark messages as read after"
-#~ msgstr "把信息标记为已读前等(_M)"
-
 #~ msgid "_Show image animations"
 #~ msgstr "显示图像动画(_S)"
 
@@ -23901,9 +24132,6 @@ msgstr "输入法"
 #~ msgid "No such source"
 #~ msgstr "没有来源"
 
-#~ msgid "Not available in offline mode"
-#~ msgstr "脱机模式下不可用"
-
 #~ msgid "Other error"
 #~ msgstr "其它错误"
 
@@ -24523,9 +24751,6 @@ msgstr "输入法"
 #~ msgid "_Remind Me Later"
 #~ msgstr "稍后提醒(_R)"
 
-#~ msgid "Edit"
-#~ msgstr "编辑"
-
 #~ msgid "Import"
 #~ msgstr "导入"
 
@@ -24664,9 +24889,6 @@ msgstr "输入法"
 #~ msgid "Frozen"
 #~ msgstr "冻结"
 
-#~ msgid "Table header"
-#~ msgstr "表头"
-
 #~ msgid "Table model"
 #~ msgstr "表格模型"
 



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